tslib: Sync with changes in OE, adopt a sane default configuration and only make it machine specific where needed

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1212 311d38ba-8fff-0310-9ca6-ca027cbcb966

21 files changed, 23 insertions, 211 deletions

diff --git a/meta/packages/tslib/tslib/akita/tslib.sh b/meta/packages/tslib/tslib/akita/tslib.sh
deleted file mode 100644
index 0ff219b31f..0000000000
--- a/meta/packages/tslib/tslib/akita/tslib.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-case `uname -r` in
-2.4*)
-        TSLIB_TSDEVICE=/dev/ts
-        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
-        ;;
-esac
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/c7x0/tslib.sh b/meta/packages/tslib/tslib/c7x0/tslib.sh
deleted file mode 100644
index 0ff219b31f..0000000000
--- a/meta/packages/tslib/tslib/c7x0/tslib.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-case `uname -r` in
-2.4*)
-        TSLIB_TSDEVICE=/dev/ts
-        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
-        ;;
-esac
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/h1940/tslib.sh b/meta/packages/tslib/tslib/h1940/tslib.sh
deleted file mode 100644
index 7dbf4ae9f1..0000000000
--- a/meta/packages/tslib/tslib/h1940/tslib.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=`detect-stylus --device`
-TSLIB_CONFFILE=/etc/ts.conf
-QWS_MOUSE_PROTO=TPanel
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE QWS_MOUSE_PROTO
-
diff --git a/meta/packages/tslib/tslib/h2200/tslib.sh b/meta/packages/tslib/tslib/h2200/tslib.sh
deleted file mode 100644
index b096bfb96e..0000000000
--- a/meta/packages/tslib/tslib/h2200/tslib.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-case `uname -r` in
-2.4*)
-        TSLIB_TSDEVICE=/dev/touchscreen/0raw
-        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
-        ;;
-esac
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
-
diff --git a/meta/packages/tslib/tslib/h3600/tslib.sh b/meta/packages/tslib/tslib/h3600/tslib.sh
deleted file mode 100644
index 6c480f46af..0000000000
--- a/meta/packages/tslib/tslib/h3600/tslib.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=`detect-stylus --device`
-TSLIB_CONFFILE=/etc/ts.conf
-
-case `uname -r` in
-2.4*)
-        TSLIB_TSDEVICE=/dev/touchscreen/0raw
-        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
-        ;;
-esac
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
-
diff --git a/meta/packages/tslib/tslib/h3900/tslib.sh b/meta/packages/tslib/tslib/h3900/tslib.sh
deleted file mode 100644
index 6c480f46af..0000000000
--- a/meta/packages/tslib/tslib/h3900/tslib.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=`detect-stylus --device`
-TSLIB_CONFFILE=/etc/ts.conf
-
-case `uname -r` in
-2.4*)
-        TSLIB_TSDEVICE=/dev/touchscreen/0raw
-        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
-        ;;
-esac
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
-
diff --git a/meta/packages/tslib/tslib/h4000/tslib.sh b/meta/packages/tslib/tslib/h4000/tslib.sh
deleted file mode 100644
index 6c480f46af..0000000000
--- a/meta/packages/tslib/tslib/h4000/tslib.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=`detect-stylus --device`
-TSLIB_CONFFILE=/etc/ts.conf
-
-case `uname -r` in
-2.4*)
-        TSLIB_TSDEVICE=/dev/touchscreen/0raw
-        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
-        ;;
-esac
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
-
diff --git a/meta/packages/tslib/tslib/h5xxx/tslib.sh b/meta/packages/tslib/tslib/h5xxx/tslib.sh
deleted file mode 100644
index b096bfb96e..0000000000
--- a/meta/packages/tslib/tslib/h5xxx/tslib.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-case `uname -r` in
-2.4*)
-        TSLIB_TSDEVICE=/dev/touchscreen/0raw
-        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
-        ;;
-esac
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
-
diff --git a/meta/packages/tslib/tslib/h6300/tslib.sh b/meta/packages/tslib/tslib/h6300/tslib.sh
deleted file mode 100644
index b3318fd820..0000000000
--- a/meta/packages/tslib/tslib/h6300/tslib.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=`detect-stylus --device`
-TSLIB_CONFFILE=/etc/ts.conf
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
-
diff --git a/meta/packages/tslib/tslib/htcuniversal/ts.conf b/meta/packages/tslib/tslib/htcuniversal/ts.conf
deleted file mode 100644
index 09309719f2..0000000000
--- a/meta/packages/tslib/tslib/htcuniversal/ts.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-module_raw input
-module pthres pmin=1
-module variance delta=30
-module dejitter delta=100
-module linear
diff --git a/meta/packages/tslib/tslib/htcuniversal/tslib.sh b/meta/packages/tslib/tslib/htcuniversal/tslib.sh
deleted file mode 100644
index cc7e6b724a..0000000000
--- a/meta/packages/tslib/tslib/htcuniversal/tslib.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=`detect-stylus --device`
-TSLIB_CONFFILE=/etc/ts.conf
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/hx2000/tslib.sh b/meta/packages/tslib/tslib/hx2000/tslib.sh
deleted file mode 100644
index 586d5c7deb..0000000000
--- a/meta/packages/tslib/tslib/hx2000/tslib.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/hx4700/tslib.sh b/meta/packages/tslib/tslib/hx4700/tslib.sh
deleted file mode 100644
index 586d5c7deb..0000000000
--- a/meta/packages/tslib/tslib/hx4700/tslib.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/nokia770/tslib.sh b/meta/packages/tslib/tslib/nokia770/tslib.sh
deleted file mode 100644
index b7acc274c0..0000000000
--- a/meta/packages/tslib/tslib/nokia770/tslib.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-
-export TSLIB_TSDEVICE
diff --git a/meta/packages/tslib/tslib/poodle/tslib.sh b/meta/packages/tslib/tslib/poodle/tslib.sh
deleted file mode 100644
index 664bda426a..0000000000
--- a/meta/packages/tslib/tslib/poodle/tslib.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-case `uname -r` in
-2.4*)
-        TSLIB_TSDEVICE=/dev/ts
-        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-collie-2.4
-        ;;
-esac
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/qemuarm/tslib.sh b/meta/packages/tslib/tslib/qemuarm/tslib.sh
deleted file mode 100644
index b7acc274c0..0000000000
--- a/meta/packages/tslib/tslib/qemuarm/tslib.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-
-export TSLIB_TSDEVICE
diff --git a/meta/packages/tslib/tslib/qemux86/tslib.sh b/meta/packages/tslib/tslib/qemux86/tslib.sh
deleted file mode 100644
index b7acc274c0..0000000000
--- a/meta/packages/tslib/tslib/qemux86/tslib.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-
-export TSLIB_TSDEVICE
diff --git a/meta/packages/tslib/tslib/spitz/tslib.sh b/meta/packages/tslib/tslib/spitz/tslib.sh
deleted file mode 100644
index 0ff219b31f..0000000000
--- a/meta/packages/tslib/tslib/spitz/tslib.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-case `uname -r` in
-2.4*)
-        TSLIB_TSDEVICE=/dev/ts
-        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
-        ;;
-esac
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/tosa/tslib.sh b/meta/packages/tslib/tslib/tosa/tslib.sh
deleted file mode 100644
index 0ff219b31f..0000000000
--- a/meta/packages/tslib/tslib/tosa/tslib.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-TSLIB_TSDEVICE=/dev/input/touchscreen0
-TSLIB_CONFFILE=/etc/ts.conf
-
-case `uname -r` in
-2.4*)
-        TSLIB_TSDEVICE=/dev/ts
-        TSLIB_CONFFILE=/usr/share/tslib/ts.conf-corgi-2.4
-        ;;
-esac
-
-export TSLIB_TSDEVICE TSLIB_CONFFILE
diff --git a/meta/packages/tslib/tslib/tslib.sh b/meta/packages/tslib/tslib/tslib.sh
index e69de29bb2..5221b05b8a 100644
--- a/meta/packages/tslib/tslib/tslib.sh
+++ b/meta/packages/tslib/tslib/tslib.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=/dev/input/touchscreen0
+
+export TSLIB_TSDEVICE
+
diff --git a/meta/packages/tslib/tslib_1.0.bb b/meta/packages/tslib/tslib_1.0.bb
index 84f3fd28a8..0ece5b0331 100644
--- a/meta/packages/tslib/tslib_1.0.bb
+++ b/meta/packages/tslib/tslib_1.0.bb
@@ -1,16 +1,14 @@
 DESCRIPTION = "tslib is a plugin-based flexible touchscreen access library."
