[oe] [PATCH 5/5] xf86-input-tslib: WIP, start with xserver-1.10.ABI.patch

[Martin Jansa]

* but later dropped support for xf86-input-tslib
* https://bugs.launchpad.net/ubuntu/+source/xf86-input-tslib/+bug/714353

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 .../xf86-input-tslib/xserver-1.10.ABI.patch        |   70 ++++++++++++++++++++
 recipes/xorg-driver/xf86-input-tslib_0.0.6.bb      |    1 +
 2 files changed, 71 insertions(+), 0 deletions(-)
 create mode 100644 recipes/xorg-driver/xf86-input-tslib/xserver-1.10.ABI.patch

diff --git a/recipes/xorg-driver/xf86-input-tslib/xserver-1.10.ABI.patch b/recipes/xorg-driver/xf86-input-tslib/xserver-1.10.ABI.patch
new file mode 100644
index 0000000..d73a2c6
--- /dev/null
+++ b/recipes/xorg-driver/xf86-input-tslib/xserver-1.10.ABI.patch
@@ -0,0 +1,70 @@
+Index: xf86-input-tslib/src/tslib.c
+===================================================================
+--- xf86-input-tslib/src/tslib.c	(revision 48)
++++ xf86-input-tslib/src/tslib.c	(working copy)
+@@ -106,7 +106,7 @@
+ }
+ 
+ static Bool
+-ConvertProc( LocalDevicePtr local,
++ConvertProc( InputInfoPtr local,
+ 			 int first,
+ 			 int num,
+ 			 int v0,
+@@ -135,7 +135,7 @@
+     return t;
+ }
+ 
+-static void ReadInput (LocalDevicePtr local)
++static void ReadInput (InputInfoPtr local)
+ {
+ 	struct ts_priv *priv = (struct ts_priv *) (local->private);
+ 	struct ts_sample samp;
+@@ -382,7 +382,11 @@
+ 					       axiswidth - 1,	/* max val */
+ 					       axiswidth,	/* resolution */
+ 					       0,		/* min_res */
+-					       axiswidth);	/* max_res */
++					       axiswidth
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
++					       ,Absolute	/* max_res */
++#endif
++					       );
+ 
+ 		InitValuatorAxisStruct(device, 1,
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+@@ -392,7 +396,11 @@
+ 					       axisheight - 1,	/* max val */
+ 					       axisheight,	/* resolution */
+ 					       0,		/* min_res */
+-					       axisheight);	/* max_res */
++					       axisheight       /* max_res */
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
++					       ,Absolute
++#endif
++					       );
+ 
+ 		if (InitProximityClassDeviceStruct (device) == FALSE) {
+ 			ErrorF ("Unable to allocate EVTouch touchscreen ProximityClassDeviceStruct\n");
+@@ -445,7 +453,7 @@
+  * called when the module subsection is found in XF86Config
+  */
+ static InputInfoPtr
+-xf86TslibInit(InputDriverPtr drv, IDevPtr dev, int flags)
++xf86TslibInit(InputDriverPtr drv, InputInfoPtr dev, int flags)
+ {
+ 	struct ts_priv *priv;
+ 	char *s;
+@@ -455,10 +463,11 @@
+         if (!priv)
+                 return NULL;
+ 
+-	if (!(pInfo = xf86AllocateInput(drv, 0))) {
++	if (!(pInfo = xf86AllocateInput())) {
+ 		xfree(priv);
+ 		return NULL;
+ 	}
++	xf86AddInput(drv, pInfo);
+ 
+ 	/* Initialise the InputInfoRec. */
+ 	pInfo->name = dev->identifier;
diff --git a/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb b/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb
index a1cecaa..decd4a6 100644
--- a/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb
+++ b/recipes/xorg-driver/xf86-input-tslib_0.0.6.bb
@@ -10,6 +10,7 @@ SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-inp
            file://10-x11-input-tslib.fdi \
            file://xserver-174-XGetPointerControl.patch \
            file://99-xf86-input-tslib.rules \
+	   file://xserver-1.10.ABI.patch \
 "
 SRC_URI[archive.md5sum] = "b7a4d2f11637ee3fcf432e044b1d017f"
 SRC_URI[archive.sha256sum] = "5f46fdef095a6e44a69e0f0b57c7d665224b26d990d006611236d8332e85b105"
-- 
1.7.4.1