From 9a6b8e416f724c1a164b9071c08d6ca17a1812e2 Mon Sep 17 00:00:00 2001
From: tnut <thierryn1 at hispeed dot ch>
Date: Thu, 14 Oct 2010 09:15:00 +0200
Subject: xorg-xf86-input-hyperpen port nettoyé
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 acompiler/xorg-xf86-input-hyperpen/Pkgfile         |  2 +-
 .../hyperpen-1.3.0-abi.patch                       | 89 ----------------------
 2 files changed, 1 insertion(+), 90 deletions(-)
 delete mode 100644 acompiler/xorg-xf86-input-hyperpen/hyperpen-1.3.0-abi.patch

(limited to 'acompiler')

diff --git a/acompiler/xorg-xf86-input-hyperpen/Pkgfile b/acompiler/xorg-xf86-input-hyperpen/Pkgfile
index 8dd6cacdb..ee8db8430 100644
--- a/acompiler/xorg-xf86-input-hyperpen/Pkgfile
+++ b/acompiler/xorg-xf86-input-hyperpen/Pkgfile
@@ -8,7 +8,7 @@ name=xorg-xf86-input-hyperpen
 version=1.3.0
 release=2
 source=(http://xorg.freedesktop.org/releases/individual/driver/xf86-input-hyperpen-$version.tar.bz2 \
-	hyperpen-1.3.0-abi.patch )
+	http://nutyx.meticul.eu/files/patchs/xorg-xf86-input-hyperpen/hyperpen-1.3.0-abi.patch )
 
 build() {
 	cd xf86-input-hyperpen-$version
diff --git a/acompiler/xorg-xf86-input-hyperpen/hyperpen-1.3.0-abi.patch b/acompiler/xorg-xf86-input-hyperpen/hyperpen-1.3.0-abi.patch
deleted file mode 100644
index efc5294bb..000000000
--- a/acompiler/xorg-xf86-input-hyperpen/hyperpen-1.3.0-abi.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 7f3815f74e77df6122320d845d6e7e9541a28b76 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Fri, 17 Jul 2009 14:28:42 +1000
-Subject: [PATCH] Cope with XINPUT ABI 7.
-
----
- src/xf86HyperPen.c |   24 ++++++++++++++++++++++--
- 1 files changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/src/xf86HyperPen.c b/src/xf86HyperPen.c
-index bd630a5..3920a04 100644
---- a/src/xf86HyperPen.c
-+++ b/src/xf86HyperPen.c
-@@ -719,6 +719,9 @@ xf86HypOpenDevice(DeviceIntPtr pHyp)
- {
-     LocalDevicePtr	local = (LocalDevicePtr)pHyp->public.devicePrivate;
-     HyperPenDevicePtr	priv = (HyperPenDevicePtr)PRIVATE(pHyp);
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+    Atom axis_labels[3] = { 0 };
-+#endif
- 
-     if (xf86HypOpen(local) != Success) {
- 	if (local->fd >= 0) {
-@@ -730,6 +733,9 @@ xf86HypOpenDevice(DeviceIntPtr pHyp)
- /* Set the real values */
-     InitValuatorAxisStruct(pHyp,
- 			   0,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+			   axis_labels[0],
-+#endif
- 			   0, /* min val */
- 			   priv->hypXSize, /* max val */
- 			   LPI2CPM(priv->hypRes), /* resolution */
-@@ -737,6 +743,9 @@ xf86HypOpenDevice(DeviceIntPtr pHyp)
- 			   LPI2CPM(priv->hypRes)); /* max_res */
-     InitValuatorAxisStruct(pHyp,
- 			   1,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+			   axis_labels[1],
-+#endif
- 			   0, /* min val */
- 			   priv->hypYSize, /* max val */
- 			   LPI2CPM(priv->hypRes), /* resolution */
-@@ -744,6 +753,9 @@ xf86HypOpenDevice(DeviceIntPtr pHyp)
- 			   LPI2CPM(priv->hypRes)); /* max_res */
-     InitValuatorAxisStruct(pHyp,
- 			   2,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+			   axis_labels[2],
-+#endif
- 			   0, /* min val */
- 			   511, /* max val */
- 			   512, /* resolution */
-@@ -765,8 +777,10 @@ xf86HypProc(DeviceIntPtr pHyp, int what)
-     int			loop;
-     LocalDevicePtr	local = (LocalDevicePtr)pHyp->public.devicePrivate;
-     HyperPenDevicePtr	priv = (HyperPenDevicePtr)PRIVATE(pHyp);
--
--
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+    Atom btn_labels[4] = { 0 };
-+    Atom axis_labels[3] = { 0 };
-+#endif
- 
-     switch (what) {
- 	case DEVICE_INIT:
-@@ -779,6 +793,9 @@ xf86HypProc(DeviceIntPtr pHyp, int what)
- 
- 	    if (InitButtonClassDeviceStruct(pHyp,
- 					    nbbuttons,
-+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
-+					    btn_labels,
-+#endif
- 					    map) == FALSE) {
- 		ErrorF("unable to allocate Button class device\n");
- 		return !Success;
-@@ -802,6 +819,9 @@ xf86HypProc(DeviceIntPtr pHyp, int what)
- 
- 	    if (InitValuatorClassDeviceStruct(pHyp,
- 		   nbaxes,
-+#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
-
-- 
cgit v1.2.3-70-g09d2