From: Phil Blundell <philb@gnu.org>
Date: Thu, 10 Feb 2005 16:40:43 +0000 (+0000)
Subject: Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
X-Git-Tag: Release-2010-05/1~15066
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=117df2399e4d5a3829e44b989b41292b29bcef30;p=openembedded.git

Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into stealth.nexus.co.uk:/home/pb/oe/oe

2005/02/10 16:40:21+00:00 nexus.co.uk!pb
set TSLIB_CONFFILE appropriately

BKrev: 420b8e8bP4SXnkyDHMx0Jaf-h44raw
---

diff --git a/packages/tslib/tslib/h3600/tslib.sh b/packages/tslib/tslib/h3600/tslib.sh
index e69de29bb2..5c446c2610 100644
--- a/packages/tslib/tslib/h3600/tslib.sh
+++ b/packages/tslib/tslib/h3600/tslib.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+case `uname -r` in
+2.4*)
+	TSLIB_TSDEVICE=/dev/touchscreen/0raw
+	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
+	;;
+*)
+	TSLIB_TSDEVICE=`detect-stylus --device`
+	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600
+	;;
+esac
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
+
diff --git a/packages/tslib/tslib/h3900/tslib.sh b/packages/tslib/tslib/h3900/tslib.sh
index e69de29bb2..5c446c2610 100644
--- a/packages/tslib/tslib/h3900/tslib.sh
+++ b/packages/tslib/tslib/h3900/tslib.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+case `uname -r` in
+2.4*)
+	TSLIB_TSDEVICE=/dev/touchscreen/0raw
+	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600-2.4
+	;;
+*)
+	TSLIB_TSDEVICE=`detect-stylus --device`
+	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600
+	;;
+esac
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
+
diff --git a/packages/tslib/tslib_cvs.bb b/packages/tslib/tslib_cvs.bb
index fba3ac8a02..46c6b153a7 100644
--- a/packages/tslib/tslib_cvs.bb
+++ b/packages/tslib/tslib_cvs.bb
@@ -1,7 +1,7 @@
 SECTION = "base"
 DESCRIPTION = "tslib is a touchscreen access library."
 PV = "0.0cvs${CVSDATE}"
-PR = "r13"
+PR = "r14"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 PACKAGE_ARCH_tslib-conf = "${MACHINE}"