rpms/xorg-x11-drv-elographics/devel elographics-1.2.3-abi.patch, NONE, 1.1 xorg-x11-drv-elographics.spec, 1.19, 1.20

[Peter Hutterer]

Author: whot

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

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


elographics-1.2.3-abi.patch:
 xf86Elo.c |   26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

--- NEW FILE elographics-1.2.3-abi.patch ---

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

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

Date: Fri, 17 Jul 2009 14:44:55 +1000

Subject: [PATCH] Cope with XINPUT ABI 7.



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

---

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

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



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

index 4ca60f1..495a43c 100644

--- a/src/xf86Elo.c

+++ b/src/xf86Elo.c

@@ -780,6 +780,10 @@ xf86EloControl(DeviceIntPtr	dev,

   unsigned char		map[] = { 0, 1 };

   unsigned char		req[ELO_PACKET_SIZE];

   unsigned char		reply[ELO_PACKET_SIZE];

+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7

+  Atom btn_label;

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

+#endif

 

   switch(mode) {

 

@@ -797,7 +801,11 @@ xf86EloControl(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 Elographics touchscreen ButtonClassDeviceStruct\n");

 	return !Success;

       }

@@ -818,6 +826,9 @@ xf86EloControl(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

@@ -827,11 +838,19 @@ xf86EloControl(DeviceIntPtr	dev,

       }

       else {

 	/* I will map coordinates myself */

-	InitValuatorAxisStruct(dev, 0, -1, -1,

+	InitValuatorAxisStruct(dev, 0,

+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7

+			       axis_labels[0],

+#endif

+			       -1, -1,

 			       9500,

 			       0     /* min_res */,

 			       9500  /* max_res */);

-	InitValuatorAxisStruct(dev, 1, -1, -1,

+	InitValuatorAxisStruct(dev, 1,

+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7

+			       axis_labels[1],

+#endif

+			       -1, -1,

 			       10500,

 			       0     /* min_res */,

 			       10500 /* max_res */);

-- 

1.6.3.rc1.2.g0164.dirty




Index: xorg-x11-drv-elographics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-elographics/devel/xorg-x11-drv-elographics.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- xorg-x11-drv-elographics.spec	15 Jul 2009 15:48:38 -0000	1.19
+++ xorg-x11-drv-elographics.spec	17 Jul 2009 04:51:00 -0000	1.20
@@ -5,13 +5,14 @@
 Summary:   Xorg X11 elographics input driver
 Name:      xorg-x11-drv-elographics
 Version: 1.2.3
-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:    elographics-1.2.3-abi.patch
 
 ExcludeArch: s390 s390x
 
@@ -24,6 +25,7 @@ X.Org X11 elographics 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/elographics.4*
 
 %changelog
+* Fri Jul 17 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.2.3-3
+- elographics-1.2.3-abi.patch: Cope with XINPUT ABI 7.
+
 * Wed Jul 15 2009 Adam Jackson <ajax at redhat.com> - 1.2.3-2.1
 - ABI bump