tslib: remove h1940 machine dependency on detect-stylus and switch to using the defau...

diff --git a/packages/tslib/tslib/h1940/tslib.sh b/packages/tslib/tslib/h1940/tslib.sh
index 7dbf4ae..f73e39c 100644 (file)
--- a/packages/tslib/tslib/h1940/tslib.sh
+++ b/packages/tslib/tslib/h1940/tslib.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 
-TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_TSDEVICE=/dev/input/touchscreen0
 TSLIB_CONFFILE=/etc/ts.conf
-QWS_MOUSE_PROTO=TPanel
 
-export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO
+export TSLIB_TSDEVICE TSLIB_CONFFILE
 

diff --git a/packages/tslib/tslib_1.0.bb b/packages/tslib/tslib_1.0.bb
index d9bc732..165c639 100644 (file)
--- 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 = "r4"
+PR = "r5"
 
 SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
            file://ts.conf \
@@ -59,7 +59,6 @@ SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 
 # People should consider using udev's /dev/input/touchscreen0 symlink 
 # instead of detect-stylus
-RDEPENDS_tslib-conf_h1940 = "detect-stylus"
 RDEPENDS_tslib-conf_h3600 = "detect-stylus"
 RDEPENDS_tslib-conf_h3900 = "detect-stylus"
 RDEPENDS_tslib-conf_blueangel = "detect-stylus"