diff options
| author | Matt Reimer <mattjreimer@gmail.com> | 2006-11-13 19:19:49 +0000 |
|---|---|---|
| committer | Matt Reimer <mattjreimer@gmail.com> | 2006-11-13 19:19:49 +0000 |
| commit | fe6bc5b4cabb5fcf87b8944b4cfbe73bb48ceecf (patch) | |
| tree | b647d0f995205700148a392c69cccfe9077c7308 /packages/tslib | |
| parent | 2b622239c20657486f9e84842fd392f0a03c4598 (diff) | |
| parent | f7171587f09b13c97cc73109cd9eaf7c5aa78e47 (diff) | |
merge of '440352b74d1975abf361c30e00a2519bd5c8051e'
and '493bfe4db4e2664b2f5a442c4973208d987e2752'
Diffstat (limited to 'packages/tslib')
| -rw-r--r-- | packages/tslib/tslib/h2200/tslib.sh | 2 | ||||
| -rw-r--r-- | packages/tslib/tslib/usec_fix.patch | 26 | ||||
| -rw-r--r-- | packages/tslib/tslib_1.0.bb | 2 |
3 files changed, 2 insertions, 28 deletions
diff --git a/packages/tslib/tslib/h2200/tslib.sh b/packages/tslib/tslib/h2200/tslib.sh index c78f2169c7..b096bfb96e 100644 --- a/packages/tslib/tslib/h2200/tslib.sh +++ b/packages/tslib/tslib/h2200/tslib.sh @@ -1,6 +1,6 @@ #!/bin/sh -TSLIB_TSDEVICE=/dev/input/touchsreen0 +TSLIB_TSDEVICE=/dev/input/touchscreen0 TSLIB_CONFFILE=/etc/ts.conf case `uname -r` in diff --git a/packages/tslib/tslib/usec_fix.patch b/packages/tslib/tslib/usec_fix.patch deleted file mode 100644 index a791b39a3c..0000000000 --- a/packages/tslib/tslib/usec_fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -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_1.0.bb b/packages/tslib/tslib_1.0.bb index afb0202262..3d2e3cd79e 100644 --- a/packages/tslib/tslib_1.0.bb +++ b/packages/tslib/tslib_1.0.bb @@ -4,7 +4,7 @@ AUTHOR = "Russell King w/ plugins by Chris Larson et. al." SECTION = "base" LICENSE = "LGPL" -PR = "r2" +PR = "r3" SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \ file://ts.conf \ |