Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=41ec513cd53cd0eceee8188c4a4c1beada4f593c
commit 41ec513cd53cd0eceee8188c4a4c1beada4f593c Author: bouleetbil <bouleet...@frogdev.info> Date: Mon Mar 8 23:40:43 2010 +0000 xf86-input-penmount-1.4.1-1-i686 *version bump diff --git a/source/x11/xf86-input-penmount/FixXinput.diff b/source/x11/xf86-input-penmount/FixXinput.diff deleted file mode 100644 index 65d2cfd..0000000 --- a/source/x11/xf86-input-penmount/FixXinput.diff +++ /dev/null @@ -1,69 +0,0 @@ -From dab0c2742c034750e3e9673167eb20812b679818 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutte...@who-t.net> -Date: Fri, 17 Jul 2009 03:59:43 +0000 -Subject: Cope with XINPUT ABI 7. - -Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> ---- -diff --git a/src/xf86PM.c b/src/xf86PM.c -index 0c01760..1e38124 100644 ---- a/src/xf86PM.c -+++ b/src/xf86PM.c -@@ -181,6 +181,9 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo) - unsigned char map[] = - {0, 1}; - int min_x, min_y, max_x, max_y; -+ Atom axis_labels[2] = { 0, 0 }; -+ Atom btn_label = 0; -+ - /* - * these have to be here instead of in the SetupProc, because when the - * SetupProc is run at server startup, screenInfo is not setup yet -@@ -191,7 +194,11 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo) - /* - * Device reports button press for 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 PenMount ButtonClassDeviceStruct\n"); - return !Success; -@@ -202,6 +209,9 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo) - * Axes min and max values are reported in raw coordinates. - */ - 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 -@@ -234,11 +244,19 @@ ProcessDeviceInit(PenMountPrivatePtr priv, DeviceIntPtr dev, InputInfoPtr pInfo) - min_y = 0; - } - -- InitValuatorAxisStruct (dev, 0, min_x, max_x, -+ InitValuatorAxisStruct (dev, 0, -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -+ axis_labels[0], -+#endif -+ min_x, max_x, - 9500, - 0 /* min_res */ , - 9500 /* max_res */ ); -- InitValuatorAxisStruct (dev, 1, min_y, max_y, -+ InitValuatorAxisStruct (dev, 1, -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -+ axis_labels[1], -+#endif -+ min_y, max_y, - 10500, - 0 /* min_res */ , - 10500 /* max_res */ ); --- -cgit v0.8.2 - diff --git a/source/x11/xf86-input-penmount/FrugalBuild b/source/x11/xf86-input-penmount/FrugalBuild index 1608f3d..c1c0fa2 100644 --- a/source/x11/xf86-input-penmount/FrugalBuild +++ b/source/x11/xf86-input-penmount/FrugalBuild @@ -2,11 +2,9 @@ # Maintainer: Christian Hamar alias krix <kr...@linuxforum.hu> pkgname=xf86-input-penmount -pkgver=1.4.0 -pkgrel=2 +pkgver=1.4.1 +pkgrel=1 Finclude xorg -source=($source FixXinput.diff) -sha1sums=('f997597a754f5dd0b5df4c1db0b42fbb11400514' \ - '78a20376999051ab57060891ac5223ec735e8333') +sha1sums=('a6923fe92ffbc698813063a5426b4ba2edfe465f') # optimization OK _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git