From: Guan Ben <ben.g...@cn.bosch.com> The patch makes sure that the old as well as the new tslib pkg-config metadata file naming style is handled correctly.
tslib 0.0 to 1.0 created only a tslib-<VERSION>.pc pkg-config metadata file. With tslib 1.1 the tslib-<VERSION>.pc phase out was started. Additionally, the pkg-config metadata file tslib.pc was added. Since tslib 1.6 the tslib-<VERSION>.pc metadata file is deprecated. Now, there is only a tslib.pc. Signed-off-by: Ben Guan <ben.g...@cn.bosch.com> Signed-off-by: Mark Jonas <mark.jo...@de.bosch.com> --- meta-oe/recipes-graphics/directfb/directfb.inc | 1 + .../directfb/fix-tslib-version-version-check.patch | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 meta-oe/recipes-graphics/directfb/directfb/fix-tslib-version-version-check.patch diff --git a/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-oe/recipes-graphics/directfb/directfb.inc index bd66a28..af07ad7 100644 --- a/meta-oe/recipes-graphics/directfb/directfb.inc +++ b/meta-oe/recipes-graphics/directfb/directfb.inc @@ -20,6 +20,7 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.g file://union-sigval.patch \ file://use-PTHREAD_MUTEX_RECURSIVE.patch \ file://fix-client-gfx_state-initialisation.patch \ + file://fix-tslib-version-version-check.patch \ " S = "${WORKDIR}/DirectFB-${PV}" diff --git a/meta-oe/recipes-graphics/directfb/directfb/fix-tslib-version-version-check.patch b/meta-oe/recipes-graphics/directfb/directfb/fix-tslib-version-version-check.patch new file mode 100644 index 0000000..b30db11 --- /dev/null +++ b/meta-oe/recipes-graphics/directfb/directfb/fix-tslib-version-version-check.patch @@ -0,0 +1,20 @@ +diff -Nru DirectFB-1.7.7.orig/configure.in DirectFB-1.7.7/configure.in +--- DirectFB-1.7.7.orig/configure.in 2015-02-10 01:16:46.000000000 +0800 ++++ DirectFB-1.7.7/configure.in 2018-06-06 17:19:18.472143103 +0800 +@@ -2459,10 +2459,13 @@ + + enable_tslib=no + if test "$checkfor_tslib" = "yes"; then +- PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0.0], [enable_tslib=yes], [enable_tslib=no]) ++ PKG_CHECK_MODULES([TSLIB], [tslib >= 1.1], [enable_tslib=yes], [enable_tslib=no]) + if test "$enable_tslib" = "no"; then +- PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [enable_tslib=yes], [enable_tslib=no +- AC_MSG_WARN([*** no tslib -- tslib driver will not be built.])]) ++ PKG_CHECK_MODULES([TSLIB], [tslib-1.0 >= 1.0], [enable_tslib=yes], [enable_tslib=no]) ++ if test "$enable_tslib" = "no"; then ++ PKG_CHECK_MODULES([TSLIB], [tslib-0.0], [enable_tslib=yes], [enable_tslib=no ++ AC_MSG_WARN([*** no tslib -- tslib driver will not be built.])]) ++ fi + fi + fi + -- 2.7.4 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
