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

directfb: fix tslib version check in configure.in

Browse Source 
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>
This commit is contained in:
Ben Guan 2018-08-07 16:15:14 +02:00 committed by Khem Raj
parent e88b38a9d2
commit 864eb0024f
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meta-oe/recipes-graphics/directfb/directfb.inc
View File

@ -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}"

38
meta-oe/recipes-graphics/directfb/directfb/fix-tslib-version-check.patch Normal file
View File

@ -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