[oe] [PATCH 4/5] om-gta0*: drop xf86-input-tslib

[Martin Jansa]

* not compatible with xserver-1.10 ABI
* needs PR bump in xserver-xorg-conf/task-x11

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 conf/machine/om-gta01.conf                         |    1 -
 conf/machine/om-gta02.conf                         |    1 -
 .../xserver-xorg-conf/om-gta01/xorg.conf           |    3 +--
 .../xserver-xorg-conf/om-gta02/xorg.conf           |    3 +--
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 97ba716..3171797 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -22,7 +22,6 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "285"
 XSERVER ?= "xserver-xorg \
-           xf86-input-tslib \
            xf86-input-evdev \
            xf86-video-fbdev \
            xf86-input-keyboard \
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 002fd64..e28b47f 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -24,7 +24,6 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "285"
 XSERVER ?= "xserver-xorg \
-           xf86-input-tslib \
            xf86-input-evdev \
            xf86-video-glamo \
            xf86-input-keyboard \
diff --git a/recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf
index e957e41..edb5e0e 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf
+++ b/recipes/xorg-xserver/xserver-xorg-conf/om-gta01/xorg.conf
@@ -32,9 +32,8 @@ EndSection
 
 Section "InputDevice"
 	Identifier	"Touchscreen"
-	Driver		"tslib"
+	Driver		"evdev"
 	Option		"Device"	"/dev/input/event1"
-	Option		"EmulateRightButton"	"1"
 EndSection
 
 Section "ServerFlags"
diff --git a/recipes/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf
index 8b116fc..de6ed1c 100644
--- a/recipes/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf
+++ b/recipes/xorg-xserver/xserver-xorg-conf/om-gta02/xorg.conf
@@ -38,9 +38,8 @@ EndSection
 
 Section "InputDevice"
 	Identifier	"Touchscreen"
-	Driver		"tslib"
+	Driver		"evdev"
 	Option		"Device"	"/dev/input/event1"
-	Option          "EmulateRightButton"    "1"
 EndSection
 
 Section "ServerFlags"
-- 
1.7.4.1