[arch-commits] Commit in xf86-input-elographics/trunk (2 files)

[andyrtr at archlinux.org]

    Date: Monday, October 12, 2009 @ 15:14:36
  Author: andyrtr
Revision: 55355

upgpkg: xf86-input-elographics 1.2.3-3
    built against Xorg-server 1.7

Added:
  xf86-input-elographics/trunk/elographics-1.2.3-abi.patch
Modified:
  xf86-input-elographics/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   11 ++++--
 elographics-1.2.3-abi.patch |   73 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-12 19:09:48 UTC (rev 55354)
+++ PKGBUILD	2009-10-12 19:14:36 UTC (rev 55355)
@@ -3,22 +3,25 @@
 
 pkgname=xf86-input-elographics
 pkgver=1.2.3
-pkgrel=2
+pkgrel=3
 pkgdesc="X.org Elographics TouchScreen input driver"
 arch=(i686 x86_64)
 license=('custom')
 url="http://xorg.freedesktop.org/"
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server>=1.6.1' 'xorg-util-macros')
+makedepends=('pkgconfig' 'xorg-server>=1.7.0' 'xorg-util-macros')
 options=('!libtool')
 groups=('xorg-input-drivers')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2
-	git-c97c9f47.patch)
-md5sums=('cc2923460c8eff9652b01889a063058d' '6ee7c814f57fc898f52cb765c3e50c31')
+	git-c97c9f47.patch elographics-1.2.3-abi.patch)
+md5sums=('cc2923460c8eff9652b01889a063058d'
+         '6ee7c814f57fc898f52cb765c3e50c31'
+         'ca8a9e00eb639214e21eec4db193d4cf')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/git-c97c9f47.patch" || return 1
+  patch -Np1 -i ${srcdir}/elographics-1.2.3-abi.patch || return 1
   libtoolize --force || return 1
   aclocal || return 1
   autoconf || return 1

Added: elographics-1.2.3-abi.patch
===================================================================
--- elographics-1.2.3-abi.patch	                        (rev 0)
+++ elographics-1.2.3-abi.patch	2009-10-12 19:14:36 UTC (rev 55355)
@@ -0,0 +1,73 @@
+From a18af14b1df5271fbe3100df3fcb3a8811981ddf Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Fri, 17 Jul 2009 14:44:55 +1000
+Subject: [PATCH] Cope with XINPUT ABI 7.
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ src/xf86Elo.c |   25 ++++++++++++++++++++++---
+ 1 files changed, 22 insertions(+), 3 deletions(-)
+
+diff --git a/src/xf86Elo.c b/src/xf86Elo.c
+index 4ca60f1..495a43c 100644
+--- a/src/xf86Elo.c
++++ b/src/xf86Elo.c
+@@ -780,6 +780,10 @@ xf86EloControl(DeviceIntPtr	dev,
+   unsigned char		map[] = { 0, 1 };
+   unsigned char		req[ELO_PACKET_SIZE];
+   unsigned char		reply[ELO_PACKET_SIZE];
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++  Atom btn_label;
++  Atom axis_labels[2] = { 0, 0 };
++#endif
+ 
+   switch(mode) {
+ 
+@@ -797,7 +801,11 @@ xf86EloControl(DeviceIntPtr	dev,
+       /*
+        * Device reports button press for up to 1 button.
+        */
+-      if (InitButtonClassDeviceStruct(dev, 1, map) == FALSE) {
++      if (InitButtonClassDeviceStruct(dev, 1,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++				      &btn_label,
++#endif
++				      map) == FALSE) {
+ 	ErrorF("Unable to allocate Elographics touchscreen ButtonClassDeviceStruct\n");
+ 	return !Success;
+       }
+@@ -818,6 +826,9 @@ xf86EloControl(DeviceIntPtr	dev,
+        * screen to fit one meter.
+        */
+       if (InitValuatorClassDeviceStruct(dev, 2,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++					axis_labels,
++#endif
+ #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+                   xf86GetMotionEvents,
+ #endif
+@@ -827,11 +838,19 @@ xf86EloControl(DeviceIntPtr	dev,
+       }
+       else {
+ 	/* I will map coordinates myself */
+-	InitValuatorAxisStruct(dev, 0, -1, -1,
++	InitValuatorAxisStruct(dev, 0,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++			       axis_labels[0],
++#endif
++			       -1, -1,
+ 			       9500,
+ 			       0     /* min_res */,
+ 			       9500  /* max_res */);
+-	InitValuatorAxisStruct(dev, 1, -1, -1,
++	InitValuatorAxisStruct(dev, 1,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++			       axis_labels[1],
++#endif
++			       -1, -1,
+ 			       10500,
+ 			       0     /* min_res */,
+ 			       10500 /* max_res */);
+-- 
+1.6.3.rc1.2.g0164.dirty
+