rpms/xorg-x11-drv-mutouch/devel mutouch-1.2.1-abi.patch, NONE, 1.1 xorg-x11-drv-mutouch.spec, 1.21, 1.22

[Peter Hutterer]

Author: whot

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

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


mutouch-1.2.1-abi.patch:
 xf86MuTouch.c |   26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

--- NEW FILE mutouch-1.2.1-abi.patch ---

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

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

Date: Fri, 17 Jul 2009 14:18:51 +1000

Subject: [PATCH] Cope with XINPUT ABI 7.



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

---

 src/xf86MuTouch.c |   25 ++++++++++++++++++++++---

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



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

index 2d5cdb0..de319fc 100644

--- a/src/xf86MuTouch.c

+++ b/src/xf86MuTouch.c

@@ -749,6 +749,10 @@ xf86MuTControl(DeviceIntPtr	dev,

   unsigned char		req[MuT_PACKET_SIZE];

   unsigned char		reply[MuT_BUFFER_SIZE];

   char			*id_string = DEVICE_ID(local->private_flags) == FINGER_ID ? "finger" : "stylus";

+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7

+  Atom btn_label;

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

+#endif

 

   switch(mode) {

 

@@ -766,7 +770,11 @@ xf86MuTControl(DeviceIntPtr	dev,

       /*

        * Device reports button press for up to 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 ButtonClassDeviceStruct\n");

 	return !Success;

       }

@@ -779,6 +787,9 @@ xf86MuTControl(DeviceIntPtr	dev,

        * screen to fit one meter.

        */

       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

@@ -787,11 +798,19 @@ xf86MuTControl(DeviceIntPtr	dev,

 	return !Success;

       }

       else {

-	InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x,

+	InitValuatorAxisStruct(dev, 0,

+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7

+			       axis_labels[0],

+#endif

+			       priv->min_x, priv->max_x,

 			       9500,

 			       0     /* min_res */,

 			       9500  /* max_res */);

-	InitValuatorAxisStruct(dev, 1, priv->min_y, priv->max_y,

+	InitValuatorAxisStruct(dev, 1,

+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7

+			       axis_labels[1],

+#endif

+			       priv->min_y, priv->max_y,

 			       10500,

 			       0     /* min_res */,

 			       10500 /* max_res */);

-- 

1.6.3.rc1.2.g0164.dirty




Index: xorg-x11-drv-mutouch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-mutouch/devel/xorg-x11-drv-mutouch.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- xorg-x11-drv-mutouch.spec	15 Jul 2009 15:56:54 -0000	1.21
+++ xorg-x11-drv-mutouch.spec	17 Jul 2009 04:25:36 -0000	1.22
@@ -5,13 +5,14 @@
 Summary:   Xorg X11 mutouch input driver
 Name:      xorg-x11-drv-mutouch
 Version: 1.2.1
-Release: 2%{?dist}.1
+Release: 3%{?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:    mutouch-1.2.1-abi.patch
 
 ExcludeArch: s390 s390x
 
@@ -24,6 +25,7 @@ X.Org X11 mutouch input driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch1 -p1
 
 %build
 %configure --disable-static
@@ -47,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/mutouch.4*
 
 %changelog
+* Fri Jul 17 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.2.1-3.1
+- mutouch-1.2.1-abi.patch: Cope with XINPUT ABI 7.
+
 * Wed Jul 15 2009 Adam Jackson <ajax at redhat.com> - 1.2.1-2.1
 - ABI bump