tslib 1.0 remove all traces of tslib-input_raw-grab_events patch. This patch

was too invasive and has been solved in the Openmoko kernel otherwise. Bump
linux-openmoko-devel to catch up with the necessary changes in kernel.
NOTE: linux-openmoko will be broken until upstream merges the unbreak-grab patch.

6 files changed, 17 insertions, 135 deletions

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 5fb4dece1f..2e8dcb3690 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -79,7 +79,7 @@ SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1066"
 SRCREV_pn-linux-openmoko ?= "88bf43840b9df0eb0a077a1394eb564be80a412e"
-SRCREV_pn-linux-openmoko-devel ?= "7a1370a816b9348dd8f36a667905dd3533cefc9b"
+SRCREV_pn-linux-openmoko-devel ?= "dd323382faf5c169960659d5d78337f06b3ea222"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-maemo-mapper ?= "118"
diff --git a/packages/tslib/tslib/om-gta01/ts.conf b/packages/tslib/tslib/om-gta01/ts.conf
index 82f712ef41..1b0da937e8 100644
--- a/packages/tslib/tslib/om-gta01/ts.conf
+++ b/packages/tslib/tslib/om-gta01/ts.conf
@@ -1,5 +1,5 @@
 # Uncomment if you wish to use the linux input layer event interface
-module_raw input grab_events=1
+module_raw input
 
 # Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d
 # module_raw collie
diff --git a/packages/tslib/tslib/om-gta02/ts.conf b/packages/tslib/tslib/om-gta02/ts.conf
index 82f712ef41..1b0da937e8 100644
--- a/packages/tslib/tslib/om-gta02/ts.conf
+++ b/packages/tslib/tslib/om-gta02/ts.conf
@@ -1,5 +1,5 @@
 # Uncomment if you wish to use the linux input layer event interface
-module_raw input grab_events=1
+module_raw input
 
 # Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d
 # module_raw collie
diff --git a/packages/tslib/tslib/ts.conf b/packages/tslib/tslib/ts.conf
index 1abde2fc7f..1b0da937e8 100644
--- a/packages/tslib/tslib/ts.conf
+++ b/packages/tslib/tslib/ts.conf
@@ -1,5 +1,5 @@
 # Uncomment if you wish to use the linux input layer event interface
-module_raw input grab_events=0
+module_raw input
 
 # Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d
 # module_raw collie
