rpms/xorg-x11-drv-hyperpen/devel hyperpen-1.3.0-abi.patch, NONE, 1.1 xorg-x11-drv-hyperpen.spec, 1.20, 1.21

[Peter Hutterer]

Author: whot

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

Modified Files:
	xorg-x11-drv-hyperpen.spec 
Added Files:
	hyperpen-1.3.0-abi.patch 
Log Message:
* Fri Jul 17 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.3.0-2
- hyperpen-1.3.0-abi.patch: Cope with XINPUT ABI 7.


hyperpen-1.3.0-abi.patch:
 xf86HyperPen.c |   25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

--- NEW FILE hyperpen-1.3.0-abi.patch ---

>From 7f3815f74e77df6122320d845d6e7e9541a28b76 Mon Sep 17 00:00:00 2001

From: Peter Hutterer <peter.hutterer at who-t.net>

Date: Fri, 17 Jul 2009 14:28:42 +1000

Subject: [PATCH] Cope with XINPUT ABI 7.



---

 src/xf86HyperPen.c |   24 ++++++++++++++++++++++--

 1 files changed, 22 insertions(+), 2 deletions(-)



diff --git a/src/xf86HyperPen.c b/src/xf86HyperPen.c

index bd630a5..3920a04 100644

--- a/src/xf86HyperPen.c

+++ b/src/xf86HyperPen.c

@@ -719,6 +719,9 @@ xf86HypOpenDevice(DeviceIntPtr pHyp)

 {

     LocalDevicePtr	local = (LocalDevicePtr)pHyp->public.devicePrivate;

     HyperPenDevicePtr	priv = (HyperPenDevicePtr)PRIVATE(pHyp);

+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7

+    Atom axis_labels[3] = { 0 };

+#endif

 

     if (xf86HypOpen(local) != Success) {

 	if (local->fd >= 0) {

@@ -730,6 +733,9 @@ xf86HypOpenDevice(DeviceIntPtr pHyp)

 /* Set the real values */

     InitValuatorAxisStruct(pHyp,

 			   0,

+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7

+			   axis_labels[0],

+#endif

 			   0, /* min val */

 			   priv->hypXSize, /* max val */

 			   LPI2CPM(priv->hypRes), /* resolution */

@@ -737,6 +743,9 @@ xf86HypOpenDevice(DeviceIntPtr pHyp)

 			   LPI2CPM(priv->hypRes)); /* max_res */

     InitValuatorAxisStruct(pHyp,

 			   1,

+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7

+			   axis_labels[1],

+#endif

 			   0, /* min val */

 			   priv->hypYSize, /* max val */

 			   LPI2CPM(priv->hypRes), /* resolution */

@@ -744,6 +753,9 @@ xf86HypOpenDevice(DeviceIntPtr pHyp)

 			   LPI2CPM(priv->hypRes)); /* max_res */

     InitValuatorAxisStruct(pHyp,

 			   2,

+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7

+			   axis_labels[2],

+#endif

 			   0, /* min val */

 			   511, /* max val */

 			   512, /* resolution */

@@ -765,8 +777,10 @@ xf86HypProc(DeviceIntPtr pHyp, int what)

     int			loop;

     LocalDevicePtr	local = (LocalDevicePtr)pHyp->public.devicePrivate;

     HyperPenDevicePtr	priv = (HyperPenDevicePtr)PRIVATE(pHyp);

-

-

+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7

+    Atom btn_labels[4] = { 0 };

+    Atom axis_labels[3] = { 0 };

+#endif

 

     switch (what) {

 	case DEVICE_INIT:

@@ -779,6 +793,9 @@ xf86HypProc(DeviceIntPtr pHyp, int what)

 

 	    if (InitButtonClassDeviceStruct(pHyp,

 					    nbbuttons,

+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7

+					    btn_labels,

+#endif

 					    map) == FALSE) {

 		ErrorF("unable to allocate Button class device\n");

 		return !Success;

@@ -802,6 +819,9 @@ xf86HypProc(DeviceIntPtr pHyp, int what)

 

 	    if (InitValuatorClassDeviceStruct(pHyp,

 		   nbaxes,

+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7

+		   axis_labels,

+#endif

 #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3

 		   xf86GetMotionEvents,

 #endif

-- 

1.6.3.rc1.2.g0164.dirty




Index: xorg-x11-drv-hyperpen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-hyperpen/devel/xorg-x11-drv-hyperpen.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- xorg-x11-drv-hyperpen.spec	15 Jul 2009 15:52:01 -0000	1.20
+++ xorg-x11-drv-hyperpen.spec	17 Jul 2009 04:36:15 -0000	1.21
@@ -5,13 +5,14 @@
 Summary:   Xorg X11 hyperpen input driver
 Name:      xorg-x11-drv-hyperpen
 Version: 1.3.0
-Release: 1%{?dist}.1
+Release: 2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
+Patch1:    hyperpen-1.3.0-abi.patch
 
 ExcludeArch: s390 s390x
 
@@ -24,6 +25,7 @@ X.Org X11 hyperpen input driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch1 -p1
 
 %build
 %configure --disable-static
@@ -46,6 +48,9 @@ rm -rf $RPM_BUILD_ROOT
 %{driverdir}/hyperpen_drv.so
 
 %changelog
+* Fri Jul 17 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.3.0-2
+- hyperpen-1.3.0-abi.patch: Cope with XINPUT ABI 7.
+
 * Wed Jul 15 2009 Adam Jackson <ajax at redhat.com> - 1.3.0-1.1
 - ABI bump