4 files changed, 77 insertions, 3 deletions
diff --git a/test/xorg-xf86-input-mutouch/.footprint b/xorg/xorg-xf86-input-mutouch/.footprint
index 33db3c496..33db3c496 100644
--- a/test/xorg-xf86-input-mutouch/.footprint
+++ b/xorg/xorg-xf86-input-mutouch/.footprint
diff --git a/test/xorg-xf86-input-mutouch/.md5sum b/xorg/xorg-xf86-input-mutouch/.md5sum
index bb3efe209..8ced93213 100644
--- a/test/xorg-xf86-input-mutouch/.md5sum
+++ b/xorg/xorg-xf86-input-mutouch/.md5sum
@@ -1 +1,2 @@
+720ecbcc20aaf0b5a78325d048095369  mutouch-1.2.1-abi.patch
 f28998cdfae2a4c41589299a4ee1f459  xf86-input-mutouch-1.2.1.tar.bz2
diff --git a/test/xorg-xf86-input-mutouch/Pkgfile b/xorg/xorg-xf86-input-mutouch/Pkgfile
index 45610b54e..58098c004 100644
--- a/test/xorg-xf86-input-mutouch/Pkgfile
+++ b/xorg/xorg-xf86-input-mutouch/Pkgfile
@@ -7,11 +7,11 @@
 name=xorg-xf86-input-mutouch
 version=1.2.1
 release=2
-source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mutouch-$version.tar.bz2)
-
+source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mutouch-$version.tar.bz2 \
+	mutouch-1.2.1-abi.patch) 
 build() {
 	cd xf86-input-mutouch-$version
-
+	patch -Np1 -i ../mutouch-1.2.1-abi.patch
 	./configure --prefix=/usr
 
 	make
diff --git a/xorg/xorg-xf86-input-mutouch/mutouch-1.2.1-abi.patch b/xorg/xorg-xf86-input-mutouch/mutouch-1.2.1-abi.patch
new file mode 100644
index 000000000..ec4e72139
--- /dev/null
+++ b/xorg/xorg-xf86-input-mutouch/mutouch-1.2.1-abi.patch
@@ -0,0 +1,73 @@
+From db04a5333b545a0442b995bae47d2c5527a7459e Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@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@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
+