commit: abe95f7952f00bf0340c8708e458d65002e1bb5a
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 8 21:51:42 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Dec 8 21:52:15 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abe95f79
dev-libs/DirectFB: fix tslib detection #567294
dev-libs/DirectFB/DirectFB-1.7.6.ebuild | 3 +-
dev-libs/DirectFB/files/DirectFB-1.7.6-tslib.patch | 33 ++++++++++++++++++++++
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/dev-libs/DirectFB/DirectFB-1.7.6.ebuild
b/dev-libs/DirectFB/DirectFB-1.7.6.ebuild
index 7e56b85..fdb99b1 100644
--- a/dev-libs/DirectFB/DirectFB-1.7.6.ebuild
+++ b/dev-libs/DirectFB/DirectFB-1.7.6.ebuild
@@ -77,7 +77,8 @@ src_prepare() {
"${FILESDIR}"/${PN}-1.6.3-setregion.patch \
"${FILESDIR}"/${PN}-1.6.3-atomic-fix-compiler-error-when-building-for-thumb2.patch
\
"${FILESDIR}"/${PN}-1.7.6-cle266.patch \
- "${FILESDIR}"/${PN}-1.7.6-idivine.patch
+ "${FILESDIR}"/${PN}-1.7.6-idivine.patch \
+ "${FILESDIR}"/${PN}-1.7.6-tslib.patch
sed -i \
-e '/#define RASPBERRY_PI/d' \
systems/egl/egl_system.c || die #497124
diff --git a/dev-libs/DirectFB/files/DirectFB-1.7.6-tslib.patch
b/dev-libs/DirectFB/files/DirectFB-1.7.6-tslib.patch
new file mode 100644
index 00000000..3315968
--- /dev/null
+++ b/dev-libs/DirectFB/files/DirectFB-1.7.6-tslib.patch
@@ -0,0 +1,33 @@
+https://github.com/deniskropp/DirectFB/pull/6
+https://bugs.gentoo.org/567294
+
+From 5c7c4b197b9d04587b05624db4cfca6503adb3ff Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vap...@gentoo.org>
+Date: Thu, 8 Dec 2016 16:47:34 -0500
+Subject: [PATCH] configure: fix tslib version check
+
+The tslib version is 1.0, not 1.0.0. Trying to check for the latter
+fails when using pkg-config:
+$ pkg-config --exists --print-errors "tslib-1.0 >= 1.0"
+$ pkg-config --exists --print-errors "tslib-1.0 >= 1.0.0"
+Requested 'tslib-1.0 >= 1.0.0' but version of tslib is 1.0
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 6143cd393699..12a65fdc4f52 100644
+--- a/configure.in
++++ b/configure.in
+@@ -2561,7 +2561,7 @@ fi
+
+ 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.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.])])
+--
+2.11.0.rc2
+
