summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMarko Lindqvist <cazfi74@gmail.com>2013-01-10 11:58:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-15 08:10:10 +0000
commit675a18d07a890a7e101462ce43e00b19b1f9f109 (patch)
tree68eaaf904553dfc3fc86805a7f679a31a40ca942 /meta
parent7b8703886718ef2f63ea355b017dcdf69fb5e56e (diff)
downloadpoky-675a18d07a890a7e101462ce43e00b19b1f9f109.tar.gz
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 OE-Core rev: 4530d308a546e989873e2978ea5ed2970e8925e7) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/tslib/tslib/obsolete_automake_macros.patch15
-rw-r--r--meta/recipes-graphics/tslib/tslib_1.0.bb6
2 files changed, 19 insertions, 2 deletions
diff --git a/meta/recipes-graphics/tslib/tslib/obsolete_automake_macros.patch b/meta/recipes-graphics/tslib/tslib/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..982413e859
--- /dev/null
+++ b/meta/recipes-graphics/tslib/tslib/obsolete_automake_macros.patch
@@ -0,0 +1,15 @@
1Upstream-Status: Submitted [https://github.com/kergoth/tslib/pull/14]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd tslib-1.0/configure.ac tslib-1.0/configure.ac
5--- tslib-1.0/configure.ac 2006-08-25 00:02:55.000000000 +0300
6+++ tslib-1.0/configure.ac 2013-01-03 06:05:02.486882412 +0200
7@@ -6,7 +6,7 @@
8 # AC_CONFIG_AUX_DIR(config)
9 AM_INIT_AUTOMAKE(dist-bzip2)
10 AC_CONFIG_SRCDIR([src/ts_close.c])
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13
14 PACKAGE_DESCRIPTION="Touchscreen Access Library"
15 AC_SUBST(PACKAGE_DESCRIPTION)
diff --git a/meta/recipes-graphics/tslib/tslib_1.0.bb b/meta/recipes-graphics/tslib/tslib_1.0.bb
index 2c4b325e20..84bc1ebdc2 100644
--- a/meta/recipes-graphics/tslib/tslib_1.0.bb
+++ b/meta/recipes-graphics/tslib/tslib_1.0.bb
@@ -10,14 +10,16 @@ SECTION = "base"
10LICENSE = "LGPLv2" 10LICENSE = "LGPLv2"
11LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a" 11LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a"
12 12
13PR = "r20" 13PR = "r21"
14 14
15SRC_URI = "http://download.berlios.de/tslib/tslib-${PV}.tar.bz2 \ 15SRC_URI = "http://download.berlios.de/tslib/tslib-${PV}.tar.bz2 \
16 file://fix_version.patch \ 16 file://fix_version.patch \
17 file://0001-Link-plugins-against-libts.patch \ 17 file://0001-Link-plugins-against-libts.patch \
18 file://ts.conf \ 18 file://ts.conf \
19 file://tslib.sh \ 19 file://tslib.sh \
20 file://set-open-mode-for-ts_calibrate_c.patch" 20 file://set-open-mode-for-ts_calibrate_c.patch \
21 file://obsolete_automake_macros.patch \
22"
21 23
22SRC_URI[md5sum] = "92b2eb55b1e4ef7e2c0347069389390e" 24SRC_URI[md5sum] = "92b2eb55b1e4ef7e2c0347069389390e"
23SRC_URI[sha256sum] = "9c40d914e4f6fe00bdd77137d671c7ce4f211686228f2eb8b2d3c2360bc249c8" 25SRC_URI[sha256sum] = "9c40d914e4f6fe00bdd77137d671c7ce4f211686228f2eb8b2d3c2360bc249c8"