tslib 1.1 update
cover tslib 1.1 update
Tested both with ts_calibrate/ts_test and the Qt Embedded demo application on both qemumips and qemux86. Once merged this should also allow removal of the tslib recipe in meta-oe.
The following change since commit b8952942aed77473d3b44a17112cbf6a9e83eff3:
qemu: Fix bit extraction for MTFSFI and MTFSF (2013-08-16 11:39:43 +0100)
is available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/tslib
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/tslib
Paul Eggleton (1):
tslib: update to 1.1
.../tslib/0001-Link-plugins-against-libts.patch | 57 --
.../tslib/tslib/32bitBE-support.patch | 55 --
.../recipes-graphics/tslib/tslib/fix_version.patch | 34 -
meta/recipes-graphics/tslib/tslib/multievent.patch | 845 ---------------------
.../tslib/tslib/obsolete_automake_macros.patch | 15 -
.../tslib/set-open-mode-for-ts_calibrate_c.patch | 30 -
.../tslib/{tslib_1.0.bb => tslib_1.1.bb} | 14 +-
7 files changed, 3 insertions(+), 1047 deletions(-)
delete mode 100644 meta/recipes-graphics/tslib/tslib/0001-Link-plugins-against-libts.patch
delete mode 100644 meta/recipes-graphics/tslib/tslib/32bitBE-support.patch
delete mode 100644 meta/recipes-graphics/tslib/tslib/fix_version.patch
delete mode 100644 meta/recipes-graphics/tslib/tslib/multievent.patch
delete mode 100644 meta/recipes-graphics/tslib/tslib/obsolete_automake_macros.patch
delete mode 100644 meta/recipes-graphics/tslib/tslib/set-open-mode-for-ts_calibrate_c.patch
rename meta/recipes-graphics/tslib/{tslib_1.0.bb => tslib_1.1.bb} (77%)Signature · 1 line
1.8.1.2
PATCH 1/1 tslib: update to 1.1
Drop patches merged upstream. 32bitBE-support.patch wasn't merged, but no longer applies and similar changes look to have been made; tslib 1.1 works properly on qemumips without it, so this has also been dropped.
---
.../tslib/0001-Link-plugins-against-libts.patch | 57 --
.../tslib/tslib/32bitBE-support.patch | 55 --
.../recipes-graphics/tslib/tslib/fix_version.patch | 34 -
meta/recipes-graphics/tslib/tslib/multievent.patch | 845 ---------------------
.../tslib/tslib/obsolete_automake_macros.patch | 15 -
.../tslib/set-open-mode-for-ts_calibrate_c.patch | 30 -
.../tslib/{tslib_1.0.bb => tslib_1.1.bb} | 14 +-
7 files changed, 3 insertions(+), 1047 deletions(-)
delete mode 100644 meta/recipes-graphics/tslib/tslib/0001-Link-plugins-against-libts.patch
delete mode 100644 meta/recipes-graphics/tslib/tslib/32bitBE-support.patch
delete mode 100644 meta/recipes-graphics/tslib/tslib/fix_version.patch
delete mode 100644 meta/recipes-graphics/tslib/tslib/multievent.patch
delete mode 100644 meta/recipes-graphics/tslib/tslib/obsolete_automake_macros.patch
delete mode 100644 meta/recipes-graphics/tslib/tslib/set-open-mode-for-ts_calibrate_c.patch
rename meta/recipes-graphics/tslib/{tslib_1.0.bb => tslib_1.1.bb} (77%)meta/recipes-graphics/tslib/tslib/0001-Link-plugins-against-libts.patch deleted +0 -57
@@ -1,57 +0,0 @@ -From 9623bbedf4ff409e5036edfcfe52b2595932a6d7 Mon Sep 17 00:00:00 2001 -From: Chris Larson <[email protected]> -Date: Sat, 1 Nov 2008 20:46:07 +0000 -Subject: [PATCH] Link plugins against libts - -Some plugins use tslib functions. Link those plugins against libts. -The problem is easy to see with LDFLAGS="-Wl,-no-undefined". -Without this change DirectFB in unable to use tslib because symbols -in the tslib plugins can't be resolved. - -Signed-off-by: Ville Syrjala <[email protected]> -Signed-off-by: Chris Larson <[email protected]> - -The patch was imported from git server git://github.com/kergoth/tslib.git -as of commit id 9623bbedf4ff409e5036edfcfe52b2595932a6d7. - -Upstream-Status: Accepted -Signed-off-by: Dmitry Cherukhin <[email protected]> ---- - plugins/Makefile.am | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index 3b902c2..4c4ef8b 100644 ---- a/plugins/Makefile.am -+++ b/plugins/Makefile.am -@@ -114,15 +114,19 @@ pluginexec_LTLIBRARIES = \ - - variance_la_SOURCES = variance.c - variance_la_LDFLAGS = -module $(LTVSN) -+variance_la_LIBADD = $(top_builddir)/src/libts.la - - dejitter_la_SOURCES = dejitter.c - dejitter_la_LDFLAGS = -module $(LTVSN) -+dejitter_la_LIBADD = $(top_builddir)/src/libts.la - - linear_la_SOURCES = linear.c - linear_la_LDFLAGS = -module $(LTVSN) -+linear_la_LIBADD = $(top_builddir)/src/libts.la - - pthres_la_SOURCES = pthres.c - pthres_la_LDFLAGS = -module $(LTVSN) -+pthres_la_LIBADD = $(top_builddir)/src/libts.la - - # hw access - corgi_la_SOURCES = corgi-raw.c -@@ -148,6 +152,7 @@ tatung_la_LDFLAGS = -module $(LTVSN) - - input_la_SOURCES = input-raw.c - input_la_LDFLAGS = -module $(LTVSN) -+input_la_LIBADD = $(top_builddir)/src/libts.la - - linear_h2200_la_SOURCES = linear-h2200.c - linear_h2200_la_LDFLAGS = -module $(LTVSN) --- -1.7.6.4 -
meta/recipes-graphics/tslib/tslib/32bitBE-support.patch deleted +0 -55
55 lines not on this page · raw message
meta/recipes-graphics/tslib/tslib/fix_version.patch deleted +0 -34
@@ -1,34 +0,0 @@ ---- - configure.ac | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -Upstream-Status: Inappropriate [configuration] - -Index: tslib-1.0/configure.ac -=================================================================== ---- tslib-1.0.orig/configure.ac 2006-08-24 22:02:55.000000000 +0100 -+++ tslib-1.0/configure.ac 2007-07-09 21:04:38.000000000 +0100 -@@ -2,7 +2,7 @@ - # Process this file with autoconf to produce a configure script. - - AC_PREREQ(2.57) --AC_INIT(tslib, 0.0.2, [email protected]) -+AC_INIT(tslib, 1.0.0, [email protected]) - # AC_CONFIG_AUX_DIR(config) - AM_INIT_AUTOMAKE(dist-bzip2) - AC_CONFIG_SRCDIR([src/ts_close.c]) -@@ -193,10 +193,10 @@ TS_CONF='${sysconfdir}/ts.conf' - AC_SUBST(TS_CONF) - - # Library versioning --LT_RELEASE=0.0 --LT_CURRENT=1 --LT_REVISION=1 --LT_AGE=1 -+LT_RELEASE=1.0 -+LT_CURRENT=0 -+LT_REVISION=0 -+LT_AGE=0 - AC_SUBST(LT_RELEASE) - AC_SUBST(LT_CURRENT) - AC_SUBST(LT_REVISION)
meta/recipes-graphics/tslib/tslib/multievent.patch deleted +0 -845
845 lines not on this page · raw message
meta/recipes-graphics/tslib/tslib/obsolete_automake_macros.patch deleted +0 -15
@@ -1,15 +0,0 @@ -Upstream-Status: Submitted [https://github.com/kergoth/tslib/pull/14] - -Signed-off-by: Marko Lindqvist <[email protected]> -diff -Nurd tslib-1.0/configure.ac tslib-1.0/configure.ac ---- tslib-1.0/configure.ac 2006-08-25 00:02:55.000000000 +0300 -+++ tslib-1.0/configure.ac 2013-01-03 06:05:02.486882412 +0200 -@@ -6,7 +6,7 @@ - # 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)
meta/recipes-graphics/tslib/tslib/set-open-mode-for-ts_calibrate_c.patch deleted +0 -30
@@ -1,30 +0,0 @@ -Get patch from: http://permalink.gmane.org/gmane.comp.lib.uclibc.buildroot/27614 - -Upstream-Status: Inappropriate [configuration] - -diff --git a/tests/ts_calibrate.c b/tests/ts_calibrate.c -index 004517b..c0a9771 100644 ---- a/tests/ts_calibrate.c -+++ b/tests/ts_calibrate.c -@@ -21,6 +21,7 @@ - #include <sys/ioctl.h> - #include <sys/mman.h> - #include <sys/time.h> -+#include <sys/stat.h> - #include <linux/kd.h> - #include <linux/vt.h> - #include <linux/fb.h> -@@ -224,9 +225,11 @@ int main() - for (i = 0; i < 7; i++) printf("%d ", cal.a [i]); - printf("\n"); - if ((calfile = getenv("TSLIB_CALIBFILE")) != NULL) { -- cal_fd = open (calfile, O_CREAT | O_RDWR); -+ cal_fd = open (calfile, O_CREAT | O_RDWR, -+ S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); - } else { -- cal_fd = open ("/etc/pointercal", O_CREAT | O_RDWR); -+ cal_fd = open ("/etc/pointercal", O_CREAT | O_RDWR, -+ S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH); - } - sprintf (cal_buffer,"%d %d %d %d %d %d %d", - cal.a[1], cal.a[2], cal.a[0],
meta/recipes-graphics/tslib/tslib_1.1.bb renamed from meta/recipes-graphics/tslib/tslib_1.0.bb +3 -11
@@ -10,21 +10,13 @@ SECTION = "base" LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a" -PR = "r21" - -SRC_URI = "http://download.berlios.de/tslib/tslib-${PV}.tar.bz2 \ - file://fix_version.patch \ - file://0001-Link-plugins-against-libts.patch \ +SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.tar.xz;downloadfilename=tslib-${PV}.tar.xz \ file://ts.conf \ file://tslib.sh \ - file://set-open-mode-for-ts_calibrate_c.patch \ - file://obsolete_automake_macros.patch \ " -SRC_URI[md5sum] = "92b2eb55b1e4ef7e2c0347069389390e" -SRC_URI[sha256sum] = "9c40d914e4f6fe00bdd77137d671c7ce4f211686228f2eb8b2d3c2360bc249c8" -SRC_URI_append_qemumips = " file://32bitBE-support.patch" -SRC_URI_append_qemuppc = " file://32bitBE-support.patch" +SRC_URI[md5sum] = "14771f8607b341bb4b297819d37e837d" +SRC_URI[sha256sum] = "fe35e5f710ea933b118f710e2ce4403ac076fe69926b570333867d4de082a51c" inherit autotools pkgconfig
Signature · 1 line
1.8.1.2