diff options
| author |   Ben Guan <ben.guan@cn.bosch.com> | 2018-08-07 16:15:14 +0200 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2018-08-19 16:09:28 -0700 |
| commit | 864eb0024f6f8cf91b3484fb002bf89f94fbb1ea (patch) | |
| tree | 3295c4149d7538581024b6e89a8a23d20b081ab2 | |
| parent | e88b38a9d214c3296892e0e6f6c6b444d1d48a54 (diff) | |
| download | meta-openembedded-contrib-864eb0024f6f8cf91b3484fb002bf89f94fbb1ea.tar.gz | |
directfb: fix tslib version check in configure.in
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.guan@cn.bosch.com>
Signed-off-by: Mark Jonas <mark.jonas@de.bosch.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-graphics/directfb/directfb.inc | 1 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/directfb/directfb/fix-tslib-version-check.patch | 38 |
2 files changed, 39 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-oe/recipes-graphics/directfb/directfb.inc index bd66a28207..96aa31117f 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-check.patch \ " S = "${WORKDIR}/DirectFB-${PV}" diff --git a/meta-oe/recipes-graphics/directfb/directfb/fix-tslib-version-check.patch b/meta-oe/recipes-graphics/directfb/directfb/fix-tslib-version-check.patch new file mode 100644 index 0000000000..352bfaf201 --- /dev/null +++ b/meta-oe/recipes-graphics/directfb/directfb/fix-tslib-version-check.patch @@ -0,0 +1,38 @@ +fix tslib version check in configure.in + +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. + +Upstream-Status: Inappropriate [no upstream] +Signed-off-by: Ben Guan <ben.guan@cn.bosch.com> +Signed-off-by: Mark Jonas <mark.jonas@de.bosch.com> + +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 + |