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

[Peter Hutterer]

Author: whot

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

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


fpit-1.3.0-abi.patch:
 xf86Fpit.c |   41 +++++++++++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 6 deletions(-)

--- NEW FILE fpit-1.3.0-abi.patch ---

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

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

Date: Fri, 17 Jul 2009 14:38:31 +1000

Subject: [PATCH] Cope with XINPUT ABI 7.



---

 src/xf86Fpit.c |   40 +++++++++++++++++++++++++++++++++++-----

 1 files changed, 35 insertions(+), 5 deletions(-)



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

index 528ebb9..f40c6a9 100644

--- a/src/xf86Fpit.c

+++ b/src/xf86Fpit.c

@@ -188,6 +188,9 @@ static void xf86FpitSetUpAxes(DeviceIntPtr dev, FpitPrivatePtr priv)

 	 * screen to fit one meter.

 	 */

 	int quarter_turns;

+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7

+        Atom axis_labels[2] = { 0, 0 };

+#endif

 

 	priv->screen_width = screenInfo.screens[priv->screen_no]->width;

 	priv->screen_height = screenInfo.screens[priv->screen_no]->height;

@@ -212,14 +215,30 @@ static void xf86FpitSetUpAxes(DeviceIntPtr dev, FpitPrivatePtr priv)

 	}

 

 	if (priv->fpitTotalOrientation & FPIT_THEN_SWAP_XY) {

-		InitValuatorAxisStruct(dev, 1, priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ ,

+		InitValuatorAxisStruct(dev, 1,

+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7

+				       axis_labels[1],

+#endif

+				       priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ ,

 				       9500 /* max_res */ );

-		InitValuatorAxisStruct(dev, 0, priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,

+		InitValuatorAxisStruct(dev, 0,

+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7

+				       axis_labels[0],

+#endif

+				       priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,

 				       10500 /* max_res */ );

 	} else {

-		InitValuatorAxisStruct(dev, 0, priv->fpitMinX, priv->fpitMaxX, 9500, 0 /* min_res */ ,

+		InitValuatorAxisStruct(dev, 0,

+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7

+				       axis_labels[0],

+#endif

+				       priv->fpitMinY, priv->fpitMaxY, 9500, 0 /* min_res */ ,

 				       9500 /* max_res */ );

-		InitValuatorAxisStruct(dev, 1, priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,

+		InitValuatorAxisStruct(dev, 1,

+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7

+				       axis_labels[1],

+#endif

+				       priv->fpitMinY, priv->fpitMaxY, 10500, 0 /* min_res */ ,

 				       10500 /* max_res */ );

 	}

 }

@@ -408,6 +427,10 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode)

 	unsigned char map[] = {

 		0, 1, 2, 3 /* DMC: changed this so we can use all three buttons */

 	};

+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7

+	Atom btn_labels[3] = { 0 };

+	Atom axis_labels[2] = { 0, 0 };

+#endif

 

 

 	switch (mode) {

@@ -420,7 +443,11 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode)

 			/*

 			 * Device reports button press for up to 3 buttons.

 			 */

-			if (InitButtonClassDeviceStruct(dev, 3, map) == FALSE) {

+			if (InitButtonClassDeviceStruct(dev, 3,

+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7

+				      btn_labels,

+#endif

+				      map) == FALSE) {

 				ErrorF("Unable to allocate Fpit touchscreen ButtonClassDeviceStruct\n");

 				return !Success;

 			}

@@ -435,6 +462,9 @@ static Bool xf86FpitControl(DeviceIntPtr dev, int mode)

 			}

 	      

 			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

-- 

1.6.3.rc1.2.g0164.dirty




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