-HOMEPAGE = "http://cvs.arm.linux.org.uk/"
+HOMEPAGE = "http://tslib.berlios.de/"
 AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
 SECTION = "base"
 LICENSE = "LGPL"
 
-PR = "r5"
+PR = "r7"
 
 SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
            file://ts.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"
@@ -33,19 +31,10 @@ do_install_append() {
         install -d ${D}${sysconfdir}/profile.d/
         install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
         case ${MACHINE} in
-        a780 | e680 | h3600 | h3900 | h5xxx | h1940 | h6300 | h2200 | ipaq-pxa270 | hx4700 | hx2000 | blueangel | h4000)
-                install -d ${D}${datadir}/tslib
-                install -m 0644 ${WORKDIR}/ts.conf-h3600-2.4 ${D}${datadir}/tslib/
-                ;;
-        c7x0 | spitz | akita | tosa )
-                install -d ${D}${datadir}/tslib
-                install -m 0644 ${WORKDIR}/ts.conf-corgi-2.4 ${D}${datadir}/tslib/
-                ;;
-        collie | poodle )
+        collie )
                 install -d ${D}${datadir}/tslib
                 install -m 0644 ${WORKDIR}/ts.conf-collie-2.4 ${D}${datadir}/tslib/
                 ;;
-
         simpad )
                 install -d ${D}${datadir}/tslib
                 install -m 0644 ${WORKDIR}/ts.conf-simpad-2.4 ${D}${datadir}/tslib/
@@ -57,19 +46,24 @@ do_install_append() {
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 
-# People should consider using udev's /dev/input/touchscreen0 symlink 
+# 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_h6300 = "detect-stylus"
-RDEPENDS_tslib-conf_blueangel = "detect-stylus"
-RDEPENDS_tslib-conf_htcuniversal = "detect-stylus"
-RDEPENDS_tslib-conf_h4000 = "detect-stylus"
+#RDEPENDS_tslib-conf_weird-machine = "detect-stylus"
 RPROVIDES_tslib-conf = "libts-0.0-conf"
 
-PACKAGE_ARCH_tslib-conf = "${MACHINE_ARCH}"
+# Machines with machine specific patches
 PACKAGE_ARCH_mnci = "${MACHINE_ARCH}"
+# Machines with machine specific config files (tslib.sh)
+PACKAGE_ARCH_tslib-conf_a780 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_collie = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_e680 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_jornada56x = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_jornada6xx = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_jornada7xx = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_netbook-pro = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_omap1610h2 = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_omap5912osk = "${MACHINE_ARCH}"
+PACKAGE_ARCH_tslib-conf_simpad = "${MACHINE_ARCH}"
 
 PACKAGES =+ "tslib-conf libts-dev tslib-tests tslib-calibrate"
 DEBIAN_NOAUTONAME_tslib-conf = "1"