Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=0317895fae34ce4dc90d3795bb7f773229885dff
commit 0317895fae34ce4dc90d3795bb7f773229885dff
Author: bouleetbil <bouleet...@frogdev.info>
Date: Wed Sep 2 17:29:27 2009 +0200
xf86-input-hyperpen-1.3.0-2-i686
*rebuild with new xorg
diff --git a/source/x11/xf86-input-hyperpen/FixXinput.diff
b/source/x11/xf86-input-hyperpen/FixXinput.diff
new file mode 100644
index 0000000..1af8313
--- /dev/null
+++ b/source/x11/xf86-input-hyperpen/FixXinput.diff
@@ -0,0 +1,86 @@
+From 7f3815f74e77df6122320d845d6e7e9541a28b76 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Fri, 17 Jul 2009 04:28:42 +0000
+Subject: Cope with XINPUT ABI 7.
+
+---
+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
+--
+cgit v0.8.2
+
diff --git a/source/x11/xf86-input-hyperpen/FrugalBuild
b/source/x11/xf86-input-hyperpen/FrugalBuild
index 5e87be8..90dd03f 100644
--- a/source/x11/xf86-input-hyperpen/FrugalBuild
+++ b/source/x11/xf86-input-hyperpen/FrugalBuild
@@ -3,7 +3,10 @@
pkgname=xf86-input-hyperpen
pkgver=1.3.0
-pkgrel=1
+pkgrel=2
Finclude xorg
-sha1sums=('c508f7d713d9127b6ad906f347c4760825a612e5')
+source=($source FixXinput.diff)
+sha1sums=('c508f7d713d9127b6ad906f347c4760825a612e5' \
+ 'ae8c0733d83d47b37c2d64c47246ab5cb55e87e3')
+
# optimization OK
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
