[meta-oe][PATCH] directfb: fix tslib version check in configure.in

[meta-oe][PATCH] directfb: fix tslib version check in configure.in

[Mark Jonas]

From: Guan Ben <ben.guan@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.guan@cn.bosch.com>
Signed-off-by: Mark Jonas <mark.jonas@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

✗ patchtest: failure for directfb: fix tslib version check in configure.in

[Patchwork]

== Series Details ==

Series: directfb: fix tslib version check in configure.in
Revision: 1
URL   : https://patchwork.openembedded.org/series/13385/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Patch            [meta-oe] directfb: fix tslib version check in configure.in
 Issue             Series sent to the wrong mailing list [test_target_mailing_list] 
  Suggested fix    Check the project's README (meta-oe) and send the patch to the indicated list

* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  master (currently at 1c4d9f46d5)

* Issue             A patch file has been added, but does not have a Signed-off-by tag [test_signed_off_by_presence] 
  Suggested fix    Sign off the added patch file (meta-oe/recipes-graphics/directfb/directfb/fix-tslib-version-version-check.patch)

* Issue             Added patch file is missing Upstream-Status in the header [test_upstream_status_presence_format] 
  Suggested fix    Add Upstream-Status: <Valid status> to the header of meta-oe/recipes-graphics/directfb/directfb/fix-tslib-version-version-check.patch
  Standard format  Upstream-Status: <Valid status>
  Valid status     Pending, Accepted, Backport, Denied, Inappropriate [reason], Submitted [where]



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

Re: [meta-oe][PATCH] directfb: fix tslib version check in configure.in

[Richard Purdie]

On Sat, 2018-08-04 at 20:26 +0200, Mark Jonas wrote:
> From: Guan Ben <ben.guan@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.

I'm a little confused about why OE needs this patch? Surely OE is using
the more recent tslib releases and therefore we don't need this patch?

Cheers,

Richard