xserver-xorg-input-synaptics: Changes to 'upstream-unstable'
configure.ac | 2 +-
src/synapticsstr.h | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 90d93891be0dcc55d87c349ab438144ead818402
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Jan 13 15:14:06 2014 +1000
synaptics 1.7.3
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index a9b8b2b..ea5c002 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-synaptics],
- [1.7.2],
+ [1.7.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-synaptics])
AC_CONFIG_SRCDIR([Makefile.am])
commit b227ca373de79fe6852ac09e71465c048790cd5b
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Jan 3 11:23:22 2014 +1000
Fix ABI detection for in-driver scaling
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit 49fe70e99d1b0932ab915824c78f952a0fdb3ee7)
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
Reply to: