[xorg-x11-drv-synaptics] Fix driver scaling for ABI 20

[Peter Hutterer]

commit 0c2c3ba1b2e67a8af007f750f6cfc50e734ad0b7
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Jan 6 09:35:45 2014 +1000

    Fix driver scaling for ABI 20

 0001-Fix-ABI-detection-for-in-driver-scaling.patch |   34 ++++++++++++++++++++
 xorg-x11-drv-synaptics.spec                        |    8 ++++-
 2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-ABI-detection-for-in-driver-scaling.patch b/0001-Fix-ABI-detection-for-in-driver-scaling.patch
new file mode 100644
index 0000000..30483a9
--- /dev/null
+++ b/0001-Fix-ABI-detection-for-in-driver-scaling.patch
@@ -0,0 +1,34 @@
+From 49fe70e99d1b0932ab915824c78f952a0fdb3ee7 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Fri, 3 Jan 2014 11:23:22 +1000
+Subject: [PATCH synaptics] Fix ABI detection for in-driver scaling
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ src/synapticsstr.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/synapticsstr.h b/src/synapticsstr.h
+index a9901a2..3d6f756 100644
+--- a/src/synapticsstr.h
++++ b/src/synapticsstr.h
+@@ -28,13 +28,13 @@
+ #define LogMessageVerbSigSafe xf86MsgVerb
+ #endif
+ 
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 19
+-#if GET_ABI_MINOR(ABI_XINPUT_VERSION) >= 2
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) > 19
++#define NO_DRIVER_SCALING 1
++#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 19 && GET_ABI_MINOR(ABI_XINPUT_VERSION) >= 2
+ /* as of 19.2, the server takes device resolution into account when scaling
+    relative events from abs device, so we must not scale in synaptics. */
+ #define NO_DRIVER_SCALING 1
+ #endif
+-#endif
+ 
+ #ifdef DBG
+ #undef DBG
+-- 
+1.8.4.2
+
diff --git a/xorg-x11-drv-synaptics.spec b/xorg-x11-drv-synaptics.spec
index 36a4449..165783b 100644
--- a/xorg-x11-drv-synaptics.spec
+++ b/xorg-x11-drv-synaptics.spec
@@ -8,7 +8,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        1.7.2
-Release:        4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Release:        5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -23,6 +23,8 @@ Source0:        ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.
 Source3:        50-synaptics.conf
 Source4:        70-touchpad-quirks.rules
 
+Patch01:        0001-Fix-ABI-detection-for-in-driver-scaling.patch
+
 ExcludeArch:    s390 s390x
 
 BuildRequires:  autoconf automake libtool pkgconfig
@@ -80,6 +82,7 @@ Features:
 
 %prep
 %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
+%patch01 -p1
 
 %build
 autoreconf -v --install --force || exit 1
@@ -135,6 +138,9 @@ Development files for the Synaptics TouchPad for X.Org.
 
 
 %changelog
+* Mon Jan 06 2014 Peter Hutterer <peter.hutterer at redhat.com> 1.7.2-5
+- Fix driver scaling for ABI 20
+
 * Tue Dec 17 2013 Adam Jackson <ajax at redhat.com> - 1.7.2-4
 - 1.15RC4 ABI rebuild