Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=bluez.git;a=commitdiff;h=751d450751d4c3a14c5857e226fe9bd5aaf087d5

commit 751d450751d4c3a14c5857e226fe9bd5aaf087d5
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Wed Feb 10 23:06:18 2010 +0000

xf86-input-void-1.3.0-1-i686
*version bump

diff --git a/source/x11/xf86-input-void/FixXinput.diff 
b/source/x11/xf86-input-void/FixXinput.diff
deleted file mode 100644
index 7199b61..0000000
--- a/source/x11/xf86-input-void/FixXinput.diff
+++ /dev/null
@@ -1,84 +0,0 @@
-From 1c549f65bdcb735f45000d88ec5e6016fe00b72d Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutte...@who-t.net>
-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 b359dce..2eee187 100644
--- a/source/x11/xf86-input-void/FrugalBuild
+++ b/source/x11/xf86-input-void/FrugalBuild
@@ -2,11 +2,9 @@
# Maintainer: Christian Hamar alias krix <kr...@linuxforum.hu>

pkgname=xf86-input-void
-pkgver=1.2.0
-pkgrel=2
+pkgver=1.3.0
+pkgrel=1
Finclude xorg
-source=($source FixXinput.diff)
-sha1sums=('18ead823be5677c63043648d1cf4327e51c8aeb0' \
-          '3a72a567f5b704dd2e441e13ea4bb82b41c538bf')
+sha1sums=('2b2d284c4cc356f2ff6fc8e448e61bbea2e4ff30')

# optimization OK
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to