diff options
| author | Khem Raj <raj.khem@gmail.com> | 2020-08-13 15:19:43 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2020-08-13 22:37:48 -0700 |
| commit | c93035a0fe085aab6d3d674ce2cb1da3f03e76fd (patch) | |
| tree | 9e4a266c60993e2d8c15c53e4bbc69c3def474d7 /meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch | |
| parent | 646429ef0a67f18812476cafd4d256bbbee2b8c9 (diff) | |
| download | meta-openembedded-c93035a0fe085aab6d3d674ce2cb1da3f03e76fd.tar.gz | |
fbida: Upgrade to 2.14
* 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>
Diffstat (limited to 'meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch')
| -rw-r--r-- | meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch b/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch index 909a0a6c0f..cdeac996a1 100644 --- a/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch +++ b/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch | |||
| @@ -1,14 +1,6 @@ | |||
| 1 | Index: fbida-2.13/GNUmakefile | 1 | --- a/scripts/jpeg-version.sh |
| 2 | =================================================================== | 2 | +++ b/scripts/jpeg-version.sh |
| 3 | --- fbida-2.13.orig/GNUmakefile | 3 | @@ -1,2 +1,2 @@ |
| 4 | +++ fbida-2.13/GNUmakefile | 4 | #!/bin/sh |
| 5 | @@ -53,8 +53,7 @@ include $(srcdir)/mk/Autoconf.mk | 5 | -echo JPEG_LIB_VERSION | cpp $CFLAGS -include jpeglib.h | tail -1 |
| 6 | 6 | +${CPP} -include jpeglib.h -dM -E -x c /dev/null | grep 'define JPEG_LIB_VERSION' | cut -f 3 -d' ' | |
| 7 | ac_jpeg_ver = $(shell \ | ||
| 8 | $(call ac_init,for libjpeg version);\ | ||
| 9 | - $(call ac_s_cmd,echo JPEG_LIB_VERSION \ | ||
| 10 | - | cpp -include jpeglib.h | tail -n 1);\ | ||
| 11 | + $(call ac_s_cmd,cpp -include jpeglib.h -dM -E -x c /dev/null | grep 'define JPEG_LIB_VERSION' | cut -f 3 -d' ');\ | ||
| 12 | $(call ac_fini)) | ||
| 13 | |||
| 14 | define make-config | ||