rpms/xorg-x11-drv-void/devel void-1.2.0-Adjust-for-ABI_XINPUT_VERSION-7.patch, NONE, 1.1 xorg-x11-drv-void.spec, 1.22, 1.23

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-void/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26494

Modified Files:
	xorg-x11-drv-void.spec 
Added Files:
	void-1.2.0-Adjust-for-ABI_XINPUT_VERSION-7.patch 
Log Message:
* Mon Jun 22 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.2.0-2
- void-1.2.0-Adjust-for-ABI_XINPUT_VERSION-7.patch: cope with new input ABI.


void-1.2.0-Adjust-for-ABI_XINPUT_VERSION-7.patch:

--- NEW FILE void-1.2.0-Adjust-for-ABI_XINPUT_VERSION-7.patch ---
>From 1c549f65bdcb735f45000d88ec5e6016fe00b72d Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Fri, 19 Jun 2009 08:38:14 +1000
Subject: [PATCH] Adjust for ABI_XINPUT_VERSION >= 7

---
 src/void.c |   30 +++++++++++++++++++++++++++++-
 1 files changed, 29 insertions(+), 1 deletions(-)

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 */
-- 
1.6.3.rc1.2.g0164.dirty



Index: xorg-x11-drv-void.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-void/devel/xorg-x11-drv-void.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- xorg-x11-drv-void.spec	24 Feb 2009 22:58:09 -0000	1.22
+++ xorg-x11-drv-void.spec	22 Jun 2009 03:20:33 -0000	1.23
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 void input driver
 Name:      xorg-x11-drv-void
 Version:   1.2.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -13,6 +13,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
+Patch1:    void-1.2.0-Adjust-for-ABI_XINPUT_VERSION-7.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
@@ -25,6 +27,8 @@ X.Org X11 void input driver.
 %prep
 %setup -q -n %{tarball}-%{version}
 
+%patch1 -p1
+
 %build
 %configure --disable-static
 make
@@ -48,6 +52,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/void.4*
 
 %changelog
+* Mon Jun 22 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.2.0-2
+- void-1.2.0-Adjust-for-ABI_XINPUT_VERSION-7.patch: cope with new input ABI.
+
 * Wed Feb 25 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.2.0-1
 - void 1.2.0