diff --git a/packages/tslib/tslib/tslib-input_raw-grab_events.patch b/packages/tslib/tslib/tslib-input_raw-grab_events.patch
deleted file mode 100644
index 4bd0a05531..0000000000
--- a/packages/tslib/tslib/tslib-input_raw-grab_events.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-This patch adds support for "EVIOCGRAB" on the input device, which
-tells the kernel _not_ to deliver events of the touchscreen to
-/dev/input/mice.  
-
-This is probably what most people want, since unprocessed raw touchscreen
-events should not be converted to emulated PS/2 mouse movements.
-
-Signed-off-by: Harald Welte <laforge@openmoko.org>
-
-Index: a/plugins/input-raw.c
-===================================================================
---- a/plugins/input-raw.c	(revision 49)
-+++ b/plugins/input-raw.c	(working copy)
-@@ -18,6 +18,7 @@
- 
- #include <errno.h>
- #include <stdio.h>
-+#include <limits.h>
- 
- #include <stdlib.h>
- #ifdef HAVE_UNISTD_H
-@@ -33,6 +34,9 @@
- 
- #include "tslib-private.h"
- 
-+#define GRAB_EVENTS_WANTED	1
-+#define GRAB_EVENTS_ACTIVE	2
-+
- struct tslib_input {
- 	struct tslib_module_info module;
- 
-@@ -42,6 +46,7 @@
- 
- 	int	sane_fd;
- 	int	using_syn;
-+	int	grab_events;
- };
- 
- static int check_fd(struct tslib_input *i)
-@@ -64,6 +69,14 @@
- 
- 	if (bit & (1 << EV_SYN))
- 		i->using_syn = 1;
-+	
-+	if (i->grab_events == GRAB_EVENTS_WANTED) {
-+		if (ioctl(ts->fd, EVIOCGRAB, (void *)1)) {
-+			fprintf(stderr, "Unable to grab selected input device\n");
-+			return -1;
-+		}
-+		i->grab_events = GRAB_EVENTS_ACTIVE;
-+	}
- 
- 	return 0;
- }
-@@ -222,6 +235,15 @@
- 
- static int ts_input_fini(struct tslib_module_info *inf)
- {
-+	struct tslib_input *i = (struct tslib_input *)inf;
-+	struct tsdev *ts = inf->dev;
-+
-+	if (i->grab_events == GRAB_EVENTS_ACTIVE) {
-+		if (ioctl(ts->fd, EVIOCGRAB, (void *)0)) {
-+			fprintf(stderr, "Unable to un-grab selected input device\n");
-+		}
-+	}
-+
- 	free(inf);
- 	return 0;
- }
-@@ -231,6 +253,36 @@
- 	.fini	= ts_input_fini,
- };
- 
-+static int parse_raw_grab(struct tslib_module_info *inf, char *str, void *data)
-+{
-+	struct tslib_input *i = (struct tslib_input *)inf;
-+	unsigned long v;
-+	int err = errno;
-+
-+	v = strtoul(str, NULL, 0);
-+
-+	if (v == ULONG_MAX && errno == ERANGE)
-+		return -1;
-+	
-+	errno = err;
-+	switch ((int)data) {
-+	case 1:
-+		if (v)
-+			i->grab_events = GRAB_EVENTS_WANTED;
-+		break;
-+	default:
-+		return -1;
-+	}
-+	return 0;
-+}
-+
-+static const struct tslib_vars raw_vars[] =
-+{
-+	{ "grab_events", (void *)1, parse_raw_grab },
-+};
-+
-+#define NR_VARS (sizeof(raw_vars) / sizeof(raw_vars[0]))
-+
- TSAPI struct tslib_module_info *mod_init(struct tsdev *dev, const char *params)
- {
- 	struct tslib_input *i;
-@@ -245,5 +297,12 @@
- 	i->current_p = 0;
- 	i->sane_fd = 0;
- 	i->using_syn = 0;
-+	i->grab_events = 0;
-+
-+	if (tslib_parse_vars(&i->module, raw_vars, NR_VARS, params)) {
-+		free(i);
-+		return NULL;
-+	}
-+
- 	return &(i->module);
- }
diff --git a/packages/tslib/tslib_1.0.bb b/packages/tslib/tslib_1.0.bb
index 6fa0b3fccc..c707eecb27 100644
--- a/packages/tslib/tslib_1.0.bb
+++ b/packages/tslib/tslib_1.0.bb
@@ -3,18 +3,20 @@ HOMEPAGE = "http://tslib.berlios.de/"
 AUTHOR = "Russell King w/ plugins by Chris Larson et. al."
 SECTION = "base"
 LICENSE = "LGPL"
+PR = "r20"
 
-PR = "r19"
-
-SRC_URI = "http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
-           file://tslib-input_raw-grab_events.patch;patch=1 \
-           file://fix_version.patch;patch=1 \
-           file://ts.conf \
-           file://ts.conf-simpad-2.4 \
-           file://ts.conf-collie-2.4 \
-           file://tslib.sh"
-SRC_URI_append_mnci += " file://devfs.patch;patch=1"
-SRC_URI_append_mnci += " file://event1.patch;patch=1"
+SRC_URI = "\
+  http://download.berlios.de/tslib/tslib-1.0.tar.bz2 \
+  file://fix_version.patch;patch=1 \
+  file://ts.conf \
+  file://ts.conf-simpad-2.4 \
+  file://ts.conf-collie-2.4 \
+  file://tslib.sh \
+"
+SRC_URI_append_mnci += "\
+  file://devfs.patch;patch=1 \
+  file://event1.patch;patch=1 \
+"
 
 inherit autotools pkgconfig