CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fbida: Fix build with libjpeg-turbo

Browse Source 
Dont hardcode cpp to point to gcc collection, helps
compiling with clang

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Khem Raj 2017-08-08 14:48:00 -07:00 committed by Martin Jansa
parent 4febf0dafb
commit 24b6c3c4ba
4 changed files with 1885 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta-oe/recipes-graphics/fbida/fbida_2.10.bb
View File

@ -12,6 +12,9 @@ DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif"
SRC_URI = "https://www.kraxel.org/releases/fbida/fbida-${PV}.tar.gz \
file://0001-Avoid-using-host-path.patch \
file://fix-preprocessor.patch \
file://support-jpeg-turbo.patch \
file://use-jpeg-turbo.patch \
"
SRC_URI[md5sum] = "09460b964b58c2e39b665498eca29018"
SRC_URI[sha256sum] = "7a5a3aac61b40a6a2bbf716d270a46e2f8e8d5c97e314e927d41398a4d0b6cb6"
@ -34,7 +37,7 @@ PACKAGECONFIG[lirc] = ",,lirc"
do_compile() {
sed -i -e 's# fbgs# \$(srcdir)/fbgs#; s#-Ijpeg#-I\$(srcdir)/jpeg#; s# jpeg/# \$(srcdir)/jpeg/#' ${S}/GNUmakefile
sed -i -e 's:/sbin/ldconfig:echo x:' ${S}/mk/Autoconf.mk
sed -i -e 's: cpp: ${TARGET_PREFIX}cpp -I${STAGING_INCDIR}:' ${S}/GNUmakefile
sed -i -e 's: cpp: ${CPP}:' ${S}/GNUmakefile
# Be sure to respect preferences (force to "no")
# Also avoid issues when ${BUILD_ARCH} == ${HOST_ARCH}

14
meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch Normal file
View File

@ -0,0 +1,14 @@
Index: fbida-2.13/GNUmakefile
===================================================================
--- fbida-2.13.orig/GNUmakefile
+++ fbida-2.13/GNUmakefile
@@ -53,8 +53,7 @@ include $(srcdir)/mk/Autoconf.mk
ac_jpeg_ver = $(shell \
$(call ac_init,for libjpeg version);\
- $(call ac_s_cmd,echo JPEG_LIB_VERSION \
- | cpp -include jpeglib.h | tail -n 1);\
+ $(call ac_s_cmd,cpp -include jpeglib.h -dM -E -x c /dev/null | grep 'define JPEG_LIB_VERSION' | cut -f 3 -d' ');\
$(call ac_fini))
define make-config

1854
meta-oe/recipes-graphics/fbida/files/support-jpeg-turbo.patch Normal file
View File

File diff suppressed because it is too large Load Diff

13
meta-oe/recipes-graphics/fbida/files/use-jpeg-turbo.patch Normal file
View File

@ -0,0 +1,13 @@
Index: fbida-2.10/GNUmakefile
===================================================================
--- fbida-2.10.orig/GNUmakefile
+++ fbida-2.10/GNUmakefile
@@ -51,7 +51,7 @@ HAVE_LIBSANE := $(call ac_lib,sane_init,
HAVE_LIBCURL := $(call ac_lib,curl_easy_init,curl)
HAVE_LIBLIRC := $(call ac_lib,lirc_init,lirc_client)
HAVE_MOTIF := $(call ac_lib,XmStringGenerate,Xm,-L/usr/X11R6/$(LIB) -lXpm -lXt -lXext -lX11)
-JPEG_VER := $(call ac_jpeg_ver)
+JPEG_VER := 62
endef
# transposing