Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorgtesting.git;a=commitdiff;h=6efab927e9ffec0879e375829a9be3c1f011a91a
commit 6efab927e9ffec0879e375829a9be3c1f011a91a Author: bouleetbil <[email protected]> Date: Wed Sep 2 21:49:10 2009 +0200 xf86-input-void-1.2.0-2-i686 *rebuild with new xorg diff --git a/source/x11/xf86-input-void/FixXinput.diff b/source/x11/xf86-input-void/FixXinput.diff new file mode 100644 index 0000000..7199b61 --- /dev/null +++ b/source/x11/xf86-input-void/FixXinput.diff @@ -0,0 +1,84 @@ +From 1c549f65bdcb735f45000d88ec5e6016fe00b72d Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <[email protected]> +Date: Thu, 18 Jun 2009 22:38:14 +0000 +Subject: Adjust for ABI_XINPUT_VERSION >= 7 + +--- +diff --git a/src/void.c b/src/void.c +index ce005d0..9d49308 100644 +--- a/src/void.c ++++ b/src/void.c +@@ -52,6 +52,11 @@ + #include <xf86Module.h> + #endif + ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++#include <X11/Xatom.h> ++#include <xserver-properties.h> ++#endif ++ + #define MAXBUTTONS 3 + + /****************************************************************************** +@@ -178,7 +183,18 @@ xf86VoidControlProc(DeviceIntPtr device, int what) + XkbRMLVOSet rmlvo; + #endif + Bool result; +- ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ Atom btn_labels[MAXBUTTONS] = {0}; ++ Atom axes_labels[2] = {0}; ++ ++ axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X); ++ axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y); ++ ++ btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT); ++ btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE); ++ btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT); ++#endif ++ + pInfo = device->public.devicePrivate; + + switch (what) +@@ -192,6 +208,9 @@ xf86VoidControlProc(DeviceIntPtr device, int what) + + if (InitButtonClassDeviceStruct(device, + MAXBUTTONS, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ btn_labels, ++#endif + map) == FALSE) { + ErrorF("unable to allocate Button class device\n"); + return !Success; +@@ -224,6 +243,9 @@ xf86VoidControlProc(DeviceIntPtr device, int what) + + if (InitValuatorClassDeviceStruct(device, + 2, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axes_labels, ++#endif + #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3 + xf86GetMotionEvents, + #endif +@@ -231,12 +253,18 @@ xf86VoidControlProc(DeviceIntPtr device, int what) + Absolute) == FALSE) { + InitValuatorAxisStruct(device, + 0, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axes_labels[0], ++#endif + 0, /* min val */1, /* max val */ + 1, /* resolution */ + 0, /* min_res */ + 1); /* max_res */ + InitValuatorAxisStruct(device, + 1, ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 ++ axes_labels[1], ++#endif + 0, /* min val */1, /* max val */ + 1, /* resolution */ + 0, /* min_res */ +-- +cgit v0.8.2 + diff --git a/source/x11/xf86-input-void/FrugalBuild b/source/x11/xf86-input-void/FrugalBuild index 84fe0ca..b359dce 100644 --- a/source/x11/xf86-input-void/FrugalBuild +++ b/source/x11/xf86-input-void/FrugalBuild @@ -3,7 +3,10 @@ pkgname=xf86-input-void pkgver=1.2.0 -pkgrel=1 +pkgrel=2 Finclude xorg -sha1sums=('18ead823be5677c63043648d1cf4327e51c8aeb0') +source=($source FixXinput.diff) +sha1sums=('18ead823be5677c63043648d1cf4327e51c8aeb0' \ + '3a72a567f5b704dd2e441e13ea4bb82b41c538bf') + # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
