mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-15 16:07:26 +00:00
Code Issues Projects Releases Wiki Activity

fbida: Upgrade to 2.14

Browse Source 
* Redo libjpeg detection to use cross cpp
* Add missing dependencies
* Use cairo only when it is compiled with EGL support which is not defaul
  in oe-core
* Fix build  with gcc10

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2020-08-13 15:19:43 -07:00
parent 646429ef0a
commit c93035a0fe
4 changed files with 93 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch
+6 -14
View File
@@ -1,14 +1,6 @@
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
--- a/scripts/jpeg-version.sh
+++ b/scripts/jpeg-version.sh
@@ -1,2 +1,2 @@
#!/bin/sh
-echo JPEG_LIB_VERSION | cpp $CFLAGS -include jpeglib.h | tail -1
+${CPP} -include jpeglib.h -dM -E -x c /dev/null | grep 'define JPEG_LIB_VERSION' | cut -f 3 -d' '