From 65b20246baacae31525bae9a6ff8e8856ac74c59 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 13:32:12 +0000 Subject: [PATCH 01/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libinput.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libinput.spec b/libinput.spec index 243b188..7c59f08 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.13.4 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -131,6 +131,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.13.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Jun 28 2019 Peter Hutterer 1.13.4-1 - libinput 1.13.4 From d1165ffd8d2c9889abf598e4629b7b6cb9c33566 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 19 Jul 2019 12:30:40 +1000 Subject: [PATCH 02/91] libinput 1.14rc2 --- libinput.spec | 13 ++++++++----- sources | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/libinput.spec b/libinput.spec index 7c59f08..2b29558 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.13.4 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.13.902 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -48,7 +48,7 @@ developing applications that use %{name}. %package utils Summary: Utilities and tools for debugging %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: python3-evdev python3-pyudev python3-libevdev +Requires: python3-pyudev python3-libevdev %description utils The %{name}-utils package contains tools to debug hardware and analyze @@ -88,9 +88,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %doc COPYING %{_libdir}/libinput.so.* %{udevdir}/libinput-device-group -%{udevdir}/libinput-model-quirks +%{udevdir}/libinput-fuzz-override %{udevdir}/rules.d/80-libinput-device-groups.rules -%{udevdir}/rules.d/90-libinput-model-quirks.rules +%{udevdir}/rules.d/90-libinput-fuzz-override.rules %{_bindir}/libinput %dir %{_libexecdir}/libinput/ %{_libexecdir}/libinput/libinput-debug-events @@ -131,6 +131,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Wed Jul 31 2019 Peter Hutterer 1.13.902-1 +- libinput 1.14rc2 + * Thu Jul 25 2019 Fedora Release Engineering - 1.13.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 2f0c91c..9df2ba5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.13.4.tar.xz) = ccfdfc704dab9ea19a503399ecd4ce3a95b8d9480b8dfddeb80be01236c34c6f2f472be0e12e04dddd68092611470d303351e092141bc7491729639bcf7e64d7 +SHA512 (libinput-1.13.902.tar.xz) = d661f90d49ee0b39c87b962f02968f9b6642f1b3dd141c3fa07d40bd4b170e4ba4163d294d66721317972a7a30b589109639829b48c70070004337580c0a2e36 From 303db7dcbb1f3e904c6f434a04290ea10f9f301d Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 8 Aug 2019 15:17:28 +1000 Subject: [PATCH 03/91] libinput 1.14 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 2b29558..6cb0024 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.13.902 +Version: 1.14.0 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -131,6 +131,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Thu Aug 08 2019 Peter Hutterer 1.14.0-1 +- libinput 1.14 + * Wed Jul 31 2019 Peter Hutterer 1.13.902-1 - libinput 1.14rc2 diff --git a/sources b/sources index 9df2ba5..c8077cd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.13.902.tar.xz) = d661f90d49ee0b39c87b962f02968f9b6642f1b3dd141c3fa07d40bd4b170e4ba4163d294d66721317972a7a30b589109639829b48c70070004337580c0a2e36 +SHA512 (libinput-1.14.0.tar.xz) = e501c5b8a58bb287c175692af0e59ff766a8613eb576aaa0700686dfbb6c6ab63b7a5d3f148fce75397c8170bc49871068861d93c352355ab5d0d9e7f1b059ec From b597484c60dcf60295f3f68f1b4af857a1d980af Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 20 Aug 2019 08:13:49 +1000 Subject: [PATCH 04/91] Fix click+drag on clickpads --- ...llow-gestures-with-a-clickpad-button.patch | 162 ++++++++++++++++++ libinput.spec | 7 +- 2 files changed, 168 insertions(+), 1 deletion(-) create mode 100644 0001-touchpad-don-t-allow-gestures-with-a-clickpad-button.patch diff --git a/0001-touchpad-don-t-allow-gestures-with-a-clickpad-button.patch b/0001-touchpad-don-t-allow-gestures-with-a-clickpad-button.patch new file mode 100644 index 0000000..d6543cf --- /dev/null +++ b/0001-touchpad-don-t-allow-gestures-with-a-clickpad-button.patch @@ -0,0 +1,162 @@ +From 73d55cc6c5787ed7a086ecd0e1e797e85b80cb7b Mon Sep 17 00:00:00 2001 +From: Matt Mayfield +Date: Wed, 14 Aug 2019 08:29:07 -0500 +Subject: [PATCH libinput] touchpad: don't allow gestures with a clickpad + button down by a finger + +Allowing gestures when holding a physical click enables tasks like +switching workspaces while dragging an icon, but this should only be +possible with a *thumb* holding down the clickpad, not fingers. This +commit restores the ability to hold down the clickpad with two or three +fingers to right- or middle-drag. + +Fixes #339, #340 + +Signed-off-by: Peter Hutterer +--- + src/evdev-mt-touchpad-gestures.c | 9 ++- + test/test-touchpad-buttons.c | 94 ++++++++++++++++++++++++++++++++ + 2 files changed, 101 insertions(+), 2 deletions(-) + +diff --git a/src/evdev-mt-touchpad-gestures.c b/src/evdev-mt-touchpad-gestures.c +index 4a0287c7..fed25c90 100644 +--- a/src/evdev-mt-touchpad-gestures.c ++++ b/src/evdev-mt-touchpad-gestures.c +@@ -717,8 +717,13 @@ tp_gesture_post_events(struct tp_dispatch *tp, uint64_t time) + if (tp->gesture.finger_count == 0) + return; + +- /* When tap-and-dragging, force 1fg mode. */ +- if (tp_tap_dragging(tp)) { ++ /* When tap-and-dragging, force 1fg mode. On clickpads, if the ++ * physical button is down, don't allow gestures unless the button ++ * is held down by a *thumb*, specifically. ++ */ ++ if (tp_tap_dragging(tp) || ++ (tp->buttons.is_clickpad && tp->buttons.state && ++ tp->thumb.state == THUMB_STATE_FINGER)) { + tp_gesture_cancel(tp, time); + tp->gesture.finger_count = 1; + tp->gesture.finger_count_pending = 0; +diff --git a/test/test-touchpad-buttons.c b/test/test-touchpad-buttons.c +index 4759b896..907d12bc 100644 +--- a/test/test-touchpad-buttons.c ++++ b/test/test-touchpad-buttons.c +@@ -958,6 +958,96 @@ START_TEST(touchpad_clickfinger_appletouch_3fg) + } + END_TEST + ++START_TEST(touchpad_clickfinger_click_drag) ++{ ++ struct litest_device *dev = litest_current_device(); ++ struct libinput *li = dev->libinput; ++ int nfingers = _i; /* ranged test */ ++ unsigned int button; ++ int nslots = libevdev_get_num_slots(dev->evdev); ++ ++ litest_enable_clickfinger(dev); ++ litest_drain_events(li); ++ ++ litest_touch_down(dev, 0, 40, 50); ++ button = BTN_LEFT; ++ ++ if (nfingers > 1) { ++ if (nslots > 1) { ++ litest_touch_down(dev, 1, 50, 50); ++ } else { ++ litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 1); ++ } ++ button = BTN_RIGHT; ++ } ++ ++ if (nfingers > 2) { ++ if (nslots > 2) { ++ litest_touch_down(dev, 2, 60, 50); ++ } else { ++ litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 0); ++ litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 1); ++ } ++ button = BTN_MIDDLE; ++ } ++ ++ litest_button_click(dev, BTN_LEFT, true); ++ ++ libinput_dispatch(li); ++ litest_assert_button_event(li, button, ++ LIBINPUT_BUTTON_STATE_PRESSED); ++ ++ for (int i = 0; i < 20; i++) { ++ litest_push_event_frame(dev); ++ switch (nfingers) { ++ case 3: ++ if (nslots >= nfingers) ++ litest_touch_move(dev, 2, 60, 50 + i); ++ /* fallthrough */ ++ case 2: ++ if (nslots >= nfingers) ++ litest_touch_move(dev, 1, 50, 50 + i); ++ /* fallthrough */ ++ case 1: ++ litest_touch_move(dev, 0, 40, 50 + i); ++ break; ++ } ++ litest_pop_event_frame(dev); ++ libinput_dispatch(li); ++ } ++ ++ litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); ++ ++ litest_button_click(dev, BTN_LEFT, false); ++ litest_assert_button_event(li, button, ++ LIBINPUT_BUTTON_STATE_RELEASED); ++ ++ if (nfingers > 3) { ++ if (nslots > 3) { ++ litest_touch_up(dev, 2); ++ } else { ++ litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 1); ++ litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 0); ++ } ++ } ++ ++ if (nfingers > 2) { ++ if (nslots > 2) { ++ litest_touch_up(dev, 1); ++ } else { ++ litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 0); ++ } ++ button = BTN_MIDDLE; ++ } ++ ++ litest_touch_up(dev, 0); ++ ++ ++ libinput_dispatch(li); ++ litest_assert_empty_queue(li); ++} ++END_TEST ++ + START_TEST(touchpad_btn_left) + { + struct litest_device *dev = litest_current_device(); +@@ -2006,6 +2096,8 @@ END_TEST + + TEST_COLLECTION(touchpad_buttons) + { ++ struct range finger_count = {1, 4}; ++ + litest_add("touchpad:button", touchpad_button, LITEST_TOUCHPAD, LITEST_CLICKPAD); + + litest_add("touchpad:clickfinger", touchpad_1fg_clickfinger, LITEST_CLICKPAD, LITEST_ANY); +@@ -2036,6 +2128,8 @@ TEST_COLLECTION(touchpad_buttons) + litest_add_for_device("touchpad:clickfinger", touchpad_clickfinger_appletouch_2fg, LITEST_APPLETOUCH); + litest_add_for_device("touchpad:clickfinger", touchpad_clickfinger_appletouch_3fg, LITEST_APPLETOUCH); + ++ litest_add_ranged("touchpad:clickfinger", touchpad_clickfinger_click_drag, LITEST_CLICKPAD, LITEST_ANY, &finger_count); ++ + litest_add("touchpad:click", touchpad_click_defaults_clickfinger, LITEST_APPLE_CLICKPAD, LITEST_ANY); + litest_add("touchpad:click", touchpad_click_defaults_btnarea, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); + litest_add("touchpad:click", touchpad_click_defaults_none, LITEST_TOUCHPAD, LITEST_CLICKPAD); +-- +2.21.0 + diff --git a/libinput.spec b/libinput.spec index 6cb0024..a9a139d 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.14.0 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -18,6 +18,8 @@ Source2: commitid Source0: http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz %endif +Patch01: 0001-touchpad-don-t-allow-gestures-with-a-clickpad-button.patch + BuildRequires: git-core BuildRequires: gcc gcc-c++ BuildRequires: meson @@ -131,6 +133,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Tue Aug 20 2019 Peter Hutterer 1.14.0-2 +- Fix click+drag on clickpads + * Thu Aug 08 2019 Peter Hutterer 1.14.0-1 - libinput 1.14 From e2b899cc63e0d29aed7f73f2159d044b816855dc Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 26 Aug 2019 13:03:36 +1000 Subject: [PATCH 05/91] libinput 1.14.1 --- ...llow-gestures-with-a-clickpad-button.patch | 162 ------------------ libinput.spec | 13 +- sources | 2 +- 3 files changed, 9 insertions(+), 168 deletions(-) delete mode 100644 0001-touchpad-don-t-allow-gestures-with-a-clickpad-button.patch diff --git a/0001-touchpad-don-t-allow-gestures-with-a-clickpad-button.patch b/0001-touchpad-don-t-allow-gestures-with-a-clickpad-button.patch deleted file mode 100644 index d6543cf..0000000 --- a/0001-touchpad-don-t-allow-gestures-with-a-clickpad-button.patch +++ /dev/null @@ -1,162 +0,0 @@ -From 73d55cc6c5787ed7a086ecd0e1e797e85b80cb7b Mon Sep 17 00:00:00 2001 -From: Matt Mayfield -Date: Wed, 14 Aug 2019 08:29:07 -0500 -Subject: [PATCH libinput] touchpad: don't allow gestures with a clickpad - button down by a finger - -Allowing gestures when holding a physical click enables tasks like -switching workspaces while dragging an icon, but this should only be -possible with a *thumb* holding down the clickpad, not fingers. This -commit restores the ability to hold down the clickpad with two or three -fingers to right- or middle-drag. - -Fixes #339, #340 - -Signed-off-by: Peter Hutterer ---- - src/evdev-mt-touchpad-gestures.c | 9 ++- - test/test-touchpad-buttons.c | 94 ++++++++++++++++++++++++++++++++ - 2 files changed, 101 insertions(+), 2 deletions(-) - -diff --git a/src/evdev-mt-touchpad-gestures.c b/src/evdev-mt-touchpad-gestures.c -index 4a0287c7..fed25c90 100644 ---- a/src/evdev-mt-touchpad-gestures.c -+++ b/src/evdev-mt-touchpad-gestures.c -@@ -717,8 +717,13 @@ tp_gesture_post_events(struct tp_dispatch *tp, uint64_t time) - if (tp->gesture.finger_count == 0) - return; - -- /* When tap-and-dragging, force 1fg mode. */ -- if (tp_tap_dragging(tp)) { -+ /* When tap-and-dragging, force 1fg mode. On clickpads, if the -+ * physical button is down, don't allow gestures unless the button -+ * is held down by a *thumb*, specifically. -+ */ -+ if (tp_tap_dragging(tp) || -+ (tp->buttons.is_clickpad && tp->buttons.state && -+ tp->thumb.state == THUMB_STATE_FINGER)) { - tp_gesture_cancel(tp, time); - tp->gesture.finger_count = 1; - tp->gesture.finger_count_pending = 0; -diff --git a/test/test-touchpad-buttons.c b/test/test-touchpad-buttons.c -index 4759b896..907d12bc 100644 ---- a/test/test-touchpad-buttons.c -+++ b/test/test-touchpad-buttons.c -@@ -958,6 +958,96 @@ START_TEST(touchpad_clickfinger_appletouch_3fg) - } - END_TEST - -+START_TEST(touchpad_clickfinger_click_drag) -+{ -+ struct litest_device *dev = litest_current_device(); -+ struct libinput *li = dev->libinput; -+ int nfingers = _i; /* ranged test */ -+ unsigned int button; -+ int nslots = libevdev_get_num_slots(dev->evdev); -+ -+ litest_enable_clickfinger(dev); -+ litest_drain_events(li); -+ -+ litest_touch_down(dev, 0, 40, 50); -+ button = BTN_LEFT; -+ -+ if (nfingers > 1) { -+ if (nslots > 1) { -+ litest_touch_down(dev, 1, 50, 50); -+ } else { -+ litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 1); -+ } -+ button = BTN_RIGHT; -+ } -+ -+ if (nfingers > 2) { -+ if (nslots > 2) { -+ litest_touch_down(dev, 2, 60, 50); -+ } else { -+ litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 0); -+ litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 1); -+ } -+ button = BTN_MIDDLE; -+ } -+ -+ litest_button_click(dev, BTN_LEFT, true); -+ -+ libinput_dispatch(li); -+ litest_assert_button_event(li, button, -+ LIBINPUT_BUTTON_STATE_PRESSED); -+ -+ for (int i = 0; i < 20; i++) { -+ litest_push_event_frame(dev); -+ switch (nfingers) { -+ case 3: -+ if (nslots >= nfingers) -+ litest_touch_move(dev, 2, 60, 50 + i); -+ /* fallthrough */ -+ case 2: -+ if (nslots >= nfingers) -+ litest_touch_move(dev, 1, 50, 50 + i); -+ /* fallthrough */ -+ case 1: -+ litest_touch_move(dev, 0, 40, 50 + i); -+ break; -+ } -+ litest_pop_event_frame(dev); -+ libinput_dispatch(li); -+ } -+ -+ litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); -+ -+ litest_button_click(dev, BTN_LEFT, false); -+ litest_assert_button_event(li, button, -+ LIBINPUT_BUTTON_STATE_RELEASED); -+ -+ if (nfingers > 3) { -+ if (nslots > 3) { -+ litest_touch_up(dev, 2); -+ } else { -+ litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 1); -+ litest_event(dev, EV_KEY, BTN_TOOL_TRIPLETAP, 0); -+ } -+ } -+ -+ if (nfingers > 2) { -+ if (nslots > 2) { -+ litest_touch_up(dev, 1); -+ } else { -+ litest_event(dev, EV_KEY, BTN_TOOL_DOUBLETAP, 0); -+ } -+ button = BTN_MIDDLE; -+ } -+ -+ litest_touch_up(dev, 0); -+ -+ -+ libinput_dispatch(li); -+ litest_assert_empty_queue(li); -+} -+END_TEST -+ - START_TEST(touchpad_btn_left) - { - struct litest_device *dev = litest_current_device(); -@@ -2006,6 +2096,8 @@ END_TEST - - TEST_COLLECTION(touchpad_buttons) - { -+ struct range finger_count = {1, 4}; -+ - litest_add("touchpad:button", touchpad_button, LITEST_TOUCHPAD, LITEST_CLICKPAD); - - litest_add("touchpad:clickfinger", touchpad_1fg_clickfinger, LITEST_CLICKPAD, LITEST_ANY); -@@ -2036,6 +2128,8 @@ TEST_COLLECTION(touchpad_buttons) - litest_add_for_device("touchpad:clickfinger", touchpad_clickfinger_appletouch_2fg, LITEST_APPLETOUCH); - litest_add_for_device("touchpad:clickfinger", touchpad_clickfinger_appletouch_3fg, LITEST_APPLETOUCH); - -+ litest_add_ranged("touchpad:clickfinger", touchpad_clickfinger_click_drag, LITEST_CLICKPAD, LITEST_ANY, &finger_count); -+ - litest_add("touchpad:click", touchpad_click_defaults_clickfinger, LITEST_APPLE_CLICKPAD, LITEST_ANY); - litest_add("touchpad:click", touchpad_click_defaults_btnarea, LITEST_CLICKPAD, LITEST_APPLE_CLICKPAD); - litest_add("touchpad:click", touchpad_click_defaults_none, LITEST_TOUCHPAD, LITEST_CLICKPAD); --- -2.21.0 - diff --git a/libinput.spec b/libinput.spec index a9a139d..06ccf4d 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.14.0 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.14.1 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -18,8 +18,6 @@ Source2: commitid Source0: http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz %endif -Patch01: 0001-touchpad-don-t-allow-gestures-with-a-clickpad-button.patch - BuildRequires: git-core BuildRequires: gcc gcc-c++ BuildRequires: meson @@ -99,7 +97,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_libexecdir}/libinput/libinput-list-devices %{_mandir}/man1/libinput.1* %{_datadir}/libinput/*.quirks - +%dir %{_datadir}/zsh +%dir %{_datadir}/zsh/site-functions +%{_datadir}/zsh/site-functions/* %{_mandir}/man1/libinput-list-devices.1* %{_mandir}/man1/libinput-debug-events.1* @@ -133,6 +133,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Mon Aug 26 2019 Peter Hutterer 1.14.1-1 +- libinput 1.14.1 + * Tue Aug 20 2019 Peter Hutterer 1.14.0-2 - Fix click+drag on clickpads diff --git a/sources b/sources index c8077cd..bfcbfe3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.14.0.tar.xz) = e501c5b8a58bb287c175692af0e59ff766a8613eb576aaa0700686dfbb6c6ab63b7a5d3f148fce75397c8170bc49871068861d93c352355ab5d0d9e7f1b059ec +SHA512 (libinput-1.14.1.tar.xz) = 8416bab51ba1aab924fa1b41360bc2ad101fb60d3a82c73584bb1e2454554524716673e3eac7f08c18bd6a1ecdfa52ea3cfe09c7a866c59fcd47d75960e82d4c From 7085d627b958fcca683b56004701c5dcdeb584d7 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 17 Oct 2019 11:33:22 +1000 Subject: [PATCH 06/91] libinput 1.14.2 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 06ccf4d..89a3d78 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.14.1 +Version: 1.14.2 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -133,6 +133,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Thu Oct 17 2019 Peter Hutterer 1.14.2-1 +- libinput 1.14.2 + * Mon Aug 26 2019 Peter Hutterer 1.14.1-1 - libinput 1.14.1 diff --git a/sources b/sources index bfcbfe3..5c2b7ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.14.1.tar.xz) = 8416bab51ba1aab924fa1b41360bc2ad101fb60d3a82c73584bb1e2454554524716673e3eac7f08c18bd6a1ecdfa52ea3cfe09c7a866c59fcd47d75960e82d4c +SHA512 (libinput-1.14.2.tar.xz) = 932949a78bf95a7a05f50170cfc7dc109c99e1e3e70e63797566c0c3a3003632cad56e9b9ca2a180880f5e2ec1060613066d068b384096f37785fe70ac30c1eb From 874bc0eb108b966ef9f073735f2e974272c13e44 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 28 Oct 2019 14:38:07 +1000 Subject: [PATCH 07/91] libinput 1.14.3 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 89a3d78..c01ce22 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.14.2 +Version: 1.14.3 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -133,6 +133,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Mon Oct 28 2019 Peter Hutterer 1.14.3-1 +- libinput 1.14.3 + * Thu Oct 17 2019 Peter Hutterer 1.14.2-1 - libinput 1.14.2 diff --git a/sources b/sources index 5c2b7ee..5455924 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.14.2.tar.xz) = 932949a78bf95a7a05f50170cfc7dc109c99e1e3e70e63797566c0c3a3003632cad56e9b9ca2a180880f5e2ec1060613066d068b384096f37785fe70ac30c1eb +SHA512 (libinput-1.14.3.tar.xz) = f01d1bd1b25b8060519575644597d35f0c89de5386d298441f440128ceee3e57549921a058adec31adc8b33dbdedf4c0bd12c76905a69f752859d3136e26336d From aa4d46a793257191ee07639200cf95e01499e7df Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 19 Nov 2019 09:39:28 +1000 Subject: [PATCH 08/91] Point users to the libinput-utils package for missing tools. --- ...s-to-the-libinput-utils-package-for-.patch | 28 +++++++++++++++++++ libinput.spec | 7 ++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0001-tools-point-users-to-the-libinput-utils-package-for-.patch diff --git a/0001-tools-point-users-to-the-libinput-utils-package-for-.patch b/0001-tools-point-users-to-the-libinput-utils-package-for-.patch new file mode 100644 index 0000000..d0fdf5f --- /dev/null +++ b/0001-tools-point-users-to-the-libinput-utils-package-for-.patch @@ -0,0 +1,28 @@ +From 579e58d5413c96e2e8499354273d5a6604a17627 Mon Sep 17 00:00:00 2001 +From: rpm-build +Date: Tue, 19 Nov 2019 09:38:18 +1000 +Subject: [PATCH] tools: point users to the libinput-utils package for missing + commands + +Signed-off-by: Peter Hutterer +--- + tools/shared.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tools/shared.c b/tools/shared.c +index 02c09dd..1367a16 100644 +--- a/tools/shared.c ++++ b/tools/shared.c +@@ -542,7 +542,8 @@ tools_exec_command(const char *prefix, int real_argc, char **real_argv) + if (errno == ENOENT) { + fprintf(stderr, + "libinput: %s is not a libinput command or not installed. " +- "See 'libinput --help'\n", ++ "See 'libinput --help'\n" ++ "\nThis command may be provided by the libinput-utils package.\n", + command); + return EXIT_INVALID_USAGE; + } else { +-- +2.23.0 + diff --git a/libinput.spec b/libinput.spec index c01ce22..62dc391 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.14.3 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -18,6 +18,8 @@ Source2: commitid Source0: http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz %endif +Patch01: 0001-tools-point-users-to-the-libinput-utils-package-for-.patch + BuildRequires: git-core BuildRequires: gcc gcc-c++ BuildRequires: meson @@ -133,6 +135,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Tue Nov 19 2019 Peter Hutterer 1.14.3-2 +- Point users to the libinput-utils package for missing tools. + * Mon Oct 28 2019 Peter Hutterer 1.14.3-1 - libinput 1.14.3 From 01a6ac088be0db99d5da2a57cff5bc9d2c415673 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 5 Dec 2019 15:37:00 +1000 Subject: [PATCH 09/91] libinput 1.15rc1 --- libinput.spec | 12 +++++++++--- sources | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libinput.spec b/libinput.spec index 62dc391..c5c085d 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.14.3 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.14.901 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -90,7 +90,8 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %doc COPYING %{_libdir}/libinput.so.* %{udevdir}/libinput-device-group -%{udevdir}/libinput-fuzz-override +%{udevdir}/libinput-fuzz-to-zero +%{udevdir}/libinput-fuzz-extract %{udevdir}/rules.d/80-libinput-device-groups.rules %{udevdir}/rules.d/90-libinput-fuzz-override.rules %{_bindir}/libinput @@ -111,6 +112,7 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_libdir}/pkgconfig/libinput.pc %files utils +%{_libexecdir}/libinput/libinput-debug-tablet %{_libexecdir}/libinput/libinput-measure %{_libexecdir}/libinput/libinput-measure-fuzz %{_libexecdir}/libinput/libinput-measure-touchpad-tap @@ -119,6 +121,7 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_libexecdir}/libinput/libinput-quirks %{_libexecdir}/libinput/libinput-record %{_libexecdir}/libinput/libinput-replay +%{_mandir}/man1/libinput-debug-tablet.1* %{_mandir}/man1/libinput-measure.1* %{_mandir}/man1/libinput-measure-fuzz.1* %{_mandir}/man1/libinput-measure-touchpad-tap.1* @@ -135,6 +138,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Thu Dec 05 2019 Peter Hutterer 1.14.901-1 +- libinput 1.15rc1 + * Tue Nov 19 2019 Peter Hutterer 1.14.3-2 - Point users to the libinput-utils package for missing tools. diff --git a/sources b/sources index 5455924..9a4309c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.14.3.tar.xz) = f01d1bd1b25b8060519575644597d35f0c89de5386d298441f440128ceee3e57549921a058adec31adc8b33dbdedf4c0bd12c76905a69f752859d3136e26336d +SHA512 (libinput-1.14.901.tar.xz) = 93d97cefa49f640b7b29ac3f54497d57cd1499cb0945504d4522ed564b2414fda55ece09d9212ca2cc3c911375ce0b6906ae62912fbc501aea5238afad3ad4bc From 210b459dcf20269a7a22de706facbde4341085fa Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 3 Jan 2020 20:35:21 +1000 Subject: [PATCH 10/91] libinput 1.15 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index c5c085d..209b252 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.14.901 +Version: 1.15.0 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -138,6 +138,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Fri Jan 03 2020 Peter Hutterer 1.15.0-1 +- libinput 1.15 + * Thu Dec 05 2019 Peter Hutterer 1.14.901-1 - libinput 1.15rc1 diff --git a/sources b/sources index 9a4309c..188b229 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.14.901.tar.xz) = 93d97cefa49f640b7b29ac3f54497d57cd1499cb0945504d4522ed564b2414fda55ece09d9212ca2cc3c911375ce0b6906ae62912fbc501aea5238afad3ad4bc +SHA512 (libinput-1.15.0.tar.xz) = 5dab48e1b4c9c0deb5b01ebc3ccb4cc28d614be25d87daaf42f51fbd2d955266f3fdba73029bc0094caa55060dad8967751b72d8f45f19a40b542f0c9118c1b6 From a32688fb116b5020f7e112a08644f61ece8b7d57 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 09:25:32 +0000 Subject: [PATCH 11/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libinput.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libinput.spec b/libinput.spec index 209b252..9c5a68d 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.15.0 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -138,6 +138,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.15.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Jan 03 2020 Peter Hutterer 1.15.0-1 - libinput 1.15 From a8333a44766c9112331392ee3303da511494b3e4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 3 Feb 2020 15:36:47 +1000 Subject: [PATCH 12/91] libinput 1.15.1 --- libinput.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libinput.spec b/libinput.spec index 9c5a68d..199fab3 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.15.0 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.15.1 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -138,6 +138,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Mon Feb 03 2020 Peter Hutterer 1.15.1-1 +- libinput 1.15.1 + * Wed Jan 29 2020 Fedora Release Engineering - 1.15.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 188b229..e41d96d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.15.0.tar.xz) = 5dab48e1b4c9c0deb5b01ebc3ccb4cc28d614be25d87daaf42f51fbd2d955266f3fdba73029bc0094caa55060dad8967751b72d8f45f19a40b542f0c9118c1b6 +SHA512 (libinput-1.15.1.tar.xz) = 634810359bc4d86f2c4c75f472bee5eaed04ed93af3c91c4bc46a596402323941f9cc90173e278bfa7e5cbda6b7a20adc59bd09520dd4152fc961302b7e57904 From 8f00dbe27c20f27eee7ca7f9e364ea9623593222 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 20 Feb 2020 14:08:58 +1000 Subject: [PATCH 13/91] libinput 1.15.2 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 199fab3..1c7c629 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.15.1 +Version: 1.15.2 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -138,6 +138,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Thu Feb 20 2020 Peter Hutterer 1.15.2-1 +- libinput 1.15.2 + * Mon Feb 03 2020 Peter Hutterer 1.15.1-1 - libinput 1.15.1 diff --git a/sources b/sources index e41d96d..7bc03c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.15.1.tar.xz) = 634810359bc4d86f2c4c75f472bee5eaed04ed93af3c91c4bc46a596402323941f9cc90173e278bfa7e5cbda6b7a20adc59bd09520dd4152fc961302b7e57904 +SHA512 (libinput-1.15.2.tar.xz) = f6b50dbdf6ee6b65f88e020c4292c94c3178125d58629f27c2e52f92b658ccd67e0c5604fbf0b303621ff0386637ce1e291daaa991761d4145e8bcda4dd128a2 From 8fa94fe0232b468fcc9c73f328575d82c9a1d8ae Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 6 Mar 2020 14:52:29 +1000 Subject: [PATCH 14/91] libinput 1.15.3 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 1c7c629..dd2c269 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.15.2 +Version: 1.15.3 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -138,6 +138,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Fri Mar 06 2020 Peter Hutterer 1.15.3-1 +- libinput 1.15.3 + * Thu Feb 20 2020 Peter Hutterer 1.15.2-1 - libinput 1.15.2 diff --git a/sources b/sources index 7bc03c8..d7236bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.15.2.tar.xz) = f6b50dbdf6ee6b65f88e020c4292c94c3178125d58629f27c2e52f92b658ccd67e0c5604fbf0b303621ff0386637ce1e291daaa991761d4145e8bcda4dd128a2 +SHA512 (libinput-1.15.3.tar.xz) = 6636fd618e2b9cfa5ee44701207dc98f2639adc53eb3ef135509d936fb19b2cedf5184eab58e887798d9cf8ee65f35bc9062f7e3630080bcbe45a90a8b631ef2 From c525038f71e95bedacf3449eda738b61855bd891 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 9 Mar 2020 10:29:45 +1000 Subject: [PATCH 15/91] fix libinput record's dmi modalias recording --- 0001-tools-record-fix-dmi-recording.patch | 97 +++++++++++++++++++++++ libinput.spec | 6 +- 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 0001-tools-record-fix-dmi-recording.patch diff --git a/0001-tools-record-fix-dmi-recording.patch b/0001-tools-record-fix-dmi-recording.patch new file mode 100644 index 0000000..fe82403 --- /dev/null +++ b/0001-tools-record-fix-dmi-recording.patch @@ -0,0 +1,97 @@ +From 850925910f7f6db16f0aa645892d9121760de7b2 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Mon, 9 Mar 2020 10:16:04 +1000 +Subject: [PATCH libinput] tools: record: fix dmi recording + +Processing os-release in the same buffer that the dmi modalias used caused the +dmi to be recorded as 'dmi: "VERSION_ID=31"'. The cause for that was simply +that the dmi modalias was read but not printed until after the os-release +information was processed. + +Fix this two-fold: rearrange that each part now reads and prints in +one go, and rename the buffers so we don't re-use them. + +Signed-off-by: Peter Hutterer +--- + tools/libinput-record.c | 46 ++++++++++++++++++++++------------------- + 1 file changed, 25 insertions(+), 21 deletions(-) + +diff --git a/tools/libinput-record.c b/tools/libinput-record.c +index 0b10d8bf..6d45efc5 100644 +--- a/tools/libinput-record.c ++++ b/tools/libinput-record.c +@@ -1430,37 +1430,26 @@ print_system_header(struct record_context *ctx) + struct utsname u; + const char *kernel = "unknown"; + FILE *dmi, *osrelease; +- char buf[2048] = "unknown"; +- +- if (uname(&u) != -1) +- kernel = u.release; +- +- dmi = fopen("/sys/class/dmi/id/modalias", "r"); +- if (dmi) { +- if (fgets(buf, sizeof(buf), dmi)) { +- buf[strlen(buf) - 1] = '\0'; /* linebreak */ +- } else { +- sprintf(buf, "unknown"); +- } +- fclose(dmi); +- } ++ char dmistr[2048] = "unknown"; + + iprintf(ctx, "system:\n"); + indent_push(ctx); + ++ /* /etc/os-release version and distribution name */ + osrelease = fopen("/etc/os-release", "r"); + if (!osrelease) + osrelease = fopen("/usr/lib/os-release", "r"); + if (osrelease) { + char *distro = NULL, *version = NULL; ++ char osrstr[256] = "unknown"; + +- while (fgets(buf, sizeof(buf), osrelease)) { +- buf[strlen(buf) - 1] = '\0'; /* linebreak */ ++ while (fgets(osrstr, sizeof(osrstr), osrelease)) { ++ osrstr[strlen(osrstr) - 1] = '\0'; /* linebreak */ + +- if (!distro && strneq(buf, "ID=", 3)) +- distro = safe_strdup(&buf[3]); +- else if (!version && strneq(buf, "VERSION_ID=", 11)) +- version = safe_strdup(&buf[11]); ++ if (!distro && strneq(osrstr, "ID=", 3)) ++ distro = safe_strdup(&osrstr[3]); ++ else if (!version && strneq(osrstr, "VERSION_ID=", 11)) ++ version = safe_strdup(&osrstr[11]); + + if (distro && version) { + iprintf(ctx, "os: \"%s:%s\"\n", distro, version); +@@ -1471,8 +1460,23 @@ print_system_header(struct record_context *ctx) + free(version); + fclose(osrelease); + } ++ ++ /* kernel version */ ++ if (uname(&u) != -1) ++ kernel = u.release; + iprintf(ctx, "kernel: \"%s\"\n", kernel); +- iprintf(ctx, "dmi: \"%s\"\n", buf); ++ ++ /* dmi modalias */ ++ dmi = fopen("/sys/class/dmi/id/modalias", "r"); ++ if (dmi) { ++ if (fgets(dmistr, sizeof(dmistr), dmi)) { ++ dmistr[strlen(dmistr) - 1] = '\0'; /* linebreak */ ++ } else { ++ sprintf(dmistr, "unknown"); ++ } ++ fclose(dmi); ++ } ++ iprintf(ctx, "dmi: \"%s\"\n", dmistr); + indent_pop(ctx); + } + +-- +2.24.1 + diff --git a/libinput.spec b/libinput.spec index dd2c269..5d2eebb 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.15.3 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -19,6 +19,7 @@ Source0: http://www.freedesktop.org/software/libinput/libinput-%{version} %endif Patch01: 0001-tools-point-users-to-the-libinput-utils-package-for-.patch +Patch02: 0001-tools-record-fix-dmi-recording.patch BuildRequires: git-core BuildRequires: gcc gcc-c++ @@ -138,6 +139,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Mon Mar 09 2020 Peter Hutterer 1.15.3-2 +- fix libinput record's dmi modalias recording + * Fri Mar 06 2020 Peter Hutterer 1.15.3-1 - libinput 1.15.3 From 3a6c0aec2bb2ee0760f0a660fa80b6630b975ad1 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 18 Mar 2020 15:41:58 +1000 Subject: [PATCH 16/91] libinput 1.15.4 --- 0001-tools-record-fix-dmi-recording.patch | 97 ----------------------- libinput.spec | 8 +- sources | 2 +- 3 files changed, 6 insertions(+), 101 deletions(-) delete mode 100644 0001-tools-record-fix-dmi-recording.patch diff --git a/0001-tools-record-fix-dmi-recording.patch b/0001-tools-record-fix-dmi-recording.patch deleted file mode 100644 index fe82403..0000000 --- a/0001-tools-record-fix-dmi-recording.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 850925910f7f6db16f0aa645892d9121760de7b2 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Mon, 9 Mar 2020 10:16:04 +1000 -Subject: [PATCH libinput] tools: record: fix dmi recording - -Processing os-release in the same buffer that the dmi modalias used caused the -dmi to be recorded as 'dmi: "VERSION_ID=31"'. The cause for that was simply -that the dmi modalias was read but not printed until after the os-release -information was processed. - -Fix this two-fold: rearrange that each part now reads and prints in -one go, and rename the buffers so we don't re-use them. - -Signed-off-by: Peter Hutterer ---- - tools/libinput-record.c | 46 ++++++++++++++++++++++------------------- - 1 file changed, 25 insertions(+), 21 deletions(-) - -diff --git a/tools/libinput-record.c b/tools/libinput-record.c -index 0b10d8bf..6d45efc5 100644 ---- a/tools/libinput-record.c -+++ b/tools/libinput-record.c -@@ -1430,37 +1430,26 @@ print_system_header(struct record_context *ctx) - struct utsname u; - const char *kernel = "unknown"; - FILE *dmi, *osrelease; -- char buf[2048] = "unknown"; -- -- if (uname(&u) != -1) -- kernel = u.release; -- -- dmi = fopen("/sys/class/dmi/id/modalias", "r"); -- if (dmi) { -- if (fgets(buf, sizeof(buf), dmi)) { -- buf[strlen(buf) - 1] = '\0'; /* linebreak */ -- } else { -- sprintf(buf, "unknown"); -- } -- fclose(dmi); -- } -+ char dmistr[2048] = "unknown"; - - iprintf(ctx, "system:\n"); - indent_push(ctx); - -+ /* /etc/os-release version and distribution name */ - osrelease = fopen("/etc/os-release", "r"); - if (!osrelease) - osrelease = fopen("/usr/lib/os-release", "r"); - if (osrelease) { - char *distro = NULL, *version = NULL; -+ char osrstr[256] = "unknown"; - -- while (fgets(buf, sizeof(buf), osrelease)) { -- buf[strlen(buf) - 1] = '\0'; /* linebreak */ -+ while (fgets(osrstr, sizeof(osrstr), osrelease)) { -+ osrstr[strlen(osrstr) - 1] = '\0'; /* linebreak */ - -- if (!distro && strneq(buf, "ID=", 3)) -- distro = safe_strdup(&buf[3]); -- else if (!version && strneq(buf, "VERSION_ID=", 11)) -- version = safe_strdup(&buf[11]); -+ if (!distro && strneq(osrstr, "ID=", 3)) -+ distro = safe_strdup(&osrstr[3]); -+ else if (!version && strneq(osrstr, "VERSION_ID=", 11)) -+ version = safe_strdup(&osrstr[11]); - - if (distro && version) { - iprintf(ctx, "os: \"%s:%s\"\n", distro, version); -@@ -1471,8 +1460,23 @@ print_system_header(struct record_context *ctx) - free(version); - fclose(osrelease); - } -+ -+ /* kernel version */ -+ if (uname(&u) != -1) -+ kernel = u.release; - iprintf(ctx, "kernel: \"%s\"\n", kernel); -- iprintf(ctx, "dmi: \"%s\"\n", buf); -+ -+ /* dmi modalias */ -+ dmi = fopen("/sys/class/dmi/id/modalias", "r"); -+ if (dmi) { -+ if (fgets(dmistr, sizeof(dmistr), dmi)) { -+ dmistr[strlen(dmistr) - 1] = '\0'; /* linebreak */ -+ } else { -+ sprintf(dmistr, "unknown"); -+ } -+ fclose(dmi); -+ } -+ iprintf(ctx, "dmi: \"%s\"\n", dmistr); - indent_pop(ctx); - } - --- -2.24.1 - diff --git a/libinput.spec b/libinput.spec index 5d2eebb..4cf328d 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.15.3 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.15.4 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -19,7 +19,6 @@ Source0: http://www.freedesktop.org/software/libinput/libinput-%{version} %endif Patch01: 0001-tools-point-users-to-the-libinput-utils-package-for-.patch -Patch02: 0001-tools-record-fix-dmi-recording.patch BuildRequires: git-core BuildRequires: gcc gcc-c++ @@ -139,6 +138,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Wed Mar 18 2020 Peter Hutterer 1.15.4-1 +- libinput 1.15.4 + * Mon Mar 09 2020 Peter Hutterer 1.15.3-2 - fix libinput record's dmi modalias recording diff --git a/sources b/sources index d7236bb..33841b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.15.3.tar.xz) = 6636fd618e2b9cfa5ee44701207dc98f2639adc53eb3ef135509d936fb19b2cedf5184eab58e887798d9cf8ee65f35bc9062f7e3630080bcbe45a90a8b631ef2 +SHA512 (libinput-1.15.4.tar.xz) = 4659818952dc729cd5bdb78ebe21edbbacbf8a66a592b13ba30f3bb4c4e264208ec94440a253cfa4edc8b2ef904954eecea6be0f8d63cf239e3858d3abb64a80 From ce957f5811cdedd123db985092ca17578ffa97dc Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Sat, 11 Apr 2020 10:33:14 +1000 Subject: [PATCH 17/91] libinput 1.15.5 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 4cf328d..b82cded 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.15.4 +Version: 1.15.5 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -138,6 +138,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Sat Apr 11 2020 Peter Hutterer 1.15.5-1 +- libinput 1.15.5 + * Wed Mar 18 2020 Peter Hutterer 1.15.4-1 - libinput 1.15.4 diff --git a/sources b/sources index 33841b4..50edfa6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.15.4.tar.xz) = 4659818952dc729cd5bdb78ebe21edbbacbf8a66a592b13ba30f3bb4c4e264208ec94440a253cfa4edc8b2ef904954eecea6be0f8d63cf239e3858d3abb64a80 +SHA512 (libinput-1.15.5.tar.xz) = a0a3a325048841fc017e19d3bc5f5490605972ab9e2730dc5678bda7efb7a5b1fa6f531f3c8abd8393899ec383d8d2bcfd586eacee04fc1fbda0e02ba2af956a From bb818539729d7986acc24f31cba07d95512c796e Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 19 Jun 2020 10:08:00 +1000 Subject: [PATCH 18/91] libinput 1.15.6 --- libinput.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libinput.spec b/libinput.spec index b82cded..b050d67 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.15.5 +Version: 1.15.6 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -138,6 +138,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Fri Jun 19 2020 Peter Hutterer 1.15.6-1 +- libinput 1.15.6 + * Sat Apr 11 2020 Peter Hutterer 1.15.5-1 - libinput 1.15.5 @@ -732,7 +735,7 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') * Fri May 29 2015 Peter Hutterer 0.15.0-4 - Add tap-to-end-drag patch (#1225998) - + * Wed May 27 2015 Peter Hutterer 0.15.0-3 - Refine disable-while-typing (#1209753) diff --git a/sources b/sources index 50edfa6..9b033d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.15.5.tar.xz) = a0a3a325048841fc017e19d3bc5f5490605972ab9e2730dc5678bda7efb7a5b1fa6f531f3c8abd8393899ec383d8d2bcfd586eacee04fc1fbda0e02ba2af956a +SHA512 (libinput-1.15.6.tar.xz) = 90459e5a1f22fd42ffcbab157b461e4514c30803bcebdaced76c65c05cccfa6f259640a50497055fe7ed0b376a6979f6d1d01227ae447fe60ba88fa81142b969 From ec6c8d00862d61211bae790a301061b57ef445c7 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 15 Jul 2020 12:01:40 +1000 Subject: [PATCH 19/91] libinput 1.16rc1 --- ...s-to-the-libinput-utils-package-for-.patch | 28 ------------------- libinput.spec | 13 +++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 32 deletions(-) delete mode 100644 0001-tools-point-users-to-the-libinput-utils-package-for-.patch diff --git a/0001-tools-point-users-to-the-libinput-utils-package-for-.patch b/0001-tools-point-users-to-the-libinput-utils-package-for-.patch deleted file mode 100644 index d0fdf5f..0000000 --- a/0001-tools-point-users-to-the-libinput-utils-package-for-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 579e58d5413c96e2e8499354273d5a6604a17627 Mon Sep 17 00:00:00 2001 -From: rpm-build -Date: Tue, 19 Nov 2019 09:38:18 +1000 -Subject: [PATCH] tools: point users to the libinput-utils package for missing - commands - -Signed-off-by: Peter Hutterer ---- - tools/shared.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tools/shared.c b/tools/shared.c -index 02c09dd..1367a16 100644 ---- a/tools/shared.c -+++ b/tools/shared.c -@@ -542,7 +542,8 @@ tools_exec_command(const char *prefix, int real_argc, char **real_argv) - if (errno == ENOENT) { - fprintf(stderr, - "libinput: %s is not a libinput command or not installed. " -- "See 'libinput --help'\n", -+ "See 'libinput --help'\n" -+ "\nThis command may be provided by the libinput-utils package.\n", - command); - return EXIT_INVALID_USAGE; - } else { --- -2.23.0 - diff --git a/libinput.spec b/libinput.spec index b050d67..59dcabe 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.15.6 +Version: 1.15.901 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -18,8 +18,6 @@ Source2: commitid Source0: http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz %endif -Patch01: 0001-tools-point-users-to-the-libinput-utils-package-for-.patch - BuildRequires: git-core BuildRequires: gcc gcc-c++ BuildRequires: meson @@ -112,21 +110,27 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_libdir}/pkgconfig/libinput.pc %files utils +%{_libexecdir}/libinput/libinput-analyze +%{_libexecdir}/libinput/libinput-analyze-per-slot-delta %{_libexecdir}/libinput/libinput-debug-tablet %{_libexecdir}/libinput/libinput-measure %{_libexecdir}/libinput/libinput-measure-fuzz %{_libexecdir}/libinput/libinput-measure-touchpad-tap %{_libexecdir}/libinput/libinput-measure-touchpad-pressure +%{_libexecdir}/libinput/libinput-measure-touchpad-size %{_libexecdir}/libinput/libinput-measure-touch-size %{_libexecdir}/libinput/libinput-quirks %{_libexecdir}/libinput/libinput-record %{_libexecdir}/libinput/libinput-replay +%{_mandir}/man1/libinput-analyze.1* +%{_mandir}/man1/libinput-analyze-per-slot-delta.1* %{_mandir}/man1/libinput-debug-tablet.1* %{_mandir}/man1/libinput-measure.1* %{_mandir}/man1/libinput-measure-fuzz.1* %{_mandir}/man1/libinput-measure-touchpad-tap.1* %{_mandir}/man1/libinput-measure-touch-size.1* %{_mandir}/man1/libinput-measure-touchpad-pressure.1* +%{_mandir}/man1/libinput-measure-touchpad-size.1* %{_mandir}/man1/libinput-quirks.1* %{_mandir}/man1/libinput-quirks-list.1* %{_mandir}/man1/libinput-quirks-validate.1* @@ -138,6 +142,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Wed Jul 15 2020 Peter Hutterer 1.15.901-1 +- libinput 1.16rc1 + * Fri Jun 19 2020 Peter Hutterer 1.15.6-1 - libinput 1.15.6 diff --git a/sources b/sources index 9b033d6..3e9eec2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.15.6.tar.xz) = 90459e5a1f22fd42ffcbab157b461e4514c30803bcebdaced76c65c05cccfa6f259640a50497055fe7ed0b376a6979f6d1d01227ae447fe60ba88fa81142b969 +SHA512 (libinput-1.15.901.tar.xz) = 0273e15d54ef0cec730fb7e4e1d7c2223e59f617068dc2fed7ebceba933c055d5f4aef27917c4646f56915ebccf26b31c8174bc56da7360da1164920ea6a6f6a From ea1468df9169a9a026e5155ebe7f33e73dd50706 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 27 Jul 2020 16:24:30 +1000 Subject: [PATCH 20/91] libinput 1.16rc2 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 59dcabe..8ad83b3 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.15.901 +Version: 1.15.902 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -142,6 +142,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Mon Jul 27 2020 Peter Hutterer 1.15.902-1 +- libinput 1.16rc2 + * Wed Jul 15 2020 Peter Hutterer 1.15.901-1 - libinput 1.16rc1 diff --git a/sources b/sources index 3e9eec2..4da6fb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.15.901.tar.xz) = 0273e15d54ef0cec730fb7e4e1d7c2223e59f617068dc2fed7ebceba933c055d5f4aef27917c4646f56915ebccf26b31c8174bc56da7360da1164920ea6a6f6a +SHA512 (libinput-1.15.902.tar.xz) = b0e597f36809cf3f9109fa75aee7fbe224b411a807d568eac6e5e1743e41c21d86b60ed2e66a7281d13217c3a774f8e859663c9569e92efdca6784717b663266 From 4e8c92d1a6a403c5dba24b20c46d7649a48a963d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 04:53:11 +0000 Subject: [PATCH 21/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libinput.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libinput.spec b/libinput.spec index 8ad83b3..cac247a 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.15.902 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -142,6 +142,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.15.902-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Peter Hutterer 1.15.902-1 - libinput 1.16rc2 From cd3d119db90cdf1158b3c4da3b7089786cbffcfd Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 3 Aug 2020 16:43:01 +1000 Subject: [PATCH 22/91] libinput 1.16.0 --- libinput.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libinput.spec b/libinput.spec index cac247a..c1a5c3f 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.15.902 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.16.0 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -142,6 +142,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Mon Aug 03 2020 Peter Hutterer 1.16.0-1 +- libinput 1.16.0 + * Tue Jul 28 2020 Fedora Release Engineering - 1.15.902-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 4da6fb2..8abadad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.15.902.tar.xz) = b0e597f36809cf3f9109fa75aee7fbe224b411a807d568eac6e5e1743e41c21d86b60ed2e66a7281d13217c3a774f8e859663c9569e92efdca6784717b663266 +SHA512 (libinput-1.16.0.tar.xz) = 0c932a88f2a1d23ebef0d58c0cdbfb558e9e3d990fca15b21f5b9011bdd1bc2da81aad374fcdb8f4590f6ee2fc45e668e0583371ceb354437e585240e687aac6 From 0afce9e8f7ccf736996dc6414b764af237d66664 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 13 Aug 2020 14:01:36 +1000 Subject: [PATCH 23/91] libinput 1.1.6.1 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index c1a5c3f..bdfacb5 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.16.0 +Version: 1.16.1 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -142,6 +142,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Thu Aug 13 2020 Peter Hutterer 1.16.1-1 +- libinput 1.1.6.1 + * Mon Aug 03 2020 Peter Hutterer 1.16.0-1 - libinput 1.16.0 diff --git a/sources b/sources index 8abadad..30c7b87 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.16.0.tar.xz) = 0c932a88f2a1d23ebef0d58c0cdbfb558e9e3d990fca15b21f5b9011bdd1bc2da81aad374fcdb8f4590f6ee2fc45e668e0583371ceb354437e585240e687aac6 +SHA512 (libinput-1.16.1.tar.xz) = 86b2d563c2cff2b3d3cae3acdd399030cc785cc9859a06357a99565ef51f95122a8427c8c0883121fb0760613460a29c8cd8c7a7e3ac68115c10330b3b75cbe0 From 63642f0c692e1ad07461d0688320f059dc66fb4f Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 22 Sep 2020 17:30:48 +1000 Subject: [PATCH 24/91] Drop gcc-c++ from the BuildRequires, it's no longer needed --- libinput.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libinput.spec b/libinput.spec index bdfacb5..73c949c 100644 --- a/libinput.spec +++ b/libinput.spec @@ -19,7 +19,7 @@ Source0: http://www.freedesktop.org/software/libinput/libinput-%{version} %endif BuildRequires: git-core -BuildRequires: gcc gcc-c++ +BuildRequires: gcc BuildRequires: meson BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(mtdev) >= 1.1.0 @@ -142,6 +142,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Tue Sep 22 2020 Peter Hutterer +- Drop gcc-c++ from the BuildRequires, it's no longer needed + * Thu Aug 13 2020 Peter Hutterer 1.16.1-1 - libinput 1.1.6.1 From 5b7b9e64dd8716e57ec733f44e26e36822109f82 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 3 Nov 2020 14:44:37 +1000 Subject: [PATCH 25/91] libinput 1.16.3 --- libinput.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libinput.spec b/libinput.spec index 73c949c..38888b1 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.16.1 +Version: 1.16.3 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -142,11 +142,14 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Tue Nov 03 2020 Peter Hutterer 1.16.3-1 +- libinput 1.16.3 + * Tue Sep 22 2020 Peter Hutterer - Drop gcc-c++ from the BuildRequires, it's no longer needed * Thu Aug 13 2020 Peter Hutterer 1.16.1-1 -- libinput 1.1.6.1 +- libinput 1.16.1 * Mon Aug 03 2020 Peter Hutterer 1.16.0-1 - libinput 1.16.0 diff --git a/sources b/sources index 30c7b87..bf9fdd4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.16.1.tar.xz) = 86b2d563c2cff2b3d3cae3acdd399030cc785cc9859a06357a99565ef51f95122a8427c8c0883121fb0760613460a29c8cd8c7a7e3ac68115c10330b3b75cbe0 +SHA512 (libinput-1.16.3.tar.xz) = cdf87988b24dc0a44b7b6ed3e15e70c7702bf65f1cfe257924967677c7a1f1485011a9e30254ba8962c83885de78f824e7955cedb07322676332d42532ec4a39 From 42029feb7514271c897164a8dd0fe6eff22c5c1c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 27 Nov 2020 11:41:22 +1000 Subject: [PATCH 26/91] libinput 1.16.4 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 38888b1..aa0942e 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.16.3 +Version: 1.16.4 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -142,6 +142,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Fri Nov 27 2020 Peter Hutterer 1.16.4-1 +- libinput 1.16.4 + * Tue Nov 03 2020 Peter Hutterer 1.16.3-1 - libinput 1.16.3 diff --git a/sources b/sources index bf9fdd4..363e45a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.16.3.tar.xz) = cdf87988b24dc0a44b7b6ed3e15e70c7702bf65f1cfe257924967677c7a1f1485011a9e30254ba8962c83885de78f824e7955cedb07322676332d42532ec4a39 +SHA512 (libinput-1.16.4.tar.xz) = a95a3bcf58a9298946d15f4f2fd93dc5807d3042f8797950a1ffd96d3c979b55a764f035a9f7680d0ea400b033698c322eb61a4387dbc280db6110ffd3e137ee From 3cd4043771c212226d95a958e41160d2cbfc45d5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 17:18:09 +0000 Subject: [PATCH 27/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libinput.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libinput.spec b/libinput.spec index aa0942e..645e495 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.16.4 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -142,6 +142,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.16.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Nov 27 2020 Peter Hutterer 1.16.4-1 - libinput 1.16.4 From 5f9c5d76299ad4a93228c6a373a9017b7321a2e4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 16 Feb 2021 13:56:26 +1000 Subject: [PATCH 28/91] libinput 1.16.902 --- libinput.spec | 9 +++++++-- sources | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libinput.spec b/libinput.spec index 645e495..9d79611 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.16.4 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.16.902 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -112,6 +112,7 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %files utils %{_libexecdir}/libinput/libinput-analyze %{_libexecdir}/libinput/libinput-analyze-per-slot-delta +%{_libexecdir}/libinput/libinput-analyze-touch-down-state %{_libexecdir}/libinput/libinput-debug-tablet %{_libexecdir}/libinput/libinput-measure %{_libexecdir}/libinput/libinput-measure-fuzz @@ -124,6 +125,7 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_libexecdir}/libinput/libinput-replay %{_mandir}/man1/libinput-analyze.1* %{_mandir}/man1/libinput-analyze-per-slot-delta.1* +%{_mandir}/man1/libinput-analyze-touch-down-state.1* %{_mandir}/man1/libinput-debug-tablet.1* %{_mandir}/man1/libinput-measure.1* %{_mandir}/man1/libinput-measure-fuzz.1* @@ -142,6 +144,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Tue Feb 16 2021 Peter Hutterer 1.16.902-1 +- libinput 1.16.902 + * Tue Jan 26 2021 Fedora Release Engineering - 1.16.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 363e45a..cc5a7bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.16.4.tar.xz) = a95a3bcf58a9298946d15f4f2fd93dc5807d3042f8797950a1ffd96d3c979b55a764f035a9f7680d0ea400b033698c322eb61a4387dbc280db6110ffd3e137ee +SHA512 (libinput-1.16.902.tar.xz) = 2610b49a4d7ef796e0947f344a462e52a49f72c22b4088a43c3e9ad9810ea3ebd0f329da90b804f2d3f635b488eac73fcfd16fa8a3383de77ffb7b3ae3716771 From 95cf40150294483012631650ea6cfe3405e98722 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 23 Feb 2021 19:38:50 +1000 Subject: [PATCH 29/91] libinput 1.17.0 --- libinput.spec | 7 ++++++- sources | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 9d79611..2d40f39 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.16.902 +Version: 1.17.0 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -112,6 +112,7 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %files utils %{_libexecdir}/libinput/libinput-analyze %{_libexecdir}/libinput/libinput-analyze-per-slot-delta +%{_libexecdir}/libinput/libinput-analyze-recording %{_libexecdir}/libinput/libinput-analyze-touch-down-state %{_libexecdir}/libinput/libinput-debug-tablet %{_libexecdir}/libinput/libinput-measure @@ -125,6 +126,7 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_libexecdir}/libinput/libinput-replay %{_mandir}/man1/libinput-analyze.1* %{_mandir}/man1/libinput-analyze-per-slot-delta.1* +%{_mandir}/man1/libinput-analyze-recording.1* %{_mandir}/man1/libinput-analyze-touch-down-state.1* %{_mandir}/man1/libinput-debug-tablet.1* %{_mandir}/man1/libinput-measure.1* @@ -144,6 +146,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Tue Feb 23 2021 Peter Hutterer 1.17.0-1 +- libinput 1.17.0 + * Tue Feb 16 2021 Peter Hutterer 1.16.902-1 - libinput 1.16.902 diff --git a/sources b/sources index cc5a7bf..664b9cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.16.902.tar.xz) = 2610b49a4d7ef796e0947f344a462e52a49f72c22b4088a43c3e9ad9810ea3ebd0f329da90b804f2d3f635b488eac73fcfd16fa8a3383de77ffb7b3ae3716771 +SHA512 (libinput-1.17.0.tar.xz) = 490c7e59cbaa43e4190dbc421582dca887b6ae92304c4f8f3ea9df515bd76de41ca9a376e6f1cfe7b235dd2d5d8d8ef5982f5ddcf958e3b31b981e9440bb0888 From 261c6e30a9ccfa854b9af2159ce505f69a574475 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 24 Mar 2021 15:28:28 +1000 Subject: [PATCH 30/91] libinput 1.17.1 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 2d40f39..ec28528 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.17.0 +Version: 1.17.1 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -146,6 +146,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Wed Mar 24 2021 Peter Hutterer 1.17.1-1 +- libinput 1.17.1 + * Tue Feb 23 2021 Peter Hutterer 1.17.0-1 - libinput 1.17.0 diff --git a/sources b/sources index 664b9cf..017501c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.17.0.tar.xz) = 490c7e59cbaa43e4190dbc421582dca887b6ae92304c4f8f3ea9df515bd76de41ca9a376e6f1cfe7b235dd2d5d8d8ef5982f5ddcf958e3b31b981e9440bb0888 +SHA512 (libinput-1.17.1.tar.xz) = 2e7baa198fed9c673d28453efb066f9371f2b575a844e41cde455c636bbe1cc68faae7129026944a502cd5d7bfcc72272066b9e3cda5c959f7b464483f9dd860 From 10c346e8ef2d00583b47e1c589b0f5987fd7889d Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 30 Apr 2021 14:27:47 +1000 Subject: [PATCH 31/91] libinput 1.17.2 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index ec28528..5030fba 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.17.1 +Version: 1.17.2 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -146,6 +146,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Fri Apr 30 2021 Peter Hutterer 1.17.2-1 +- libinput 1.17.2 + * Wed Mar 24 2021 Peter Hutterer 1.17.1-1 - libinput 1.17.1 diff --git a/sources b/sources index 017501c..775a7c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.17.1.tar.xz) = 2e7baa198fed9c673d28453efb066f9371f2b575a844e41cde455c636bbe1cc68faae7129026944a502cd5d7bfcc72272066b9e3cda5c959f7b464483f9dd860 +SHA512 (libinput-1.17.2.tar.xz) = b8953ad483648d5629d56c4dc226d4906693b15da5ba4027627a51ec35ea65b0603c09056b52ed2025df1f7a877669a5b7482c025e0b37003fc676563bd05263 From 9209f851700d1c45a84209185981362453fad0c5 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 26 May 2021 12:49:48 +1000 Subject: [PATCH 32/91] libinput 1.17.3 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 5030fba..4623bf4 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.17.2 +Version: 1.17.3 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -146,6 +146,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Wed May 26 2021 Peter Hutterer 1.17.3-1 +- libinput 1.17.3 + * Fri Apr 30 2021 Peter Hutterer 1.17.2-1 - libinput 1.17.2 diff --git a/sources b/sources index 775a7c5..026820f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.17.2.tar.xz) = b8953ad483648d5629d56c4dc226d4906693b15da5ba4027627a51ec35ea65b0603c09056b52ed2025df1f7a877669a5b7482c025e0b37003fc676563bd05263 +SHA512 (libinput-1.17.3.tar.xz) = 3d1ab4362ede886996795d700a938d20e04cd922e8f9598fe9346f9f93e149119526fb324a096787b4b8a47bf3e5613130bcd874f10df86761031710d2acc792 From f5209a1aa36ddbc5d98a848c6c5a5a99737a9601 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 26 May 2021 13:31:36 +1000 Subject: [PATCH 33/91] libinput 1.17.901 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 4623bf4..759a09d 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.17.3 +Version: 1.17.901 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -146,6 +146,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Wed May 26 2021 Peter Hutterer 1.17.901-1 +- libinput 1.17.901 + * Wed May 26 2021 Peter Hutterer 1.17.3-1 - libinput 1.17.3 diff --git a/sources b/sources index 026820f..026cfe4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.17.3.tar.xz) = 3d1ab4362ede886996795d700a938d20e04cd922e8f9598fe9346f9f93e149119526fb324a096787b4b8a47bf3e5613130bcd874f10df86761031710d2acc792 +SHA512 (libinput-1.17.901.tar.xz) = 7d6fa4377eea2714b3a26ec3a26618b22fc257a9811a1f17672ffc409f991d966bb36f4a9cd0619f6ac3e70585b980baabf87b3b388cbeb7e674926b5d83969c From 43e178c21d5a68c481c49784c65678a37ccaa49d Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 2 Jun 2021 13:44:23 +1000 Subject: [PATCH 34/91] libinput 1.18.0 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 759a09d..11b11f1 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.17.901 +Version: 1.18.0 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -146,6 +146,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Wed Jun 02 2021 Peter Hutterer 1.18.0-1 +- libinput 1.18.0 + * Wed May 26 2021 Peter Hutterer 1.17.901-1 - libinput 1.17.901 diff --git a/sources b/sources index 026cfe4..c149312 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.17.901.tar.xz) = 7d6fa4377eea2714b3a26ec3a26618b22fc257a9811a1f17672ffc409f991d966bb36f4a9cd0619f6ac3e70585b980baabf87b3b388cbeb7e674926b5d83969c +SHA512 (libinput-1.18.0.tar.xz) = 9a834f075d7a1f892416bb6b241eb052f749d3aa883c4b39c0f1c9616c115d6b9a541b587508646fddaf0d3fe57af92fe4629b522d1d51196499e7b523e0aa90 From 3bb4699393c027e7d93d1e4d4dc0e047a3ae9222 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 21 Jun 2021 08:55:06 +1000 Subject: [PATCH 35/91] Add quirk for the Huawai Matebook 2020 (#1972370) --- ...rk-for-the-Huawei-Matebook-2020-touc.patch | 32 +++++++++++++++++++ libinput.spec | 7 +++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 0001-quirks-add-a-quirk-for-the-Huawei-Matebook-2020-touc.patch diff --git a/0001-quirks-add-a-quirk-for-the-Huawei-Matebook-2020-touc.patch b/0001-quirks-add-a-quirk-for-the-Huawei-Matebook-2020-touc.patch new file mode 100644 index 0000000..789550e --- /dev/null +++ b/0001-quirks-add-a-quirk-for-the-Huawei-Matebook-2020-touc.patch @@ -0,0 +1,32 @@ +From 17783c24df991e6283c693050d6b0304b7307d3e Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Mon, 21 Jun 2021 08:51:04 +1000 +Subject: [PATCH libinput] quirks: add a quirk for the Huawei Matebook 2020 + touchpad + +Clickpad that announces BTN_RIGHT + +https://bugzilla.redhat.com/show_bug.cgi?id=1972370 + +Signed-off-by: Peter Hutterer +--- + quirks/50-system-huawei.quirks | 7 +++++++ + 1 file changed, 7 insertions(+) + create mode 100644 quirks/50-system-huawei.quirks + +diff --git a/quirks/50-system-huawei.quirks b/quirks/50-system-huawei.quirks +new file mode 100644 +index 00000000..43ccb075 +--- /dev/null ++++ b/quirks/50-system-huawei.quirks +@@ -0,0 +1,7 @@ ++# Clickpad that announces BTN_RIGHT ++# https://bugzilla.redhat.com/show_bug.cgi?id=1972370 ++[Huawei MateBook 2020 Touchpad] ++MatchName=ELAN2604:00 04F3:3114 Touchpad ++MatchUdevType=touchpad ++MatchDMIModalias=dmi:*svnHUAWEI:*pvrM1010* ++AttrEventCodeDisable=BTN_RIGHT +-- +2.31.1 + diff --git a/libinput.spec b/libinput.spec index 11b11f1..1048b9e 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.18.0 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -18,6 +18,8 @@ Source2: commitid Source0: http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz %endif +Patch001: 0001-quirks-add-a-quirk-for-the-Huawei-Matebook-2020-touc.patch + BuildRequires: git-core BuildRequires: gcc BuildRequires: meson @@ -146,6 +148,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Mon Jun 21 2021 Peter Hutterer 1.18.0-2 +- Add quirk for the Huawai Matebook 2020 (#1972370) + * Wed Jun 02 2021 Peter Hutterer 1.18.0-1 - libinput 1.18.0 From 1e06039d1ea362232a7b99c66c74b7f7dc473406 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 11:37:29 +0000 Subject: [PATCH 36/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libinput.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libinput.spec b/libinput.spec index 1048b9e..5ed84f8 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.18.0 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -148,6 +148,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.18.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jun 21 2021 Peter Hutterer 1.18.0-2 - Add quirk for the Huawai Matebook 2020 (#1972370) From 37d524a1498c425ecc719a4eccb2533089a0748c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 3 Aug 2021 13:35:16 +1000 Subject: [PATCH 37/91] libinput 1.18.1 --- ...rk-for-the-Huawei-Matebook-2020-touc.patch | 32 ------------------- libinput.spec | 9 +++--- sources | 2 +- 3 files changed, 6 insertions(+), 37 deletions(-) delete mode 100644 0001-quirks-add-a-quirk-for-the-Huawei-Matebook-2020-touc.patch diff --git a/0001-quirks-add-a-quirk-for-the-Huawei-Matebook-2020-touc.patch b/0001-quirks-add-a-quirk-for-the-Huawei-Matebook-2020-touc.patch deleted file mode 100644 index 789550e..0000000 --- a/0001-quirks-add-a-quirk-for-the-Huawei-Matebook-2020-touc.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 17783c24df991e6283c693050d6b0304b7307d3e Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Mon, 21 Jun 2021 08:51:04 +1000 -Subject: [PATCH libinput] quirks: add a quirk for the Huawei Matebook 2020 - touchpad - -Clickpad that announces BTN_RIGHT - -https://bugzilla.redhat.com/show_bug.cgi?id=1972370 - -Signed-off-by: Peter Hutterer ---- - quirks/50-system-huawei.quirks | 7 +++++++ - 1 file changed, 7 insertions(+) - create mode 100644 quirks/50-system-huawei.quirks - -diff --git a/quirks/50-system-huawei.quirks b/quirks/50-system-huawei.quirks -new file mode 100644 -index 00000000..43ccb075 ---- /dev/null -+++ b/quirks/50-system-huawei.quirks -@@ -0,0 +1,7 @@ -+# Clickpad that announces BTN_RIGHT -+# https://bugzilla.redhat.com/show_bug.cgi?id=1972370 -+[Huawei MateBook 2020 Touchpad] -+MatchName=ELAN2604:00 04F3:3114 Touchpad -+MatchUdevType=touchpad -+MatchDMIModalias=dmi:*svnHUAWEI:*pvrM1010* -+AttrEventCodeDisable=BTN_RIGHT --- -2.31.1 - diff --git a/libinput.spec b/libinput.spec index 5ed84f8..7efc43a 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.18.0 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.18.1 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -18,8 +18,6 @@ Source2: commitid Source0: http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz %endif -Patch001: 0001-quirks-add-a-quirk-for-the-Huawei-Matebook-2020-touc.patch - BuildRequires: git-core BuildRequires: gcc BuildRequires: meson @@ -148,6 +146,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Tue Aug 03 2021 Peter Hutterer - 1.18.1-1 +- libinput 1.18.1 + * Thu Jul 22 2021 Fedora Release Engineering - 1.18.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index c149312..882e173 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.18.0.tar.xz) = 9a834f075d7a1f892416bb6b241eb052f749d3aa883c4b39c0f1c9616c115d6b9a541b587508646fddaf0d3fe57af92fe4629b522d1d51196499e7b523e0aa90 +SHA512 (libinput-1.18.1.tar.xz) = 450e38c0f8245aa0165a8047d25aebee646332f0f2ed442bb2d1bd3e723c2082b6d00d6e3bda308981ece8e29b5cddbd56eab900d2b7497705a45fc27b281828 From dea0b6e457ab1301198002a5d4f3e71e34cb3f44 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 1 Sep 2021 15:05:20 +1000 Subject: [PATCH 38/91] libinput 1.18.901 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 7efc43a..9abca2d 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.18.1 +Version: 1.18.901 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -146,6 +146,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Wed Sep 01 2021 Peter Hutterer - 1.18.901-1 +- libinput 1.18.901 + * Tue Aug 03 2021 Peter Hutterer - 1.18.1-1 - libinput 1.18.1 diff --git a/sources b/sources index 882e173..8de2d73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.18.1.tar.xz) = 450e38c0f8245aa0165a8047d25aebee646332f0f2ed442bb2d1bd3e723c2082b6d00d6e3bda308981ece8e29b5cddbd56eab900d2b7497705a45fc27b281828 +SHA512 (libinput-1.18.901.tar.xz) = 383ffc85eaa74c58860600617878bfc60ae2dd9a29b975f2a393575901f76abeb3721194c00e62054218ffdf8cf479dd9deba58a906e4e7ef17df561fe1f5207 From d06b493b1be61d136dbb6e63839a9bd8c0ace4d2 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 15 Sep 2021 09:22:34 +1000 Subject: [PATCH 39/91] libinput 1.19.0 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 9abca2d..ba5a86b 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.18.901 +Version: 1.19.0 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -146,6 +146,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Wed Sep 15 2021 Peter Hutterer - 1.19.0-1 +- libinput 1.19.0 + * Wed Sep 01 2021 Peter Hutterer - 1.18.901-1 - libinput 1.18.901 diff --git a/sources b/sources index 8de2d73..6c08389 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.18.901.tar.xz) = 383ffc85eaa74c58860600617878bfc60ae2dd9a29b975f2a393575901f76abeb3721194c00e62054218ffdf8cf479dd9deba58a906e4e7ef17df561fe1f5207 +SHA512 (libinput-1.19.0.tar.xz) = daf42ce797f2b5aef8d6f7a5c0d967590581e6ac12c26fa6bde5fbc619d75319e39ca55d65d5347e554dd6a48b91f5fed4d3167eabef8ad1ebc43bc0c3e8e220 From f3b0ff9c2cc415310f4f160058886444072bf22a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 29 Sep 2021 07:43:14 +1000 Subject: [PATCH 40/91] libinput 1.19.1 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index ba5a86b..45d1e1e 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.19.0 +Version: 1.19.1 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -146,6 +146,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Wed Sep 29 2021 Peter Hutterer - 1.19.1-1 +- libinput 1.19.1 + * Wed Sep 15 2021 Peter Hutterer - 1.19.0-1 - libinput 1.19.0 diff --git a/sources b/sources index 6c08389..513a2de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.19.0.tar.xz) = daf42ce797f2b5aef8d6f7a5c0d967590581e6ac12c26fa6bde5fbc619d75319e39ca55d65d5347e554dd6a48b91f5fed4d3167eabef8ad1ebc43bc0c3e8e220 +SHA512 (libinput-1.19.1.tar.xz) = 63084f5e081ee4918fee8584d99e6feb84ce9b771015c556c930843e0097abb9b93b6f9731c488b8493eac18fa4086f4822a2ed00f3cb3258346341ad0061c36 From 6ab4b03fb491378aa1a12a0954f8b752d3c7e1b5 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 21 Oct 2021 14:39:47 +1000 Subject: [PATCH 41/91] libinput 1.19.2 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 45d1e1e..e56bfff 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.19.1 +Version: 1.19.2 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -146,6 +146,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Thu Oct 21 2021 Peter Hutterer - 1.19.2-1 +- libinput 1.19.2 + * Wed Sep 29 2021 Peter Hutterer - 1.19.1-1 - libinput 1.19.1 diff --git a/sources b/sources index 513a2de..e0c036f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.19.1.tar.xz) = 63084f5e081ee4918fee8584d99e6feb84ce9b771015c556c930843e0097abb9b93b6f9731c488b8493eac18fa4086f4822a2ed00f3cb3258346341ad0061c36 +SHA512 (libinput-1.19.2.tar.xz) = fc5244dc90ceb710f7b5bb76a3cafc7dd5a8d5fa05c51122412615bfc3a99435d6a1017b79c3ce73561139fc2f5959acaf16cb9500796ea2f3eb6cb95d1a1acb From a957d5eea76d106bc633437b8e3ea73b6ba20ef6 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 13 Dec 2021 13:49:22 +1000 Subject: [PATCH 42/91] libinput 1.19.3 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index e56bfff..df8cbf5 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.19.2 +Version: 1.19.3 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -146,6 +146,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Mon Dec 13 2021 Peter Hutterer - 1.19.3-1 +- libinput 1.19.3 + * Thu Oct 21 2021 Peter Hutterer - 1.19.2-1 - libinput 1.19.2 diff --git a/sources b/sources index e0c036f..065725c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.19.2.tar.xz) = fc5244dc90ceb710f7b5bb76a3cafc7dd5a8d5fa05c51122412615bfc3a99435d6a1017b79c3ce73561139fc2f5959acaf16cb9500796ea2f3eb6cb95d1a1acb +SHA512 (libinput-1.19.3.tar.xz) = f4b776d0da78c687ba21b430a04941ac6b43f68970c82ec9f7360358fdea5ed6a873948ce66a25bcdd64d4b95fa4bf705cc24dbc25c7c0f5fd2d0efbd763f298 From 6da83b37006b2daa0e85155efb77ca09a3320943 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 13 Dec 2021 14:32:27 +1000 Subject: [PATCH 43/91] Rebuild for libwacom soname bump --- libinput.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libinput.spec b/libinput.spec index df8cbf5..31a2ccf 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.19.3 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -146,6 +146,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Mon Dec 13 2021 Peter Hutterer - 1.19.3-2 +- Rebuild for libwacom soname bump + * Mon Dec 13 2021 Peter Hutterer - 1.19.3-1 - libinput 1.19.3 From c1528d9c4acb292d91dc476c544b7e72eb5f3a8b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 16:28:38 +0000 Subject: [PATCH 44/91] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libinput.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libinput.spec b/libinput.spec index 31a2ccf..c250214 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.19.3 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -146,6 +146,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.19.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Mon Dec 13 2021 Peter Hutterer - 1.19.3-2 - Rebuild for libwacom soname bump From 79623357bad61d701cafb3f2106c1664af8b202e Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 7 Feb 2022 13:10:04 +1000 Subject: [PATCH 45/91] libinput 1.20rc1 --- .gitignore | 2 +- libinput.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 9a06e56..edf6ae0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/libinput-*.tar.xz +/libinput-*.tar.bz2 diff --git a/libinput.spec b/libinput.spec index c250214..8545280 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.19.3 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.19.901 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -15,7 +15,7 @@ Source0: %{name}-%{gitdate}.tar.xz Source1: make-git-snapshot.sh Source2: commitid %else -Source0: http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz +Source0: https://gitlab.freedesktop.org/libinput/libinput/-/archive/%{version}/libinput-%{version}.tar.bz2 %endif BuildRequires: git-core @@ -146,6 +146,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Mon Feb 07 2022 Peter Hutterer - 1.19.901-1 +- libinput 1.20rc1 + * Thu Jan 20 2022 Fedora Release Engineering - 1.19.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 065725c..cc74840 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.19.3.tar.xz) = f4b776d0da78c687ba21b430a04941ac6b43f68970c82ec9f7360358fdea5ed6a873948ce66a25bcdd64d4b95fa4bf705cc24dbc25c7c0f5fd2d0efbd763f298 +SHA512 (libinput-1.19.901.tar.bz2) = d2f6827d3efe4cdd2ae9aa3ebc886bcbef7e1986d7dc8b38874da2cc21a6ed3151e08951ac4a95ff0ae0d26a85e50f00e979dcb2db919c9b511453b70599f336 From c99e2cd00df0537a083d508bc5711e8e1469a468 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 21 Feb 2022 08:25:28 +1000 Subject: [PATCH 46/91] libinput 1.20 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 8545280..cb20da1 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.19.901 +Version: 1.20.0 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -146,6 +146,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Mon Feb 21 2022 Peter Hutterer - 1.20.0-1 +- libinput 1.20 + * Mon Feb 07 2022 Peter Hutterer - 1.19.901-1 - libinput 1.20rc1 diff --git a/sources b/sources index cc74840..74bd834 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.19.901.tar.bz2) = d2f6827d3efe4cdd2ae9aa3ebc886bcbef7e1986d7dc8b38874da2cc21a6ed3151e08951ac4a95ff0ae0d26a85e50f00e979dcb2db919c9b511453b70599f336 +SHA512 (libinput-1.20.0.tar.bz2) = 145b0e0760929137ab442b2030b4b42f6df54a3ae61c47c929e1a74857a170f0f2a56bb7522b7d1d9c0943028ac54c7728cf8d66a0c384f6118f31d6625ab44c From d19bc244c8e43252cfeb6a543e5fe03253add13a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 20 Apr 2022 15:42:26 +1000 Subject: [PATCH 47/91] libinput 1.20.1 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index cb20da1..7f942ce 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.20.0 +Version: 1.20.1 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -146,6 +146,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Wed Apr 20 2022 Peter Hutterer - 1.20.1-1 +- libinput 1.20.1 + * Mon Feb 21 2022 Peter Hutterer - 1.20.0-1 - libinput 1.20 diff --git a/sources b/sources index 74bd834..1d6175e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.20.0.tar.bz2) = 145b0e0760929137ab442b2030b4b42f6df54a3ae61c47c929e1a74857a170f0f2a56bb7522b7d1d9c0943028ac54c7728cf8d66a0c384f6118f31d6625ab44c +SHA512 (libinput-1.20.1.tar.bz2) = d981bf90980c2f609393da998926bc4018599dddbb86c272dfb77bab1b2d5f35c6070f96bcfe5ef0032bd6c957b13f64ed32025d9f04fb413268571b2ee79cd1 From a56a13bff0566120c5f5e3564cfc36f7c7754ce0 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 14 Jun 2022 13:32:38 +1000 Subject: [PATCH 48/91] libinput 1.21.0 --- libinput.spec | 9 ++++++++- sources | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 7f942ce..a1f7e16 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.20.1 +Version: 1.21.0 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -142,10 +142,17 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-replay.1* %files test +%{_libexecdir}/libinput/libinput-test %{_libexecdir}/libinput/libinput-test-suite +%{_libexecdir}/libinput/libinput-test-utils +%{_mandir}/man1/libinput-test.1* %{_mandir}/man1/libinput-test-suite.1* + %changelog +* Mon Jun 13 2022 Peter Hutterer - 1.21.0-1 +- libinput 1.21.0 + * Wed Apr 20 2022 Peter Hutterer - 1.20.1-1 - libinput 1.20.1 diff --git a/sources b/sources index 1d6175e..819c0c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.20.1.tar.bz2) = d981bf90980c2f609393da998926bc4018599dddbb86c272dfb77bab1b2d5f35c6070f96bcfe5ef0032bd6c957b13f64ed32025d9f04fb413268571b2ee79cd1 +SHA512 (libinput-1.21.0.tar.bz2) = 537f2dc40d6e21e267f157b08540b41176c3de68a2867d52d7acdcbb5616dc563dc0b6247f6efee75848ce64f76a3633f335cfd3bbf51c93d240fb16c06c2a4d From e0608553e98b39315ea0dde9e618aec99273dab8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 18:06:15 +0000 Subject: [PATCH 49/91] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libinput.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libinput.spec b/libinput.spec index a1f7e16..93846ab 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.21.0 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -150,6 +150,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.21.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 13 2022 Peter Hutterer - 1.21.0-1 - libinput 1.21.0 From 16e60efc5390042951ef63b1d061a6ab141fcb6f Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 31 Aug 2022 14:00:55 +1000 Subject: [PATCH 50/91] Add udev to BuildRequires for udevdir to resolve againt --- libinput.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libinput.spec b/libinput.spec index 93846ab..127db75 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.21.0 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -25,6 +25,7 @@ BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(mtdev) >= 1.1.0 BuildRequires: pkgconfig(libevdev) >= 0.4 BuildRequires: pkgconfig(libwacom) >= 0.20 +BuildRequires: pkgconfig(udev) BuildRequires: python3-devel BuildRequires: check-devel @@ -150,6 +151,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %changelog +* Wed Aug 31 2022 Peter Hutterer - 1.21.0-3 +- Add udev to BuildRequires for udevdir to resolve againt + * Thu Jul 21 2022 Fedora Release Engineering - 1.21.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 0a4f789b30e995f8b185561b66d484ed628779f2 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 21 Nov 2022 10:03:47 +1000 Subject: [PATCH 51/91] libinput 1.22.0 --- libinput.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libinput.spec b/libinput.spec index 127db75..0d54c5c 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.21.0 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.22.0 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -151,6 +151,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %changelog +* Mon Nov 21 2022 Peter Hutterer - 1.22.0-1git58abea394} +- libinput 1.22.0 + * Wed Aug 31 2022 Peter Hutterer - 1.21.0-3 - Add udev to BuildRequires for udevdir to resolve againt diff --git a/sources b/sources index 819c0c5..35daed0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.21.0.tar.bz2) = 537f2dc40d6e21e267f157b08540b41176c3de68a2867d52d7acdcbb5616dc563dc0b6247f6efee75848ce64f76a3633f335cfd3bbf51c93d240fb16c06c2a4d +SHA512 (libinput-1.22.0.tar.bz2) = 62cc36845daa7bc4b8477dd71abe629309683a93de753382a90e8466915e2b96b9c6914b431747d3462c15d8ab42bc70ee755800eec60c4ad7e9f3b4f7dba76d From ad65e5bf75358bdbad38d0aca491365c800f7e8b Mon Sep 17 00:00:00 2001 From: Lumir Balhar Date: Tue, 1 Nov 2022 07:09:14 +0100 Subject: [PATCH 52/91] Use %py3_shebang_fix instead of direct call of pathfix.py For more info see https://fedoraproject.org/wiki/Changes/Python3.12#pathfix.py_tool_will_be_removed --- libinput.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libinput.spec b/libinput.spec index 0d54c5c..a1525f5 100644 --- a/libinput.spec +++ b/libinput.spec @@ -66,7 +66,7 @@ intended to be run by users. %prep %autosetup -S git # Replace whatever the source uses with the approved call -pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') +%py3_shebang_fix $(git grep -l '#!/usr/bin/.*python3') %build %meson -Ddebug-gui=false \ From 111d95f603537dc8fbeecf9c8da5af2d0023e5cd Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Sat, 26 Nov 2022 10:53:35 -0800 Subject: [PATCH 53/91] Backport upstream patch to add Apple MTP touchpad quirk for Apple M2 laptops --- ...-quirks-Add-Apple-MTP-touchpad-quirk.patch | 41 +++++++++++++++++++ libinput.spec | 9 +++- 2 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 0001-quirks-Add-Apple-MTP-touchpad-quirk.patch diff --git a/0001-quirks-Add-Apple-MTP-touchpad-quirk.patch b/0001-quirks-Add-Apple-MTP-touchpad-quirk.patch new file mode 100644 index 0000000..a912006 --- /dev/null +++ b/0001-quirks-Add-Apple-MTP-touchpad-quirk.patch @@ -0,0 +1,41 @@ +From 6f417fec0071fa2814d4449cc78db8da8f009d99 Mon Sep 17 00:00:00 2001 +From: Hector Martin +Date: Tue, 22 Nov 2022 13:52:24 +0900 +Subject: [PATCH] quirks: Add Apple MTP touchpad quirk + +Apple M2 (and presumably newer) laptops now embed the touchpad +controller into the main SoC, and use a new internal communications +protocol between it and the main CPU. This isn't really a "bus" like +SPI or I2C, so the downstream kernel driver currently uses the (not +well supported) HOST bus type. MatchBus can't match on that, so let's +just use a name match (plus the vendor ID, which is still valid and +the usual Apple one). + +Signed-off-by: Hector Martin +--- + quirks/50-system-apple.quirks | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/quirks/50-system-apple.quirks b/quirks/50-system-apple.quirks +index 7f7a81cd36d5..a6d6eea91d5a 100644 +--- a/quirks/50-system-apple.quirks ++++ b/quirks/50-system-apple.quirks +@@ -105,6 +105,15 @@ AttrSizeHint=104x75 + AttrTouchSizeRange=150:130 + AttrPalmSizeThreshold=1600 + ++[Apple Laptop Touchpad (MTP)] ++MatchUdevType=touchpad ++MatchName=Apple*MTP* ++MatchVendor=0x5AC ++ModelAppleTouchpad=1 ++AttrSizeHint=104x75 ++AttrTouchSizeRange=150:130 ++AttrPalmSizeThreshold=1600 ++ + # The Linux applespi driver currently uses the Synaptics vendor for some reason + [Apple Laptop Touchpad (SPI)] + MatchUdevType=touchpad +-- +2.38.1 + diff --git a/libinput.spec b/libinput.spec index a1525f5..633a577 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.22.0 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -17,6 +17,8 @@ Source2: commitid %else Source0: https://gitlab.freedesktop.org/libinput/libinput/-/archive/%{version}/libinput-%{version}.tar.bz2 %endif +# Apple MTP touchpad quirk for Apple M2 laptops +Patch0: 0001-quirks-Add-Apple-MTP-touchpad-quirk.patch BuildRequires: git-core BuildRequires: gcc @@ -64,7 +66,7 @@ The %{name}-test package contains the libinput test suite. It is not intended to be run by users. %prep -%autosetup -S git +%autosetup -S git -p1 # Replace whatever the source uses with the approved call %py3_shebang_fix $(git grep -l '#!/usr/bin/.*python3') @@ -151,6 +153,9 @@ intended to be run by users. %changelog +* Sat Nov 26 2022 Davide Cavalca 1.22.0-2 +- Backport upstream patch to add Apple MTP touchpad quirk for Apple M2 laptops + * Mon Nov 21 2022 Peter Hutterer - 1.22.0-1git58abea394} - libinput 1.22.0 From 924963edebc3f060e23a9549e6012fe5be1d34c9 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 16 Jan 2023 17:35:29 +1000 Subject: [PATCH 54/91] libinput 1.22.1 --- ...-quirks-Add-Apple-MTP-touchpad-quirk.patch | 41 ------------------- libinput.spec | 9 ++-- sources | 2 +- 3 files changed, 6 insertions(+), 46 deletions(-) delete mode 100644 0001-quirks-Add-Apple-MTP-touchpad-quirk.patch diff --git a/0001-quirks-Add-Apple-MTP-touchpad-quirk.patch b/0001-quirks-Add-Apple-MTP-touchpad-quirk.patch deleted file mode 100644 index a912006..0000000 --- a/0001-quirks-Add-Apple-MTP-touchpad-quirk.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6f417fec0071fa2814d4449cc78db8da8f009d99 Mon Sep 17 00:00:00 2001 -From: Hector Martin -Date: Tue, 22 Nov 2022 13:52:24 +0900 -Subject: [PATCH] quirks: Add Apple MTP touchpad quirk - -Apple M2 (and presumably newer) laptops now embed the touchpad -controller into the main SoC, and use a new internal communications -protocol between it and the main CPU. This isn't really a "bus" like -SPI or I2C, so the downstream kernel driver currently uses the (not -well supported) HOST bus type. MatchBus can't match on that, so let's -just use a name match (plus the vendor ID, which is still valid and -the usual Apple one). - -Signed-off-by: Hector Martin ---- - quirks/50-system-apple.quirks | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/quirks/50-system-apple.quirks b/quirks/50-system-apple.quirks -index 7f7a81cd36d5..a6d6eea91d5a 100644 ---- a/quirks/50-system-apple.quirks -+++ b/quirks/50-system-apple.quirks -@@ -105,6 +105,15 @@ AttrSizeHint=104x75 - AttrTouchSizeRange=150:130 - AttrPalmSizeThreshold=1600 - -+[Apple Laptop Touchpad (MTP)] -+MatchUdevType=touchpad -+MatchName=Apple*MTP* -+MatchVendor=0x5AC -+ModelAppleTouchpad=1 -+AttrSizeHint=104x75 -+AttrTouchSizeRange=150:130 -+AttrPalmSizeThreshold=1600 -+ - # The Linux applespi driver currently uses the Synaptics vendor for some reason - [Apple Laptop Touchpad (SPI)] - MatchUdevType=touchpad --- -2.38.1 - diff --git a/libinput.spec b/libinput.spec index 633a577..5cb8125 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.22.0 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.22.1 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -17,8 +17,6 @@ Source2: commitid %else Source0: https://gitlab.freedesktop.org/libinput/libinput/-/archive/%{version}/libinput-%{version}.tar.bz2 %endif -# Apple MTP touchpad quirk for Apple M2 laptops -Patch0: 0001-quirks-Add-Apple-MTP-touchpad-quirk.patch BuildRequires: git-core BuildRequires: gcc @@ -153,6 +151,9 @@ intended to be run by users. %changelog +* Mon Jan 16 2023 Peter Hutterer - 1.22.1-1 +- libinput 1.22.1 + * Sat Nov 26 2022 Davide Cavalca 1.22.0-2 - Backport upstream patch to add Apple MTP touchpad quirk for Apple M2 laptops diff --git a/sources b/sources index 35daed0..7b353c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.22.0.tar.bz2) = 62cc36845daa7bc4b8477dd71abe629309683a93de753382a90e8466915e2b96b9c6914b431747d3462c15d8ab42bc70ee755800eec60c4ad7e9f3b4f7dba76d +SHA512 (libinput-1.22.1.tar.bz2) = 9d1985bc03ae304643fcd3acb762afc53305942e39071a062e7f8950be4929c72bdfeff06039c77f70e53233885df1e2e1a1dc538caeefd2b46f35826d290e9e From 065e79f93d1aa48a942c059eb17a5e9e27c88c49 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 16:36:37 +0000 Subject: [PATCH 55/91] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libinput.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libinput.spec b/libinput.spec index 5cb8125..cc91fe9 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.22.1 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -151,6 +151,9 @@ intended to be run by users. %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.22.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Jan 16 2023 Peter Hutterer - 1.22.1-1 - libinput 1.22.1 From a6cac42be582f6554d9354e4fd9f14644bcabe17 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 27 Mar 2023 16:00:54 +1000 Subject: [PATCH 56/91] libinput 1.23.0 --- libinput.spec | 9 +++++++-- sources | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libinput.spec b/libinput.spec index cc91fe9..d27f639 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.22.1 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.23.0 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -116,6 +116,7 @@ intended to be run by users. %{_libexecdir}/libinput/libinput-analyze-recording %{_libexecdir}/libinput/libinput-analyze-touch-down-state %{_libexecdir}/libinput/libinput-debug-tablet +%{_libexecdir}/libinput/libinput-list-kernel-devices %{_libexecdir}/libinput/libinput-measure %{_libexecdir}/libinput/libinput-measure-fuzz %{_libexecdir}/libinput/libinput-measure-touchpad-tap @@ -130,6 +131,7 @@ intended to be run by users. %{_mandir}/man1/libinput-analyze-recording.1* %{_mandir}/man1/libinput-analyze-touch-down-state.1* %{_mandir}/man1/libinput-debug-tablet.1* +%{_mandir}/man1/libinput-list-kernel-devices.1* %{_mandir}/man1/libinput-measure.1* %{_mandir}/man1/libinput-measure-fuzz.1* %{_mandir}/man1/libinput-measure-touchpad-tap.1* @@ -151,6 +153,9 @@ intended to be run by users. %changelog +* Mon Mar 27 2023 Peter Hutterer - 1.23.0-1 +- libinput 1.23.0 + * Thu Jan 19 2023 Fedora Release Engineering - 1.22.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 7b353c0..49cd3ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.22.1.tar.bz2) = 9d1985bc03ae304643fcd3acb762afc53305942e39071a062e7f8950be4929c72bdfeff06039c77f70e53233885df1e2e1a1dc538caeefd2b46f35826d290e9e +SHA512 (libinput-1.23.0.tar.bz2) = cb752d8611d70d9ea26d875aba9db8d0e319e60697aedef1b16295e8180761ce4c8c9635b1aaeb3cfc32d8c5fbe4abfd9a5a4fd29c4b964b25c853c90e816a43 From 37e9aa1136eaefe9e15f894d3dc436d2f4d6c3c9 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 11 Apr 2023 10:20:03 +1000 Subject: [PATCH 57/91] Add two patches for better Apple touchpad behavior (see libinput MR 834 and 897) --- ...atural-scrolling-by-default-on-Apple.patch | 102 ++++++++++++++++++ ...-edge-palm-detection-Apple-touchpads.patch | 50 +++++++++ libinput.spec | 9 +- 3 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 0001-evdev-Enable-natural-scrolling-by-default-on-Apple.patch create mode 100644 0001-touchpad-Disable-edge-palm-detection-Apple-touchpads.patch diff --git a/0001-evdev-Enable-natural-scrolling-by-default-on-Apple.patch b/0001-evdev-Enable-natural-scrolling-by-default-on-Apple.patch new file mode 100644 index 0000000..b5e8341 --- /dev/null +++ b/0001-evdev-Enable-natural-scrolling-by-default-on-Apple.patch @@ -0,0 +1,102 @@ +From d61d385951c5678ad18d495358abe952ce359ac9 Mon Sep 17 00:00:00 2001 +From: Hector Martin +Date: Sat, 10 Dec 2022 19:40:07 +0900 +Subject: [PATCH] evdev: Enable natural scrolling by default on Apple + +As suggested by the comment itself. I think most users expect this. + +Signed-off-by: Hector Martin +Signed-off-by: Peter Hutterer +--- + src/evdev-mt-touchpad.c | 12 ++++++++++++ + src/evdev.c | 3 +-- + test/litest.h | 4 ++++ + test/test-touchpad.c | 6 ++++-- + 4 files changed, 21 insertions(+), 4 deletions(-) + +diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c +index b29a5c56..e2ecdea7 100644 +--- a/src/evdev-mt-touchpad.c ++++ b/src/evdev-mt-touchpad.c +@@ -3137,12 +3137,24 @@ tp_scroll_config_scroll_method_get_default_method(struct libinput_device *device + return tp_scroll_get_default_method(tp); + } + ++static int ++tp_scroll_config_natural_get_default(struct libinput_device *device) ++{ ++ struct evdev_device *dev = evdev_device(device); ++ ++ return (evdev_device_has_model_quirk(dev, QUIRK_MODEL_APPLE_TOUCHPAD) || ++ evdev_device_has_model_quirk(dev, QUIRK_MODEL_APPLE_TOUCHPAD_ONEBUTTON)); ++} ++ + static void + tp_init_scroll(struct tp_dispatch *tp, struct evdev_device *device) + { + tp_edge_scroll_init(tp, device); + + evdev_init_natural_scroll(device); ++ /* Override natural scroll config for Apple touchpads */ ++ device->scroll.config_natural.get_default_enabled = tp_scroll_config_natural_get_default; ++ device->scroll.natural_scrolling_enabled = tp_scroll_config_natural_get_default(&device->base); + + tp->scroll.config_method.get_methods = tp_scroll_config_scroll_method_get_methods; + tp->scroll.config_method.set_method = tp_scroll_config_scroll_method_set_method; +diff --git a/src/evdev.c b/src/evdev.c +index 524ae9a1..33b3f514 100644 +--- a/src/evdev.c ++++ b/src/evdev.c +@@ -957,8 +957,7 @@ evdev_scroll_config_natural_get(struct libinput_device *device) + static int + evdev_scroll_config_natural_get_default(struct libinput_device *device) + { +- /* could enable this on Apple touchpads. could do that, could +- * very well do that... */ ++ /* Overridden in evdev-mt-touchpad.c for Apple touchpads. */ + return 0; + } + +diff --git a/test/litest.h b/test/litest.h +index baba5cbb..95150831 100644 +--- a/test/litest.h ++++ b/test/litest.h +@@ -1064,6 +1064,8 @@ litest_enable_2fg_scroll(struct litest_device *dev) + + expected = LIBINPUT_CONFIG_STATUS_SUCCESS; + litest_assert_int_eq(status, expected); ++ ++ libinput_device_config_scroll_set_natural_scroll_enabled(device, 0); + } + + static inline void +@@ -1077,6 +1079,8 @@ litest_enable_edge_scroll(struct litest_device *dev) + + expected = LIBINPUT_CONFIG_STATUS_SUCCESS; + litest_assert_int_eq(status, expected); ++ ++ libinput_device_config_scroll_set_natural_scroll_enabled(device, 0); + } + + static inline bool +diff --git a/test/test-touchpad.c b/test/test-touchpad.c +index c02cb01c..d72ae0fa 100644 +--- a/test/test-touchpad.c ++++ b/test/test-touchpad.c +@@ -611,9 +611,11 @@ START_TEST(touchpad_scroll_natural_defaults) + { + struct litest_device *dev = litest_current_device(); + ++ int enabled = libevdev_get_id_vendor(dev->evdev) == VENDOR_ID_APPLE; ++ + ck_assert_int_ge(libinput_device_config_scroll_has_natural_scroll(dev->libinput_device), 1); +- ck_assert_int_eq(libinput_device_config_scroll_get_natural_scroll_enabled(dev->libinput_device), 0); +- ck_assert_int_eq(libinput_device_config_scroll_get_default_natural_scroll_enabled(dev->libinput_device), 0); ++ ck_assert_int_eq(libinput_device_config_scroll_get_natural_scroll_enabled(dev->libinput_device), enabled); ++ ck_assert_int_eq(libinput_device_config_scroll_get_default_natural_scroll_enabled(dev->libinput_device), enabled); + } + END_TEST + +-- +2.40.0 + diff --git a/0001-touchpad-Disable-edge-palm-detection-Apple-touchpads.patch b/0001-touchpad-Disable-edge-palm-detection-Apple-touchpads.patch new file mode 100644 index 0000000..b36c371 --- /dev/null +++ b/0001-touchpad-Disable-edge-palm-detection-Apple-touchpads.patch @@ -0,0 +1,50 @@ +From 4a8b5e6ec445b507fc0b1ef9842a60bf13c58772 Mon Sep 17 00:00:00 2001 +From: Hector Martin +Date: Thu, 6 Apr 2023 15:33:42 +0900 +Subject: [PATCH] touchpad: Disable edge palm detection Apple touchpads + +This hurts more than it helps, and users complain of dead trackpad +edges. Apple touchpads have fairly sophisticated internal palm rejection +algorithms going back many years, so let's just disable this one on +everything Apple. + +Related to: #433 (need to figure out what other hardware may need this) + +Signed-off-by: Hector Martin +Signed-off-by: Peter Hutterer +--- + src/evdev-mt-touchpad.c | 4 ++++ + test/litest.h | 2 +- + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c +index e2ecdea7..5b040ce5 100644 +--- a/src/evdev-mt-touchpad.c ++++ b/src/evdev-mt-touchpad.c +@@ -3350,6 +3350,10 @@ tp_init_palmdetect_edge(struct tp_dispatch *tp, + !tp_is_tpkb_combo_below(device)) + return; + ++ /* Edge palm detection hurts more than it helps on Apple touchpads. */ ++ if (evdev_device_has_model_quirk(device, QUIRK_MODEL_APPLE_TOUCHPAD)) ++ return; ++ + evdev_device_get_size(device, &width, &height); + + /* Enable edge palm detection on touchpads >= 70 mm. Anything +diff --git a/test/litest.h b/test/litest.h +index 95150831..457790b3 100644 +--- a/test/litest.h ++++ b/test/litest.h +@@ -1287,7 +1287,7 @@ litest_has_palm_detect_size(struct litest_device *dev) + if (bustype == BUS_BLUETOOTH) + return 0; + if (vendor == VENDOR_ID_APPLE) +- return 1; ++ return 0; + + rc = libinput_device_get_size(dev->libinput_device, &width, &height); + +-- +2.40.0 + diff --git a/libinput.spec b/libinput.spec index d27f639..b0879e1 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.23.0 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -18,6 +18,9 @@ Source2: commitid Source0: https://gitlab.freedesktop.org/libinput/libinput/-/archive/%{version}/libinput-%{version}.tar.bz2 %endif +Patch0001: 0001-evdev-Enable-natural-scrolling-by-default-on-Apple.patch +Patch0002: 0001-touchpad-Disable-edge-palm-detection-Apple-touchpads.patch + BuildRequires: git-core BuildRequires: gcc BuildRequires: meson @@ -153,6 +156,10 @@ intended to be run by users. %changelog +* Tue Apr 11 2023 Peter Hutterer - 1.23.0-2 +- Add two patches for better Apple touchpad behavior (see libinput MR + 834 and 897) + * Mon Mar 27 2023 Peter Hutterer - 1.23.0-1 - libinput 1.23.0 From e7bd82577e48cc240e9babe5a4c904c540322371 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 20 Jul 2023 15:11:12 +1000 Subject: [PATCH 58/91] BuildRequires python3-rpm-macros for pathfix.py --- libinput.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index b0879e1..d83d3c3 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.23.0 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -29,7 +29,7 @@ BuildRequires: pkgconfig(mtdev) >= 1.1.0 BuildRequires: pkgconfig(libevdev) >= 0.4 BuildRequires: pkgconfig(libwacom) >= 0.20 BuildRequires: pkgconfig(udev) -BuildRequires: python3-devel +BuildRequires: python3-rpm-macros BuildRequires: check-devel %description @@ -156,6 +156,9 @@ intended to be run by users. %changelog +* Thu Jul 20 2023 Peter Hutterer - 1.23.0-3 +- BuildRequires python3-rpm-macros for pathfix.py + * Tue Apr 11 2023 Peter Hutterer - 1.23.0-2 - Add two patches for better Apple touchpad behavior (see libinput MR 834 and 897) From 0dc838f17637edfcf7f62ea0136531202bda05de Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 25 Aug 2023 13:19:19 +1000 Subject: [PATCH 59/91] libinput 1.24.0 --- ...atural-scrolling-by-default-on-Apple.patch | 102 ------------------ ...-edge-palm-detection-Apple-touchpads.patch | 50 --------- libinput.spec | 10 +- sources | 2 +- 4 files changed, 6 insertions(+), 158 deletions(-) delete mode 100644 0001-evdev-Enable-natural-scrolling-by-default-on-Apple.patch delete mode 100644 0001-touchpad-Disable-edge-palm-detection-Apple-touchpads.patch diff --git a/0001-evdev-Enable-natural-scrolling-by-default-on-Apple.patch b/0001-evdev-Enable-natural-scrolling-by-default-on-Apple.patch deleted file mode 100644 index b5e8341..0000000 --- a/0001-evdev-Enable-natural-scrolling-by-default-on-Apple.patch +++ /dev/null @@ -1,102 +0,0 @@ -From d61d385951c5678ad18d495358abe952ce359ac9 Mon Sep 17 00:00:00 2001 -From: Hector Martin -Date: Sat, 10 Dec 2022 19:40:07 +0900 -Subject: [PATCH] evdev: Enable natural scrolling by default on Apple - -As suggested by the comment itself. I think most users expect this. - -Signed-off-by: Hector Martin -Signed-off-by: Peter Hutterer ---- - src/evdev-mt-touchpad.c | 12 ++++++++++++ - src/evdev.c | 3 +-- - test/litest.h | 4 ++++ - test/test-touchpad.c | 6 ++++-- - 4 files changed, 21 insertions(+), 4 deletions(-) - -diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c -index b29a5c56..e2ecdea7 100644 ---- a/src/evdev-mt-touchpad.c -+++ b/src/evdev-mt-touchpad.c -@@ -3137,12 +3137,24 @@ tp_scroll_config_scroll_method_get_default_method(struct libinput_device *device - return tp_scroll_get_default_method(tp); - } - -+static int -+tp_scroll_config_natural_get_default(struct libinput_device *device) -+{ -+ struct evdev_device *dev = evdev_device(device); -+ -+ return (evdev_device_has_model_quirk(dev, QUIRK_MODEL_APPLE_TOUCHPAD) || -+ evdev_device_has_model_quirk(dev, QUIRK_MODEL_APPLE_TOUCHPAD_ONEBUTTON)); -+} -+ - static void - tp_init_scroll(struct tp_dispatch *tp, struct evdev_device *device) - { - tp_edge_scroll_init(tp, device); - - evdev_init_natural_scroll(device); -+ /* Override natural scroll config for Apple touchpads */ -+ device->scroll.config_natural.get_default_enabled = tp_scroll_config_natural_get_default; -+ device->scroll.natural_scrolling_enabled = tp_scroll_config_natural_get_default(&device->base); - - tp->scroll.config_method.get_methods = tp_scroll_config_scroll_method_get_methods; - tp->scroll.config_method.set_method = tp_scroll_config_scroll_method_set_method; -diff --git a/src/evdev.c b/src/evdev.c -index 524ae9a1..33b3f514 100644 ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -957,8 +957,7 @@ evdev_scroll_config_natural_get(struct libinput_device *device) - static int - evdev_scroll_config_natural_get_default(struct libinput_device *device) - { -- /* could enable this on Apple touchpads. could do that, could -- * very well do that... */ -+ /* Overridden in evdev-mt-touchpad.c for Apple touchpads. */ - return 0; - } - -diff --git a/test/litest.h b/test/litest.h -index baba5cbb..95150831 100644 ---- a/test/litest.h -+++ b/test/litest.h -@@ -1064,6 +1064,8 @@ litest_enable_2fg_scroll(struct litest_device *dev) - - expected = LIBINPUT_CONFIG_STATUS_SUCCESS; - litest_assert_int_eq(status, expected); -+ -+ libinput_device_config_scroll_set_natural_scroll_enabled(device, 0); - } - - static inline void -@@ -1077,6 +1079,8 @@ litest_enable_edge_scroll(struct litest_device *dev) - - expected = LIBINPUT_CONFIG_STATUS_SUCCESS; - litest_assert_int_eq(status, expected); -+ -+ libinput_device_config_scroll_set_natural_scroll_enabled(device, 0); - } - - static inline bool -diff --git a/test/test-touchpad.c b/test/test-touchpad.c -index c02cb01c..d72ae0fa 100644 ---- a/test/test-touchpad.c -+++ b/test/test-touchpad.c -@@ -611,9 +611,11 @@ START_TEST(touchpad_scroll_natural_defaults) - { - struct litest_device *dev = litest_current_device(); - -+ int enabled = libevdev_get_id_vendor(dev->evdev) == VENDOR_ID_APPLE; -+ - ck_assert_int_ge(libinput_device_config_scroll_has_natural_scroll(dev->libinput_device), 1); -- ck_assert_int_eq(libinput_device_config_scroll_get_natural_scroll_enabled(dev->libinput_device), 0); -- ck_assert_int_eq(libinput_device_config_scroll_get_default_natural_scroll_enabled(dev->libinput_device), 0); -+ ck_assert_int_eq(libinput_device_config_scroll_get_natural_scroll_enabled(dev->libinput_device), enabled); -+ ck_assert_int_eq(libinput_device_config_scroll_get_default_natural_scroll_enabled(dev->libinput_device), enabled); - } - END_TEST - --- -2.40.0 - diff --git a/0001-touchpad-Disable-edge-palm-detection-Apple-touchpads.patch b/0001-touchpad-Disable-edge-palm-detection-Apple-touchpads.patch deleted file mode 100644 index b36c371..0000000 --- a/0001-touchpad-Disable-edge-palm-detection-Apple-touchpads.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 4a8b5e6ec445b507fc0b1ef9842a60bf13c58772 Mon Sep 17 00:00:00 2001 -From: Hector Martin -Date: Thu, 6 Apr 2023 15:33:42 +0900 -Subject: [PATCH] touchpad: Disable edge palm detection Apple touchpads - -This hurts more than it helps, and users complain of dead trackpad -edges. Apple touchpads have fairly sophisticated internal palm rejection -algorithms going back many years, so let's just disable this one on -everything Apple. - -Related to: #433 (need to figure out what other hardware may need this) - -Signed-off-by: Hector Martin -Signed-off-by: Peter Hutterer ---- - src/evdev-mt-touchpad.c | 4 ++++ - test/litest.h | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c -index e2ecdea7..5b040ce5 100644 ---- a/src/evdev-mt-touchpad.c -+++ b/src/evdev-mt-touchpad.c -@@ -3350,6 +3350,10 @@ tp_init_palmdetect_edge(struct tp_dispatch *tp, - !tp_is_tpkb_combo_below(device)) - return; - -+ /* Edge palm detection hurts more than it helps on Apple touchpads. */ -+ if (evdev_device_has_model_quirk(device, QUIRK_MODEL_APPLE_TOUCHPAD)) -+ return; -+ - evdev_device_get_size(device, &width, &height); - - /* Enable edge palm detection on touchpads >= 70 mm. Anything -diff --git a/test/litest.h b/test/litest.h -index 95150831..457790b3 100644 ---- a/test/litest.h -+++ b/test/litest.h -@@ -1287,7 +1287,7 @@ litest_has_palm_detect_size(struct litest_device *dev) - if (bustype == BUS_BLUETOOTH) - return 0; - if (vendor == VENDOR_ID_APPLE) -- return 1; -+ return 0; - - rc = libinput_device_get_size(dev->libinput_device, &width, &height); - --- -2.40.0 - diff --git a/libinput.spec b/libinput.spec index d83d3c3..acc589b 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.23.0 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.24.0 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -18,9 +18,6 @@ Source2: commitid Source0: https://gitlab.freedesktop.org/libinput/libinput/-/archive/%{version}/libinput-%{version}.tar.bz2 %endif -Patch0001: 0001-evdev-Enable-natural-scrolling-by-default-on-Apple.patch -Patch0002: 0001-touchpad-Disable-edge-palm-detection-Apple-touchpads.patch - BuildRequires: git-core BuildRequires: gcc BuildRequires: meson @@ -156,6 +153,9 @@ intended to be run by users. %changelog +* Fri Aug 25 2023 Peter Hutterer - 1.24.0-1 +- libinput 1.24.0 + * Thu Jul 20 2023 Peter Hutterer - 1.23.0-3 - BuildRequires python3-rpm-macros for pathfix.py diff --git a/sources b/sources index 49cd3ab..2146c09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.23.0.tar.bz2) = cb752d8611d70d9ea26d875aba9db8d0e319e60697aedef1b16295e8180761ce4c8c9635b1aaeb3cfc32d8c5fbe4abfd9a5a4fd29c4b964b25c853c90e816a43 +SHA512 (libinput-1.24.0.tar.bz2) = 924554d62d232f99851db51386653e67083b8f3b8203b5d848294c08880e1ba153f80699900210d1b5b31566a2ef6bd4aa0662f107a2dcaed1fe0f7e1fb784db From acbe31e980a0d61903c4ec2bd5ac1cd9f48c8555 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 5 Sep 2023 11:47:05 +1000 Subject: [PATCH 60/91] SPDX migration: license is already SPDX compatible --- libinput.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libinput.spec b/libinput.spec index acc589b..957a634 100644 --- a/libinput.spec +++ b/libinput.spec @@ -8,6 +8,7 @@ Version: 1.24.0 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library +# SPDX License: MIT URL: http://www.freedesktop.org/wiki/Software/libinput/ %if 0%{?gitdate} @@ -153,6 +154,9 @@ intended to be run by users. %changelog +* Tue Sep 05 2023 Peter Hutterer +- SPDX migration: license is already SPDX compatible + * Fri Aug 25 2023 Peter Hutterer - 1.24.0-1 - libinput 1.24.0 From e549107e60ce50537cdcf3169f501e6028a726be Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 15 Jan 2024 20:07:26 +1000 Subject: [PATCH 61/91] libinput 1.25 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 957a634..d337c35 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.24.0 +Version: 1.25.0 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -154,6 +154,9 @@ intended to be run by users. %changelog +* Mon Jan 15 2024 Peter Hutterer - 1.25.0-1 +- libinput 1.25 + * Tue Sep 05 2023 Peter Hutterer - SPDX migration: license is already SPDX compatible diff --git a/sources b/sources index 2146c09..afcd41a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.24.0.tar.bz2) = 924554d62d232f99851db51386653e67083b8f3b8203b5d848294c08880e1ba153f80699900210d1b5b31566a2ef6bd4aa0662f107a2dcaed1fe0f7e1fb784db +SHA512 (libinput-1.25.0.tar.bz2) = b9dc3f3b5f34c82399dfb7ccb5f65d19a596c415f0198b39e3f360f5b87c42124a5355c8d9f6f42cc9ae2d4f9a90fe5da6260136fa83d278048392f93381a84b From af8c3247b4ef4e965eee81b85cea99d6966fc4bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 04:22:37 +0000 Subject: [PATCH 62/91] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libinput.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libinput.spec b/libinput.spec index d337c35..52ddd50 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.25.0 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library # SPDX @@ -154,6 +154,9 @@ intended to be run by users. %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 1.25.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Jan 15 2024 Peter Hutterer - 1.25.0-1 - libinput 1.25 From ebf686410106782c7263bc7ea94e372881401c3d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 02:31:52 +0000 Subject: [PATCH 63/91] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libinput.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libinput.spec b/libinput.spec index 52ddd50..b232971 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.25.0 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library # SPDX @@ -154,6 +154,9 @@ intended to be run by users. %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 1.25.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 1.25.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From ba22c6ea905af77d3bb1cdeff1d2f9b69075a1b7 Mon Sep 17 00:00:00 2001 From: Arthur Bols Date: Wed, 27 Mar 2024 15:38:15 +0100 Subject: [PATCH 64/91] Add quirk for Framework 16 to recognize keyboard as internal https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/974 --- ...work-16-keyboard-modules-as-internal.patch | 27 +++++++++++++++++++ libinput.spec | 8 +++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0001-Recognizing-framework-16-keyboard-modules-as-internal.patch diff --git a/0001-Recognizing-framework-16-keyboard-modules-as-internal.patch b/0001-Recognizing-framework-16-keyboard-modules-as-internal.patch new file mode 100644 index 0000000..f98bd34 --- /dev/null +++ b/0001-Recognizing-framework-16-keyboard-modules-as-internal.patch @@ -0,0 +1,27 @@ +From 566857bd98131009699c9ab6efc7af37afd43fd0 Mon Sep 17 00:00:00 2001 +From: Josip Medved +Date: Fri, 16 Feb 2024 23:48:43 -0800 +Subject: [PATCH] Recognizing Framework 16 keyboard modules as internal + keyboards + +--- + quirks/50-system-framework.quirks | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/quirks/50-system-framework.quirks b/quirks/50-system-framework.quirks +index d42fe370e..3f4408eca 100644 +--- a/quirks/50-system-framework.quirks ++++ b/quirks/50-system-framework.quirks +@@ -3,3 +3,9 @@ MatchName=PIXA3854:00 093A:0274 Touchpad + MatchUdevType=touchpad + MatchDMIModalias=dmi:*svnFramework:pnLaptop* + AttrEventCode=-BTN_RIGHT ++ ++[Framework Laptop 16 Keyboard Module] ++MatchName=Framework Laptop 16 Keyboard Module* ++MatchUdevType=keyboard ++MatchDMIModalias=dmi:*svnFramework:pnLaptop16* ++AttrKeyboardIntegration=internal +-- +GitLab + diff --git a/libinput.spec b/libinput.spec index b232971..6a498c5 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.25.0 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library # SPDX @@ -19,6 +19,9 @@ Source2: commitid Source0: https://gitlab.freedesktop.org/libinput/libinput/-/archive/%{version}/libinput-%{version}.tar.bz2 %endif +# https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/974 +Patch0001: 0001-Recognizing-framework-16-keyboard-modules-as-internal.patch + BuildRequires: git-core BuildRequires: gcc BuildRequires: meson @@ -154,6 +157,9 @@ intended to be run by users. %changelog +* Wed Mar 27 2024 Arthur Bols - 1.25.0-4 +- Add quirk for Framework 16 to recognize keyboard as internal + * Thu Jan 25 2024 Fedora Release Engineering - 1.25.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 966f3a4acad55823d084d4404160947decddd665 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 31 May 2024 13:52:29 +1000 Subject: [PATCH 65/91] Mark datadir/libinput as owned by us (#2283754) --- libinput.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libinput.spec b/libinput.spec index 6a498c5..97c3c96 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.25.0 -Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library # SPDX @@ -102,6 +102,7 @@ intended to be run by users. %{_libexecdir}/libinput/libinput-debug-events %{_libexecdir}/libinput/libinput-list-devices %{_mandir}/man1/libinput.1* +%dir %{_datadir}/libinput %{_datadir}/libinput/*.quirks %dir %{_datadir}/zsh %dir %{_datadir}/zsh/site-functions @@ -157,6 +158,9 @@ intended to be run by users. %changelog +* Fri May 31 2024 Peter Hutterer - 1.25.0-5 +- Mark datadir/libinput as owned by us (#2283754) + * Wed Mar 27 2024 Arthur Bols - 1.25.0-4 - Add quirk for Framework 16 to recognize keyboard as internal From 815d9fb80a6a70248c0ad1531626b3b2c1655de6 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 6 Jun 2024 16:04:21 +1000 Subject: [PATCH 66/91] libinput 1.26.0 --- ...work-16-keyboard-modules-as-internal.patch | 27 ------------------- libinput.spec | 10 +++---- sources | 2 +- 3 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 0001-Recognizing-framework-16-keyboard-modules-as-internal.patch diff --git a/0001-Recognizing-framework-16-keyboard-modules-as-internal.patch b/0001-Recognizing-framework-16-keyboard-modules-as-internal.patch deleted file mode 100644 index f98bd34..0000000 --- a/0001-Recognizing-framework-16-keyboard-modules-as-internal.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 566857bd98131009699c9ab6efc7af37afd43fd0 Mon Sep 17 00:00:00 2001 -From: Josip Medved -Date: Fri, 16 Feb 2024 23:48:43 -0800 -Subject: [PATCH] Recognizing Framework 16 keyboard modules as internal - keyboards - ---- - quirks/50-system-framework.quirks | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/quirks/50-system-framework.quirks b/quirks/50-system-framework.quirks -index d42fe370e..3f4408eca 100644 ---- a/quirks/50-system-framework.quirks -+++ b/quirks/50-system-framework.quirks -@@ -3,3 +3,9 @@ MatchName=PIXA3854:00 093A:0274 Touchpad - MatchUdevType=touchpad - MatchDMIModalias=dmi:*svnFramework:pnLaptop* - AttrEventCode=-BTN_RIGHT -+ -+[Framework Laptop 16 Keyboard Module] -+MatchName=Framework Laptop 16 Keyboard Module* -+MatchUdevType=keyboard -+MatchDMIModalias=dmi:*svnFramework:pnLaptop16* -+AttrKeyboardIntegration=internal --- -GitLab - diff --git a/libinput.spec b/libinput.spec index 97c3c96..0c50354 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.25.0 -Release: 5%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.26.0 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library # SPDX @@ -19,9 +19,6 @@ Source2: commitid Source0: https://gitlab.freedesktop.org/libinput/libinput/-/archive/%{version}/libinput-%{version}.tar.bz2 %endif -# https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/974 -Patch0001: 0001-Recognizing-framework-16-keyboard-modules-as-internal.patch - BuildRequires: git-core BuildRequires: gcc BuildRequires: meson @@ -158,6 +155,9 @@ intended to be run by users. %changelog +* Thu Jun 06 2024 Peter Hutterer 1.26.0-1 +- libinput 1.26.0 + * Fri May 31 2024 Peter Hutterer - 1.25.0-5 - Mark datadir/libinput as owned by us (#2283754) diff --git a/sources b/sources index afcd41a..ea0117f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.25.0.tar.bz2) = b9dc3f3b5f34c82399dfb7ccb5f65d19a596c415f0198b39e3f360f5b87c42124a5355c8d9f6f42cc9ae2d4f9a90fe5da6260136fa83d278048392f93381a84b +SHA512 (libinput-1.26.0.tar.bz2) = 7cd6a46ff6f43eab4cc7558b77804005aa94d75b9b07b8d954c57b8521b2dfb182018043bebaf5f3ab7ec8b56fc7313cbd193b4670c065ccc51c719d518b7c98 From cc59a153ec8114e8536d33a3c83741718d11f9da Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 27 Jun 2024 13:19:12 +1000 Subject: [PATCH 67/91] libinput 1.26.1 --- libinput.spec | 7 ++++++- sources | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 0c50354..0695f54 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.26.0 +Version: 1.26.1 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -114,6 +114,7 @@ intended to be run by users. %files utils %{_libexecdir}/libinput/libinput-analyze +%{_libexecdir}/libinput/libinput-analyze-buttons %{_libexecdir}/libinput/libinput-analyze-per-slot-delta %{_libexecdir}/libinput/libinput-analyze-recording %{_libexecdir}/libinput/libinput-analyze-touch-down-state @@ -129,6 +130,7 @@ intended to be run by users. %{_libexecdir}/libinput/libinput-record %{_libexecdir}/libinput/libinput-replay %{_mandir}/man1/libinput-analyze.1* +%{_mandir}/man1/libinput-analyze-buttons.1* %{_mandir}/man1/libinput-analyze-per-slot-delta.1* %{_mandir}/man1/libinput-analyze-recording.1* %{_mandir}/man1/libinput-analyze-touch-down-state.1* @@ -155,6 +157,9 @@ intended to be run by users. %changelog +* Thu Jun 27 2024 Peter Hutterer - 1.26.1-1 +- libinput 1.26.1 + * Thu Jun 06 2024 Peter Hutterer 1.26.0-1 - libinput 1.26.0 diff --git a/sources b/sources index ea0117f..f1d177e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.26.0.tar.bz2) = 7cd6a46ff6f43eab4cc7558b77804005aa94d75b9b07b8d954c57b8521b2dfb182018043bebaf5f3ab7ec8b56fc7313cbd193b4670c065ccc51c719d518b7c98 +SHA512 (libinput-1.26.1.tar.bz2) = d4611fc75ee6091f3139134f348db79d710560c27a936c7a8c0dc50657d6e1bdbdb1b44fb4c2c668a5b45934d91d3aef336d4096806807354472b25e298cdab6 From 11038cabe3d4769806a4ff7ad5b5804fd1aef66e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 14:09:53 +0000 Subject: [PATCH 68/91] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- libinput.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libinput.spec b/libinput.spec index 0695f54..8e80375 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.26.1 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library # SPDX @@ -157,6 +157,9 @@ intended to be run by users. %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1.26.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jun 27 2024 Peter Hutterer - 1.26.1-1 - libinput 1.26.1 From aadcd7507d2f53fde62eb0395969df9fea6d5a67 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 19 Aug 2024 10:14:38 +1000 Subject: [PATCH 69/91] libinput 1.26.2 --- libinput.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libinput.spec b/libinput.spec index 8e80375..c1b293d 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.26.1 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.26.2 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library # SPDX @@ -157,6 +157,9 @@ intended to be run by users. %changelog +* Mon Aug 19 2024 Peter Hutterer - 1.26.2-1 +- libinput 1.26.2 + * Thu Jul 18 2024 Fedora Release Engineering - 1.26.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index f1d177e..e4e44bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.26.1.tar.bz2) = d4611fc75ee6091f3139134f348db79d710560c27a936c7a8c0dc50657d6e1bdbdb1b44fb4c2c668a5b45934d91d3aef336d4096806807354472b25e298cdab6 +SHA512 (libinput-1.26.2.tar.bz2) = 51fab62e1bfb6007287e1219bf458a351806ce685e6e7ba5360062c863f0811da75acc6ec92aef7f9e0556dac0413fbe43a4744885f7449e38036130112907a6 From a03c423de4a50646de5c3f756ab9b51718945533 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 19 Nov 2024 14:40:02 +1000 Subject: [PATCH 70/91] libinput 1.27.0 drop the check-devel dependency, no longer needed libinput 1.27.0 drop the check-devel dependency, no longer needed libinput 1.27.0 drop the check-devel dependency, no longer needed libinput 1.27.0 drop the check-devel dependency, no longer needed --- libinput.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index c1b293d..84bae06 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.26.2 +Version: 1.27.0 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -28,7 +28,6 @@ BuildRequires: pkgconfig(libevdev) >= 0.4 BuildRequires: pkgconfig(libwacom) >= 0.20 BuildRequires: pkgconfig(udev) BuildRequires: python3-rpm-macros -BuildRequires: check-devel %description libinput is a library that handles input devices for display servers and other @@ -157,6 +156,10 @@ intended to be run by users. %changelog +* Tue Nov 19 2024 Peter Hutterer - 1.27.0-1 +- libinput 1.27.0 +- drop the check-devel dependency, no longer needed + * Mon Aug 19 2024 Peter Hutterer - 1.26.2-1 - libinput 1.26.2 From 225720c01fd88e9935b8511e8617e6b8638a003b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 22 Nov 2024 16:03:08 +1000 Subject: [PATCH 71/91] libinput 1.27.0, with sources libinput 1.27.0, with sources libinput 1.27.0, with sources libinput 1.27.0, with sources --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 84bae06..8cfd767 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.27.0 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library # SPDX @@ -156,6 +156,9 @@ intended to be run by users. %changelog +* Fri Nov 22 2024 Peter Hutterer - 1.27.0-2 +- libinput 1.27.0, with sources + * Tue Nov 19 2024 Peter Hutterer - 1.27.0-1 - libinput 1.27.0 - drop the check-devel dependency, no longer needed diff --git a/sources b/sources index e4e44bb..acaa1f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.26.2.tar.bz2) = 51fab62e1bfb6007287e1219bf458a351806ce685e6e7ba5360062c863f0811da75acc6ec92aef7f9e0556dac0413fbe43a4744885f7449e38036130112907a6 +SHA512 (libinput-1.27.0.tar.bz2) = ddfb4a16cbd40f8e55a536f8e18e77bb26113690bd4188d2e6ea04c1a906d8392d4df340d4e24f20c5152b3ef7d727702229a86fc27ad50c5ea9a85a58d3e24a From fb85b1c89c65e20da087b7ac16532494b306085b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 6 Jan 2025 15:12:47 +1000 Subject: [PATCH 72/91] libinput 1.27.1 --- libinput.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libinput.spec b/libinput.spec index 8cfd767..185d9aa 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.27.0 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.27.1 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library # SPDX @@ -156,6 +156,9 @@ intended to be run by users. %changelog +* Mon Jan 06 2025 Peter Hutterer - 1.27.1-1 +- libinput 1.27.1 + * Fri Nov 22 2024 Peter Hutterer - 1.27.0-2 - libinput 1.27.0, with sources diff --git a/sources b/sources index acaa1f8..b95a138 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.27.0.tar.bz2) = ddfb4a16cbd40f8e55a536f8e18e77bb26113690bd4188d2e6ea04c1a906d8392d4df340d4e24f20c5152b3ef7d727702229a86fc27ad50c5ea9a85a58d3e24a +SHA512 (libinput-1.27.1.tar.bz2) = c8312000d7ce8c6f209b233177358c53dc830769cf2a80bd23ceebb408a0371de668846a5d1321b6ef803b3c17af5c0aba941ce5a2dc1fac6a0d5d791a13088b From fb6760cd6c0a3de3dca0046a8413b372d7a0af6d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 11:34:21 +0000 Subject: [PATCH 73/91] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- libinput.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libinput.spec b/libinput.spec index 185d9aa..6976ea0 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.27.1 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library # SPDX @@ -156,6 +156,9 @@ intended to be run by users. %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1.27.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Jan 06 2025 Peter Hutterer - 1.27.1-1 - libinput 1.27.1 From 21d9865a917208e2d8e6e70cc5f00f24c4766463 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 24 Mar 2025 14:45:13 +1000 Subject: [PATCH 74/91] libinput 1.28.0 --- libinput.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libinput.spec b/libinput.spec index 6976ea0..3ff5adc 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.27.1 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.28.0 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library # SPDX @@ -156,6 +156,9 @@ intended to be run by users. %changelog +* Mon Mar 24 2025 Peter Hutterer - 1.28.0-1 +- libinput 1.28.0 + * Fri Jan 17 2025 Fedora Release Engineering - 1.27.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index b95a138..1bd4f55 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.27.1.tar.bz2) = c8312000d7ce8c6f209b233177358c53dc830769cf2a80bd23ceebb408a0371de668846a5d1321b6ef803b3c17af5c0aba941ce5a2dc1fac6a0d5d791a13088b +SHA512 (libinput-1.28.0.tar.bz2) = 2665fbfbf47f8ef329e387841ff9542b6191925d2fb46a19be64ef0b2e274db3b9ce8b42652ccdeb18c66e3a3c748ff576b313ecb8f7f6b4a01102bfb3e999e3 From 46fb06c0842380cc6bbc9849fd240b7d873df746 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 1 Apr 2025 12:56:30 +1000 Subject: [PATCH 75/91] libinput 1.28.1 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 3ff5adc..19e746f 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.28.0 +Version: 1.28.1 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -156,6 +156,9 @@ intended to be run by users. %changelog +* Tue Apr 01 2025 Peter Hutterer - 1.28.1-1 +- libinput 1.28.1 + * Mon Mar 24 2025 Peter Hutterer - 1.28.0-1 - libinput 1.28.0 diff --git a/sources b/sources index 1bd4f55..ed63a20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.28.0.tar.bz2) = 2665fbfbf47f8ef329e387841ff9542b6191925d2fb46a19be64ef0b2e274db3b9ce8b42652ccdeb18c66e3a3c748ff576b313ecb8f7f6b4a01102bfb3e999e3 +SHA512 (libinput-1.28.1.tar.bz2) = 354a91f2239da5e5bbb12bb7473bd1fb7adf69e6243e8da786ace9e80eda6c8f733620b5f1e20411c732fcfa4dedf5ccd2e722a78693e564a24771e80f1c72aa From d06960eaa23474e41015d707b9b2546bb1db6af0 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 10 Jul 2025 16:02:14 +1000 Subject: [PATCH 76/91] libinput 1.28.901 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 19e746f..9da7823 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.28.1 +Version: 1.28.901 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -156,6 +156,9 @@ intended to be run by users. %changelog +* Thu Jul 10 2025 Peter Hutterer - 1.28.901-1 +- libinput 1.28.901 + * Tue Apr 01 2025 Peter Hutterer - 1.28.1-1 - libinput 1.28.1 diff --git a/sources b/sources index ed63a20..38e9b8a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.28.1.tar.bz2) = 354a91f2239da5e5bbb12bb7473bd1fb7adf69e6243e8da786ace9e80eda6c8f733620b5f1e20411c732fcfa4dedf5ccd2e722a78693e564a24771e80f1c72aa +SHA512 (libinput-1.28.901.tar.bz2) = b314517a96bff9674256dd095b11559a9c5a005c6c213fef188e4afdd433d9a3fc6557c7b565342e13a0f93a90679fb4d694076616eabe8d13506cda068be487 From 31bbe71e25e2d88c8c6d6f1f225c74b012e3f372 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 15 Jul 2025 09:11:05 +1000 Subject: [PATCH 77/91] Fix broken mouse wheel on non-high-resolution devices (#2379768) --- ...ugin-to-emulate-high-resolution-whee.patch | 208 ++++++++++++++++++ libinput.spec | 7 +- 2 files changed, 214 insertions(+), 1 deletion(-) create mode 100644 0001-plugins-add-a-plugin-to-emulate-high-resolution-whee.patch diff --git a/0001-plugins-add-a-plugin-to-emulate-high-resolution-whee.patch b/0001-plugins-add-a-plugin-to-emulate-high-resolution-whee.patch new file mode 100644 index 0000000..7bd61e8 --- /dev/null +++ b/0001-plugins-add-a-plugin-to-emulate-high-resolution-whee.patch @@ -0,0 +1,208 @@ +From 5f44eebff87b13977f0eeca5356cf00228f285b6 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Mon, 14 Jul 2025 10:05:22 +1000 +Subject: [PATCH] plugins: add a plugin to emulate high-resolution wheel events + +Fixes a regression causing missing scroll events on devices where the +kernel only sets REL_WHEEL/REL_HWHEEL but not the corresponding +hires events. On those devices we would get the legacy axis events but +no longer the new ones. + +The mouse wheel plugin will correctly emulate missing hires events +but it doesn't attach to devices where the hires bit is never set. + +This plugin can be very simple - since we know we enabled the code on +this device we don't need to keep any extra state around. If our frame +handler is called for this device we want to add the hi-res events. + +Theoretically this breaks if the device has only one hi-res axis enabled +but not the other one (i.e. REL_WHEEL_HI_RES but only REL_HWHEEL) but +that's too theoretical to worry about. + +Closes #1156 + +Fixes: 31854a829a21 ("plugin: only register the wheel plugin on devices that have a wheel") +Signed-off-by: Peter Hutterer +--- + meson.build | 1 + + src/libinput-plugin-mouse-wheel-lowres.c | 97 ++++++++++++++++++++++++ + src/libinput-plugin-mouse-wheel-lowres.h | 30 ++++++++ + src/libinput-plugin.c | 2 + + 4 files changed, 130 insertions(+) + create mode 100644 src/libinput-plugin-mouse-wheel-lowres.c + create mode 100644 src/libinput-plugin-mouse-wheel-lowres.h + +diff --git a/meson.build b/meson.build +index e5932754bc9f..e51357885ae9 100644 +--- a/meson.build ++++ b/meson.build +@@ -384,6 +384,7 @@ src_libinput = src_libfilter + [ + 'src/libinput-plugin.c', + 'src/libinput-plugin-button-debounce.c', + 'src/libinput-plugin-mouse-wheel.c', ++ 'src/libinput-plugin-mouse-wheel-lowres.c', + 'src/libinput-plugin-tablet-double-tool.c', + 'src/libinput-plugin-tablet-eraser-button.c', + 'src/libinput-plugin-tablet-forced-tool.c', +diff --git a/src/libinput-plugin-mouse-wheel-lowres.c b/src/libinput-plugin-mouse-wheel-lowres.c +new file mode 100644 +index 000000000000..ce3847e2e002 +--- /dev/null ++++ b/src/libinput-plugin-mouse-wheel-lowres.c +@@ -0,0 +1,97 @@ ++/* ++ * Copyright © 2025 Red Hat, Inc. ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a ++ * copy of this software and associated documentation files (the "Software"), ++ * to deal in the Software without restriction, including without limitation ++ * the rights to use, copy, modify, merge, publish, distribute, sublicense, ++ * and/or sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice (including the next ++ * paragraph) shall be included in all copies or substantial portions of the ++ * Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ * DEALINGS IN THE SOFTWARE. ++ */ ++ ++#include "config.h" ++ ++#include ++ ++#include "evdev.h" ++#include "libinput-plugin-mouse-wheel-lowres.h" ++#include "libinput-plugin.h" ++#include "src/evdev-frame.h" ++ ++static void ++wheel_plugin_device_new(struct libinput_plugin *libinput_plugin, ++ struct libinput_device *device, ++ struct libevdev *libevdev, ++ struct udev_device *udev_device) ++{ ++ struct evdev_device *evdev = evdev_device(device); ++ ++ if (libevdev_has_event_code(libevdev, EV_REL, REL_WHEEL_HI_RES) || ++ libevdev_has_event_code(libevdev, EV_REL, REL_HWHEEL_HI_RES)) ++ return; ++ ++ if (libevdev_has_event_code(libevdev, EV_REL, REL_WHEEL) || ++ libevdev_has_event_code(libevdev, EV_REL, REL_HWHEEL)) ++ evdev_log_info(evdev, ++ "emulating high-resolution scroll wheel events.\n"); ++ ++ if (libevdev_has_event_code(libevdev, EV_REL, REL_WHEEL)) ++ libevdev_enable_event_code(libevdev, EV_REL, REL_WHEEL_HI_RES, NULL); ++ ++ if (libevdev_has_event_code(libevdev, EV_REL, REL_HWHEEL)) ++ libevdev_enable_event_code(libevdev, EV_REL, REL_HWHEEL_HI_RES, NULL); ++ ++ libinput_plugin_enable_device_event_frame(libinput_plugin, device, true); ++} ++ ++static void ++wheel_plugin_evdev_frame(struct libinput_plugin *libinput_plugin, ++ struct libinput_device *device, ++ struct evdev_frame *frame) ++{ ++ size_t nevents; ++ struct evdev_event *events = evdev_frame_get_events(frame, &nevents); ++ ++ for (size_t i = 0; i < nevents; i++) { ++ struct evdev_event *e = &events[i]; ++ switch (evdev_usage_enum(e->usage)) { ++ case EVDEV_REL_WHEEL: ++ evdev_frame_append_one(frame, ++ evdev_usage_from(EVDEV_REL_WHEEL_HI_RES), ++ e->value * 120); ++ break; ++ case EVDEV_REL_HWHEEL: ++ evdev_frame_append_one( ++ frame, ++ evdev_usage_from(EVDEV_REL_HWHEEL_HI_RES), ++ e->value * 120); ++ break; ++ default: ++ break; ++ } ++ } ++} ++ ++static const struct libinput_plugin_interface interface = { ++ .device_new = wheel_plugin_device_new, ++ .evdev_frame = wheel_plugin_evdev_frame, ++}; ++ ++void ++libinput_mouse_plugin_wheel_lowres(struct libinput *libinput) ++{ ++ _unref_(libinput_plugin) *p = ++ libinput_plugin_new(libinput, "mouse-wheel-lowres", &interface, NULL); ++} +diff --git a/src/libinput-plugin-mouse-wheel-lowres.h b/src/libinput-plugin-mouse-wheel-lowres.h +new file mode 100644 +index 000000000000..9fee3ec3cb1c +--- /dev/null ++++ b/src/libinput-plugin-mouse-wheel-lowres.h +@@ -0,0 +1,30 @@ ++/* ++ * Copyright © 2025 Red Hat, Inc. ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a ++ * copy of this software and associated documentation files (the "Software"), ++ * to deal in the Software without restriction, including without limitation ++ * the rights to use, copy, modify, merge, publish, distribute, sublicense, ++ * and/or sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice (including the next ++ * paragraph) shall be included in all copies or substantial portions of the ++ * Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ * DEALINGS IN THE SOFTWARE. ++ */ ++ ++#include "config.h" ++ ++#include "libinput-plugin.h" ++#include "libinput.h" ++ ++void ++libinput_mouse_plugin_wheel_lowres(struct libinput *libinput); +diff --git a/src/libinput-plugin.c b/src/libinput-plugin.c +index c14ae33751d4..6e0f068cd45c 100644 +--- a/src/libinput-plugin.c ++++ b/src/libinput-plugin.c +@@ -30,6 +30,7 @@ + + #include "evdev-plugin.h" + #include "libinput-plugin-button-debounce.h" ++#include "libinput-plugin-mouse-wheel-lowres.h" + #include "libinput-plugin-mouse-wheel.h" + #include "libinput-plugin-mtdev.h" + #include "libinput-plugin-private.h" +@@ -390,6 +391,7 @@ libinput_plugin_system_load_internal_plugins(struct libinput *libinput, + libinput_tablet_plugin_proximity_timer(libinput); + libinput_tablet_plugin_eraser_button(libinput); + libinput_debounce_plugin(libinput); ++ libinput_mouse_plugin_wheel_lowres(libinput); + libinput_mouse_plugin_wheel(libinput); + + /* Our own event dispatch is implemented as mini-plugin, +-- +2.50.0 + diff --git a/libinput.spec b/libinput.spec index 9da7823..a8b3dd2 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.28.901 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library # SPDX @@ -19,6 +19,8 @@ Source2: commitid Source0: https://gitlab.freedesktop.org/libinput/libinput/-/archive/%{version}/libinput-%{version}.tar.bz2 %endif +Patch0001: 0001-plugins-add-a-plugin-to-emulate-high-resolution-whee.patch + BuildRequires: git-core BuildRequires: gcc BuildRequires: meson @@ -156,6 +158,9 @@ intended to be run by users. %changelog +* Tue Jul 15 2025 Peter Hutterer - 1.28.901-2 +- Fix broken mouse wheel on non-high-resolution devices (#2379768) + * Thu Jul 10 2025 Peter Hutterer - 1.28.901-1 - libinput 1.28.901 From 879df748c4a6500296582ad46962d1f9dce9e97e Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 16 Jul 2025 09:50:40 +1000 Subject: [PATCH 78/91] Fix Alt+PrintScreen not working (#2379912) --- ...SYSRQ-frames-and-pass-them-even-as-r.patch | 152 ++++++++++++++++++ libinput.spec | 6 +- 2 files changed, 157 insertions(+), 1 deletion(-) create mode 100644 0002-evdev-track-KEY_SYSRQ-frames-and-pass-them-even-as-r.patch diff --git a/0002-evdev-track-KEY_SYSRQ-frames-and-pass-them-even-as-r.patch b/0002-evdev-track-KEY_SYSRQ-frames-and-pass-them-even-as-r.patch new file mode 100644 index 0000000..6a4d875 --- /dev/null +++ b/0002-evdev-track-KEY_SYSRQ-frames-and-pass-them-even-as-r.patch @@ -0,0 +1,152 @@ +From 25f40a788d6c2fdefb373761e318abb29c5c6f60 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Tue, 15 Jul 2025 21:29:43 +1000 +Subject: [PATCH] evdev: track KEY_SYSRQ frames and pass them even as repeat + frames + +Alt+Printscreen aka KEY_LEFTALT + KEY_SYSRQ is emulated by the kernel +and always posted with SYN_REPORT 1, see +drivers/tty/sysrq.c:sysrq_reinject_alt_sysrq() + +The actual sequence when pressing Alt + Printscreen is to release Alt +first, then press it again: +- evdev: + - [ 10, 674010, 1, 56, 0] # EV_KEY / KEY_LEFTALT 0 + - [ 10, 674010, 0, 0, 0] # ------------ SYN_REPORT (0) ---------- +2861ms + - evdev: + - [ 10, 674030, 1, 56, 1] # EV_KEY / KEY_LEFTALT 1 + - [ 10, 674030, 1, 99, 1] # EV_KEY / KEY_SYSRQ 1 + - [ 10, 674030, 0, 0, 1] # ------------ SYN_REPORT (1) ---------- +0ms + - evdev: + - [ 10, 674031, 1, 99, 0] # EV_KEY / KEY_SYSRQ 0 + - [ 10, 674031, 1, 56, 0] # EV_KEY / KEY_LEFTALT 0 + - [ 10, 674031, 0, 0, 1] # ------------ SYN_REPORT (1) ---------- +0ms + +Handle that special case so we get our printscreen key to work as +expected anymore. + +Fixes: 9a9466b6a92c ("evdev: discard any frame with EV_SYN SYN_REPORT 1") +Signed-off-by: Peter Hutterer +--- + src/evdev.c | 13 +++++++++- + test/test-keyboard.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 69 insertions(+), 1 deletion(-) + +diff --git a/src/evdev.c b/src/evdev.c +index 5e52f4fc69e2..d0ef1c252fb3 100644 +--- a/src/evdev.c ++++ b/src/evdev.c +@@ -1043,6 +1043,7 @@ evdev_device_dispatch(void *data) + struct input_event ev; + int rc; + bool once = false; ++ bool had_sysrq = false; + _unref_(evdev_frame) *frame = evdev_frame_new(64); + + /* If the compositor is repainting, this function is called only once +@@ -1083,17 +1084,27 @@ evdev_device_dispatch(void *data) + device, + "event frame overflow, discarding events.\n"); + } ++ /* Alt+Printscreen is always a repeat frame, see ++ * drivers/tty/sysrq.c:sysrq_reinject_alt_sysrq() in the ++ * kernel ++ */ ++ if (ev.type == EV_KEY && ev.code == KEY_SYSRQ) ++ had_sysrq = true; ++ + if (ev.type == EV_SYN && ev.code == SYN_REPORT) { + /* A SYN_REPORT 1 event is a kernel-inserted + * auto-repeat. Nothing in libinput cares about kernel + * repeats and the inserted frame causes issues with + * timestamp deltas (see e.g. #1145) ++ * ++ * (well, except Alt+Printscreen (KEY_SYSRQ)) + */ +- if (ev.value != 1) ++ if (ev.value != 1 || had_sysrq) + evdev_device_dispatch_frame(libinput, + device, + frame); + evdev_frame_reset(frame); ++ had_sysrq = false; + } + } else if (rc == -ENODEV) { + evdev_device_remove(device); +diff --git a/test/test-keyboard.c b/test/test-keyboard.c +index 4e1baf7f0d41..380727b25f40 100644 +--- a/test/test-keyboard.c ++++ b/test/test-keyboard.c +@@ -468,6 +468,61 @@ START_TEST(keyboard_no_scroll) + } + END_TEST + ++START_TEST(keyboard_alt_printscreen) ++{ ++ struct litest_device *dev = litest_current_device(); ++ struct libinput *li = dev->libinput; ++ ++ litest_drain_events(li); ++ ++ /* repeat frame, ignored */ ++ litest_event(dev, EV_KEY, KEY_A, 1); ++ litest_event(dev, EV_SYN, SYN_REPORT, 1); ++ litest_dispatch(li); ++ litest_assert_empty_queue(li); ++ ++ /* not a repeat frame */ ++ litest_event(dev, EV_KEY, KEY_LEFTALT, 1); ++ litest_event(dev, EV_SYN, SYN_REPORT, 0); ++ litest_dispatch(li); ++ litest_assert_key_event(li, KEY_LEFTALT, LIBINPUT_KEY_STATE_PRESSED); ++ ++ /* normal repeat frame, ignored */ ++ litest_event(dev, EV_KEY, KEY_LEFTALT, 2); ++ litest_event(dev, EV_SYN, SYN_REPORT, 1); ++ litest_dispatch(li); ++ litest_assert_empty_queue(li); ++ ++ /* not repeat frame */ ++ litest_event(dev, EV_KEY, KEY_LEFTALT, 0); ++ litest_event(dev, EV_SYN, SYN_REPORT, 0); ++ litest_dispatch(li); ++ litest_assert_key_event(li, KEY_LEFTALT, LIBINPUT_KEY_STATE_RELEASED); ++ ++ /* special alt+printscreen repeat frame, *not* ignored */ ++ litest_event(dev, EV_KEY, KEY_LEFTALT, 1); ++ litest_event(dev, EV_KEY, KEY_SYSRQ, 1); ++ litest_event(dev, EV_SYN, SYN_REPORT, 1); ++ litest_dispatch(li); ++ ++ /* special alt+printscreen repeat frame, *not* ignored */ ++ litest_event(dev, EV_KEY, KEY_LEFTALT, 0); ++ litest_event(dev, EV_KEY, KEY_SYSRQ, 0); ++ litest_event(dev, EV_SYN, SYN_REPORT, 1); ++ litest_dispatch(li); ++ ++ /* Note: the kernel doesn't release the key combo until both keys are released ++ * and the order is reshuffled so we have alt down, sysrq down, sysrq up, alt up ++ */ ++ litest_assert_key_event(li, KEY_LEFTALT, LIBINPUT_KEY_STATE_PRESSED); ++ litest_assert_key_event(li, KEY_SYSRQ, LIBINPUT_KEY_STATE_PRESSED); ++ litest_assert_key_event(li, KEY_SYSRQ, LIBINPUT_KEY_STATE_RELEASED); ++ litest_assert_key_event(li, KEY_LEFTALT, LIBINPUT_KEY_STATE_RELEASED); ++ ++ litest_assert_empty_queue(li); ++} ++END_TEST ++ + TEST_COLLECTION(keyboard) + { + /* clang-format off */ +@@ -484,5 +539,7 @@ TEST_COLLECTION(keyboard) + litest_add(keyboard_leds, LITEST_ANY, LITEST_ANY); + + litest_add(keyboard_no_scroll, LITEST_KEYS, LITEST_WHEEL); ++ ++ litest_add_for_device(keyboard_alt_printscreen, LITEST_KEYBOARD); + /* clang-format on */ + } +-- +2.50.1 + diff --git a/libinput.spec b/libinput.spec index a8b3dd2..a9f0162 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.28.901 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library # SPDX @@ -20,6 +20,7 @@ Source0: https://gitlab.freedesktop.org/libinput/libinput/-/archive/%{ver %endif Patch0001: 0001-plugins-add-a-plugin-to-emulate-high-resolution-whee.patch +Patch0002: 0002-evdev-track-KEY_SYSRQ-frames-and-pass-them-even-as-r.patch BuildRequires: git-core BuildRequires: gcc @@ -158,6 +159,9 @@ intended to be run by users. %changelog +* Wed Jul 16 2025 Peter Hutterer - 1.28.901-3 +- Fix Alt+PrintScreen not working (#2379912) + * Tue Jul 15 2025 Peter Hutterer - 1.28.901-2 - Fix broken mouse wheel on non-high-resolution devices (#2379768) From 86954d38cdd8a36b033aafa68ebe00e0ed7d8d40 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 17 Jul 2025 13:09:24 +1000 Subject: [PATCH 79/91] libinput 1.28.902 --- ...ugin-to-emulate-high-resolution-whee.patch | 208 ------------------ ...SYSRQ-frames-and-pass-them-even-as-r.patch | 152 ------------- libinput.spec | 10 +- sources | 2 +- 4 files changed, 6 insertions(+), 366 deletions(-) delete mode 100644 0001-plugins-add-a-plugin-to-emulate-high-resolution-whee.patch delete mode 100644 0002-evdev-track-KEY_SYSRQ-frames-and-pass-them-even-as-r.patch diff --git a/0001-plugins-add-a-plugin-to-emulate-high-resolution-whee.patch b/0001-plugins-add-a-plugin-to-emulate-high-resolution-whee.patch deleted file mode 100644 index 7bd61e8..0000000 --- a/0001-plugins-add-a-plugin-to-emulate-high-resolution-whee.patch +++ /dev/null @@ -1,208 +0,0 @@ -From 5f44eebff87b13977f0eeca5356cf00228f285b6 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Mon, 14 Jul 2025 10:05:22 +1000 -Subject: [PATCH] plugins: add a plugin to emulate high-resolution wheel events - -Fixes a regression causing missing scroll events on devices where the -kernel only sets REL_WHEEL/REL_HWHEEL but not the corresponding -hires events. On those devices we would get the legacy axis events but -no longer the new ones. - -The mouse wheel plugin will correctly emulate missing hires events -but it doesn't attach to devices where the hires bit is never set. - -This plugin can be very simple - since we know we enabled the code on -this device we don't need to keep any extra state around. If our frame -handler is called for this device we want to add the hi-res events. - -Theoretically this breaks if the device has only one hi-res axis enabled -but not the other one (i.e. REL_WHEEL_HI_RES but only REL_HWHEEL) but -that's too theoretical to worry about. - -Closes #1156 - -Fixes: 31854a829a21 ("plugin: only register the wheel plugin on devices that have a wheel") -Signed-off-by: Peter Hutterer ---- - meson.build | 1 + - src/libinput-plugin-mouse-wheel-lowres.c | 97 ++++++++++++++++++++++++ - src/libinput-plugin-mouse-wheel-lowres.h | 30 ++++++++ - src/libinput-plugin.c | 2 + - 4 files changed, 130 insertions(+) - create mode 100644 src/libinput-plugin-mouse-wheel-lowres.c - create mode 100644 src/libinput-plugin-mouse-wheel-lowres.h - -diff --git a/meson.build b/meson.build -index e5932754bc9f..e51357885ae9 100644 ---- a/meson.build -+++ b/meson.build -@@ -384,6 +384,7 @@ src_libinput = src_libfilter + [ - 'src/libinput-plugin.c', - 'src/libinput-plugin-button-debounce.c', - 'src/libinput-plugin-mouse-wheel.c', -+ 'src/libinput-plugin-mouse-wheel-lowres.c', - 'src/libinput-plugin-tablet-double-tool.c', - 'src/libinput-plugin-tablet-eraser-button.c', - 'src/libinput-plugin-tablet-forced-tool.c', -diff --git a/src/libinput-plugin-mouse-wheel-lowres.c b/src/libinput-plugin-mouse-wheel-lowres.c -new file mode 100644 -index 000000000000..ce3847e2e002 ---- /dev/null -+++ b/src/libinput-plugin-mouse-wheel-lowres.c -@@ -0,0 +1,97 @@ -+/* -+ * Copyright © 2025 Red Hat, Inc. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the next -+ * paragraph) shall be included in all copies or substantial portions of the -+ * Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ */ -+ -+#include "config.h" -+ -+#include -+ -+#include "evdev.h" -+#include "libinput-plugin-mouse-wheel-lowres.h" -+#include "libinput-plugin.h" -+#include "src/evdev-frame.h" -+ -+static void -+wheel_plugin_device_new(struct libinput_plugin *libinput_plugin, -+ struct libinput_device *device, -+ struct libevdev *libevdev, -+ struct udev_device *udev_device) -+{ -+ struct evdev_device *evdev = evdev_device(device); -+ -+ if (libevdev_has_event_code(libevdev, EV_REL, REL_WHEEL_HI_RES) || -+ libevdev_has_event_code(libevdev, EV_REL, REL_HWHEEL_HI_RES)) -+ return; -+ -+ if (libevdev_has_event_code(libevdev, EV_REL, REL_WHEEL) || -+ libevdev_has_event_code(libevdev, EV_REL, REL_HWHEEL)) -+ evdev_log_info(evdev, -+ "emulating high-resolution scroll wheel events.\n"); -+ -+ if (libevdev_has_event_code(libevdev, EV_REL, REL_WHEEL)) -+ libevdev_enable_event_code(libevdev, EV_REL, REL_WHEEL_HI_RES, NULL); -+ -+ if (libevdev_has_event_code(libevdev, EV_REL, REL_HWHEEL)) -+ libevdev_enable_event_code(libevdev, EV_REL, REL_HWHEEL_HI_RES, NULL); -+ -+ libinput_plugin_enable_device_event_frame(libinput_plugin, device, true); -+} -+ -+static void -+wheel_plugin_evdev_frame(struct libinput_plugin *libinput_plugin, -+ struct libinput_device *device, -+ struct evdev_frame *frame) -+{ -+ size_t nevents; -+ struct evdev_event *events = evdev_frame_get_events(frame, &nevents); -+ -+ for (size_t i = 0; i < nevents; i++) { -+ struct evdev_event *e = &events[i]; -+ switch (evdev_usage_enum(e->usage)) { -+ case EVDEV_REL_WHEEL: -+ evdev_frame_append_one(frame, -+ evdev_usage_from(EVDEV_REL_WHEEL_HI_RES), -+ e->value * 120); -+ break; -+ case EVDEV_REL_HWHEEL: -+ evdev_frame_append_one( -+ frame, -+ evdev_usage_from(EVDEV_REL_HWHEEL_HI_RES), -+ e->value * 120); -+ break; -+ default: -+ break; -+ } -+ } -+} -+ -+static const struct libinput_plugin_interface interface = { -+ .device_new = wheel_plugin_device_new, -+ .evdev_frame = wheel_plugin_evdev_frame, -+}; -+ -+void -+libinput_mouse_plugin_wheel_lowres(struct libinput *libinput) -+{ -+ _unref_(libinput_plugin) *p = -+ libinput_plugin_new(libinput, "mouse-wheel-lowres", &interface, NULL); -+} -diff --git a/src/libinput-plugin-mouse-wheel-lowres.h b/src/libinput-plugin-mouse-wheel-lowres.h -new file mode 100644 -index 000000000000..9fee3ec3cb1c ---- /dev/null -+++ b/src/libinput-plugin-mouse-wheel-lowres.h -@@ -0,0 +1,30 @@ -+/* -+ * Copyright © 2025 Red Hat, Inc. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the next -+ * paragraph) shall be included in all copies or substantial portions of the -+ * Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ */ -+ -+#include "config.h" -+ -+#include "libinput-plugin.h" -+#include "libinput.h" -+ -+void -+libinput_mouse_plugin_wheel_lowres(struct libinput *libinput); -diff --git a/src/libinput-plugin.c b/src/libinput-plugin.c -index c14ae33751d4..6e0f068cd45c 100644 ---- a/src/libinput-plugin.c -+++ b/src/libinput-plugin.c -@@ -30,6 +30,7 @@ - - #include "evdev-plugin.h" - #include "libinput-plugin-button-debounce.h" -+#include "libinput-plugin-mouse-wheel-lowres.h" - #include "libinput-plugin-mouse-wheel.h" - #include "libinput-plugin-mtdev.h" - #include "libinput-plugin-private.h" -@@ -390,6 +391,7 @@ libinput_plugin_system_load_internal_plugins(struct libinput *libinput, - libinput_tablet_plugin_proximity_timer(libinput); - libinput_tablet_plugin_eraser_button(libinput); - libinput_debounce_plugin(libinput); -+ libinput_mouse_plugin_wheel_lowres(libinput); - libinput_mouse_plugin_wheel(libinput); - - /* Our own event dispatch is implemented as mini-plugin, --- -2.50.0 - diff --git a/0002-evdev-track-KEY_SYSRQ-frames-and-pass-them-even-as-r.patch b/0002-evdev-track-KEY_SYSRQ-frames-and-pass-them-even-as-r.patch deleted file mode 100644 index 6a4d875..0000000 --- a/0002-evdev-track-KEY_SYSRQ-frames-and-pass-them-even-as-r.patch +++ /dev/null @@ -1,152 +0,0 @@ -From 25f40a788d6c2fdefb373761e318abb29c5c6f60 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 15 Jul 2025 21:29:43 +1000 -Subject: [PATCH] evdev: track KEY_SYSRQ frames and pass them even as repeat - frames - -Alt+Printscreen aka KEY_LEFTALT + KEY_SYSRQ is emulated by the kernel -and always posted with SYN_REPORT 1, see -drivers/tty/sysrq.c:sysrq_reinject_alt_sysrq() - -The actual sequence when pressing Alt + Printscreen is to release Alt -first, then press it again: -- evdev: - - [ 10, 674010, 1, 56, 0] # EV_KEY / KEY_LEFTALT 0 - - [ 10, 674010, 0, 0, 0] # ------------ SYN_REPORT (0) ---------- +2861ms - - evdev: - - [ 10, 674030, 1, 56, 1] # EV_KEY / KEY_LEFTALT 1 - - [ 10, 674030, 1, 99, 1] # EV_KEY / KEY_SYSRQ 1 - - [ 10, 674030, 0, 0, 1] # ------------ SYN_REPORT (1) ---------- +0ms - - evdev: - - [ 10, 674031, 1, 99, 0] # EV_KEY / KEY_SYSRQ 0 - - [ 10, 674031, 1, 56, 0] # EV_KEY / KEY_LEFTALT 0 - - [ 10, 674031, 0, 0, 1] # ------------ SYN_REPORT (1) ---------- +0ms - -Handle that special case so we get our printscreen key to work as -expected anymore. - -Fixes: 9a9466b6a92c ("evdev: discard any frame with EV_SYN SYN_REPORT 1") -Signed-off-by: Peter Hutterer ---- - src/evdev.c | 13 +++++++++- - test/test-keyboard.c | 57 ++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 69 insertions(+), 1 deletion(-) - -diff --git a/src/evdev.c b/src/evdev.c -index 5e52f4fc69e2..d0ef1c252fb3 100644 ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -1043,6 +1043,7 @@ evdev_device_dispatch(void *data) - struct input_event ev; - int rc; - bool once = false; -+ bool had_sysrq = false; - _unref_(evdev_frame) *frame = evdev_frame_new(64); - - /* If the compositor is repainting, this function is called only once -@@ -1083,17 +1084,27 @@ evdev_device_dispatch(void *data) - device, - "event frame overflow, discarding events.\n"); - } -+ /* Alt+Printscreen is always a repeat frame, see -+ * drivers/tty/sysrq.c:sysrq_reinject_alt_sysrq() in the -+ * kernel -+ */ -+ if (ev.type == EV_KEY && ev.code == KEY_SYSRQ) -+ had_sysrq = true; -+ - if (ev.type == EV_SYN && ev.code == SYN_REPORT) { - /* A SYN_REPORT 1 event is a kernel-inserted - * auto-repeat. Nothing in libinput cares about kernel - * repeats and the inserted frame causes issues with - * timestamp deltas (see e.g. #1145) -+ * -+ * (well, except Alt+Printscreen (KEY_SYSRQ)) - */ -- if (ev.value != 1) -+ if (ev.value != 1 || had_sysrq) - evdev_device_dispatch_frame(libinput, - device, - frame); - evdev_frame_reset(frame); -+ had_sysrq = false; - } - } else if (rc == -ENODEV) { - evdev_device_remove(device); -diff --git a/test/test-keyboard.c b/test/test-keyboard.c -index 4e1baf7f0d41..380727b25f40 100644 ---- a/test/test-keyboard.c -+++ b/test/test-keyboard.c -@@ -468,6 +468,61 @@ START_TEST(keyboard_no_scroll) - } - END_TEST - -+START_TEST(keyboard_alt_printscreen) -+{ -+ struct litest_device *dev = litest_current_device(); -+ struct libinput *li = dev->libinput; -+ -+ litest_drain_events(li); -+ -+ /* repeat frame, ignored */ -+ litest_event(dev, EV_KEY, KEY_A, 1); -+ litest_event(dev, EV_SYN, SYN_REPORT, 1); -+ litest_dispatch(li); -+ litest_assert_empty_queue(li); -+ -+ /* not a repeat frame */ -+ litest_event(dev, EV_KEY, KEY_LEFTALT, 1); -+ litest_event(dev, EV_SYN, SYN_REPORT, 0); -+ litest_dispatch(li); -+ litest_assert_key_event(li, KEY_LEFTALT, LIBINPUT_KEY_STATE_PRESSED); -+ -+ /* normal repeat frame, ignored */ -+ litest_event(dev, EV_KEY, KEY_LEFTALT, 2); -+ litest_event(dev, EV_SYN, SYN_REPORT, 1); -+ litest_dispatch(li); -+ litest_assert_empty_queue(li); -+ -+ /* not repeat frame */ -+ litest_event(dev, EV_KEY, KEY_LEFTALT, 0); -+ litest_event(dev, EV_SYN, SYN_REPORT, 0); -+ litest_dispatch(li); -+ litest_assert_key_event(li, KEY_LEFTALT, LIBINPUT_KEY_STATE_RELEASED); -+ -+ /* special alt+printscreen repeat frame, *not* ignored */ -+ litest_event(dev, EV_KEY, KEY_LEFTALT, 1); -+ litest_event(dev, EV_KEY, KEY_SYSRQ, 1); -+ litest_event(dev, EV_SYN, SYN_REPORT, 1); -+ litest_dispatch(li); -+ -+ /* special alt+printscreen repeat frame, *not* ignored */ -+ litest_event(dev, EV_KEY, KEY_LEFTALT, 0); -+ litest_event(dev, EV_KEY, KEY_SYSRQ, 0); -+ litest_event(dev, EV_SYN, SYN_REPORT, 1); -+ litest_dispatch(li); -+ -+ /* Note: the kernel doesn't release the key combo until both keys are released -+ * and the order is reshuffled so we have alt down, sysrq down, sysrq up, alt up -+ */ -+ litest_assert_key_event(li, KEY_LEFTALT, LIBINPUT_KEY_STATE_PRESSED); -+ litest_assert_key_event(li, KEY_SYSRQ, LIBINPUT_KEY_STATE_PRESSED); -+ litest_assert_key_event(li, KEY_SYSRQ, LIBINPUT_KEY_STATE_RELEASED); -+ litest_assert_key_event(li, KEY_LEFTALT, LIBINPUT_KEY_STATE_RELEASED); -+ -+ litest_assert_empty_queue(li); -+} -+END_TEST -+ - TEST_COLLECTION(keyboard) - { - /* clang-format off */ -@@ -484,5 +539,7 @@ TEST_COLLECTION(keyboard) - litest_add(keyboard_leds, LITEST_ANY, LITEST_ANY); - - litest_add(keyboard_no_scroll, LITEST_KEYS, LITEST_WHEEL); -+ -+ litest_add_for_device(keyboard_alt_printscreen, LITEST_KEYBOARD); - /* clang-format on */ - } --- -2.50.1 - diff --git a/libinput.spec b/libinput.spec index a9f0162..2ea69aa 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.28.901 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.28.902 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library # SPDX @@ -19,9 +19,6 @@ Source2: commitid Source0: https://gitlab.freedesktop.org/libinput/libinput/-/archive/%{version}/libinput-%{version}.tar.bz2 %endif -Patch0001: 0001-plugins-add-a-plugin-to-emulate-high-resolution-whee.patch -Patch0002: 0002-evdev-track-KEY_SYSRQ-frames-and-pass-them-even-as-r.patch - BuildRequires: git-core BuildRequires: gcc BuildRequires: meson @@ -159,6 +156,9 @@ intended to be run by users. %changelog +* Thu Jul 17 2025 Peter Hutterer - 1.28.902-1 +- libinput 1.28.902 + * Wed Jul 16 2025 Peter Hutterer - 1.28.901-3 - Fix Alt+PrintScreen not working (#2379912) diff --git a/sources b/sources index 38e9b8a..c9ddf47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.28.901.tar.bz2) = b314517a96bff9674256dd095b11559a9c5a005c6c213fef188e4afdd433d9a3fc6557c7b565342e13a0f93a90679fb4d694076616eabe8d13506cda068be487 +SHA512 (libinput-1.28.902.tar.bz2) = ddf3da8ffd8f3c2b782fbfd06ecff9371831b8737100be857607912bcc9c7899236c2cbd1acd977786b768194eddefbab43402d2c23a6a30d3183cd9ccecaffa From 58e71a6895bd133fe2bdd04c926226c0631c677e Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 21 Jul 2025 15:09:03 +1000 Subject: [PATCH 80/91] libinput 1.28.903 (#2382208) --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 2ea69aa..0739923 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.28.902 +Version: 1.28.903 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -156,6 +156,9 @@ intended to be run by users. %changelog +* Mon Jul 21 2025 Peter Hutterer - 1.28.903-1 +- libinput 1.28.903 (#2382208) + * Thu Jul 17 2025 Peter Hutterer - 1.28.902-1 - libinput 1.28.902 diff --git a/sources b/sources index c9ddf47..170d474 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.28.902.tar.bz2) = ddf3da8ffd8f3c2b782fbfd06ecff9371831b8737100be857607912bcc9c7899236c2cbd1acd977786b768194eddefbab43402d2c23a6a30d3183cd9ccecaffa +SHA512 (libinput-1.28.903.tar.bz2) = 189e98d85e825bb8c5c17a3be091ba5b541a63c84ad4963ae4db16954318d0396483d626693dc28472b81fd24a243656559ba6fb39a09dadbe035c78a0e11949 From de60b2a048b0fa16cb203781565e90080f647af7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 19:49:27 +0000 Subject: [PATCH 81/91] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- libinput.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libinput.spec b/libinput.spec index 0739923..c63f3e9 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.28.903 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library # SPDX @@ -156,6 +156,9 @@ intended to be run by users. %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.28.903-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Jul 21 2025 Peter Hutterer - 1.28.903-1 - libinput 1.28.903 (#2382208) From 33f4f3ebd793b245becb3f60db5039f78291e0d5 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 31 Jul 2025 18:35:20 +1000 Subject: [PATCH 82/91] libinput 1.29.0 --- libinput.spec | 9 +++++++-- sources | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libinput.spec b/libinput.spec index c63f3e9..c196816 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.28.903 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.29.0 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library # SPDX @@ -118,6 +118,7 @@ intended to be run by users. %{_libexecdir}/libinput/libinput-analyze-recording %{_libexecdir}/libinput/libinput-analyze-touch-down-state %{_libexecdir}/libinput/libinput-debug-tablet +%{_libexecdir}/libinput/libinput-debug-tablet-pad %{_libexecdir}/libinput/libinput-list-kernel-devices %{_libexecdir}/libinput/libinput-measure %{_libexecdir}/libinput/libinput-measure-fuzz @@ -134,6 +135,7 @@ intended to be run by users. %{_mandir}/man1/libinput-analyze-recording.1* %{_mandir}/man1/libinput-analyze-touch-down-state.1* %{_mandir}/man1/libinput-debug-tablet.1* +%{_mandir}/man1/libinput-debug-tablet-pad.1* %{_mandir}/man1/libinput-list-kernel-devices.1* %{_mandir}/man1/libinput-measure.1* %{_mandir}/man1/libinput-measure-fuzz.1* @@ -156,6 +158,9 @@ intended to be run by users. %changelog +* Thu Jul 31 2025 Peter Hutterer - 1.29.0-1 +- libinput 1.29.0 + * Thu Jul 24 2025 Fedora Release Engineering - 1.28.903-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index 170d474..7e71bd8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.28.903.tar.bz2) = 189e98d85e825bb8c5c17a3be091ba5b541a63c84ad4963ae4db16954318d0396483d626693dc28472b81fd24a243656559ba6fb39a09dadbe035c78a0e11949 +SHA512 (libinput-1.29.0.tar.bz2) = 22ce58d6d5e2a0550c788e487e6c27d31ee67b4d1c66c72339b348ebfb47a7d4d1b80e521a86e0fc4576273c3bb1e94b13f993b323f1c1a89788d2a0f68929cd From 5abab2fe82abc22897a7650b686c720f4157523a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 28 Aug 2025 19:06:00 +1000 Subject: [PATCH 83/91] libinput 1.29.1 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index c196816..1ca07c6 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.29.0 +Version: 1.29.1 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -158,6 +158,9 @@ intended to be run by users. %changelog +* Thu Aug 28 2025 Peter Hutterer - 1.29.1-1 +- libinput 1.29.1 + * Thu Jul 31 2025 Peter Hutterer - 1.29.0-1 - libinput 1.29.0 diff --git a/sources b/sources index 7e71bd8..04888cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.29.0.tar.bz2) = 22ce58d6d5e2a0550c788e487e6c27d31ee67b4d1c66c72339b348ebfb47a7d4d1b80e521a86e0fc4576273c3bb1e94b13f993b323f1c1a89788d2a0f68929cd +SHA512 (libinput-1.29.1.tar.bz2) = 9e5f352c2279c1234fe952ae6ecd0a275a48a595cbea8e26de682ab278499cf31a36d720800b02fd0472b20e5479ae9880633e03b1240e63d50bb6e8a1d2baf2 From 50e19d0b61685feafe8e70576a912efa0cf90816 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 21 Oct 2025 15:03:26 +1000 Subject: [PATCH 84/91] libinput 1.29.2 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 1ca07c6..70f7748 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.29.1 +Version: 1.29.2 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -158,6 +158,9 @@ intended to be run by users. %changelog +* Tue Oct 21 2025 Peter Hutterer - 1.29.2-1 +- libinput 1.29.2 + * Thu Aug 28 2025 Peter Hutterer - 1.29.1-1 - libinput 1.29.1 diff --git a/sources b/sources index 04888cb..cd6aec5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.29.1.tar.bz2) = 9e5f352c2279c1234fe952ae6ecd0a275a48a595cbea8e26de682ab278499cf31a36d720800b02fd0472b20e5479ae9880633e03b1240e63d50bb6e8a1d2baf2 +SHA512 (libinput-1.29.2.tar.bz2) = fe57f4179f830844506fcf50231d43545dce9099617957abf771cca7b263aa8d65997dc8ade39d00bc865c851deb0468ba330d3be38754fb23923304dba3ae8f From 00ac2e045bd15dbaa166cabbee9517254beb2200 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 4 Nov 2025 16:11:26 +1000 Subject: [PATCH 85/91] libinput 1.29.901 - with plugin autoload enabled --- libinput.spec | 9 +++++++-- sources | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/libinput.spec b/libinput.spec index 70f7748..c5d5482 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.29.2 +Version: 1.29.901 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -28,6 +28,7 @@ BuildRequires: pkgconfig(libevdev) >= 0.4 BuildRequires: pkgconfig(libwacom) >= 0.20 BuildRequires: pkgconfig(udev) BuildRequires: python3-rpm-macros +BuildRequires: luajit-devel %description libinput is a library that handles input devices for display servers and other @@ -73,7 +74,8 @@ intended to be run by users. -Ddocumentation=false \ -Dtests=true \ -Dinstall-tests=true \ - -Dudev-dir=%{udevdir} + -Dudev-dir=%{udevdir} \ + -Dautoload-plugins=true %meson_build %install @@ -158,6 +160,9 @@ intended to be run by users. %changelog +* Tue Nov 04 2025 Peter Hutterer - 1.29.901-1 +- libinput 1.29.901 - with plugin autoload enabled + * Tue Oct 21 2025 Peter Hutterer - 1.29.2-1 - libinput 1.29.2 diff --git a/sources b/sources index cd6aec5..b293145 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.29.2.tar.bz2) = fe57f4179f830844506fcf50231d43545dce9099617957abf771cca7b263aa8d65997dc8ade39d00bc865c851deb0468ba330d3be38754fb23923304dba3ae8f +SHA512 (libinput-1.29.901.tar.bz2) = 8046e613dfaa25be3106cc4aeaa81a4a0ccf6ac7f9e830047717c7ddb6458736a072e808031b86c1a1407f1088103c3729b0bc2e71000b9675a65af106c65ff4 From 38094a7cc41b6a28086877e32f1afc631fed1947 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 4 Nov 2025 16:27:25 +1000 Subject: [PATCH 86/91] Disable plugins on ppc64le - there's no luajit --- libinput.spec | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/libinput.spec b/libinput.spec index c5d5482..0ca2215 100644 --- a/libinput.spec +++ b/libinput.spec @@ -1,11 +1,17 @@ %global udevdir %(pkg-config --variable=udevdir udev) +%if "%{_arch}" == "ppc64le" +%bcond_with plugins +%else +%bcond_without plugins +%endif + #global gitdate 20141211 %global gitversion 58abea394 Name: libinput Version: 1.29.901 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library # SPDX @@ -28,7 +34,10 @@ BuildRequires: pkgconfig(libevdev) >= 0.4 BuildRequires: pkgconfig(libwacom) >= 0.20 BuildRequires: pkgconfig(udev) BuildRequires: python3-rpm-macros + +%if %{with plugins} BuildRequires: luajit-devel +%endif %description libinput is a library that handles input devices for display servers and other @@ -74,8 +83,12 @@ intended to be run by users. -Ddocumentation=false \ -Dtests=true \ -Dinstall-tests=true \ - -Dudev-dir=%{udevdir} \ - -Dautoload-plugins=true +%if %{with plugins} + -Dautoload-plugins=true \ +%else + -Dlua-plugins=disabled \ +%endif + -Dudev-dir=%{udevdir} %meson_build %install @@ -160,6 +173,9 @@ intended to be run by users. %changelog +* Tue Nov 04 2025 Peter Hutterer - 1.29.901-2 +- Disable plugins on ppc64le - there's no luajit + * Tue Nov 04 2025 Peter Hutterer - 1.29.901-1 - libinput 1.29.901 - with plugin autoload enabled From 140995a228c1afa2ffcd37562077b071bc22d12b Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 6 Nov 2025 19:07:17 -0500 Subject: [PATCH 87/91] Disable plugins on RHEL luajit is not already included, and we don't want to own it just for this. The code is only compatible with the 5.1 API, so the regular lua cannot be used either. --- libinput.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libinput.spec b/libinput.spec index 0ca2215..1aee04a 100644 --- a/libinput.spec +++ b/libinput.spec @@ -1,9 +1,8 @@ %global udevdir %(pkg-config --variable=udevdir udev) -%if "%{_arch}" == "ppc64le" -%bcond_with plugins -%else -%bcond_without plugins +# Plugins require luajit or lua-5.1 +%if "%{_arch}" != "ppc64le" +%bcond plugins %{undefined rhel} %endif #global gitdate 20141211 @@ -11,7 +10,7 @@ Name: libinput Version: 1.29.901 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library # SPDX @@ -173,6 +172,9 @@ intended to be run by users. %changelog +* Fri Nov 07 2025 Yaakov Selkowitz - 1.29.901-3 +- Disable plugins on RHEL + * Tue Nov 04 2025 Peter Hutterer - 1.29.901-2 - Disable plugins on ppc64le - there's no luajit From 002d51d3785e62c78e046b15906bbd7a5f28ed77 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 18 Nov 2025 14:02:27 +1000 Subject: [PATCH 88/91] libinput 1.29.902 - reenable ppc64le --- libinput.spec | 12 ++++++------ sources | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libinput.spec b/libinput.spec index 1aee04a..781950b 100644 --- a/libinput.spec +++ b/libinput.spec @@ -1,16 +1,13 @@ %global udevdir %(pkg-config --variable=udevdir udev) -# Plugins require luajit or lua-5.1 -%if "%{_arch}" != "ppc64le" %bcond plugins %{undefined rhel} -%endif #global gitdate 20141211 %global gitversion 58abea394 Name: libinput -Version: 1.29.901 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.29.902 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library # SPDX @@ -35,7 +32,7 @@ BuildRequires: pkgconfig(udev) BuildRequires: python3-rpm-macros %if %{with plugins} -BuildRequires: luajit-devel +BuildRequires: lua-devel %endif %description @@ -172,6 +169,9 @@ intended to be run by users. %changelog +* Tue Nov 18 2025 Peter Hutterer - 1.29.902-1 +- libinput 1.29.902 - reenable ppc64le + * Fri Nov 07 2025 Yaakov Selkowitz - 1.29.901-3 - Disable plugins on RHEL diff --git a/sources b/sources index b293145..c59b5f1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.29.901.tar.bz2) = 8046e613dfaa25be3106cc4aeaa81a4a0ccf6ac7f9e830047717c7ddb6458736a072e808031b86c1a1407f1088103c3729b0bc2e71000b9675a65af106c65ff4 +SHA512 (libinput-1.29.902.tar.bz2) = 292f86a6e43943859030cc84ba8e0371134ac0606e93f06c40ff87f700a601b0ce50a217d0234d43008d98aac3f277426647efbfb8a7efbf9de298a006abb1d9 From f74cdffeb434d6b06d632ba06cd52e0942389d04 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 24 Nov 2025 10:11:21 +1000 Subject: [PATCH 89/91] Re-enable plugins on RHEL - lua 5.4 is available --- libinput.spec | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/libinput.spec b/libinput.spec index 781950b..8309e84 100644 --- a/libinput.spec +++ b/libinput.spec @@ -1,13 +1,11 @@ %global udevdir %(pkg-config --variable=udevdir udev) -%bcond plugins %{undefined rhel} - #global gitdate 20141211 %global gitversion 58abea394 Name: libinput Version: 1.29.902 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library # SPDX @@ -31,9 +29,7 @@ BuildRequires: pkgconfig(libwacom) >= 0.20 BuildRequires: pkgconfig(udev) BuildRequires: python3-rpm-macros -%if %{with plugins} BuildRequires: lua-devel -%endif %description libinput is a library that handles input devices for display servers and other @@ -79,11 +75,7 @@ intended to be run by users. -Ddocumentation=false \ -Dtests=true \ -Dinstall-tests=true \ -%if %{with plugins} -Dautoload-plugins=true \ -%else - -Dlua-plugins=disabled \ -%endif -Dudev-dir=%{udevdir} %meson_build @@ -169,6 +161,9 @@ intended to be run by users. %changelog +* Mon Nov 24 2025 Peter Hutterer - 1.29.902-2 +- Re-enable plugins on RHEL - lua 5.4 is available + * Tue Nov 18 2025 Peter Hutterer - 1.29.902-1 - libinput 1.29.902 - reenable ppc64le From fa48a970939c152b2e4abec022dab0ef81b3eed3 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 25 Nov 2025 15:09:26 +1000 Subject: [PATCH 90/91] libinput 1.30.0 --- libinput.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libinput.spec b/libinput.spec index 8309e84..4161710 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.29.902 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.30.0 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library # SPDX @@ -161,6 +161,9 @@ intended to be run by users. %changelog +* Tue Nov 25 2025 Peter Hutterer - 1.30.0-1 +- libinput 1.30.0 + * Mon Nov 24 2025 Peter Hutterer - 1.29.902-2 - Re-enable plugins on RHEL - lua 5.4 is available diff --git a/sources b/sources index c59b5f1..9c71d23 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.29.902.tar.bz2) = 292f86a6e43943859030cc84ba8e0371134ac0606e93f06c40ff87f700a601b0ce50a217d0234d43008d98aac3f277426647efbfb8a7efbf9de298a006abb1d9 +SHA512 (libinput-1.30.0.tar.bz2) = 3965b02254e89acf349ef077709da0b9e5837cd2867d07145a08bcdb0309355f5a25b80a06ecc2bb604c1055a4a571c80d933b0cc2a5bd5ae62d039d7db309b1 From d46f71c744060479bef47ba046f30f4cb70a3169 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 8 Dec 2025 12:49:08 +1000 Subject: [PATCH 91/91] libinput 1.30.1 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 4161710..856e23e 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.30.0 +Version: 1.30.1 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -161,6 +161,9 @@ intended to be run by users. %changelog +* Mon Dec 08 2025 Peter Hutterer - 1.30.1-1 +- libinput 1.30.1 + * Tue Nov 25 2025 Peter Hutterer - 1.30.0-1 - libinput 1.30.0 diff --git a/sources b/sources index 9c71d23..b53b11e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.30.0.tar.bz2) = 3965b02254e89acf349ef077709da0b9e5837cd2867d07145a08bcdb0309355f5a25b80a06ecc2bb604c1055a4a571c80d933b0cc2a5bd5ae62d039d7db309b1 +SHA512 (libinput-1.30.1.tar.bz2) = 6d9bb5653dfeb0e30c64e92f8146a8908233162ef39f89114f619605b7f0de3f9e0f344412d91c809d3c1dc3d4b836a5709373a80191484db3c6d0a8f69c4f82