rpms/xorg-x11-drv-penmount/devel penmount-1.4.0-abi.patch, NONE, 1.1 xorg-x11-drv-penmount.spec, 1.24, 1.25

[Peter Hutterer]

Author: whot

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

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


penmount-1.4.0-abi.patch:
 xf86PM.c |   25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

--- NEW FILE penmount-1.4.0-abi.patch ---

>From dab0c2742c034750e3e9673167eb20812b679818 Mon Sep 17 00:00:00 2001

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

Date: Fri, 17 Jul 2009 13:59:43 +1000

Subject: [PATCH] Cope with XINPUT ABI 7.



Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

---

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

 1 files changed, 21 insertions(+), 3 deletions(-)



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 */ );

-- 

1.6.3.rc1.2.g0164.dirty




Index: xorg-x11-drv-penmount.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-penmount/devel/xorg-x11-drv-penmount.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- xorg-x11-drv-penmount.spec	15 Jul 2009 16:00:30 -0000	1.24
+++ xorg-x11-drv-penmount.spec	17 Jul 2009 04:14:44 -0000	1.25
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 penmount input driver
 Name:      xorg-x11-drv-penmount
 Version:   1.4.0
-Release:   2%{?dist}.1
+Release:   3%{?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: penmount-1.4.0-abi.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
@@ -25,6 +27,7 @@ X.Org X11 penmount input driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch1 -p1
 
 %build
 %configure --disable-static
@@ -48,6 +51,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/penmount.4*
 
 %changelog
+* Fri Jul 17 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.4.0-3
+- penmount-1.4.0-abi.patch: Cope with XINPUT ABI 7.
+
 * Wed Jul 15 2009 Adam Jackson <ajax at redhat.com> - 1.4.0-2.1
 - ABI bump