From b7b0b482028f9f3fe2071bcfdad51e561aafae67 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 9 Dec 2015 09:39:18 +1000 Subject: [PATCH] libinput 1.1.2 --- .gitignore | 1 + ...uced-the-2fg-scroll-threshold-to-1mm.patch | 55 ------------------- libinput.spec | 9 +-- sources | 2 +- 4 files changed, 7 insertions(+), 60 deletions(-) delete mode 100644 0001-touchpad-reduced-the-2fg-scroll-threshold-to-1mm.patch diff --git a/.gitignore b/.gitignore index a45fa00..fbe924d 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /libinput-1.0.2.tar.xz /libinput-1.1.0.tar.xz /libinput-1.1.1.tar.xz +/libinput-1.1.2.tar.xz diff --git a/0001-touchpad-reduced-the-2fg-scroll-threshold-to-1mm.patch b/0001-touchpad-reduced-the-2fg-scroll-threshold-to-1mm.patch deleted file mode 100644 index 3b15250..0000000 --- a/0001-touchpad-reduced-the-2fg-scroll-threshold-to-1mm.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 09a296708aa291e0dd5ada2db14f288a3095b61e Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Mon, 9 Nov 2015 16:21:36 +1000 -Subject: [PATCH libinput] touchpad: reduced the 2fg scroll threshold to 1mm - -At least on the t440, this is enough to trigger correct detection between -pinch and scroll 90% of the time. Since scrolling is significantly more -prevalent than gesturing, erring on the side of scrolling at the cost of -misdetecting some gestures is acceptable. - -Signed-off-by: Peter Hutterer -Reviewed-by: Hans de Goede ---- - src/evdev-mt-touchpad-gestures.c | 2 +- - test/gestures.c | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/evdev-mt-touchpad-gestures.c b/src/evdev-mt-touchpad-gestures.c -index cc26e2a..80aa89f 100644 ---- a/src/evdev-mt-touchpad-gestures.c -+++ b/src/evdev-mt-touchpad-gestures.c -@@ -195,7 +195,7 @@ tp_gesture_get_direction(struct tp_dispatch *tp, struct tp_touch *touch) - (tp->device->model_flags & EVDEV_MODEL_ELANTECH_TOUCHPAD) == 0) - move_threshold = TP_MM_TO_DPI_NORMALIZED(4); - else -- move_threshold = TP_MM_TO_DPI_NORMALIZED(2); -+ move_threshold = TP_MM_TO_DPI_NORMALIZED(1); - - delta = device_delta(touch->point, touch->gesture.initial); - -diff --git a/test/gestures.c b/test/gestures.c -index 9e44724..9fc73b9 100644 ---- a/test/gestures.c -+++ b/test/gestures.c -@@ -294,13 +294,13 @@ START_TEST(gestures_spread) - for (i = 0; i < 15; i++) { - litest_push_event_frame(dev); - if (dir_x > 0.0) -- dir_x += 2; -+ dir_x += 1; - else if (dir_x < 0.0) -- dir_x -= 2; -+ dir_x -= 1; - if (dir_y > 0.0) -- dir_y += 2; -+ dir_y += 1; - else if (dir_y < 0.0) -- dir_y -= 2; -+ dir_y -= 1; - litest_touch_move(dev, - 0, - 50 + dir_x, --- -2.5.0 - diff --git a/libinput.spec b/libinput.spec index 0b0e60e..7f9eed0 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.1.1 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.1.2 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -20,8 +20,6 @@ Source0: http://www.freedesktop.org/software/libinput/libinput-%{version} # Not upstream, keep until kernel 4.2 or 4.1.x with dbf3c37086 Patch01: 0001-touchpad-serial-synaptics-need-to-fake-new-touches-o.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=1247958 -Patch02: 0001-touchpad-reduced-the-2fg-scroll-threshold-to-1mm.patch BuildRequires: git BuildRequires: autoconf automake libtool pkgconfig @@ -99,6 +97,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete %changelog +* Wed Dec 09 2015 Peter Hutterer 1.1.2-1 +- libinput 1.1.2 + * Mon Dec 07 2015 Peter Hutterer 1.1.1-2 - Reduce 2fg scroll threshold to 1mm (#1247958) diff --git a/sources b/sources index 5c6e420..4e826c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4a3fc842ac0b7bf0fa306ea7badc31a0 libinput-1.1.1.tar.xz +634830eb423acd71262b23a13154f6f7 libinput-1.1.2.tar.xz