tslib: Remove hardcoded input event devices or detect-stylus calls for machines with...

diff --git a/packages/tslib/tslib-maemo/nokia770/tslib.sh b/packages/tslib/tslib-maemo/nokia770/tslib.sh
index d31bc76368f4014ac3178e6b8f298b4ef9992ffb..b7acc274c0cf2a3a5640667946470e7720efdb86 100644 (file)
--- a/packages/tslib/tslib-maemo/nokia770/tslib.sh
+++ b/packages/tslib/tslib-maemo/nokia770/tslib.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_TSDEVICE=/dev/input/touchscreen0
 
 export TSLIB_TSDEVICE

diff --git a/packages/tslib/tslib-maemo_0.0.1-15.bb b/packages/tslib/tslib-maemo_0.0.1-15.bb
index 483181a4f9550ab6edf39bb0d9ee77304f419dd4..f744833d574982f1ed0469505f949c91dfc5dc41 100644 (file)
--- a/packages/tslib/tslib-maemo_0.0.1-15.bb
+++ b/packages/tslib/tslib-maemo_0.0.1-15.bb
@@ -1,7 +1,7 @@
 DEFAULT_PREFERENCE = "-1"
 SECTION = "base"
 DESCRIPTION = "tslib is a touchscreen access library (maemo patched version)."
-PR = "r1"
+PR = "r2"
 PROVIDES = "tslib"
 
 DEFAULT_PREFERENCE = "-1"

diff --git a/packages/tslib/tslib/akita/tslib.sh b/packages/tslib/tslib/akita/tslib.sh
index 218da0751b0b4ea48debf47c2559ebf5458bc462..0c8b1a12b9b59304bbb848214222de2db9faf29b 100644 (file)
--- a/packages/tslib/tslib/akita/tslib.sh
+++ b/packages/tslib/tslib/akita/tslib.sh
@@ -7,7 +7,7 @@ case `uname -r` in
        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
        ;;
 *)
-       TSLIB_TSDEVICE=/dev/input/event1
+       TSLIB_TSDEVICE=/dev/input/touchscreen0
        TSLIB_TSEVENTTYPE=INPUT
        TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
        ;;

diff --git a/packages/tslib/tslib/c7x0/tslib.sh b/packages/tslib/tslib/c7x0/tslib.sh
index 218da0751b0b4ea48debf47c2559ebf5458bc462..0c8b1a12b9b59304bbb848214222de2db9faf29b 100644 (file)
--- a/packages/tslib/tslib/c7x0/tslib.sh
+++ b/packages/tslib/tslib/c7x0/tslib.sh
@@ -7,7 +7,7 @@ case `uname -r` in
        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
        ;;
 *)
-       TSLIB_TSDEVICE=/dev/input/event1
+       TSLIB_TSDEVICE=/dev/input/touchscreen0
        TSLIB_TSEVENTTYPE=INPUT
        TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
        ;;

diff --git a/packages/tslib/tslib/collie/tslib.sh b/packages/tslib/tslib/collie/tslib.sh
index d9cc02cb1cbeaac741087942d179cc8c31dc7759..759d5cf091f427560f72ef3e9ef0f8e4b4b39d8e 100644 (file)
--- a/packages/tslib/tslib/collie/tslib.sh
+++ b/packages/tslib/tslib/collie/tslib.sh
@@ -7,7 +7,7 @@ case `uname -r` in
        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4
        ;;
 *)
-       TSLIB_TSDEVICE=/dev/input/event1
+       TSLIB_TSDEVICE=/dev/input/touchscreen0
        TSLIB_TSEVENTTYPE=INPUT
        TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
        ;;

diff --git a/packages/tslib/tslib/ipaq-pxa270/tslib.sh b/packages/tslib/tslib/ipaq-pxa270/tslib.sh
index 3adaba0de852ef51a754133952a420d7b74c30f7..3a6ba78c50df4f91a1b825943d210cf77a4e0219 100644 (file)
--- a/packages/tslib/tslib/ipaq-pxa270/tslib.sh
+++ b/packages/tslib/tslib/ipaq-pxa270/tslib.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_TSDEVICE=/dev/input/touchscreen0
 TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
 
 export TSLIB_TSDEVICE TSLIB_CONFFILE

diff --git a/packages/tslib/tslib/poodle/tslib.sh b/packages/tslib/tslib/poodle/tslib.sh
index d9cc02cb1cbeaac741087942d179cc8c31dc7759..759d5cf091f427560f72ef3e9ef0f8e4b4b39d8e 100644 (file)
--- a/packages/tslib/tslib/poodle/tslib.sh
+++ b/packages/tslib/tslib/poodle/tslib.sh
@@ -7,7 +7,7 @@ case `uname -r` in
        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4
        ;;
 *)
-       TSLIB_TSDEVICE=/dev/input/event1
+       TSLIB_TSDEVICE=/dev/input/touchscreen0
        TSLIB_TSEVENTTYPE=INPUT
        TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
        ;;

diff --git a/packages/tslib/tslib/simpad/tslib.sh b/packages/tslib/tslib/simpad/tslib.sh
index 530123937324bab638560d5dffe919e7e1b221c8..39b1c4ba58c502d7876457742480cf28843cac05 100644 (file)
--- a/packages/tslib/tslib/simpad/tslib.sh
+++ b/packages/tslib/tslib/simpad/tslib.sh
@@ -6,7 +6,7 @@ case `uname -r` in
        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-simpad-2.4
        ;;
 *)
-       TSLIB_TSDEVICE=/dev/input/event0
+       TSLIB_TSDEVICE=/dev/input/touchscreen0
        TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
        ;;
 esac

diff --git a/packages/tslib/tslib/spitz/tslib.sh b/packages/tslib/tslib/spitz/tslib.sh
index 218da0751b0b4ea48debf47c2559ebf5458bc462..0c8b1a12b9b59304bbb848214222de2db9faf29b 100644 (file)
--- a/packages/tslib/tslib/spitz/tslib.sh
+++ b/packages/tslib/tslib/spitz/tslib.sh
@@ -7,7 +7,7 @@ case `uname -r` in
        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
        ;;
 *)
-       TSLIB_TSDEVICE=/dev/input/event1
+       TSLIB_TSDEVICE=/dev/input/touchscreen0
        TSLIB_TSEVENTTYPE=INPUT
        TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
        ;;

diff --git a/packages/tslib/tslib/tosa/tslib.sh b/packages/tslib/tslib/tosa/tslib.sh
index 218da0751b0b4ea48debf47c2559ebf5458bc462..0c8b1a12b9b59304bbb848214222de2db9faf29b 100644 (file)
--- a/packages/tslib/tslib/tosa/tslib.sh
+++ b/packages/tslib/tslib/tosa/tslib.sh
@@ -7,7 +7,7 @@ case `uname -r` in
        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
        ;;
 *)
-       TSLIB_TSDEVICE=/dev/input/event1
+       TSLIB_TSDEVICE=/dev/input/touchscreen0
        TSLIB_TSEVENTTYPE=INPUT
        TSLIB_CONFFILE=/usr/share/tslib/ts-2.6.conf
        ;;

diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb
index 57eede769d9fc3402e4921ffcb129b76c59b725b..4014baeed6dd24023b98a31c17c39bed37b6a959 100644 (file)
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_cvs.bb
@@ -5,7 +5,7 @@ SECTION = "base"
 LICENSE = "LGPL"
 
 PV = "0.0+cvs${SRCDATE}"
-PR = "r35"
+PR = "r36"
 
 SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
            file://usec_fix.patch;patch=1 \