Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=6bbf933f828950dbde41ce58f46015c43587eb54
commit 6bbf933f828950dbde41ce58f46015c43587eb54
Author: bouleetbil <bouleet...@frogdev.info>
Date: Wed Sep 2 17:08:03 2009 +0200
xf86-input-elographics-1.2.3-2-i686
*rebuild with new xorg
diff --git a/source/x11/xf86-input-elographics/FixXinput.diff
b/source/x11/xf86-input-elographics/FixXinput.diff
new file mode 100644
index 0000000..0493539
--- /dev/null
+++ b/source/x11/xf86-input-elographics/FixXinput.diff
@@ -0,0 +1,70 @@
+From a18af14b1df5271fbe3100df3fcb3a8811981ddf Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Fri, 17 Jul 2009 04:44:55 +0000
+Subject: Cope with XINPUT ABI 7.
+
+Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+---
+diff --git a/src/xf86Elo.c b/src/xf86Elo.c
+index 4ca60f1..495a43c 100644
+--- a/src/xf86Elo.c
++++ b/src/xf86Elo.c
+@@ -780,6 +780,10 @@ xf86EloControl(DeviceIntPtr dev,
+ unsigned char map[] = { 0, 1 };
+ unsigned char req[ELO_PACKET_SIZE];
+ unsigned char reply[ELO_PACKET_SIZE];
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ Atom btn_label;
++ Atom axis_labels[2] = { 0, 0 };
++#endif
+
+ switch(mode) {
+
+@@ -797,7 +801,11 @@ xf86EloControl(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 Elographics touchscreen
ButtonClassDeviceStruct\n");
+ return !Success;
+ }
+@@ -818,6 +826,9 @@ xf86EloControl(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
+@@ -827,11 +838,19 @@ xf86EloControl(DeviceIntPtr dev,
+ }
+ else {
+ /* I will map coordinates myself */
+- InitValuatorAxisStruct(dev, 0, -1, -1,
++ InitValuatorAxisStruct(dev, 0,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels[0],
++#endif
++ -1, -1,
+ 9500,
+ 0 /* min_res */,
+ 9500 /* max_res */);
+- InitValuatorAxisStruct(dev, 1, -1, -1,
++ InitValuatorAxisStruct(dev, 1,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
++ axis_labels[1],
++#endif
++ -1, -1,
+ 10500,
+ 0 /* min_res */,
+ 10500 /* max_res */);
+--
+cgit v0.8.2
+
diff --git a/source/x11/xf86-input-elographics/FrugalBuild
b/source/x11/xf86-input-elographics/FrugalBuild
index 2b916fe..d548624 100644
--- a/source/x11/xf86-input-elographics/FrugalBuild
+++ b/source/x11/xf86-input-elographics/FrugalBuild
@@ -3,8 +3,11 @@
pkgname=xf86-input-elographics
pkgver=1.2.3
-pkgrel=1
+pkgrel=2
Finclude xorg
+source=($source FixXinput.diff)
_F_cd_path="$pkgname-$pkgver"
-sha1sums=('9485c42a79e91035447e72a3a2d1ba9a2ecbe8af')
+sha1sums=('9485c42a79e91035447e72a3a2d1ba9a2ecbe8af' \
+ '2fc267f8efe1accb37fe96960f1c09ea5a932a5c')
+
# optimization OK
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
