From f11bd4ba52c717e00a3755141dbc0a8d7ab45cba Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 1 May 2018 17:52:30 +1000 Subject: [PATCH] libinput 1.10.6 --- .gitignore | 1 + ...S_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch | 78 ------------------- libinput.spec | 8 +- sources | 2 +- 4 files changed, 7 insertions(+), 82 deletions(-) delete mode 100644 0001-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch diff --git a/.gitignore b/.gitignore index f0297c4..8cb5f9d 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /libinput-1.10.3.tar.xz /libinput-1.10.4.tar.xz /libinput-1.10.5.tar.xz +/libinput-1.10.6.tar.xz diff --git a/0001-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch b/0001-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch deleted file mode 100644 index 8d14de1..0000000 --- a/0001-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 4fb3f9e1d4de48853e2cdc43300e4d1fa41550b3 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 19 Apr 2018 11:00:51 +1000 -Subject: [PATCH libinput] evdev: disable ABS_MT_TOOL_PALM on the Lenovo X1 - Carbon 6th gen - -This device randomly decides that a touch is now a palm, based on -the moon phase, the user's starsign and possibly what the dog had for -breakfast. Since libinput assumes that a touchpad that labels a touch as palm -has reasons to do so, let's unassume this for this device by disabling that -axis altogether and relying on the touch pressure only. - -https://bugzilla.redhat.com/show_bug.cgi?id=1565692 - -Signed-off-by: Peter Hutterer -(cherry picked from commit 762c1726f1b633d46ce0415a43fcee93453b8b7a) ---- - src/evdev.c | 8 ++++++++ - src/evdev.h | 1 + - udev/90-libinput-model-quirks.hwdb | 4 ++++ - 3 files changed, 13 insertions(+) - -diff --git a/src/evdev.c b/src/evdev.c -index 13b2b13c..a145a03b 100644 ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -1272,6 +1272,7 @@ evdev_read_model_flags(struct evdev_device *device) - MODEL(LOGITECH_MARBLE_MOUSE), - MODEL(TABLET_NO_PROXIMITY_OUT), - MODEL(MS_NANO_TRANSCEIVER), -+ MODEL(LENOVO_CARBON_X1_6TH), - #undef MODEL - { "ID_INPUT_TRACKBALL", EVDEV_MODEL_TRACKBALL }, - { NULL, EVDEV_MODEL_DEFAULT }, -@@ -1868,6 +1869,13 @@ evdev_pre_configure_model_quirks(struct evdev_device *device) - /* Logitech Marble Mouse claims to have a middle button */ - if (device->model_flags & EVDEV_MODEL_LOGITECH_MARBLE_MOUSE) - libevdev_disable_event_code(device->evdev, EV_KEY, BTN_MIDDLE); -+ -+ /* Lenovo Carbon X1 6th gen sends bogus ABS_MT_TOOL_TYPE events for -+ * MT_TOOL_PALM */ -+ if (device->model_flags & EVDEV_MODEL_LENOVO_CARBON_X1_6TH) -+ libevdev_disable_event_code(device->evdev, -+ EV_ABS, -+ ABS_MT_TOOL_TYPE); - } - - static void -diff --git a/src/evdev.h b/src/evdev.h -index 496bea7f..cdcaf8f9 100644 ---- a/src/evdev.h -+++ b/src/evdev.h -@@ -112,6 +112,7 @@ enum evdev_device_model { - EVDEV_MODEL_JUMPING_SEMI_MT = (1 << 10), - EVDEV_MODEL_LOGITECH_K400 = (1 << 11), - EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81 = (1 << 12), -+ EVDEV_MODEL_LENOVO_CARBON_X1_6TH = (1 << 13), - EVDEV_MODEL_CYBORG_RAT = (1 << 14), - EVDEV_MODEL_HP_STREAM11_TOUCHPAD = (1 << 16), - EVDEV_MODEL_LENOVO_T450_TOUCHPAD= (1 << 17), -diff --git a/udev/90-libinput-model-quirks.hwdb b/udev/90-libinput-model-quirks.hwdb -index 7470973f..6f625017 100644 ---- a/udev/90-libinput-model-quirks.hwdb -+++ b/udev/90-libinput-model-quirks.hwdb -@@ -232,6 +232,10 @@ libinput:keyboard:input:b0003v17EFp6047* - libinput:name:*ALPS TrackPoint*:svnLENOVO:*:pvrThinkPadX280:* - LIBINPUT_ATTR_TRACKPOINT_RANGE=70 - -+# Lenovo Carbon X1 6th gen (RMI4 only, PS/2 is broken on this device) -+libinput:name:Synaptics TM3288-010:dmi:*svnLenovo:*pvrThinkPadX1Carbon6th:* -+ LIBINPUT_MODEL_LENOVO_CARBON_X1_6TH=1 -+ - ########################################## - # Logitech - ########################################## --- -2.14.3 - diff --git a/libinput.spec b/libinput.spec index 922c29a..ec1119d 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.10.5 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.10.6 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -18,7 +18,6 @@ Source2: commitid Source0: http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz %endif -Patch01: 0001-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch Patch02: 0001-touchpad-fix-the-trackpoint-event-counter-for-the-T4.patch BuildRequires: git-core @@ -112,6 +111,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Tue May 01 2018 Peter Hutterer 1.10.6-1 +- libinput 1.10.6 + * Fri Apr 27 2018 Peter Hutterer 1.10.5-3 - Fix the T460s halting cursor problem harder (#1572394) diff --git a/sources b/sources index 2ce19c2..43281a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.10.5.tar.xz) = 61f19ea777b523f0e76869b8e7dbbff5e51132d3c856c6edb9915a695f7903256228e71be2567642866923a800f1283bdd5aff97266ac26c2e42dfce0bffa50b +SHA512 (libinput-1.10.6.tar.xz) = b76963c3429c5590ee04f1da94d08775c8bb8584830e678804fb1d4cf0e2af84826782eae71fdd57492461f85df87ac2fc940c280b0672c75cd81d5f34702fe4