[oe-commits] Koen Kooi : xf86-input-tslib: add patch to make detection using HAL work instead of hardcoding /dev/ event0

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 4a70a7201b0e8be41f68c3c8659061d672f8d5b4
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4a70a7201b0e8be41f68c3c8659061d672f8d5b4

Author: Koen Kooi <koen at openembedded.org>
Date:   Tue Nov 11 13:21:18 2008 +0100

xf86-input-tslib: add patch to make detection using HAL work instead of hardcoding /dev/event0

---

 .../xf86-input-tslib/use-hal-for-device.diff       |   45 ++++++++++++++++++++
 packages/xorg-driver/xf86-input-tslib_0.0.5.bb     |    3 +-
 2 files changed, 47 insertions(+), 1 deletions(-)

diff --git a/packages/xorg-driver/xf86-input-tslib/use-hal-for-device.diff b/packages/xorg-driver/xf86-input-tslib/use-hal-for-device.diff
new file mode 100644
index 0000000..9f2cfa2
--- /dev/null
+++ b/packages/xorg-driver/xf86-input-tslib/use-hal-for-device.diff
@@ -0,0 +1,45 @@
+From: Markku Vire markku.vire at movial.fi <mvire at movial.fi>
+Date: Tue, 9 Oct 2007 07:29:08 +0000 (+0300)
+Subject: Changed tslib device path to use the data provided by
+X-Git-Url: http://linux.onarm.com/gitweb/?p=generic%2Fsource%2Fxf86-input-tslib.git;a=commitdiff_plain;h=9ead96bb85857c0122b7a1a4653a5863f187d511
+
+Changed tslib device path to use the data provided by
+automatic device detection.
+---
+
+--- /tmp/tslib.c	2008-11-11 13:05:57.000000000 +0100
++++ xf86-input-tslib-0.0.5/src/tslib.c	2008-11-11 13:10:55.000000000 +0100
+@@ -72,11 +72,6 @@
+ 	int width;
+ };
+ 
+-static const char *DEFAULTS[] = {
+-	"TslibDevice", "/dev/event0",
+-	NULL
+-};
+-
+ static void
+ BellProc(int percent, DeviceIntPtr pDev, pointer ctrl, int unused)
+ {
+@@ -308,7 +303,7 @@
+ 	pInfo->private = priv;
+ 
+ 	/* Collect the options, and process the common options. */
+-	xf86CollectInputOptions(pInfo, DEFAULTS, NULL);
++	xf86CollectInputOptions(pInfo, NULL, NULL);
+ 	xf86ProcessCommonOptions(pInfo, pInfo->options);
+ 
+ 	priv->screen_num = xf86SetIntOption(pInfo->options, "ScreenNumber", 0 );
+@@ -334,8 +329,10 @@
+ 		priv->rotate = TSLIB_ROTATE_NONE;
+ 	}
+ 
+-	s = xf86SetStrOption(pInfo->options, "TslibDevice", NULL);
+-
++ 	s = xf86CheckStrOption(dev->commonOptions, "path", NULL);
++  	if (!s)
++		s = xf86CheckStrOption(dev->commonOptions, "Device", NULL);
++ 
+ 	priv->ts = ts_open(s, 0);
+ 	if (!priv->ts) {
+ 		ErrorF("ts_open failed (device=%s)\n",s);
diff --git a/packages/xorg-driver/xf86-input-tslib_0.0.5.bb b/packages/xorg-driver/xf86-input-tslib_0.0.5.bb
index b504dff..b8d8888 100644
--- a/packages/xorg-driver/xf86-input-tslib_0.0.5.bb
+++ b/packages/xorg-driver/xf86-input-tslib_0.0.5.bb
@@ -2,9 +2,10 @@ require xorg-driver-input.inc
 
 DESCRIPTION = "X.Org X server -- tslib input driver"
 RRECOMMENDS += "hal"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2 \
+           file://use-hal-for-device.diff;patch=1 \
            file://10-x11-input-tslib.fdi"
 
 do_configure_prepend() {