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

[andyrtr at archlinux.org]

    Date: Monday, October 12, 2009 @ 15:27:07
  Author: andyrtr
Revision: 55368

upgpkg: xf86-input-fpit 1.3.0-3
    built against Xorg-server 1.7

Added:
  xf86-input-fpit/trunk/fpit-1.3.0-abi.patch
Modified:
  xf86-input-fpit/trunk/PKGBUILD

----------------------+
 PKGBUILD             |   14 ++++---
 fpit-1.3.0-abi.patch |   95 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-12 19:26:07 UTC (rev 55367)
+++ PKGBUILD	2009-10-12 19:27:07 UTC (rev 55368)
@@ -3,21 +3,25 @@
 
 pkgname=xf86-input-fpit
 pkgver=1.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc="X.Org Fujitsu Stylistic Tablet PC 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=('e5bfda480f25121e3c4222e5e1eb5880' '2d8404d3112316f04cba864c915adfac')
+source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 LICENSE
+	fpit-1.3.0-abi.patch)
+md5sums=('e5bfda480f25121e3c4222e5e1eb5880'
+         '2d8404d3112316f04cba864c915adfac'
+         '9d8f1033924deb04edc1775bc82440f3')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i ${srcdir}/fpit-1.3.0-abi.patch || return 1
   ./configure --prefix=/usr || return 1
   make || return 1
   make DESTDIR="${pkgdir}" install || return 1

Added: fpit-1.3.0-abi.patch
===================================================================
--- fpit-1.3.0-abi.patch	                        (rev 0)
+++ fpit-1.3.0-abi.patch	2009-10-12 19:27:07 UTC (rev 55368)
@@ -0,0 +1,95 @@
+From 7d203627e7e3e7a6f8d0e847ed650b0b89760c09 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Fri, 17 Jul 2009 14:38:31 +1000
+Subject: [PATCH] Cope with XINPUT ABI 7.
+
+---
+ src/xf86Fpit.c |   40 +++++++++++++++++++++++++++++++++++-----
+ 1 files changed, 35 insertions(+), 5 deletions(-)
+
+diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c
+index 528ebb9..f40c6a9 100644
+--- a/src/xf86Fpit.c
++++ b/src/xf86Fpit.c
+@@ -188,6 +188,9 @@ static void xf86FpitSetUpAxes(DeviceIntPtr dev, FpitPrivatePtr priv)
+ 	 * screen to fit one meter.
+ 	 */
+ 	int quarter_turns;
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++        Atom axis_labels[2] = { 0, 0 };
++#endif
+ 
+ 	priv->screen_width = screenInfo.screens[priv->screen_no]->width;
+ 	priv->screen_height = screenInfo.screens[priv->screen_no]->height;
+@@ -212,14 +215,30 @@ static void xf86FpitSetUpAxes(DeviceIntPtr dev, FpitPrivatePtr priv)
+ 	}
+ 
+ 	if (priv->fpitTotalOrientation & FPIT_THEN_SWAP_XY) {
+-		InitValuatorAxisStruct(dev, 1, priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ ,
++		InitValuatorAxisStruct(dev, 1,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++				       axis_labels[1],
++#endif
++				       priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ ,
+ 				       9500 /* max_res */ );
+-		InitValuatorAxisStruct(dev, 0, priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,
++		InitValuatorAxisStruct(dev, 0,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++				       axis_labels[0],
++#endif
++				       priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,
+ 				       10500 /* max_res */ );
+ 	} else {
+-		InitValuatorAxisStruct(dev, 0, priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ ,
++		InitValuatorAxisStruct(dev, 0,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++				       axis_labels[0],
++#endif
++				       priv->fpitMinY, priv->fpitMaxY, 9500, 0 /* min_res */ ,
+ 				       9500 /* max_res */ );
+-		InitValuatorAxisStruct(dev, 1, priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,
++		InitValuatorAxisStruct(dev, 1,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++				       axis_labels[1],
++#endif
++				       priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,
+ 				       10500 /* max_res */ );
+ 	}
+ }
+@@ -408,6 +427,10 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode)
+ 	unsigned char map[] = {
+ 		0, 1, 2, 3 /* DMC: changed this so we can use all three buttons */
+ 	};
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++	Atom btn_labels[3] = { 0 };
++	Atom axis_labels[2] = { 0, 0 };
++#endif
+ 
+ 
+ 	switch (mode) {
+@@ -420,7 +443,11 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode)
+ 			/*
+ 			 * Device reports button press for up to 3 buttons.
+ 			 */
+-			if (InitButtonClassDeviceStruct(dev, 3, map) == FALSE) {
++			if (InitButtonClassDeviceStruct(dev, 3,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++				      btn_labels,
++#endif
++				      map) == FALSE) {
+ 				ErrorF("Unable to allocate Fpit touchscreen ButtonClassDeviceStruct\n");
+ 				return !Success;
+ 			}
+@@ -435,6 +462,9 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode)
+ 			}
+ 	      
+ 			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
+-- 
+1.6.3.rc1.2.g0164.dirty
+