ChangeLog | 69 +++++++++++++++++++++++++++++++++++++------------------ configure.ac | 2 - debian/changelog | 8 ++++++ debian/watch | 2 - src/evdev.c | 1 5 files changed, 58 insertions(+), 24 deletions(-)
New commits: commit 370ccb89675364e1aa0ede3fe4a1edaaf3ef9aff Author: Julien Cristau <jcris...@debian.org> Date: Sat Sep 24 15:45:19 2016 +0200 Upload to unstable diff --git a/debian/changelog b/debian/changelog index e625aaa..733212e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,10 @@ -xserver-xorg-input-evdev (1:2.10.3-1) UNRELEASED; urgency=medium +xserver-xorg-input-evdev (1:2.10.3-1) unstable; urgency=medium + * Team upload. * New upstream release. * Use https URL in watch file. - -- Julien Cristau <jcris...@debian.org> Sat, 24 Sep 2016 15:43:20 +0200 + -- Julien Cristau <jcris...@debian.org> Sat, 24 Sep 2016 15:45:04 +0200 xserver-xorg-input-evdev (1:2.10.2-1) unstable; urgency=medium commit 3054f1c9acce4e97e378d0908c68952cfe0d4b61 Author: Julien Cristau <jcris...@debian.org> Date: Sat Sep 24 15:43:56 2016 +0200 Bump changelogs diff --git a/ChangeLog b/ChangeLog index 482f59f..39c1b10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,28 @@ +commit 7c1971d9e7b73b861874633a33f97487abf1d45d +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Wed Jun 1 11:41:03 2016 +1000 + + evdev 2.10.3 + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 9a6952dafe7241d4987eedd4637e5a9785d7ec23 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Thu May 12 15:22:19 2016 +1000 + + Restore non-xy axes updates + + This broke in d24431a1863c49aa Restore wheel emulation for absolute devices, + last hunk when the valuator update was moved to before any early exit + condition. But that new update only applies to valuator maps < 2, i.e. x/y + only. Other valuators are now ignored and remain on 0 forever. + + Restore the valuator update. + + https://bugs.freedesktop.org/show_bug.cgi?id=95315 + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + commit f12eca9f8392934031cb250e7a2a5ed1d5ca11cf Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Fri Apr 29 09:13:35 2016 +1000 @@ -1323,25 +1348,25 @@ Date: Thu Jan 19 14:17:34 2012 -0800 (1000, 1000). The third touch begins after the first two end, and is at (500, 500). - ABS_MT_SLOT 0 /* Set touch slot */ - ABS_MT_TRACKING_ID 0 /* New touch with ID 0 in slot 0 */ - ABS_MT_POSITION_X 500 /* Initial X position */ - ABS_MT_POSITION_Y 500 /* Initial Y position */ - ABS_MT_SLOT 1 /* Set touch slot */ - ABS_MT_TRACKING_ID 1 /* New touch with ID 1 in slot 1 */ - ABS_MT_POSITION_X 1000 /* Initial X position */ - ABS_MT_POSITION_Y 1000 /* Initial Y position */ - SYNC /* End of frame */ - ABS_MT_SLOT 0 /* Go back to slot 0 */ - ABS_MT_TRACKING_ID -1 /* Touch in slot 0 ended */ - ABS_MT_SLOT 1 /* Go to slot 1 */ - ABS_MT_TRACKING_ID -1 /* Touch in slot 1 ended */ - SYNC /* End of frame */ - ABS_MT_SLOT 0 /* Go back to slot 0 */ - ABS_MT_TRACKING_ID 2 /* New touch in slot 0 with ID 2 */ - SYNC /* End of frame */ - ABS_MT_TRACKING_ID -1 /* Touch in last slot (0) ended */ - SYNC /* End of frame */ + ABS_MT_SLOT 0 /* Set touch slot */ + ABS_MT_TRACKING_ID 0 /* New touch with ID 0 in slot 0 */ + ABS_MT_POSITION_X 500 /* Initial X position */ + ABS_MT_POSITION_Y 500 /* Initial Y position */ + ABS_MT_SLOT 1 /* Set touch slot */ + ABS_MT_TRACKING_ID 1 /* New touch with ID 1 in slot 1 */ + ABS_MT_POSITION_X 1000 /* Initial X position */ + ABS_MT_POSITION_Y 1000 /* Initial Y position */ + SYNC /* End of frame */ + ABS_MT_SLOT 0 /* Go back to slot 0 */ + ABS_MT_TRACKING_ID -1 /* Touch in slot 0 ended */ + ABS_MT_SLOT 1 /* Go to slot 1 */ + ABS_MT_TRACKING_ID -1 /* Touch in slot 1 ended */ + SYNC /* End of frame */ + ABS_MT_SLOT 0 /* Go back to slot 0 */ + ABS_MT_TRACKING_ID 2 /* New touch in slot 0 with ID 2 */ + SYNC /* End of frame */ + ABS_MT_TRACKING_ID -1 /* Touch in last slot (0) ended */ + SYNC /* End of frame */ Note that touch 2 has the same X and Y position as touch 0. This is implied because no new value was emitted for slot 0. In fact, Linux will @@ -1823,7 +1848,7 @@ Date: Wed Nov 9 16:01:48 2011 +1000 Merge branch 'smooth-scrolling' Conflicts: - src/evdev.c + src/evdev.c Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> @@ -3975,7 +4000,7 @@ Date: Thu Jul 16 18:25:37 2009 +0300 Coverity Prevent: NO_EFFECT in EvdevWheelEmuSetProperty: Event unsigned_compare: Comparing unsigned less than zero is never true. "pEvdev->emulateWheel.timeout < 0UL" - 342 if (pEvdev->emulateWheel.timeout < 0) + 342 if (pEvdev->emulateWheel.timeout < 0) Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> @@ -6392,7 +6417,7 @@ Date: Tue Jun 5 23:14:46 2007 -0400 Conflicts: - src/evdev.h + src/evdev.h commit 294355842ba9fb3cb3bbd7bfd60c9ca3ce704475 Author: Zephaniah E. Hull <warp@agamemnon.b5> diff --git a/debian/changelog b/debian/changelog index dda3098..e625aaa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ -xserver-xorg-input-evdev (1:2.10.2-2) UNRELEASED; urgency=medium +xserver-xorg-input-evdev (1:2.10.3-1) UNRELEASED; urgency=medium + * New upstream release. * Use https URL in watch file. - -- Julien Cristau <jcris...@debian.org> Sat, 24 Sep 2016 15:42:06 +0200 + -- Julien Cristau <jcris...@debian.org> Sat, 24 Sep 2016 15:43:20 +0200 xserver-xorg-input-evdev (1:2.10.2-1) unstable; urgency=medium commit bcb59510327ceab21468674c6ded8b77e5495f18 Author: Julien Cristau <jcris...@debian.org> Date: Sat Sep 24 15:42:16 2016 +0200 Use https URL in watch file. diff --git a/debian/changelog b/debian/changelog index e5d19e0..dda3098 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-input-evdev (1:2.10.2-2) UNRELEASED; urgency=medium + + * Use https URL in watch file. + + -- Julien Cristau <jcris...@debian.org> Sat, 24 Sep 2016 15:42:06 +0200 + xserver-xorg-input-evdev (1:2.10.2-1) unstable; urgency=medium * New upstream release. diff --git a/debian/watch b/debian/watch index afe53ba..d274e71 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ #git=git://anongit.freedesktop.org/xorg/driver/xf86-input-evdev version=3 opts=pgpsigurlmangle=s/$/.sig/ \ -http://xorg.freedesktop.org/releases/individual/driver/ xf86-input-evdev-(.*)\.tar\.gz +https://xorg.freedesktop.org/releases/individual/driver/ xf86-input-evdev-(.*)\.tar\.gz commit 7c1971d9e7b73b861874633a33f97487abf1d45d Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Wed Jun 1 11:41:03 2016 +1000 evdev 2.10.3 Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/configure.ac b/configure.ac index 47ab4f8..920154d 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-input-evdev], - [2.10.2], + [2.10.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-input-evdev]) AC_CONFIG_SRCDIR([Makefile.am]) commit 9a6952dafe7241d4987eedd4637e5a9785d7ec23 Author: Peter Hutterer <peter.hutte...@who-t.net> Date: Thu May 12 15:22:19 2016 +1000 Restore non-xy axes updates This broke in d24431a1863c49aa Restore wheel emulation for absolute devices, last hunk when the valuator update was moved to before any early exit condition. But that new update only applies to valuator maps < 2, i.e. x/y only. Other valuators are now ignored and remain on 0 forever. Restore the valuator update. https://bugs.freedesktop.org/show_bug.cgi?id=95315 Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> diff --git a/src/evdev.c b/src/evdev.c index 2c88343..341db61 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -796,6 +796,7 @@ EvdevProcessAbsoluteMotionEvent(InputInfoPtr pInfo, struct input_event *ev) pEvdev->rel_queued = 1; } } else { + valuator_mask_set(pEvdev->abs_vals, map, value); pEvdev->abs_queued = 1; } }