[arch-commits] Commit in xf86-input-mutouch/trunk (PKGBUILD mutouch-1.2.1-abi.patch)

[andyrtr at archlinux.org]

    Date: Monday, October 12, 2009 @ 15:53:39
  Author: andyrtr
Revision: 55407

upgpkg: xf86-input-mutouch 1.2.1-4
    built against Xorg-server 1.7

Added:
  xf86-input-mutouch/trunk/mutouch-1.2.1-abi.patch
Modified:
  xf86-input-mutouch/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   14 +++++---
 mutouch-1.2.1-abi.patch |   73 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-12 19:51:47 UTC (rev 55406)
+++ PKGBUILD	2009-10-12 19:53:39 UTC (rev 55407)
@@ -3,21 +3,25 @@
 
 pkgname=xf86-input-mutouch
 pkgver=1.2.1
-pkgrel=3
+pkgrel=4
 pkgdesc="X.org mutouch input driver"
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 depends=('glibc')
-makedepends=('pkgconfig' 'xorg-server>=1.6.0')
-conflicts=('xorg-server<1.6.0')
+makedepends=('pkgconfig' 'xorg-server>=1.7.0')
+conflicts=('xorg-server<1.7.0')
 groups=('xorg-input-drivers')
 options=('!libtool')
-source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 LICENSE)
-md5sums=('f28998cdfae2a4c41589299a4ee1f459' '36af84f23456724171d087116f6a4c09')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 LICENSE
+	mutouch-1.2.1-abi.patch)
+md5sums=('f28998cdfae2a4c41589299a4ee1f459'
+         '36af84f23456724171d087116f6a4c09'
+         '720ecbcc20aaf0b5a78325d048095369')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/mutouch-1.2.1-abi.patch || return 1
   ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1

Added: mutouch-1.2.1-abi.patch
===================================================================
--- mutouch-1.2.1-abi.patch	                        (rev 0)
+++ mutouch-1.2.1-abi.patch	2009-10-12 19:53:39 UTC (rev 55407)
@@ -0,0 +1,73 @@
+From db04a5333b545a0442b995bae47d2c5527a7459e Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Fri, 17 Jul 2009 14:18:51 +1000
+Subject: [PATCH] Cope with XINPUT ABI 7.
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ src/xf86MuTouch.c |   25 ++++++++++++++++++++++---
+ 1 files changed, 22 insertions(+), 3 deletions(-)
+
+diff --git a/src/xf86MuTouch.c b/src/xf86MuTouch.c
+index 2d5cdb0..de319fc 100644
+--- a/src/xf86MuTouch.c
++++ b/src/xf86MuTouch.c
+@@ -749,6 +749,10 @@ xf86MuTControl(DeviceIntPtr	dev,
+   unsigned char		req[MuT_PACKET_SIZE];
+   unsigned char		reply[MuT_BUFFER_SIZE];
+   char			*id_string = DEVICE_ID(local->private_flags) == FINGER_ID ? "finger" : "stylus";
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++  Atom btn_label;
++  Atom axis_labels[2] = { 0, 0 };
++#endif
+ 
+   switch(mode) {
+ 
+@@ -766,7 +770,11 @@ xf86MuTControl(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 ButtonClassDeviceStruct\n");
+ 	return !Success;
+       }
+@@ -779,6 +787,9 @@ xf86MuTControl(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
+@@ -787,11 +798,19 @@ xf86MuTControl(DeviceIntPtr	dev,
+ 	return !Success;
+       }
+       else {
+-	InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x,
++	InitValuatorAxisStruct(dev, 0,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++			       axis_labels[0],
++#endif
++			       priv->min_x, priv->max_x,
+ 			       9500,
+ 			       0     /* min_res */,
+ 			       9500  /* max_res */);
+-	InitValuatorAxisStruct(dev, 1, priv->min_y, priv->max_y,
++	InitValuatorAxisStruct(dev, 1,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++			       axis_labels[1],
++#endif
++			       priv->min_y, priv->max_y,
+ 			       10500,
+ 			       0     /* min_res */,
+ 			       10500 /* max_res */);
+-- 
+1.6.3.rc1.2.g0164.dirty
+