Updates against mainline openembedded + removal of some unneeded files

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

4 files changed, 18 insertions, 5 deletions

diff --git a/openembedded/packages/tslib/tslib/h6300/tslib.sh b/openembedded/packages/tslib/tslib/h6300/tslib.sh
new file mode 100644
index 0000000000..21aaad9ca4
--- /dev/null
+++ b/openembedded/packages/tslib/tslib/h6300/tslib.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+TSLIB_TSDEVICE=`detect-stylus --device`
+TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h6300
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
+
diff --git a/openembedded/packages/tslib/tslib/ts.conf-h2200 b/openembedded/packages/tslib/tslib/ts.conf-h2200
index ece916f39e..6a6a231139 100644
--- a/openembedded/packages/tslib/tslib/ts.conf-h2200
+++ b/openembedded/packages/tslib/tslib/ts.conf-h2200
@@ -1,5 +1,5 @@
 module_raw input
-module linear_h2200
+module_raw linear_h2200
 module pthres pmin=1
 module variance delta=30
 module dejitter delta=100
diff --git a/openembedded/packages/tslib/tslib/ts.conf-h6300 b/openembedded/packages/tslib/tslib/ts.conf-h6300
new file mode 100644
index 0000000000..09309719f2
--- /dev/null
+++ b/openembedded/packages/tslib/tslib/ts.conf-h6300
@@ -0,0 +1,5 @@
+module_raw input
+module pthres pmin=1
+module variance delta=30
+module dejitter delta=100
+module linear
diff --git a/openembedded/packages/tslib/tslib_cvs.bb b/openembedded/packages/tslib/tslib_cvs.bb
index 80fd8f2966..5c52147e1c 100644
--- a/openembedded/packages/tslib/tslib_cvs.bb
+++ b/openembedded/packages/tslib/tslib_cvs.bb
@@ -1,7 +1,7 @@
 SECTION = "base"
 DESCRIPTION = "tslib is a touchscreen access library."
 PV = "0.0cvs${CVSDATE}"
-PR = "r29"
+PR = "r31"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 PACKAGE_ARCH_tslib-conf = "${MACHINE}"
@@ -9,7 +9,7 @@ PACKAGE_ARCH_mnci = "${MACHINE}"
 
 SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
            file://ts.conf \
-           file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h2200 \
+           file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h2200 file://ts.conf-h6300 \
            file://ts.conf-corgi file://ts.conf-corgi-2.4 \
            file://tslib.sh"
 SRC_URI_append_mnci += " file://devfs.patch;patch=1"
@@ -23,6 +23,7 @@ inherit autotools
 PACKAGES = "tslib-conf libts libts-dev tslib-tests tslib-calibrate"
 EXTRA_OECONF        = "--enable-shared"
 EXTRA_OECONF_mnci   = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
+EXTRA_OECONF_beagle = "--enable-shared --enable-h3600 --disable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00 "
 
 do_stage () {
         oe_libinstall -so -C src libts-0.0 ${STAGING_LIBDIR}
@@ -39,9 +40,9 @@ do_install_append() {
         install -d ${D}${sysconfdir}/profile.d/
         install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
         case ${MACHINE} in
-        h3600 | h3900 | h1940 | ipaq-pxa270)
+        h3600 | h3900 | h1940 | h6300 | ipaq-pxa270)
                 install -d ${D}${datadir}/tslib
-                for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h2200; do
+                for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h2200 ts.conf-h6300; do
                         install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
                 done
                 rm -f ${D}${sysconfdir}/ts.conf