summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-04-29 16:26:48 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-29 16:26:48 +0000
commit8add3433f0fa433974d053f1b1350308b6a0edaa (patch)
tree7655439b75908a594b647870f64b388f7f36ad5a
parent4cf27bc97eb54825a04c1d124ffdc83a3adb0846 (diff)
tslib: Add fix for collie_raw and corgi_raw modules from Alberto Mardegan (#511)
-rw-r--r--packages/tslib/tslib/usec_fix.patch26
-rw-r--r--packages/tslib/tslib_cvs.bb7
2 files changed, 30 insertions, 3 deletions
diff --git a/packages/tslib/tslib/usec_fix.patch b/packages/tslib/tslib/usec_fix.patch
new file mode 100644
index 0000000000..a791b39a3c
--- /dev/null
+++ b/packages/tslib/tslib/usec_fix.patch
@@ -0,0 +1,26 @@
+Index: work/tslib-0.0cvs20051201-r32/tslib/plugins/collie-raw.c
+===================================================================
+--- tslib.orig/plugins/collie-raw.c 2005-12-04 10:09:33.000000000 +0100
++++ tslib/plugins/collie-raw.c 2005-12-04 10:16:05.000000000 +0100
+@@ -29,7 +29,7 @@
+ #ifdef DEBUG
+ fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure);
+ #endif /*DEBUG*/
+- samp->tv.tv_usec = collie_evt->millisecs % 1000;
++ samp->tv.tv_usec = (collie_evt->millisecs % 1000) * 1000;
+ samp->tv.tv_sec = collie_evt->millisecs / 1000;
+ samp++;
+ collie_evt++;
+Index: work/tslib-0.0cvs20051201-r32/tslib/plugins/corgi-raw.c
+===================================================================
+--- tslib.orig/plugins/corgi-raw.c 2005-12-04 10:10:19.000000000 +0100
++++ tslib/plugins/corgi-raw.c 2005-12-04 10:16:15.000000000 +0100
+@@ -29,7 +29,7 @@
+ #ifdef DEBUG
+ fprintf(stderr,"RAW---------------------------> %d %d %d\n",samp->x,samp->y,samp->pressure);
+ #endif /*DEBUG*/
+- samp->tv.tv_usec = corgi_evt->millisecs % 1000;
++ samp->tv.tv_usec = (corgi_evt->millisecs % 1000) * 1000;
+ samp->tv.tv_sec = corgi_evt->millisecs / 1000;
+ samp++;
+ corgi_evt++;
diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb
index 78fd48e5fc..bac18153fa 100644
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_cvs.bb
@@ -1,15 +1,16 @@
SECTION = "base"
DESCRIPTION = "tslib is a touchscreen access library."
PV = "0.0+cvs${SRCDATE}"
-PR = "r33"
+PR = "r34"
SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
PACKAGE_ARCH_mnci = "${MACHINE_ARCH}"
SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
- file://ts.conf file://ts-2.6.conf \
- file://ts.conf-h3600-2.4 file://ts.conf-simpad-2.4 \
+ file://usec_fix.patch;patch=1 \
+ file://ts.conf file://ts-2.6.conf \
+ file://ts.conf-h3600-2.4 file://ts.conf-simpad-2.4 \
file://ts.conf-corgi-2.4 file://ts.conf-collie-2.4 \
file://tslib.sh"
SRC_URI_append_mnci += " file://devfs.patch;patch=1"