tslib: replace obsolete automake macros with working ones

Add obsolete-automake-macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.

(From meta-openembedded rev: 4ba5cc77f1c47c428c8b607375f22521d1860176)

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/obsolete_automake_macros.patch b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/obsolete_automake_macros.patch
new file mode 100644 (file)
index 0000000..752077d
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib/obsolete_automake_macros.patch
@@ -0,0 +1,16 @@
+Upstream-Status: Submitted [https://github.com/kergoth/tslib/pull/14]
+
+Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
+diff --git a/configure.ac b/configure.ac
+index c42be91..6d71be0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,7 +6,7 @@ AC_INIT(tslib, 1.0.0, kergoth@handhelds.org)
+ # AC_CONFIG_AUX_DIR(config)
+ AM_INIT_AUTOMAKE(dist-bzip2)
+ AC_CONFIG_SRCDIR([src/ts_close.c])
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+
+ PACKAGE_DESCRIPTION="Touchscreen Access Library"
+ AC_SUBST(PACKAGE_DESCRIPTION)

diff --git a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_git.bb b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_git.bb
index 07f8a97..71a63ee 100644 (file)
--- a/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_git.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/tslib/tslib_git.bb
@@ -10,11 +10,12 @@ SECTION = "base"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a"
 
-PR = "r0"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "git://github.com/kergoth/tslib.git;protocol=git \
+           file://obsolete_automake_macros.patch \
            file://ts.conf \
            file://tslib.sh"
 SRCREV = "e17263ef401ee885a27d649b90b577cfb44500e0"