From 01d21ba8fd30a37396e10ac1ec61cd259b03ae4f Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 28 Sep 2017 15:18:18 +1000 Subject: [PATCH 001/184] libinput 1.9rc1 --- .gitignore | 1 + ...pad-don-t-resume-a-disabled-touchpad.patch | 186 ------------------ libinput.spec | 13 +- sources | 2 +- 4 files changed, 12 insertions(+), 190 deletions(-) delete mode 100644 0001-touchpad-don-t-resume-a-disabled-touchpad.patch diff --git a/.gitignore b/.gitignore index 64164f2..3e64959 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /libinput-1.8.0.tar.xz /libinput-1.8.1.tar.xz /libinput-1.8.2.tar.xz +/libinput-1.8.901.tar.xz diff --git a/0001-touchpad-don-t-resume-a-disabled-touchpad.patch b/0001-touchpad-don-t-resume-a-disabled-touchpad.patch deleted file mode 100644 index 8158120..0000000 --- a/0001-touchpad-don-t-resume-a-disabled-touchpad.patch +++ /dev/null @@ -1,186 +0,0 @@ -From 03f13ce6e854b3ff5d4b8971405a97afd66eef8e Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 5 Sep 2017 14:38:53 +1000 -Subject: [PATCH libinput] touchpad: don't resume a disabled touchpad - -Signed-off-by: Peter Hutterer ---- - src/evdev-mt-touchpad.c | 44 ++++++++++++++++++---------- - test/test-lid.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 107 insertions(+), 15 deletions(-) - -diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c -index 5b8fb1ec..c0a78255 100644 ---- a/src/evdev-mt-touchpad.c -+++ b/src/evdev-mt-touchpad.c -@@ -1426,6 +1426,31 @@ tp_resume(struct tp_dispatch *tp, struct evdev_device *device) - } - } - -+#define NO_EXCLUDED_DEVICE NULL -+static void -+tp_resume_conditional(struct tp_dispatch *tp, -+ struct evdev_device *device, -+ struct evdev_device *excluded_device) -+{ -+ if (tp->sendevents.current_mode == LIBINPUT_CONFIG_SEND_EVENTS_DISABLED) -+ return; -+ -+ if (tp->sendevents.current_mode == -+ LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE) { -+ struct libinput_device *dev; -+ -+ list_for_each(dev, &device->base.seat->devices_list, link) { -+ struct evdev_device *d = evdev_device(dev); -+ if (d != excluded_device && -+ (d->tags & EVDEV_TAG_EXTERNAL_MOUSE)) { -+ return; -+ } -+ } -+ } -+ -+ tp_resume(tp, device); -+} -+ - static void - tp_trackpoint_timeout(uint64_t now, void *data) - { -@@ -1667,7 +1692,7 @@ tp_lid_switch_event(uint64_t time, struct libinput_event *event, void *data) - swev = libinput_event_get_switch_event(event); - switch (libinput_event_switch_get_switch_state(swev)) { - case LIBINPUT_SWITCH_STATE_OFF: -- tp_resume(tp, tp->device); -+ tp_resume_conditional(tp, tp->device, NO_EXCLUDED_DEVICE); - evdev_log_debug(tp->device, "lid: resume touchpad\n"); - break; - case LIBINPUT_SWITCH_STATE_ON: -@@ -1722,7 +1747,6 @@ tp_interface_device_removed(struct evdev_device *device, - struct evdev_device *removed_device) - { - struct tp_dispatch *tp = (struct tp_dispatch*)device->dispatch; -- struct libinput_device *dev; - - if (removed_device == tp->buttons.trackpoint) { - /* Clear any pending releases for the trackpoint */ -@@ -1749,19 +1773,9 @@ tp_interface_device_removed(struct evdev_device *device, - tp->lid_switch.lid_switch = NULL; - } - -- if (tp->sendevents.current_mode != -- LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE) -- return; -- -- list_for_each(dev, &device->base.seat->devices_list, link) { -- struct evdev_device *d = evdev_device(dev); -- if (d != removed_device && -- (d->tags & EVDEV_TAG_EXTERNAL_MOUSE)) { -- return; -- } -- } -- -- tp_resume(tp, device); -+ /* removed_device is still in the device list at this point, so we -+ * need to exclude it from the tp_resume_conditional */ -+ tp_resume_conditional(tp, device, removed_device); - } - - static inline void -diff --git a/test/test-lid.c b/test/test-lid.c -index 4bf4c059..7e42f53d 100644 ---- a/test/test-lid.c -+++ b/test/test-lid.c -@@ -342,6 +342,81 @@ START_TEST(lid_disable_touchpad_already_open) - } - END_TEST - -+START_TEST(lid_dont_resume_disabled_touchpad) -+{ -+ struct litest_device *sw = litest_current_device(); -+ struct litest_device *touchpad; -+ struct libinput *li = sw->libinput; -+ -+ touchpad = lid_init_paired_touchpad(li); -+ litest_disable_tap(touchpad->libinput_device); -+ libinput_device_config_send_events_set_mode(touchpad->libinput_device, -+ LIBINPUT_CONFIG_SEND_EVENTS_DISABLED); -+ litest_drain_events(li); -+ -+ /* switch is on - no events */ -+ litest_lid_action(sw, LIBINPUT_SWITCH_STATE_ON); -+ litest_assert_only_typed_events(li, LIBINPUT_EVENT_SWITCH_TOGGLE); -+ -+ litest_touch_down(touchpad, 0, 50, 50); -+ litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10, 1); -+ litest_touch_up(touchpad, 0); -+ litest_assert_empty_queue(li); -+ -+ /* switch is off - motion events */ -+ litest_lid_action(sw, LIBINPUT_SWITCH_STATE_OFF); -+ litest_assert_only_typed_events(li, LIBINPUT_EVENT_SWITCH_TOGGLE); -+ -+ litest_touch_down(touchpad, 0, 50, 50); -+ litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10, 1); -+ litest_touch_up(touchpad, 0); -+ litest_assert_empty_queue(li); -+ -+ litest_delete_device(touchpad); -+} -+END_TEST -+ -+START_TEST(lid_dont_resume_disabled_touchpad_external_mouse) -+{ -+ struct litest_device *sw = litest_current_device(); -+ struct litest_device *touchpad, *mouse; -+ struct libinput *li = sw->libinput; -+ -+ touchpad = lid_init_paired_touchpad(li); -+ mouse = litest_add_device(li, LITEST_MOUSE); -+ litest_disable_tap(touchpad->libinput_device); -+ libinput_device_config_send_events_set_mode(touchpad->libinput_device, -+ LIBINPUT_CONFIG_SEND_EVENTS_DISABLED_ON_EXTERNAL_MOUSE); -+ litest_drain_events(li); -+ -+ litest_touch_down(touchpad, 0, 50, 50); -+ litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10, 1); -+ litest_touch_up(touchpad, 0); -+ litest_assert_empty_queue(li); -+ -+ /* switch is on - no events */ -+ litest_lid_action(sw, LIBINPUT_SWITCH_STATE_ON); -+ litest_assert_only_typed_events(li, LIBINPUT_EVENT_SWITCH_TOGGLE); -+ -+ litest_touch_down(touchpad, 0, 50, 50); -+ litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10, 1); -+ litest_touch_up(touchpad, 0); -+ litest_assert_empty_queue(li); -+ -+ /* switch is off - motion events */ -+ litest_lid_action(sw, LIBINPUT_SWITCH_STATE_OFF); -+ litest_assert_only_typed_events(li, LIBINPUT_EVENT_SWITCH_TOGGLE); -+ -+ litest_touch_down(touchpad, 0, 50, 50); -+ litest_touch_move_to(touchpad, 0, 50, 50, 70, 50, 10, 1); -+ litest_touch_up(touchpad, 0); -+ litest_assert_empty_queue(li); -+ -+ litest_delete_device(touchpad); -+ litest_delete_device(mouse); -+} -+END_TEST -+ - START_TEST(lid_open_on_key) - { - struct litest_device *sw = litest_current_device(); -@@ -568,6 +643,9 @@ litest_setup_tests_lid(void) - litest_add("lid:disable_touchpad", lid_disable_touchpad_edge_scroll_interrupt, LITEST_SWITCH, LITEST_ANY); - litest_add("lid:disable_touchpad", lid_disable_touchpad_already_open, LITEST_SWITCH, LITEST_ANY); - -+ litest_add("switch:touchpad", lid_dont_resume_disabled_touchpad, LITEST_SWITCH, LITEST_ANY); -+ litest_add("switch:touchpad", lid_dont_resume_disabled_touchpad_external_mouse, LITEST_SWITCH, LITEST_ANY); -+ - litest_add("lid:keyboard", lid_open_on_key, LITEST_SWITCH, LITEST_ANY); - litest_add("lid:keyboard", lid_open_on_key_touchpad_enabled, LITEST_SWITCH, LITEST_ANY); - --- -2.13.5 - diff --git a/libinput.spec b/libinput.spec index 77bc2d4..780bc49 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.8.2 +Version: 1.8.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 -Patch02: 0001-touchpad-don-t-resume-a-disabled-touchpad.patch - BuildRequires: git-core BuildRequires: gcc BuildRequires: meson @@ -90,9 +88,15 @@ git am -p1 %{patches} < /dev/null %{_libexecdir}/libinput/libinput-list-devices %{_libexecdir}/libinput/libinput-measure %{_libexecdir}/libinput/libinput-measure-touchpad-tap +%{_libexecdir}/libinput/libinput-measure-touch-size +%{_libexecdir}/libinput/libinput-measure-touchpad-pressure +%{_libexecdir}/libinput/libinput-measure-trackpoint-range %{_mandir}/man1/libinput.1* %{_mandir}/man1/libinput-measure.1* %{_mandir}/man1/libinput-measure-touchpad-tap.1* +%{_mandir}/man1/libinput-measure-touch-size.1.gz +%{_mandir}/man1/libinput-measure-touchpad-pressure.1.gz +%{_mandir}/man1/libinput-measure-trackpoint-range.1.gz %{_mandir}/man1/libinput-list-devices.1* %{_mandir}/man1/libinput-debug-events.1* %{_bindir}/libinput-list-devices @@ -105,6 +109,9 @@ git am -p1 %{patches} < /dev/null %changelog +* Thu Sep 28 2017 Peter Hutterer 1.8.901-1 +- libinput 1.9rc1 + * Thu Sep 07 2017 Peter Hutterer 1.8.2-1 - libinput 1.8.2 diff --git a/sources b/sources index 4848c70..9cb6ae8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.8.2.tar.xz) = 555a7680cc8aaf62c5370a865f3aff0a933d42d94a3d8861c072666b02c9e1be45ea39de9a749a9575cdfb613b6150e412e18559d94d4919f21ca4680a3c76a7 +SHA512 (libinput-1.8.901.tar.xz) = cae85d300af1dc898847c67b4f10a1871c9c752645cae8cfbd04d8430ebad1aceba1f0102628ff8a005044df56201dbfaa946d8672a4f02bd84dbe8cdddaec7c From efb5637f8560138460f9df77a7eaed2f0836d514 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 10 Oct 2017 17:48:43 +1000 Subject: [PATCH 002/184] libinput 1.9rc2 --- .gitignore | 1 + libinput.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3e64959..57b8890 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /libinput-1.8.1.tar.xz /libinput-1.8.2.tar.xz /libinput-1.8.901.tar.xz +/libinput-1.8.902.tar.xz diff --git a/libinput.spec b/libinput.spec index 780bc49..bcd0dd0 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.8.901 +Version: 1.8.902 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -109,6 +109,9 @@ git am -p1 %{patches} < /dev/null %changelog +* Tue Oct 10 2017 Peter Hutterer 1.8.902-1 +- libinput 1.9rc2 + * Thu Sep 28 2017 Peter Hutterer 1.8.901-1 - libinput 1.9rc1 diff --git a/sources b/sources index 9cb6ae8..b7cb8c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.8.901.tar.xz) = cae85d300af1dc898847c67b4f10a1871c9c752645cae8cfbd04d8430ebad1aceba1f0102628ff8a005044df56201dbfaa946d8672a4f02bd84dbe8cdddaec7c +SHA512 (libinput-1.8.902.tar.xz) = 4a0c0f5f141f728f06f624083138763c25e98aef665e5f5c0cfb31b3d227327459e007a5ed7038cdc33328ddb32b988b73aaf9ead4060ab46a0d890ad4444081 From 0d90a83365f3ef51e9b7aeb5a414568b5da7f472 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 19 Oct 2017 14:03:23 +1000 Subject: [PATCH 003/184] libinput 1.9.0 --- .gitignore | 1 + libinput.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 57b8890..9438fcd 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /libinput-1.8.2.tar.xz /libinput-1.8.901.tar.xz /libinput-1.8.902.tar.xz +/libinput-1.9.0.tar.xz diff --git a/libinput.spec b/libinput.spec index bcd0dd0..18d586d 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.8.902 +Version: 1.9.0 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -109,6 +109,9 @@ git am -p1 %{patches} < /dev/null %changelog +* Thu Oct 19 2017 Peter Hutterer 1.9.0-1 +- libinput 1.9.0 + * Tue Oct 10 2017 Peter Hutterer 1.8.902-1 - libinput 1.9rc2 diff --git a/sources b/sources index b7cb8c9..c21a5b7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.8.902.tar.xz) = 4a0c0f5f141f728f06f624083138763c25e98aef665e5f5c0cfb31b3d227327459e007a5ed7038cdc33328ddb32b988b73aaf9ead4060ab46a0d890ad4444081 +SHA512 (libinput-1.9.0.tar.xz) = 4111dd02ef7778c246da28ead284a77014f6eaa4b7f90f36ee124af809e31c70ac065216ef5648d1d2dc525355176e2aa22788bfbb19f5f6d25276fbba42e150 From 4f0ce18b85486326abbead74dd95379947856c85 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 26 Oct 2017 14:35:54 +1000 Subject: [PATCH 004/184] Drop explicit .gz from the man pages --- libinput.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libinput.spec b/libinput.spec index 18d586d..457c779 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.9.0 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -94,9 +94,9 @@ git am -p1 %{patches} < /dev/null %{_mandir}/man1/libinput.1* %{_mandir}/man1/libinput-measure.1* %{_mandir}/man1/libinput-measure-touchpad-tap.1* -%{_mandir}/man1/libinput-measure-touch-size.1.gz -%{_mandir}/man1/libinput-measure-touchpad-pressure.1.gz -%{_mandir}/man1/libinput-measure-trackpoint-range.1.gz +%{_mandir}/man1/libinput-measure-touch-size.1* +%{_mandir}/man1/libinput-measure-touchpad-pressure.1* +%{_mandir}/man1/libinput-measure-trackpoint-range.1* %{_mandir}/man1/libinput-list-devices.1* %{_mandir}/man1/libinput-debug-events.1* %{_bindir}/libinput-list-devices @@ -109,6 +109,9 @@ git am -p1 %{patches} < /dev/null %changelog +* Thu Oct 26 2017 Peter Hutterer 1.9.0-2 +- Drop explicit .gz from the man pages + * Thu Oct 19 2017 Peter Hutterer 1.9.0-1 - libinput 1.9.0 From 16249394c50d2d18d0675b39df96b321af17e7b5 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 30 Oct 2017 15:30:52 +1000 Subject: [PATCH 005/184] libinput 1.9.1 --- .gitignore | 1 + libinput.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9438fcd..3b62b06 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /libinput-1.8.901.tar.xz /libinput-1.8.902.tar.xz /libinput-1.9.0.tar.xz +/libinput-1.9.1.tar.xz diff --git a/libinput.spec b/libinput.spec index 457c779..70afae8 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.9.0 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.9.1 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -109,6 +109,9 @@ git am -p1 %{patches} < /dev/null %changelog +* Mon Oct 30 2017 Peter Hutterer 1.9.1-1 +- libinput 1.9.1 + * Thu Oct 26 2017 Peter Hutterer 1.9.0-2 - Drop explicit .gz from the man pages diff --git a/sources b/sources index c21a5b7..ad21d54 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.9.0.tar.xz) = 4111dd02ef7778c246da28ead284a77014f6eaa4b7f90f36ee124af809e31c70ac065216ef5648d1d2dc525355176e2aa22788bfbb19f5f6d25276fbba42e150 +SHA512 (libinput-1.9.1.tar.xz) = e60c401cdec6b862c6c7186e636bba285e229b82998d9f86940659806bb64c295ec1060b5e8065345668e4b3ff95457bd01327351520d9f6cf8cbc98b9b95da0 From 9a7d455eba72aa8b97ed10c64ed55bce8cd2b447 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 9 Nov 2017 15:00:48 +1000 Subject: [PATCH 006/184] Split some of the tools into a libinput-utils package so we can require the various bits easier (#1509298) --- ...e-command-isn-t-installed-print-that.patch | 46 +++++++++++++++++++ libinput.spec | 38 ++++++++++----- 2 files changed, 73 insertions(+), 11 deletions(-) create mode 100644 0001-tools-when-the-command-isn-t-installed-print-that.patch diff --git a/0001-tools-when-the-command-isn-t-installed-print-that.patch b/0001-tools-when-the-command-isn-t-installed-print-that.patch new file mode 100644 index 0000000..03a7182 --- /dev/null +++ b/0001-tools-when-the-command-isn-t-installed-print-that.patch @@ -0,0 +1,46 @@ +From 92aa1d14183bd88a8080be96672682a2e5696477 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Thu, 9 Nov 2017 15:17:37 +1000 +Subject: [PATCH libinput] tools: when the command isn't installed, print that + +Makes it more user-friendly to be able to split the tools into multiple +packages + +Signed-off-by: Peter Hutterer +--- + tools/shared.c | 19 ++++++++++++++----- + 1 file changed, 14 insertions(+), 5 deletions(-) + +diff --git a/tools/shared.c b/tools/shared.c +index ae3287ba..962159e1 100644 +--- a/tools/shared.c ++++ b/tools/shared.c +@@ -510,11 +510,20 @@ tools_exec_command(const char *prefix, int real_argc, char **real_argv) + setup_path(); + + rc = execvp(executable, argv); +- if (rc) +- fprintf(stderr, +- "Failed to execute '%s' (%s)\n", +- command, +- strerror(errno)); ++ if (rc) { ++ if (errno == ENOENT) { ++ fprintf(stderr, ++ "libinput: %s is not a libinput command or not installed. " ++ "See 'libinput --help'\n", ++ command); ++ ++ } else { ++ fprintf(stderr, ++ "Failed to execute '%s' (%s)\n", ++ command, ++ strerror(errno)); ++ } ++ } + + return EXIT_FAILURE; + } +-- +2.13.6 + diff --git a/libinput.spec b/libinput.spec index 70afae8..a147603 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.9.1 -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-when-the-command-isn-t-installed-print-that.patch + BuildRequires: git-core BuildRequires: gcc BuildRequires: meson @@ -43,6 +45,14 @@ Requires: %{name}%{?_isa} = %{version}-%{release} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%package utils +Summary: Utilities and tools for debugging %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: python3-evdev python3-pyudev + +%description utils +The %{name}-utils package contains tools to debug hardware and analyze +%{name}. %prep %setup -q -n %{name}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} @@ -86,17 +96,8 @@ git am -p1 %{patches} < /dev/null %dir %{_libexecdir}/libinput/ %{_libexecdir}/libinput/libinput-debug-events %{_libexecdir}/libinput/libinput-list-devices -%{_libexecdir}/libinput/libinput-measure -%{_libexecdir}/libinput/libinput-measure-touchpad-tap -%{_libexecdir}/libinput/libinput-measure-touch-size -%{_libexecdir}/libinput/libinput-measure-touchpad-pressure -%{_libexecdir}/libinput/libinput-measure-trackpoint-range %{_mandir}/man1/libinput.1* -%{_mandir}/man1/libinput-measure.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-trackpoint-range.1* + %{_mandir}/man1/libinput-list-devices.1* %{_mandir}/man1/libinput-debug-events.1* %{_bindir}/libinput-list-devices @@ -107,8 +108,23 @@ git am -p1 %{patches} < /dev/null %{_libdir}/libinput.so %{_libdir}/pkgconfig/libinput.pc +%files utils +%{_libexecdir}/libinput/libinput-measure +%{_libexecdir}/libinput/libinput-measure-touchpad-tap +%{_libexecdir}/libinput/libinput-measure-touchpad-pressure +%{_libexecdir}/libinput/libinput-measure-touch-size +%{_libexecdir}/libinput/libinput-measure-trackpoint-range +%{_mandir}/man1/libinput-measure.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-trackpoint-range.1* %changelog +* Thu Nov 09 2017 Peter Hutterer 1.9.1-2 +- Split some of the tools into a libinput-utils package so we can require + the various bits easier (#1509298) + * Mon Oct 30 2017 Peter Hutterer 1.9.1-1 - libinput 1.9.1 From 20471d9763f13b477e3b98eb1ef99fea8abd8110 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 14 Nov 2017 18:21:49 +1000 Subject: [PATCH 007/184] Handle printing of tablet mode switches (#1510814) --- ...s-Handle-LIBINPUT_SWITCH_TABLET_MODE.patch | 31 +++++++++++++++++++ libinput.spec | 6 +++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0001-tools-Handle-LIBINPUT_SWITCH_TABLET_MODE.patch diff --git a/0001-tools-Handle-LIBINPUT_SWITCH_TABLET_MODE.patch b/0001-tools-Handle-LIBINPUT_SWITCH_TABLET_MODE.patch new file mode 100644 index 0000000..9145d31 --- /dev/null +++ b/0001-tools-Handle-LIBINPUT_SWITCH_TABLET_MODE.patch @@ -0,0 +1,31 @@ +From 48fd22def7ae1a8d67d1f6f2e0d6e6f98c7a9361 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20Br=C3=BCns?= +Date: Fri, 3 Nov 2017 23:01:23 +0100 +Subject: [PATCH libinput] tools: Handle LIBINPUT_SWITCH_TABLET_MODE +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Stefan Brüns +Signed-off-by: Peter Hutterer +--- + tools/libinput-debug-events.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/tools/libinput-debug-events.c b/tools/libinput-debug-events.c +index 87b7b803..fb8d84d8 100644 +--- a/tools/libinput-debug-events.c ++++ b/tools/libinput-debug-events.c +@@ -747,6 +747,9 @@ print_switch_event(struct libinput_event *ev) + case LIBINPUT_SWITCH_LID: + which = "lid"; + break; ++ case LIBINPUT_SWITCH_TABLET_MODE: ++ which = "tablet-mode"; ++ break; + default: + abort(); + } +-- +2.13.6 + diff --git a/libinput.spec b/libinput.spec index a147603..8869450 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.9.1 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?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-when-the-command-isn-t-installed-print-that.patch +Patch02: 0001-tools-Handle-LIBINPUT_SWITCH_TABLET_MODE.patch BuildRequires: git-core BuildRequires: gcc @@ -121,6 +122,9 @@ git am -p1 %{patches} < /dev/null %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Tue Nov 14 2017 Peter Hutterer 1.9.1-3 +- Handle printing of tablet mode switches (#1510814) + * Thu Nov 09 2017 Peter Hutterer 1.9.1-2 - Split some of the tools into a libinput-utils package so we can require the various bits easier (#1509298) From 0bb4f2fd9a613ce5977323b0aa9528e4c1105312 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 15 Nov 2017 09:53:52 +1000 Subject: [PATCH 008/184] Mark the Lenovo Compact Keyboard as external (#1510814) --- ...tion-flag-for-the-Lenovo-Compact-Key.patch | 31 +++++++++++++++++++ libinput.spec | 6 +++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0001-udev-add-integration-flag-for-the-Lenovo-Compact-Key.patch diff --git a/0001-udev-add-integration-flag-for-the-Lenovo-Compact-Key.patch b/0001-udev-add-integration-flag-for-the-Lenovo-Compact-Key.patch new file mode 100644 index 0000000..09b19bc --- /dev/null +++ b/0001-udev-add-integration-flag-for-the-Lenovo-Compact-Key.patch @@ -0,0 +1,31 @@ +From c06660b314f5d9b284088d30770c1c40006d9ab0 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Tue, 14 Nov 2017 15:53:12 +1000 +Subject: [PATCH libinput] udev: add integration flag for the Lenovo Compact + Keyboard with TrackPoint + +From https://bugzilla.redhat.com/show_bug.cgi?id=1510814 + +Signed-off-by: Peter Hutterer +--- + udev/90-libinput-model-quirks.hwdb | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/udev/90-libinput-model-quirks.hwdb b/udev/90-libinput-model-quirks.hwdb +index 820cb8db..c23ef833 100644 +--- a/udev/90-libinput-model-quirks.hwdb ++++ b/udev/90-libinput-model-quirks.hwdb +@@ -204,6 +204,10 @@ libinput:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO:*:pvrThinkPadX1Carbon3rd + LIBINPUT_MODEL_LENOVO_T450_TOUCHPAD=1 + LIBINPUT_ATTR_PALM_PRESSURE_THRESHOLD=150 + ++# Lenovo ThinkPad Compact USB Keyboard with TrackPoint ++libinput:keyboard:input:b0003v17EFp6047* ++ LIBINPUT_ATTR_KEYBOARD_INTEGRATION=external ++ + ########################################## + # Logitech + ########################################## +-- +2.13.6 + diff --git a/libinput.spec b/libinput.spec index 8869450..bbd8d62 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.9.1 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -20,6 +20,7 @@ Source0: http://www.freedesktop.org/software/libinput/libinput-%{version} Patch01: 0001-tools-when-the-command-isn-t-installed-print-that.patch Patch02: 0001-tools-Handle-LIBINPUT_SWITCH_TABLET_MODE.patch +Patch03: 0001-udev-add-integration-flag-for-the-Lenovo-Compact-Key.patch BuildRequires: git-core BuildRequires: gcc @@ -122,6 +123,9 @@ git am -p1 %{patches} < /dev/null %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Wed Nov 15 2017 Peter Hutterer 1.9.1-4 +- Mark the Lenovo Compact Keyboard as external (#1510814) + * Tue Nov 14 2017 Peter Hutterer 1.9.1-3 - Handle printing of tablet mode switches (#1510814) From 5bdc7cbd58e612b5fc22fea4a394374e491ba889 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 15 Nov 2017 14:46:45 +1000 Subject: [PATCH 009/184] libinput 1.9.2 --- .gitignore | 1 + ...s-Handle-LIBINPUT_SWITCH_TABLET_MODE.patch | 31 ------------- ...e-command-isn-t-installed-print-that.patch | 46 ------------------- libinput.spec | 9 ++-- sources | 2 +- 5 files changed, 7 insertions(+), 82 deletions(-) delete mode 100644 0001-tools-Handle-LIBINPUT_SWITCH_TABLET_MODE.patch delete mode 100644 0001-tools-when-the-command-isn-t-installed-print-that.patch diff --git a/.gitignore b/.gitignore index 3b62b06..0c72477 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /libinput-1.8.902.tar.xz /libinput-1.9.0.tar.xz /libinput-1.9.1.tar.xz +/libinput-1.9.2.tar.xz diff --git a/0001-tools-Handle-LIBINPUT_SWITCH_TABLET_MODE.patch b/0001-tools-Handle-LIBINPUT_SWITCH_TABLET_MODE.patch deleted file mode 100644 index 9145d31..0000000 --- a/0001-tools-Handle-LIBINPUT_SWITCH_TABLET_MODE.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 48fd22def7ae1a8d67d1f6f2e0d6e6f98c7a9361 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= -Date: Fri, 3 Nov 2017 23:01:23 +0100 -Subject: [PATCH libinput] tools: Handle LIBINPUT_SWITCH_TABLET_MODE -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Stefan Brüns -Signed-off-by: Peter Hutterer ---- - tools/libinput-debug-events.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/tools/libinput-debug-events.c b/tools/libinput-debug-events.c -index 87b7b803..fb8d84d8 100644 ---- a/tools/libinput-debug-events.c -+++ b/tools/libinput-debug-events.c -@@ -747,6 +747,9 @@ print_switch_event(struct libinput_event *ev) - case LIBINPUT_SWITCH_LID: - which = "lid"; - break; -+ case LIBINPUT_SWITCH_TABLET_MODE: -+ which = "tablet-mode"; -+ break; - default: - abort(); - } --- -2.13.6 - diff --git a/0001-tools-when-the-command-isn-t-installed-print-that.patch b/0001-tools-when-the-command-isn-t-installed-print-that.patch deleted file mode 100644 index 03a7182..0000000 --- a/0001-tools-when-the-command-isn-t-installed-print-that.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 92aa1d14183bd88a8080be96672682a2e5696477 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 9 Nov 2017 15:17:37 +1000 -Subject: [PATCH libinput] tools: when the command isn't installed, print that - -Makes it more user-friendly to be able to split the tools into multiple -packages - -Signed-off-by: Peter Hutterer ---- - tools/shared.c | 19 ++++++++++++++----- - 1 file changed, 14 insertions(+), 5 deletions(-) - -diff --git a/tools/shared.c b/tools/shared.c -index ae3287ba..962159e1 100644 ---- a/tools/shared.c -+++ b/tools/shared.c -@@ -510,11 +510,20 @@ tools_exec_command(const char *prefix, int real_argc, char **real_argv) - setup_path(); - - rc = execvp(executable, argv); -- if (rc) -- fprintf(stderr, -- "Failed to execute '%s' (%s)\n", -- command, -- strerror(errno)); -+ if (rc) { -+ if (errno == ENOENT) { -+ fprintf(stderr, -+ "libinput: %s is not a libinput command or not installed. " -+ "See 'libinput --help'\n", -+ command); -+ -+ } else { -+ fprintf(stderr, -+ "Failed to execute '%s' (%s)\n", -+ command, -+ strerror(errno)); -+ } -+ } - - return EXIT_FAILURE; - } --- -2.13.6 - diff --git a/libinput.spec b/libinput.spec index bbd8d62..3fccee8 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.9.1 -Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.9.2 +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-tools-when-the-command-isn-t-installed-print-that.patch -Patch02: 0001-tools-Handle-LIBINPUT_SWITCH_TABLET_MODE.patch Patch03: 0001-udev-add-integration-flag-for-the-Lenovo-Compact-Key.patch BuildRequires: git-core @@ -123,6 +121,9 @@ git am -p1 %{patches} < /dev/null %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Wed Nov 15 2017 Peter Hutterer 1.9.2-1 +- libinput 1.9.2 + * Wed Nov 15 2017 Peter Hutterer 1.9.1-4 - Mark the Lenovo Compact Keyboard as external (#1510814) diff --git a/sources b/sources index ad21d54..2bff43a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.9.1.tar.xz) = e60c401cdec6b862c6c7186e636bba285e229b82998d9f86940659806bb64c295ec1060b5e8065345668e4b3ff95457bd01327351520d9f6cf8cbc98b9b95da0 +SHA512 (libinput-1.9.2.tar.xz) = 99719ab26be8ed35937ce91307459fa8c4aa7c383a555f1012a058ba98ca1d1c5df0d9b5e6a45046341c6dbae496dc29512b487ac7873b6ec67cab1176ee04ac From 7ac010a0d43dbeb93d5e9c6dd568e20df0a28656 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 28 Nov 2017 15:16:35 +1000 Subject: [PATCH 010/184] libinput 1.9.3 --- .gitignore | 1 + libinput.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0c72477..db19ce4 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /libinput-1.9.0.tar.xz /libinput-1.9.1.tar.xz /libinput-1.9.2.tar.xz +/libinput-1.9.3.tar.xz diff --git a/libinput.spec b/libinput.spec index 3fccee8..52c7715 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.9.2 +Version: 1.9.3 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -121,6 +121,9 @@ git am -p1 %{patches} < /dev/null %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Tue Nov 28 2017 Peter Hutterer 1.9.3-1 +- libinput 1.9.3 + * Wed Nov 15 2017 Peter Hutterer 1.9.2-1 - libinput 1.9.2 diff --git a/sources b/sources index 2bff43a..6fac782 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.9.2.tar.xz) = 99719ab26be8ed35937ce91307459fa8c4aa7c383a555f1012a058ba98ca1d1c5df0d9b5e6a45046341c6dbae496dc29512b487ac7873b6ec67cab1176ee04ac +SHA512 (libinput-1.9.3.tar.xz) = 33fb17724d4c2992bf31f9bb2e0825955468058e122ad420678b01ee293e1651d659fbae8873a7913f571243b3618032774cd350d2513eb73320d40aaa9953d1 From c8c113962bee7078cad4b6a6d38a0f157be94c86 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 8 Dec 2017 10:28:31 +1000 Subject: [PATCH 011/184] Immediately post key events, don't wait for EV_SYN --- ...y-events-out-immediately-upon-receiv.patch | 163 ++++++++++++++++++ libinput.spec | 6 +- 2 files changed, 168 insertions(+), 1 deletion(-) create mode 100644 0001-fallback-send-key-events-out-immediately-upon-receiv.patch diff --git a/0001-fallback-send-key-events-out-immediately-upon-receiv.patch b/0001-fallback-send-key-events-out-immediately-upon-receiv.patch new file mode 100644 index 0000000..e13c179 --- /dev/null +++ b/0001-fallback-send-key-events-out-immediately-upon-receiv.patch @@ -0,0 +1,163 @@ +From 1c8636923b7d8245a5f55dfbfa191c0129ad4414 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Fri, 8 Dec 2017 09:41:07 +1000 +Subject: [PATCH libinput] fallback: send key events out immediately upon + receiving them + +Commit db3b6fe5f7f8 "fallback: change to handle the state at EV_SYN time" +introduced regressions for two types of event sequences. + +One is a kernel bug - some devices/drivers like the asus-wireless send a key +press + release within the same event frame which now cancels out and +disappears into the ether. This should be fixed in the kernel drivers but +there appear to be enough of them that we can't just pretend it's an outlier. + +The second issue is a libinput bug. If we get two key events in the same frame +(e.g. shift + A) we update the state correctly but the events are sent in the +order of the event codes. KEY_A sorts before KEY_LEFTSHIFT and our shift + A +becomes A + shift. + +Fix this by treating key events as before db3b6fe5f7f8 - by sending them out +as we get them. + +https://bugs.freedesktop.org/show_bug.cgi?id=104030 + +Signed-off-by: Peter Hutterer +--- + src/evdev-fallback.c | 35 ++++++++++++++++---------------- + test/test-keyboard.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 73 insertions(+), 18 deletions(-) + +diff --git a/src/evdev-fallback.c b/src/evdev-fallback.c +index 52a3bde1..0cd2497e 100644 +--- a/src/evdev-fallback.c ++++ b/src/evdev-fallback.c +@@ -501,6 +501,22 @@ fallback_process_key(struct fallback_dispatch *dispatch, + } + + hw_set_key_down(dispatch, e->code, e->value); ++ ++ switch (type) { ++ case KEY_TYPE_NONE: ++ break; ++ case KEY_TYPE_KEY: ++ fallback_keyboard_notify_key( ++ dispatch, ++ device, ++ time, ++ e->code, ++ e->value ? LIBINPUT_KEY_STATE_PRESSED : ++ LIBINPUT_KEY_STATE_RELEASED); ++ break; ++ case KEY_TYPE_BUTTON: ++ break; ++ } + } + + static void +@@ -834,27 +850,10 @@ fallback_handle_state(struct fallback_dispatch *dispatch, + if (dispatch->pending_event & EVDEV_KEY) { + bool want_debounce = false; + for (unsigned int code = 0; code <= KEY_MAX; code++) { +- bool new_state; +- + if (!hw_key_has_changed(dispatch, code)) + continue; + +- new_state = hw_is_key_down(dispatch, code); +- +- switch (get_key_type(code)) { +- case KEY_TYPE_NONE: +- break; +- case KEY_TYPE_KEY: +- fallback_keyboard_notify_key( +- dispatch, +- device, +- time, +- code, +- new_state ? +- LIBINPUT_KEY_STATE_PRESSED : +- LIBINPUT_KEY_STATE_RELEASED); +- break; +- case KEY_TYPE_BUTTON: ++ if (get_key_type(code) == KEY_TYPE_BUTTON) { + want_debounce = true; + break; + } +diff --git a/test/test-keyboard.c b/test/test-keyboard.c +index dc2e630e..db836381 100644 +--- a/test/test-keyboard.c ++++ b/test/test-keyboard.c +@@ -365,6 +365,61 @@ START_TEST(keyboard_no_buttons) + } + END_TEST + ++START_TEST(keyboard_frame_order) ++{ ++ struct litest_device *dev = litest_current_device(); ++ struct libinput *li = dev->libinput; ++ ++ if (!libevdev_has_event_code(dev->evdev, EV_KEY, KEY_A) || ++ !libevdev_has_event_code(dev->evdev, EV_KEY, KEY_LEFTSHIFT)) ++ return; ++ ++ litest_drain_events(li); ++ ++ litest_event(dev, EV_KEY, KEY_LEFTSHIFT, 1); ++ litest_event(dev, EV_KEY, KEY_A, 1); ++ litest_event(dev, EV_SYN, SYN_REPORT, 0); ++ libinput_dispatch(li); ++ ++ litest_assert_key_event(li, ++ KEY_LEFTSHIFT, ++ LIBINPUT_KEY_STATE_PRESSED); ++ litest_assert_key_event(li, KEY_A, LIBINPUT_KEY_STATE_PRESSED); ++ ++ litest_event(dev, EV_KEY, KEY_LEFTSHIFT, 0); ++ litest_event(dev, EV_KEY, KEY_A, 0); ++ litest_event(dev, EV_SYN, SYN_REPORT, 0); ++ libinput_dispatch(li); ++ ++ litest_assert_key_event(li, ++ KEY_LEFTSHIFT, ++ LIBINPUT_KEY_STATE_RELEASED); ++ litest_assert_key_event(li, KEY_A, LIBINPUT_KEY_STATE_RELEASED); ++ ++ litest_event(dev, EV_KEY, KEY_A, 1); ++ litest_event(dev, EV_KEY, KEY_LEFTSHIFT, 1); ++ litest_event(dev, EV_SYN, SYN_REPORT, 0); ++ libinput_dispatch(li); ++ ++ litest_assert_key_event(li, KEY_A, LIBINPUT_KEY_STATE_PRESSED); ++ litest_assert_key_event(li, ++ KEY_LEFTSHIFT, ++ LIBINPUT_KEY_STATE_PRESSED); ++ ++ litest_event(dev, EV_KEY, KEY_A, 0); ++ litest_event(dev, EV_KEY, KEY_LEFTSHIFT, 0); ++ litest_event(dev, EV_SYN, SYN_REPORT, 0); ++ libinput_dispatch(li); ++ ++ litest_assert_key_event(li, KEY_A, LIBINPUT_KEY_STATE_RELEASED); ++ litest_assert_key_event(li, ++ KEY_LEFTSHIFT, ++ LIBINPUT_KEY_STATE_RELEASED); ++ ++ libinput_dispatch(li); ++} ++END_TEST ++ + START_TEST(keyboard_leds) + { + struct litest_device *dev = litest_current_device(); +@@ -432,6 +487,7 @@ litest_setup_tests_keyboard(void) + litest_add("keyboard:time", keyboard_time_usec, LITEST_KEYS, LITEST_ANY); + + litest_add("keyboard:events", keyboard_no_buttons, LITEST_KEYS, LITEST_ANY); ++ litest_add("keyboard:events", keyboard_frame_order, LITEST_KEYS, LITEST_ANY); + + litest_add("keyboard:leds", keyboard_leds, LITEST_ANY, LITEST_ANY); + +-- +2.13.6 + diff --git a/libinput.spec b/libinput.spec index 52c7715..8db9201 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.9.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 Patch03: 0001-udev-add-integration-flag-for-the-Lenovo-Compact-Key.patch +Patch04: 0001-fallback-send-key-events-out-immediately-upon-receiv.patch BuildRequires: git-core BuildRequires: gcc @@ -121,6 +122,9 @@ git am -p1 %{patches} < /dev/null %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Fri Dec 08 2017 Peter Hutterer 1.9.3-2 +- Immediately post key events, don't wait for EV_SYN + * Tue Nov 28 2017 Peter Hutterer 1.9.3-1 - libinput 1.9.3 From 3f8446aaf64314a57f6593d1fff2ef5655bebb6a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 14 Dec 2017 16:22:40 +1000 Subject: [PATCH 012/184] libinput 1.9.4 --- .gitignore | 1 + ...y-events-out-immediately-upon-receiv.patch | 163 ------------------ libinput.spec | 8 +- sources | 2 +- 4 files changed, 7 insertions(+), 167 deletions(-) delete mode 100644 0001-fallback-send-key-events-out-immediately-upon-receiv.patch diff --git a/.gitignore b/.gitignore index db19ce4..f439386 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /libinput-1.9.1.tar.xz /libinput-1.9.2.tar.xz /libinput-1.9.3.tar.xz +/libinput-1.9.4.tar.xz diff --git a/0001-fallback-send-key-events-out-immediately-upon-receiv.patch b/0001-fallback-send-key-events-out-immediately-upon-receiv.patch deleted file mode 100644 index e13c179..0000000 --- a/0001-fallback-send-key-events-out-immediately-upon-receiv.patch +++ /dev/null @@ -1,163 +0,0 @@ -From 1c8636923b7d8245a5f55dfbfa191c0129ad4414 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 8 Dec 2017 09:41:07 +1000 -Subject: [PATCH libinput] fallback: send key events out immediately upon - receiving them - -Commit db3b6fe5f7f8 "fallback: change to handle the state at EV_SYN time" -introduced regressions for two types of event sequences. - -One is a kernel bug - some devices/drivers like the asus-wireless send a key -press + release within the same event frame which now cancels out and -disappears into the ether. This should be fixed in the kernel drivers but -there appear to be enough of them that we can't just pretend it's an outlier. - -The second issue is a libinput bug. If we get two key events in the same frame -(e.g. shift + A) we update the state correctly but the events are sent in the -order of the event codes. KEY_A sorts before KEY_LEFTSHIFT and our shift + A -becomes A + shift. - -Fix this by treating key events as before db3b6fe5f7f8 - by sending them out -as we get them. - -https://bugs.freedesktop.org/show_bug.cgi?id=104030 - -Signed-off-by: Peter Hutterer ---- - src/evdev-fallback.c | 35 ++++++++++++++++---------------- - test/test-keyboard.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 73 insertions(+), 18 deletions(-) - -diff --git a/src/evdev-fallback.c b/src/evdev-fallback.c -index 52a3bde1..0cd2497e 100644 ---- a/src/evdev-fallback.c -+++ b/src/evdev-fallback.c -@@ -501,6 +501,22 @@ fallback_process_key(struct fallback_dispatch *dispatch, - } - - hw_set_key_down(dispatch, e->code, e->value); -+ -+ switch (type) { -+ case KEY_TYPE_NONE: -+ break; -+ case KEY_TYPE_KEY: -+ fallback_keyboard_notify_key( -+ dispatch, -+ device, -+ time, -+ e->code, -+ e->value ? LIBINPUT_KEY_STATE_PRESSED : -+ LIBINPUT_KEY_STATE_RELEASED); -+ break; -+ case KEY_TYPE_BUTTON: -+ break; -+ } - } - - static void -@@ -834,27 +850,10 @@ fallback_handle_state(struct fallback_dispatch *dispatch, - if (dispatch->pending_event & EVDEV_KEY) { - bool want_debounce = false; - for (unsigned int code = 0; code <= KEY_MAX; code++) { -- bool new_state; -- - if (!hw_key_has_changed(dispatch, code)) - continue; - -- new_state = hw_is_key_down(dispatch, code); -- -- switch (get_key_type(code)) { -- case KEY_TYPE_NONE: -- break; -- case KEY_TYPE_KEY: -- fallback_keyboard_notify_key( -- dispatch, -- device, -- time, -- code, -- new_state ? -- LIBINPUT_KEY_STATE_PRESSED : -- LIBINPUT_KEY_STATE_RELEASED); -- break; -- case KEY_TYPE_BUTTON: -+ if (get_key_type(code) == KEY_TYPE_BUTTON) { - want_debounce = true; - break; - } -diff --git a/test/test-keyboard.c b/test/test-keyboard.c -index dc2e630e..db836381 100644 ---- a/test/test-keyboard.c -+++ b/test/test-keyboard.c -@@ -365,6 +365,61 @@ START_TEST(keyboard_no_buttons) - } - END_TEST - -+START_TEST(keyboard_frame_order) -+{ -+ struct litest_device *dev = litest_current_device(); -+ struct libinput *li = dev->libinput; -+ -+ if (!libevdev_has_event_code(dev->evdev, EV_KEY, KEY_A) || -+ !libevdev_has_event_code(dev->evdev, EV_KEY, KEY_LEFTSHIFT)) -+ return; -+ -+ litest_drain_events(li); -+ -+ litest_event(dev, EV_KEY, KEY_LEFTSHIFT, 1); -+ litest_event(dev, EV_KEY, KEY_A, 1); -+ litest_event(dev, EV_SYN, SYN_REPORT, 0); -+ libinput_dispatch(li); -+ -+ litest_assert_key_event(li, -+ KEY_LEFTSHIFT, -+ LIBINPUT_KEY_STATE_PRESSED); -+ litest_assert_key_event(li, KEY_A, LIBINPUT_KEY_STATE_PRESSED); -+ -+ litest_event(dev, EV_KEY, KEY_LEFTSHIFT, 0); -+ litest_event(dev, EV_KEY, KEY_A, 0); -+ litest_event(dev, EV_SYN, SYN_REPORT, 0); -+ libinput_dispatch(li); -+ -+ litest_assert_key_event(li, -+ KEY_LEFTSHIFT, -+ LIBINPUT_KEY_STATE_RELEASED); -+ litest_assert_key_event(li, KEY_A, LIBINPUT_KEY_STATE_RELEASED); -+ -+ litest_event(dev, EV_KEY, KEY_A, 1); -+ litest_event(dev, EV_KEY, KEY_LEFTSHIFT, 1); -+ litest_event(dev, EV_SYN, SYN_REPORT, 0); -+ libinput_dispatch(li); -+ -+ litest_assert_key_event(li, KEY_A, LIBINPUT_KEY_STATE_PRESSED); -+ litest_assert_key_event(li, -+ KEY_LEFTSHIFT, -+ LIBINPUT_KEY_STATE_PRESSED); -+ -+ litest_event(dev, EV_KEY, KEY_A, 0); -+ litest_event(dev, EV_KEY, KEY_LEFTSHIFT, 0); -+ litest_event(dev, EV_SYN, SYN_REPORT, 0); -+ libinput_dispatch(li); -+ -+ litest_assert_key_event(li, KEY_A, LIBINPUT_KEY_STATE_RELEASED); -+ litest_assert_key_event(li, -+ KEY_LEFTSHIFT, -+ LIBINPUT_KEY_STATE_RELEASED); -+ -+ libinput_dispatch(li); -+} -+END_TEST -+ - START_TEST(keyboard_leds) - { - struct litest_device *dev = litest_current_device(); -@@ -432,6 +487,7 @@ litest_setup_tests_keyboard(void) - litest_add("keyboard:time", keyboard_time_usec, LITEST_KEYS, LITEST_ANY); - - litest_add("keyboard:events", keyboard_no_buttons, LITEST_KEYS, LITEST_ANY); -+ litest_add("keyboard:events", keyboard_frame_order, LITEST_KEYS, LITEST_ANY); - - litest_add("keyboard:leds", keyboard_leds, LITEST_ANY, LITEST_ANY); - --- -2.13.6 - diff --git a/libinput.spec b/libinput.spec index 8db9201..790a8c6 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.9.3 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.9.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 Patch03: 0001-udev-add-integration-flag-for-the-Lenovo-Compact-Key.patch -Patch04: 0001-fallback-send-key-events-out-immediately-upon-receiv.patch BuildRequires: git-core BuildRequires: gcc @@ -122,6 +121,9 @@ git am -p1 %{patches} < /dev/null %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Thu Dec 14 2017 Peter Hutterer 1.9.4-1 +- libinput 1.9.4 + * Fri Dec 08 2017 Peter Hutterer 1.9.3-2 - Immediately post key events, don't wait for EV_SYN diff --git a/sources b/sources index 6fac782..46cbbf5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.9.3.tar.xz) = 33fb17724d4c2992bf31f9bb2e0825955468058e122ad420678b01ee293e1651d659fbae8873a7913f571243b3618032774cd350d2513eb73320d40aaa9953d1 +SHA512 (libinput-1.9.4.tar.xz) = 302f9497ea9ffb2163c643e9ca2f0a773ea141f6fe0a3aa3d8e86eb11a5d11e75d858b1e679ebfd3f913c645beac059cfd356b37c4ea17a8853068f79a740a4b From be6c4601eed7abe36410aabcf2a66adbba287490 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 22 Jan 2018 11:35:19 +1000 Subject: [PATCH 013/184] libinput 1.10rc1 --- .gitignore | 1 + ...tion-flag-for-the-Lenovo-Compact-Key.patch | 31 ------------------- libinput.spec | 7 +++-- sources | 2 +- 4 files changed, 6 insertions(+), 35 deletions(-) delete mode 100644 0001-udev-add-integration-flag-for-the-Lenovo-Compact-Key.patch diff --git a/.gitignore b/.gitignore index f439386..010b12b 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /libinput-1.9.2.tar.xz /libinput-1.9.3.tar.xz /libinput-1.9.4.tar.xz +/libinput-1.9.901.tar.xz diff --git a/0001-udev-add-integration-flag-for-the-Lenovo-Compact-Key.patch b/0001-udev-add-integration-flag-for-the-Lenovo-Compact-Key.patch deleted file mode 100644 index 09b19bc..0000000 --- a/0001-udev-add-integration-flag-for-the-Lenovo-Compact-Key.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c06660b314f5d9b284088d30770c1c40006d9ab0 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 14 Nov 2017 15:53:12 +1000 -Subject: [PATCH libinput] udev: add integration flag for the Lenovo Compact - Keyboard with TrackPoint - -From https://bugzilla.redhat.com/show_bug.cgi?id=1510814 - -Signed-off-by: Peter Hutterer ---- - udev/90-libinput-model-quirks.hwdb | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/udev/90-libinput-model-quirks.hwdb b/udev/90-libinput-model-quirks.hwdb -index 820cb8db..c23ef833 100644 ---- a/udev/90-libinput-model-quirks.hwdb -+++ b/udev/90-libinput-model-quirks.hwdb -@@ -204,6 +204,10 @@ libinput:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO:*:pvrThinkPadX1Carbon3rd - LIBINPUT_MODEL_LENOVO_T450_TOUCHPAD=1 - LIBINPUT_ATTR_PALM_PRESSURE_THRESHOLD=150 - -+# Lenovo ThinkPad Compact USB Keyboard with TrackPoint -+libinput:keyboard:input:b0003v17EFp6047* -+ LIBINPUT_ATTR_KEYBOARD_INTEGRATION=external -+ - ########################################## - # Logitech - ########################################## --- -2.13.6 - diff --git a/libinput.spec b/libinput.spec index 790a8c6..25c9f2b 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.9.4 +Version: 1.9.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 -Patch03: 0001-udev-add-integration-flag-for-the-Lenovo-Compact-Key.patch - BuildRequires: git-core BuildRequires: gcc BuildRequires: meson @@ -121,6 +119,9 @@ git am -p1 %{patches} < /dev/null %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Mon Jan 22 2018 Peter Hutterer 1.9.901-1 +- libinput 1.10rc1 + * Thu Dec 14 2017 Peter Hutterer 1.9.4-1 - libinput 1.9.4 diff --git a/sources b/sources index 46cbbf5..0edf74c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.9.4.tar.xz) = 302f9497ea9ffb2163c643e9ca2f0a773ea141f6fe0a3aa3d8e86eb11a5d11e75d858b1e679ebfd3f913c645beac059cfd356b37c4ea17a8853068f79a740a4b +SHA512 (libinput-1.9.901.tar.xz) = 4e79f81bb52c17833d4e9b05d84657b0e52ff681c9f0408614f7fd66bdd022f8670efc8cb1eff86285b3f39aa51f9727b5c353bae7b6a925070fe6de389f3107 From 60862d0ab5224d4a5573487e728095c879689b3a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 2 Feb 2018 12:11:23 +1000 Subject: [PATCH 014/184] Use autosetup instead of the manual git magic --- libinput.spec | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/libinput.spec b/libinput.spec index 25c9f2b..0ee025e 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.9.901 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -53,17 +53,7 @@ The %{name}-utils package contains tools to debug hardware and analyze %{name}. %prep -%setup -q -n %{name}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} -git init -if [ -z "$GIT_COMMITTER_NAME" ]; then - git config user.email "x@fedoraproject.org" - git config user.name "Fedora X Ninjas" -fi -git add . -git commit --allow-empty -a -q -m "%{version} baseline." - -# Apply all the patches. -git am -p1 %{patches} < /dev/null +%autosetup -S git %build %meson -Ddebug-gui=false \ @@ -119,6 +109,9 @@ git am -p1 %{patches} < /dev/null %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Fri Feb 02 2018 Peter Hutterer 1.9.901-2 +- Use autosetup instead of the manual git magic + * Mon Jan 22 2018 Peter Hutterer 1.9.901-1 - libinput 1.10rc1 From 4afc4b052ff2efb6ea577657967544c347fcc8fc Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 5 Feb 2018 19:38:58 +1000 Subject: [PATCH 015/184] Fix crasher on first event from tablets not supported by libwacom (#1535755) --- ...-rotation-on-a-tool-if-we-don-t-have.patch | 56 +++++++++++++++++++ libinput.spec | 8 ++- 2 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 0001-tablet-don-t-set-rotation-on-a-tool-if-we-don-t-have.patch diff --git a/0001-tablet-don-t-set-rotation-on-a-tool-if-we-don-t-have.patch b/0001-tablet-don-t-set-rotation-on-a-tool-if-we-don-t-have.patch new file mode 100644 index 0000000..d4ed141 --- /dev/null +++ b/0001-tablet-don-t-set-rotation-on-a-tool-if-we-don-t-have.patch @@ -0,0 +1,56 @@ +From d26b08b93f05eba58d46ad6811e71e9da0e74201 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Mon, 5 Feb 2018 09:11:42 +1000 +Subject: [PATCH libinput] tablet: don't set rotation on a tool if we don't + have ABS_Z + +Rotation on a tool can either ABS_Z or in the case of the mouse/lens tools a +combination of ABS_TILT_X/Y. The code assumes that if the rotation on a stylus +(not mouse/lense) changes, we need to fetch it from ABS_Z. This happens on the +very first event from the tablet, proximity in invalidates all axes so we can +send the current state to the caller. + +On libwacom-recognized tablets we never set the rotation bit on the stylus, so +that's all fine. On tablets without libwacom support, the stylus may have a +rotation bit copied because we have it set thanks to mouse+tilt on the tablet. +When that first event is handled, we try to access ABS_Z. On tablets without +ABS_Z like Aipteks, we go boom. + +Fix this by checking for ABS_Z during tablet init, if we don't have that axis +then never set the rotation bit on the tool. That's the only axis where we +need this, all other axes have a single cause only and thus the tablet bits +are accurate anyway. + +https://bugs.freedesktop.org/show_bug.cgi?id=104939 + +Signed-off-by: Peter Hutterer +--- + src/evdev-tablet.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/src/evdev-tablet.c b/src/evdev-tablet.c +index 2f6b64da..771e7775 100644 +--- a/src/evdev-tablet.c ++++ b/src/evdev-tablet.c +@@ -933,7 +933,17 @@ tool_set_bits(const struct tablet_dispatch *tablet, + copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_TILT_X); + copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_TILT_Y); + copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_SLIDER); +- copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_ROTATION_Z); ++ ++ /* Rotation is special, it can be either ABS_Z or ++ * BTN_TOOL_MOUSE+ABS_TILT_X/Y. Aiptek tablets have ++ * mouse+tilt (and thus rotation), but they do not have ++ * ABS_Z. So let's not copy the axis bit if we don't have ++ * ABS_Z, otherwise we try to get the value from it later on ++ * proximity in and go boom because the absinfo isn't there. ++ */ ++ if (libevdev_has_event_code(tablet->device->evdev, EV_ABS, ++ ABS_Z)) ++ copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_ROTATION_Z); + break; + case LIBINPUT_TABLET_TOOL_TYPE_MOUSE: + case LIBINPUT_TABLET_TOOL_TYPE_LENS: +-- +2.14.3 + diff --git a/libinput.spec b/libinput.spec index 0ee025e..e02e637 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.9.901 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?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-tablet-don-t-set-rotation-on-a-tool-if-we-don-t-have.patch + BuildRequires: git-core BuildRequires: gcc BuildRequires: meson @@ -109,6 +111,10 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Mon Feb 05 2018 Peter Hutterer 1.9.901-3 +- Fix crasher on first event from tablets not supported by libwacom + (#1535755) + * Fri Feb 02 2018 Peter Hutterer 1.9.901-2 - Use autosetup instead of the manual git magic From 27ee09342ea26a284a198a6172e9259b6b9ba270 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 6 Feb 2018 20:26:10 +1000 Subject: [PATCH 016/184] libinput 1.10rc2 --- .gitignore | 1 + libinput.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 010b12b..e5a3dd6 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /libinput-1.9.3.tar.xz /libinput-1.9.4.tar.xz /libinput-1.9.901.tar.xz +/libinput-1.9.902.tar.xz diff --git a/libinput.spec b/libinput.spec index e02e637..13cfdf8 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.9.901 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.9.902 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -111,6 +111,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Tue Feb 06 2018 Peter Hutterer 1.9.902-1 +- libinput 1.10rc2 + * Mon Feb 05 2018 Peter Hutterer 1.9.901-3 - Fix crasher on first event from tablets not supported by libwacom (#1535755) diff --git a/sources b/sources index 0edf74c..492edc8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.9.901.tar.xz) = 4e79f81bb52c17833d4e9b05d84657b0e52ff681c9f0408614f7fd66bdd022f8670efc8cb1eff86285b3f39aa51f9727b5c353bae7b6a925070fe6de389f3107 +SHA512 (libinput-1.9.902.tar.xz) = b2309145c90b7d24bbc8894ea1fb8846d67900ce761273a6f3fa769c0e0bb0d1162363845e26ee535d5a4f438f09fa104c04c4db0ddf9efdd229fb786e32dd7e From b1b678240612a2069f43b36cf4cf1ea950136f15 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 13 Feb 2018 11:57:10 +1000 Subject: [PATCH 017/184] libinput 1.10 --- .gitignore | 1 + ...-rotation-on-a-tool-if-we-don-t-have.patch | 56 ------------------- libinput.spec | 7 ++- sources | 2 +- 4 files changed, 6 insertions(+), 60 deletions(-) delete mode 100644 0001-tablet-don-t-set-rotation-on-a-tool-if-we-don-t-have.patch diff --git a/.gitignore b/.gitignore index e5a3dd6..f689597 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /libinput-1.9.4.tar.xz /libinput-1.9.901.tar.xz /libinput-1.9.902.tar.xz +/libinput-1.10.0.tar.xz diff --git a/0001-tablet-don-t-set-rotation-on-a-tool-if-we-don-t-have.patch b/0001-tablet-don-t-set-rotation-on-a-tool-if-we-don-t-have.patch deleted file mode 100644 index d4ed141..0000000 --- a/0001-tablet-don-t-set-rotation-on-a-tool-if-we-don-t-have.patch +++ /dev/null @@ -1,56 +0,0 @@ -From d26b08b93f05eba58d46ad6811e71e9da0e74201 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Mon, 5 Feb 2018 09:11:42 +1000 -Subject: [PATCH libinput] tablet: don't set rotation on a tool if we don't - have ABS_Z - -Rotation on a tool can either ABS_Z or in the case of the mouse/lens tools a -combination of ABS_TILT_X/Y. The code assumes that if the rotation on a stylus -(not mouse/lense) changes, we need to fetch it from ABS_Z. This happens on the -very first event from the tablet, proximity in invalidates all axes so we can -send the current state to the caller. - -On libwacom-recognized tablets we never set the rotation bit on the stylus, so -that's all fine. On tablets without libwacom support, the stylus may have a -rotation bit copied because we have it set thanks to mouse+tilt on the tablet. -When that first event is handled, we try to access ABS_Z. On tablets without -ABS_Z like Aipteks, we go boom. - -Fix this by checking for ABS_Z during tablet init, if we don't have that axis -then never set the rotation bit on the tool. That's the only axis where we -need this, all other axes have a single cause only and thus the tablet bits -are accurate anyway. - -https://bugs.freedesktop.org/show_bug.cgi?id=104939 - -Signed-off-by: Peter Hutterer ---- - src/evdev-tablet.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/src/evdev-tablet.c b/src/evdev-tablet.c -index 2f6b64da..771e7775 100644 ---- a/src/evdev-tablet.c -+++ b/src/evdev-tablet.c -@@ -933,7 +933,17 @@ tool_set_bits(const struct tablet_dispatch *tablet, - copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_TILT_X); - copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_TILT_Y); - copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_SLIDER); -- copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_ROTATION_Z); -+ -+ /* Rotation is special, it can be either ABS_Z or -+ * BTN_TOOL_MOUSE+ABS_TILT_X/Y. Aiptek tablets have -+ * mouse+tilt (and thus rotation), but they do not have -+ * ABS_Z. So let's not copy the axis bit if we don't have -+ * ABS_Z, otherwise we try to get the value from it later on -+ * proximity in and go boom because the absinfo isn't there. -+ */ -+ if (libevdev_has_event_code(tablet->device->evdev, EV_ABS, -+ ABS_Z)) -+ copy_axis_cap(tablet, tool, LIBINPUT_TABLET_TOOL_AXIS_ROTATION_Z); - break; - case LIBINPUT_TABLET_TOOL_TYPE_MOUSE: - case LIBINPUT_TABLET_TOOL_TYPE_LENS: --- -2.14.3 - diff --git a/libinput.spec b/libinput.spec index 13cfdf8..d950b94 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.9.902 +Version: 1.10.0 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-tablet-don-t-set-rotation-on-a-tool-if-we-don-t-have.patch - BuildRequires: git-core BuildRequires: gcc BuildRequires: meson @@ -111,6 +109,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Tue Feb 13 2018 Peter Hutterer 1.10.0-1 +- libinput 1.10 + * Tue Feb 06 2018 Peter Hutterer 1.9.902-1 - libinput 1.10rc2 diff --git a/sources b/sources index 492edc8..71cbd0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.9.902.tar.xz) = b2309145c90b7d24bbc8894ea1fb8846d67900ce761273a6f3fa769c0e0bb0d1162363845e26ee535d5a4f438f09fa104c04c4db0ddf9efdd229fb786e32dd7e +SHA512 (libinput-1.10.0.tar.xz) = 173f72f454c534dee755b6121c4577900ae9b8a129ac41de69410c3195950a6d149d6148892c4976f013eeabca66117d53fa67e352cc005960863a5576696928 From 2e5d33a53e675ad8fae3250fbd08b228e4ddcdbd Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 13 Feb 2018 14:43:23 +1000 Subject: [PATCH 018/184] Fix crasher due to missing devnode after resume (#1536633) --- ...e-open_restricted-if-the-devnode-doe.patch | 47 +++++++++++++++++++ libinput.spec | 7 ++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 0001-evdev-fail-before-open_restricted-if-the-devnode-doe.patch diff --git a/0001-evdev-fail-before-open_restricted-if-the-devnode-doe.patch b/0001-evdev-fail-before-open_restricted-if-the-devnode-doe.patch new file mode 100644 index 0000000..4494695 --- /dev/null +++ b/0001-evdev-fail-before-open_restricted-if-the-devnode-doe.patch @@ -0,0 +1,47 @@ +From cb186abc17ad9e525609dc32385b0a7992e949a9 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Fri, 9 Feb 2018 19:24:15 +1000 +Subject: [PATCH libinput] evdev: fail before open_restricted if the devnode + doesn't exist + +https://bugzilla.redhat.com/show_bug.cgi?id=1536633 +https://bugzilla.redhat.com/show_bug.cgi?id=1539046 +https://bugzilla.redhat.com/show_bug.cgi?id=1539783 +https://bugzilla.redhat.com/show_bug.cgi?id=1540662 +https://bugs.freedesktop.org/show_bug.cgi?id=104278 + +Debugged-by: Jeff Smith +Signed-off-by: Peter Hutterer +--- + src/evdev.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/evdev.c b/src/evdev.c +index d1ca243d..63b93ec3 100644 +--- a/src/evdev.c ++++ b/src/evdev.c +@@ -1917,6 +1917,11 @@ evdev_device_create(struct libinput_seat *seat, + const char *devnode = udev_device_get_devnode(udev_device); + const char *sysname = udev_device_get_sysname(udev_device); + ++ if (!devnode) { ++ log_info(libinput, "%s: no device node associated\n", sysname); ++ return NULL; ++ } ++ + if (udev_device_should_be_ignored(udev_device)) { + log_debug(libinput, "%s: device is ignored\n", sysname); + return NULL; +@@ -2434,6 +2439,9 @@ evdev_device_resume(struct evdev_device *device) + return -ENODEV; + + devnode = udev_device_get_devnode(device->udev_device); ++ if (!devnode) ++ return -ENODEV; ++ + fd = open_restricted(libinput, devnode, + O_RDWR | O_NONBLOCK | O_CLOEXEC); + +-- +2.14.3 + diff --git a/libinput.spec b/libinput.spec index d950b94..1a9bd4a 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.10.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-evdev-fail-before-open_restricted-if-the-devnode-doe.patch + BuildRequires: git-core BuildRequires: gcc BuildRequires: meson @@ -109,6 +111,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Tue Feb 13 2018 Peter Hutterer 1.10.0-2 +- Fix crasher due to missing devnode after resume (#1536633) + * Tue Feb 13 2018 Peter Hutterer 1.10.0-1 - libinput 1.10 From 4796492d71a6ea581f55fe807c74ef1ec8bef143 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 28 Feb 2018 10:23:41 +1000 Subject: [PATCH 019/184] libinput 1.10.1 --- .gitignore | 1 + ...e-open_restricted-if-the-devnode-doe.patch | 47 ------------------- libinput.spec | 9 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 52 deletions(-) delete mode 100644 0001-evdev-fail-before-open_restricted-if-the-devnode-doe.patch diff --git a/.gitignore b/.gitignore index f689597..385fbdf 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /libinput-1.9.901.tar.xz /libinput-1.9.902.tar.xz /libinput-1.10.0.tar.xz +/libinput-1.10.1.tar.xz diff --git a/0001-evdev-fail-before-open_restricted-if-the-devnode-doe.patch b/0001-evdev-fail-before-open_restricted-if-the-devnode-doe.patch deleted file mode 100644 index 4494695..0000000 --- a/0001-evdev-fail-before-open_restricted-if-the-devnode-doe.patch +++ /dev/null @@ -1,47 +0,0 @@ -From cb186abc17ad9e525609dc32385b0a7992e949a9 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 9 Feb 2018 19:24:15 +1000 -Subject: [PATCH libinput] evdev: fail before open_restricted if the devnode - doesn't exist - -https://bugzilla.redhat.com/show_bug.cgi?id=1536633 -https://bugzilla.redhat.com/show_bug.cgi?id=1539046 -https://bugzilla.redhat.com/show_bug.cgi?id=1539783 -https://bugzilla.redhat.com/show_bug.cgi?id=1540662 -https://bugs.freedesktop.org/show_bug.cgi?id=104278 - -Debugged-by: Jeff Smith -Signed-off-by: Peter Hutterer ---- - src/evdev.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/evdev.c b/src/evdev.c -index d1ca243d..63b93ec3 100644 ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -1917,6 +1917,11 @@ evdev_device_create(struct libinput_seat *seat, - const char *devnode = udev_device_get_devnode(udev_device); - const char *sysname = udev_device_get_sysname(udev_device); - -+ if (!devnode) { -+ log_info(libinput, "%s: no device node associated\n", sysname); -+ return NULL; -+ } -+ - if (udev_device_should_be_ignored(udev_device)) { - log_debug(libinput, "%s: device is ignored\n", sysname); - return NULL; -@@ -2434,6 +2439,9 @@ evdev_device_resume(struct evdev_device *device) - return -ENODEV; - - devnode = udev_device_get_devnode(device->udev_device); -+ if (!devnode) -+ return -ENODEV; -+ - fd = open_restricted(libinput, devnode, - O_RDWR | O_NONBLOCK | O_CLOEXEC); - --- -2.14.3 - diff --git a/libinput.spec b/libinput.spec index 1a9bd4a..a7e6445 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.10.0 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.10.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-evdev-fail-before-open_restricted-if-the-devnode-doe.patch - BuildRequires: git-core BuildRequires: gcc BuildRequires: meson @@ -111,6 +109,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Wed Feb 28 2018 Peter Hutterer 1.10.1-1 +- libinput 1.10.1 + * Tue Feb 13 2018 Peter Hutterer 1.10.0-2 - Fix crasher due to missing devnode after resume (#1536633) diff --git a/sources b/sources index 71cbd0e..f3c1e8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.10.0.tar.xz) = 173f72f454c534dee755b6121c4577900ae9b8a129ac41de69410c3195950a6d149d6148892c4976f013eeabca66117d53fa67e352cc005960863a5576696928 +SHA512 (libinput-1.10.1.tar.xz) = 69e7cd12f3d686d1b09afd93fe072ddd6f8c9a1f04c0a651c7dd02c5a20b3f8163c5b787b41bf3ae91db0da7d3e2958d315d6c9a2875259c62b0d290ac89d1fb From fb24aaa4b50ce062d798840464be83ba860f3cc4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 2 Mar 2018 14:08:25 +1000 Subject: [PATCH 020/184] Fix touchpad jitter by changing from "disable if no jitter" to "enable if jitter" (#1548550) --- ...he-hysteresis-into-its-own-substruct.patch | 60 +++++++++ ...ve-the-code-for-disabling-hysteresis.patch | 63 +++++++++ 0003-touchpad-add-wobbling-detection.patch | 126 ++++++++++++++++++ libinput.spec | 10 +- 4 files changed, 258 insertions(+), 1 deletion(-) create mode 100644 0001-touchpad-move-the-hysteresis-into-its-own-substruct.patch create mode 100644 0002-touchpad-remove-the-code-for-disabling-hysteresis.patch create mode 100644 0003-touchpad-add-wobbling-detection.patch diff --git a/0001-touchpad-move-the-hysteresis-into-its-own-substruct.patch b/0001-touchpad-move-the-hysteresis-into-its-own-substruct.patch new file mode 100644 index 0000000..53099f9 --- /dev/null +++ b/0001-touchpad-move-the-hysteresis-into-its-own-substruct.patch @@ -0,0 +1,60 @@ +From 298b28d7f1eec7ebc7cd239915966ca0c322cf54 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Fri, 23 Feb 2018 11:21:04 +1000 +Subject: [PATCH libinput 1/3] touchpad: move the hysteresis into its own + substruct + +Prep work for the wobbling detection patch + +Signed-off-by: Peter Hutterer +Reviewed-by: Konstantin Kharlamov +(cherry picked from commit e43bd4ae3a75f72b45c6bab6168bd859ab4a01b3) +--- + src/evdev-mt-touchpad.c | 10 +++++----- + src/evdev-mt-touchpad.h | 4 +++- + 2 files changed, 8 insertions(+), 6 deletions(-) + +diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c +index 7bce8114..a024be28 100644 +--- a/src/evdev-mt-touchpad.c ++++ b/src/evdev-mt-touchpad.c +@@ -162,16 +162,16 @@ tp_motion_hysteresis(struct tp_dispatch *tp, + return; + + if (t->history.count == 0) { +- t->hysteresis_center = t->point; ++ t->hysteresis.center = t->point; + } else { + x = evdev_hysteresis(x, +- t->hysteresis_center.x, ++ t->hysteresis.center.x, + tp->hysteresis.margin.x); + y = evdev_hysteresis(y, +- t->hysteresis_center.y, ++ t->hysteresis.center.y, + tp->hysteresis.margin.y); +- t->hysteresis_center.x = x; +- t->hysteresis_center.y = y; ++ t->hysteresis.center.x = x; ++ t->hysteresis.center.y = y; + t->point.x = x; + t->point.y = y; + } +diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h +index 442f34a3..4c2f156b 100644 +--- a/src/evdev-mt-touchpad.h ++++ b/src/evdev-mt-touchpad.h +@@ -173,7 +173,9 @@ struct tp_touch { + unsigned int count; + } history; + +- struct device_coords hysteresis_center; ++ struct { ++ struct device_coords center; ++ } hysteresis; + + /* A pinned touchpoint is the one that pressed the physical button + * on a clickpad. After the release, it won't move until the center +-- +2.14.3 + diff --git a/0002-touchpad-remove-the-code-for-disabling-hysteresis.patch b/0002-touchpad-remove-the-code-for-disabling-hysteresis.patch new file mode 100644 index 0000000..0bdee04 --- /dev/null +++ b/0002-touchpad-remove-the-code-for-disabling-hysteresis.patch @@ -0,0 +1,63 @@ +From 5f4d975861ace89b47b6d7e265d38103045c1cc6 Mon Sep 17 00:00:00 2001 +From: Konstantin Kharlamov +Date: Sun, 18 Feb 2018 13:09:23 +0300 +Subject: [PATCH libinput 2/3] touchpad: remove the code for disabling + hysteresis + +Signed-off-by: Konstantin Kharlamov +Signed-off-by: Peter Hutterer +Reviewed-by: Konstantin Kharlamov +(cherry picked from commit e8dffbd73a1b3c17716f972f210e420de94028c2) +--- + src/evdev-mt-touchpad.c | 21 +-------------------- + 1 file changed, 1 insertion(+), 20 deletions(-) + +diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c +index a024be28..9f36fcbe 100644 +--- a/src/evdev-mt-touchpad.c ++++ b/src/evdev-mt-touchpad.c +@@ -135,22 +135,6 @@ tp_motion_history_push(struct tp_touch *t) + t->history.index = motion_index; + } + +-static inline void +-tp_maybe_disable_hysteresis(struct tp_dispatch *tp, uint64_t time) +-{ +- /* If the finger is down for 80ms without seeing motion events, +- the firmware filters and we don't need a software hysteresis */ +- if (tp->nfingers_down >= 1 && +- time - tp->hysteresis.last_motion_time > ms2us(80)) { +- tp->hysteresis.enabled = false; +- evdev_log_debug(tp->device, "hysteresis disabled\n"); +- return; +- } +- +- if (tp->queued & TOUCHPAD_EVENT_MOTION) +- tp->hysteresis.last_motion_time = time; +-} +- + static inline void + tp_motion_hysteresis(struct tp_dispatch *tp, + struct tp_touch *t) +@@ -1550,9 +1534,6 @@ static void + tp_handle_state(struct tp_dispatch *tp, + uint64_t time) + { +- if (tp->hysteresis.enabled) +- tp_maybe_disable_hysteresis(tp, time); +- + tp_process_state(tp, time); + tp_post_events(tp, time); + tp_post_process_state(tp, time); +@@ -2942,7 +2923,7 @@ tp_init_hysteresis(struct tp_dispatch *tp) + res_y = tp->device->abs.absinfo_y->resolution; + tp->hysteresis.margin.x = res_x/2; + tp->hysteresis.margin.y = res_y/2; +- tp->hysteresis.enabled = true; ++ tp->hysteresis.enabled = false; + } + + static void +-- +2.14.3 + diff --git a/0003-touchpad-add-wobbling-detection.patch b/0003-touchpad-add-wobbling-detection.patch new file mode 100644 index 0000000..27e20e9 --- /dev/null +++ b/0003-touchpad-add-wobbling-detection.patch @@ -0,0 +1,126 @@ +From 3efd7c82aa4758a012e0bac7a148f270060f0e54 Mon Sep 17 00:00:00 2001 +From: Konstantin Kharlamov +Date: Wed, 21 Feb 2018 20:16:41 +0300 +Subject: [PATCH libinput 3/3] touchpad: add wobbling detection + +The details are explained in comment in the code. That aside, I shall +mention the check is so light, that it shouldn't influence CPU +performance even a bit, and can blindly be kept always enabled. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104828 + +Signed-off-by: Konstantin Kharlamov +Signed-off-by: Peter Hutterer +Reviewed-by: Konstantin Kharlamov +(cherry picked from commit 400aadd53ac00ca773533d14e231ba192f4141a9) +--- + src/evdev-mt-touchpad.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++- + src/evdev-mt-touchpad.h | 2 ++ + 2 files changed, 59 insertions(+), 1 deletion(-) + +diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c +index 9f36fcbe..d9ed8ab3 100644 +--- a/src/evdev-mt-touchpad.c ++++ b/src/evdev-mt-touchpad.c +@@ -135,6 +135,61 @@ tp_motion_history_push(struct tp_touch *t) + t->history.index = motion_index; + } + ++/* Idea: if we got a tuple of *very* quick moves like {Left, Right, ++ * Left}, or {Right, Left, Right}, it means touchpad jitters since no ++ * human can move like that within thresholds. ++ * ++ * We encode left moves as zeroes, and right as ones. We also drop ++ * the array to all zeroes when contraints are not satisfied. Then we ++ * search for the pattern {1,0,1}. It can't match {Left, Right, Left}, ++ * but it does match {Left, Right, Left, Right}, so it's okay. ++ * ++ * This only looks at x changes, y changes are ignored. ++ */ ++static inline void ++tp_detect_wobbling(struct tp_dispatch *tp, ++ struct tp_touch *t, ++ uint64_t time) ++{ ++ int dx, dy; ++ uint64_t dtime; ++ ++ if (!(tp->queued & TOUCHPAD_EVENT_MOTION) || tp->hysteresis.enabled) ++ return; ++ ++ if (t->last_point.x == 0) { /* first invocation */ ++ dx = 0; ++ dy = 0; ++ } else { ++ dx = t->last_point.x - t->point.x; ++ dy = t->last_point.y - t->point.y; ++ } ++ ++ dtime = time - tp->hysteresis.last_motion_time; ++ ++ tp->hysteresis.last_motion_time = time; ++ t->last_point = t->point; ++ ++ if (dx == 0 && dy != 0) /* ignore y-only changes */ ++ return; ++ ++ if (dtime > ms2us(40)) { ++ t->hysteresis.x_motion_history = 0; ++ return; ++ } ++ ++ t->hysteresis.x_motion_history <<= 1; ++ if (dx > 0) { /* right move */ ++ static const char r_l_r = 0x5; /* {Right, Left, Right} */ ++ ++ t->hysteresis.x_motion_history |= 0x1; ++ if (t->hysteresis.x_motion_history == r_l_r) { ++ tp->hysteresis.enabled = true; ++ evdev_log_debug(tp->device, "hysteresis enabled\n"); ++ } ++ } ++} ++ + static inline void + tp_motion_hysteresis(struct tp_dispatch *tp, + struct tp_touch *t) +@@ -264,6 +319,7 @@ tp_new_touch(struct tp_dispatch *tp, struct tp_touch *t, uint64_t time) + t->time = time; + t->speed.last_speed = 0; + t->speed.exceeded_count = 0; ++ t->hysteresis.x_motion_history = 0; + tp->queued |= TOUCHPAD_EVENT_MOTION; + } + +@@ -1410,7 +1466,7 @@ tp_process_state(struct tp_dispatch *tp, uint64_t time) + + tp_thumb_detect(tp, t, time); + tp_palm_detect(tp, t, time); +- ++ tp_detect_wobbling(tp, t, time); + tp_motion_hysteresis(tp, t); + tp_motion_history_push(t); + +diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h +index 4c2f156b..467aca57 100644 +--- a/src/evdev-mt-touchpad.h ++++ b/src/evdev-mt-touchpad.h +@@ -147,6 +147,7 @@ struct tp_touch { + bool has_ended; /* TRACKING_ID == -1 */ + bool dirty; + struct device_coords point; ++ struct device_coords last_point; + uint64_t time; + int pressure; + bool is_tool_palm; /* MT_TOOL_PALM */ +@@ -175,6 +176,7 @@ struct tp_touch { + + struct { + struct device_coords center; ++ uint8_t x_motion_history; + } hysteresis; + + /* A pinned touchpoint is the one that pressed the physical button +-- +2.14.3 + diff --git a/libinput.spec b/libinput.spec index a7e6445..cdd120d 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.10.1 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -18,6 +18,10 @@ Source2: commitid Source0: http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz %endif +Patch01: 0001-touchpad-move-the-hysteresis-into-its-own-substruct.patch +Patch02: 0002-touchpad-remove-the-code-for-disabling-hysteresis.patch +Patch03: 0003-touchpad-add-wobbling-detection.patch + BuildRequires: git-core BuildRequires: gcc BuildRequires: meson @@ -109,6 +113,10 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Fri Mar 02 2018 Peter Hutterer 1.10.1-2 +- Fix touchpad jitter by changing from "disable if no jitter" to "enable if + jitter" (#1548550) + * Wed Feb 28 2018 Peter Hutterer 1.10.1-1 - libinput 1.10.1 From b08753422bce4301145a6e4470771744d8199d37 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 7 Mar 2018 16:19:33 +1000 Subject: [PATCH 021/184] libinput 1.10.2 --- .gitignore | 1 + ...he-hysteresis-into-its-own-substruct.patch | 60 --------- ...ve-the-code-for-disabling-hysteresis.patch | 63 --------- 0003-touchpad-add-wobbling-detection.patch | 126 ------------------ libinput.spec | 9 +- sources | 2 +- 6 files changed, 6 insertions(+), 255 deletions(-) delete mode 100644 0001-touchpad-move-the-hysteresis-into-its-own-substruct.patch delete mode 100644 0002-touchpad-remove-the-code-for-disabling-hysteresis.patch delete mode 100644 0003-touchpad-add-wobbling-detection.patch diff --git a/.gitignore b/.gitignore index 385fbdf..333adda 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /libinput-1.9.902.tar.xz /libinput-1.10.0.tar.xz /libinput-1.10.1.tar.xz +/libinput-1.10.2.tar.xz diff --git a/0001-touchpad-move-the-hysteresis-into-its-own-substruct.patch b/0001-touchpad-move-the-hysteresis-into-its-own-substruct.patch deleted file mode 100644 index 53099f9..0000000 --- a/0001-touchpad-move-the-hysteresis-into-its-own-substruct.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 298b28d7f1eec7ebc7cd239915966ca0c322cf54 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 23 Feb 2018 11:21:04 +1000 -Subject: [PATCH libinput 1/3] touchpad: move the hysteresis into its own - substruct - -Prep work for the wobbling detection patch - -Signed-off-by: Peter Hutterer -Reviewed-by: Konstantin Kharlamov -(cherry picked from commit e43bd4ae3a75f72b45c6bab6168bd859ab4a01b3) ---- - src/evdev-mt-touchpad.c | 10 +++++----- - src/evdev-mt-touchpad.h | 4 +++- - 2 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c -index 7bce8114..a024be28 100644 ---- a/src/evdev-mt-touchpad.c -+++ b/src/evdev-mt-touchpad.c -@@ -162,16 +162,16 @@ tp_motion_hysteresis(struct tp_dispatch *tp, - return; - - if (t->history.count == 0) { -- t->hysteresis_center = t->point; -+ t->hysteresis.center = t->point; - } else { - x = evdev_hysteresis(x, -- t->hysteresis_center.x, -+ t->hysteresis.center.x, - tp->hysteresis.margin.x); - y = evdev_hysteresis(y, -- t->hysteresis_center.y, -+ t->hysteresis.center.y, - tp->hysteresis.margin.y); -- t->hysteresis_center.x = x; -- t->hysteresis_center.y = y; -+ t->hysteresis.center.x = x; -+ t->hysteresis.center.y = y; - t->point.x = x; - t->point.y = y; - } -diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h -index 442f34a3..4c2f156b 100644 ---- a/src/evdev-mt-touchpad.h -+++ b/src/evdev-mt-touchpad.h -@@ -173,7 +173,9 @@ struct tp_touch { - unsigned int count; - } history; - -- struct device_coords hysteresis_center; -+ struct { -+ struct device_coords center; -+ } hysteresis; - - /* A pinned touchpoint is the one that pressed the physical button - * on a clickpad. After the release, it won't move until the center --- -2.14.3 - diff --git a/0002-touchpad-remove-the-code-for-disabling-hysteresis.patch b/0002-touchpad-remove-the-code-for-disabling-hysteresis.patch deleted file mode 100644 index 0bdee04..0000000 --- a/0002-touchpad-remove-the-code-for-disabling-hysteresis.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 5f4d975861ace89b47b6d7e265d38103045c1cc6 Mon Sep 17 00:00:00 2001 -From: Konstantin Kharlamov -Date: Sun, 18 Feb 2018 13:09:23 +0300 -Subject: [PATCH libinput 2/3] touchpad: remove the code for disabling - hysteresis - -Signed-off-by: Konstantin Kharlamov -Signed-off-by: Peter Hutterer -Reviewed-by: Konstantin Kharlamov -(cherry picked from commit e8dffbd73a1b3c17716f972f210e420de94028c2) ---- - src/evdev-mt-touchpad.c | 21 +-------------------- - 1 file changed, 1 insertion(+), 20 deletions(-) - -diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c -index a024be28..9f36fcbe 100644 ---- a/src/evdev-mt-touchpad.c -+++ b/src/evdev-mt-touchpad.c -@@ -135,22 +135,6 @@ tp_motion_history_push(struct tp_touch *t) - t->history.index = motion_index; - } - --static inline void --tp_maybe_disable_hysteresis(struct tp_dispatch *tp, uint64_t time) --{ -- /* If the finger is down for 80ms without seeing motion events, -- the firmware filters and we don't need a software hysteresis */ -- if (tp->nfingers_down >= 1 && -- time - tp->hysteresis.last_motion_time > ms2us(80)) { -- tp->hysteresis.enabled = false; -- evdev_log_debug(tp->device, "hysteresis disabled\n"); -- return; -- } -- -- if (tp->queued & TOUCHPAD_EVENT_MOTION) -- tp->hysteresis.last_motion_time = time; --} -- - static inline void - tp_motion_hysteresis(struct tp_dispatch *tp, - struct tp_touch *t) -@@ -1550,9 +1534,6 @@ static void - tp_handle_state(struct tp_dispatch *tp, - uint64_t time) - { -- if (tp->hysteresis.enabled) -- tp_maybe_disable_hysteresis(tp, time); -- - tp_process_state(tp, time); - tp_post_events(tp, time); - tp_post_process_state(tp, time); -@@ -2942,7 +2923,7 @@ tp_init_hysteresis(struct tp_dispatch *tp) - res_y = tp->device->abs.absinfo_y->resolution; - tp->hysteresis.margin.x = res_x/2; - tp->hysteresis.margin.y = res_y/2; -- tp->hysteresis.enabled = true; -+ tp->hysteresis.enabled = false; - } - - static void --- -2.14.3 - diff --git a/0003-touchpad-add-wobbling-detection.patch b/0003-touchpad-add-wobbling-detection.patch deleted file mode 100644 index 27e20e9..0000000 --- a/0003-touchpad-add-wobbling-detection.patch +++ /dev/null @@ -1,126 +0,0 @@ -From 3efd7c82aa4758a012e0bac7a148f270060f0e54 Mon Sep 17 00:00:00 2001 -From: Konstantin Kharlamov -Date: Wed, 21 Feb 2018 20:16:41 +0300 -Subject: [PATCH libinput 3/3] touchpad: add wobbling detection - -The details are explained in comment in the code. That aside, I shall -mention the check is so light, that it shouldn't influence CPU -performance even a bit, and can blindly be kept always enabled. - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=104828 - -Signed-off-by: Konstantin Kharlamov -Signed-off-by: Peter Hutterer -Reviewed-by: Konstantin Kharlamov -(cherry picked from commit 400aadd53ac00ca773533d14e231ba192f4141a9) ---- - src/evdev-mt-touchpad.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++- - src/evdev-mt-touchpad.h | 2 ++ - 2 files changed, 59 insertions(+), 1 deletion(-) - -diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c -index 9f36fcbe..d9ed8ab3 100644 ---- a/src/evdev-mt-touchpad.c -+++ b/src/evdev-mt-touchpad.c -@@ -135,6 +135,61 @@ tp_motion_history_push(struct tp_touch *t) - t->history.index = motion_index; - } - -+/* Idea: if we got a tuple of *very* quick moves like {Left, Right, -+ * Left}, or {Right, Left, Right}, it means touchpad jitters since no -+ * human can move like that within thresholds. -+ * -+ * We encode left moves as zeroes, and right as ones. We also drop -+ * the array to all zeroes when contraints are not satisfied. Then we -+ * search for the pattern {1,0,1}. It can't match {Left, Right, Left}, -+ * but it does match {Left, Right, Left, Right}, so it's okay. -+ * -+ * This only looks at x changes, y changes are ignored. -+ */ -+static inline void -+tp_detect_wobbling(struct tp_dispatch *tp, -+ struct tp_touch *t, -+ uint64_t time) -+{ -+ int dx, dy; -+ uint64_t dtime; -+ -+ if (!(tp->queued & TOUCHPAD_EVENT_MOTION) || tp->hysteresis.enabled) -+ return; -+ -+ if (t->last_point.x == 0) { /* first invocation */ -+ dx = 0; -+ dy = 0; -+ } else { -+ dx = t->last_point.x - t->point.x; -+ dy = t->last_point.y - t->point.y; -+ } -+ -+ dtime = time - tp->hysteresis.last_motion_time; -+ -+ tp->hysteresis.last_motion_time = time; -+ t->last_point = t->point; -+ -+ if (dx == 0 && dy != 0) /* ignore y-only changes */ -+ return; -+ -+ if (dtime > ms2us(40)) { -+ t->hysteresis.x_motion_history = 0; -+ return; -+ } -+ -+ t->hysteresis.x_motion_history <<= 1; -+ if (dx > 0) { /* right move */ -+ static const char r_l_r = 0x5; /* {Right, Left, Right} */ -+ -+ t->hysteresis.x_motion_history |= 0x1; -+ if (t->hysteresis.x_motion_history == r_l_r) { -+ tp->hysteresis.enabled = true; -+ evdev_log_debug(tp->device, "hysteresis enabled\n"); -+ } -+ } -+} -+ - static inline void - tp_motion_hysteresis(struct tp_dispatch *tp, - struct tp_touch *t) -@@ -264,6 +319,7 @@ tp_new_touch(struct tp_dispatch *tp, struct tp_touch *t, uint64_t time) - t->time = time; - t->speed.last_speed = 0; - t->speed.exceeded_count = 0; -+ t->hysteresis.x_motion_history = 0; - tp->queued |= TOUCHPAD_EVENT_MOTION; - } - -@@ -1410,7 +1466,7 @@ tp_process_state(struct tp_dispatch *tp, uint64_t time) - - tp_thumb_detect(tp, t, time); - tp_palm_detect(tp, t, time); -- -+ tp_detect_wobbling(tp, t, time); - tp_motion_hysteresis(tp, t); - tp_motion_history_push(t); - -diff --git a/src/evdev-mt-touchpad.h b/src/evdev-mt-touchpad.h -index 4c2f156b..467aca57 100644 ---- a/src/evdev-mt-touchpad.h -+++ b/src/evdev-mt-touchpad.h -@@ -147,6 +147,7 @@ struct tp_touch { - bool has_ended; /* TRACKING_ID == -1 */ - bool dirty; - struct device_coords point; -+ struct device_coords last_point; - uint64_t time; - int pressure; - bool is_tool_palm; /* MT_TOOL_PALM */ -@@ -175,6 +176,7 @@ struct tp_touch { - - struct { - struct device_coords center; -+ uint8_t x_motion_history; - } hysteresis; - - /* A pinned touchpoint is the one that pressed the physical button --- -2.14.3 - diff --git a/libinput.spec b/libinput.spec index cdd120d..50aa941 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.10.1 +Version: 1.10.2 Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -18,10 +18,6 @@ Source2: commitid Source0: http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz %endif -Patch01: 0001-touchpad-move-the-hysteresis-into-its-own-substruct.patch -Patch02: 0002-touchpad-remove-the-code-for-disabling-hysteresis.patch -Patch03: 0003-touchpad-add-wobbling-detection.patch - BuildRequires: git-core BuildRequires: gcc BuildRequires: meson @@ -113,6 +109,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Wed Mar 07 2018 Peter Hutterer 1.10.2-2 +- libinput 1.10.2 + * Fri Mar 02 2018 Peter Hutterer 1.10.1-2 - Fix touchpad jitter by changing from "disable if no jitter" to "enable if jitter" (#1548550) diff --git a/sources b/sources index f3c1e8b..2dbd3d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.10.1.tar.xz) = 69e7cd12f3d686d1b09afd93fe072ddd6f8c9a1f04c0a651c7dd02c5a20b3f8163c5b787b41bf3ae91db0da7d3e2958d315d6c9a2875259c62b0d290ac89d1fb +SHA512 (libinput-1.10.2.tar.xz) = c0418b2e0919fe085839a9ce7d4f155ea7a76f5395f5ed0ab7ab2f2226a2085b10ada5006bfb64c65d98a5fcc19395f722de379f0977a6c52a3630a9c0ad556e From 1778ef6300331865a71042a36be7a42c4a80539c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 8 Mar 2018 10:18:00 +1000 Subject: [PATCH 022/184] Add BuildRequires gcc-c++, needed for a test build --- libinput.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 50aa941..f8186f0 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.10.2 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -19,7 +19,7 @@ Source0: http://www.freedesktop.org/software/libinput/libinput-%{version} %endif BuildRequires: git-core -BuildRequires: gcc +BuildRequires: gcc gcc-c++ BuildRequires: meson BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(mtdev) >= 1.1.0 @@ -109,6 +109,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Thu Mar 08 2018 Peter Hutterer 1.10.2-3 +- Add BuildRequires gcc-c++, needed for a test build + * Wed Mar 07 2018 Peter Hutterer 1.10.2-2 - libinput 1.10.2 From d99aa73a3cd3ed752a13bdfe741ffca9b8e646dd Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 12 Mar 2018 12:03:09 +1000 Subject: [PATCH 023/184] Fix occasional crashes on gestures when libinput loses track of hovering fake fingers --- ...-hovering-touches-in-maybe_end_touch.patch | 60 +++++++++++++++++++ libinput.spec | 8 ++- 2 files changed, 67 insertions(+), 1 deletion(-) create mode 100644 0001-touchpad-end-hovering-touches-in-maybe_end_touch.patch diff --git a/0001-touchpad-end-hovering-touches-in-maybe_end_touch.patch b/0001-touchpad-end-hovering-touches-in-maybe_end_touch.patch new file mode 100644 index 0000000..3080187 --- /dev/null +++ b/0001-touchpad-end-hovering-touches-in-maybe_end_touch.patch @@ -0,0 +1,60 @@ +From 42e8813a632699e55f8287430f458ae6f5312146 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Mon, 12 Mar 2018 10:33:21 +1000 +Subject: [PATCH libinput] touchpad: end hovering touches in maybe_end_touch + +Otherwise a hovering touch stays around forever even after the finger has +discontinued. This doesn't matter on slots, but for fake fingers the finger +may suddenly end up being forced down/up as a result of the pressure changes +on the real fingers. + +So when in maybe_end_touch, switch them back to NONE immediately - hovering +touches do not need to trigger a TOUCH_END event. + +https://bugs.freedesktop.org/show_bug.cgi?id=105258 + +Signed-off-by: Peter Hutterer +(cherry picked from commit d8db6b5927f61460b2991479a85056256c819485) +--- + src/evdev-mt-touchpad.c | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) + +diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c +index 3080e8a8..4ebadc25 100644 +--- a/src/evdev-mt-touchpad.c ++++ b/src/evdev-mt-touchpad.c +@@ -345,22 +345,26 @@ tp_maybe_end_touch(struct tp_dispatch *tp, + switch (t->state) { + case TOUCH_NONE: + case TOUCH_MAYBE_END: +- case TOUCH_HOVERING: + return; + case TOUCH_END: + evdev_log_bug_libinput(tp->device, + "touch already in TOUCH_END\n"); + return; ++ case TOUCH_HOVERING: + case TOUCH_BEGIN: + case TOUCH_UPDATE: + break; + } + +- t->dirty = true; +- t->state = TOUCH_MAYBE_END; ++ if (t->state != TOUCH_HOVERING) { ++ assert(tp->nfingers_down >= 1); ++ tp->nfingers_down--; ++ t->state = TOUCH_MAYBE_END; ++ } else { ++ t->state = TOUCH_NONE; ++ } + +- assert(tp->nfingers_down >= 1); +- tp->nfingers_down--; ++ t->dirty = true; + } + + /** +-- +2.14.3 + diff --git a/libinput.spec b/libinput.spec index f8186f0..385b61d 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.10.2 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 4%{?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-end-hovering-touches-in-maybe_end_touch.patch + BuildRequires: git-core BuildRequires: gcc gcc-c++ BuildRequires: meson @@ -109,6 +111,10 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Mon Mar 12 2018 Peter Hutterer 1.10.2-4 +- Fix occasional crashes on gestures when libinput loses track of hovering + fake fingers + * Thu Mar 08 2018 Peter Hutterer 1.10.2-3 - Add BuildRequires gcc-c++, needed for a test build From 9a10f4b8076e19868cd795d3cfb2e874b02ed455 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 14 Mar 2018 21:05:44 +1000 Subject: [PATCH 024/184] libinput 1.10.3 --- .gitignore | 1 + ...-hovering-touches-in-maybe_end_touch.patch | 60 ------------------- libinput.spec | 9 +-- sources | 2 +- 4 files changed, 7 insertions(+), 65 deletions(-) delete mode 100644 0001-touchpad-end-hovering-touches-in-maybe_end_touch.patch diff --git a/.gitignore b/.gitignore index 333adda..70fbda4 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /libinput-1.10.0.tar.xz /libinput-1.10.1.tar.xz /libinput-1.10.2.tar.xz +/libinput-1.10.3.tar.xz diff --git a/0001-touchpad-end-hovering-touches-in-maybe_end_touch.patch b/0001-touchpad-end-hovering-touches-in-maybe_end_touch.patch deleted file mode 100644 index 3080187..0000000 --- a/0001-touchpad-end-hovering-touches-in-maybe_end_touch.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 42e8813a632699e55f8287430f458ae6f5312146 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Mon, 12 Mar 2018 10:33:21 +1000 -Subject: [PATCH libinput] touchpad: end hovering touches in maybe_end_touch - -Otherwise a hovering touch stays around forever even after the finger has -discontinued. This doesn't matter on slots, but for fake fingers the finger -may suddenly end up being forced down/up as a result of the pressure changes -on the real fingers. - -So when in maybe_end_touch, switch them back to NONE immediately - hovering -touches do not need to trigger a TOUCH_END event. - -https://bugs.freedesktop.org/show_bug.cgi?id=105258 - -Signed-off-by: Peter Hutterer -(cherry picked from commit d8db6b5927f61460b2991479a85056256c819485) ---- - src/evdev-mt-touchpad.c | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c -index 3080e8a8..4ebadc25 100644 ---- a/src/evdev-mt-touchpad.c -+++ b/src/evdev-mt-touchpad.c -@@ -345,22 +345,26 @@ tp_maybe_end_touch(struct tp_dispatch *tp, - switch (t->state) { - case TOUCH_NONE: - case TOUCH_MAYBE_END: -- case TOUCH_HOVERING: - return; - case TOUCH_END: - evdev_log_bug_libinput(tp->device, - "touch already in TOUCH_END\n"); - return; -+ case TOUCH_HOVERING: - case TOUCH_BEGIN: - case TOUCH_UPDATE: - break; - } - -- t->dirty = true; -- t->state = TOUCH_MAYBE_END; -+ if (t->state != TOUCH_HOVERING) { -+ assert(tp->nfingers_down >= 1); -+ tp->nfingers_down--; -+ t->state = TOUCH_MAYBE_END; -+ } else { -+ t->state = TOUCH_NONE; -+ } - -- assert(tp->nfingers_down >= 1); -- tp->nfingers_down--; -+ t->dirty = true; - } - - /** --- -2.14.3 - diff --git a/libinput.spec b/libinput.spec index 385b61d..6d4d9d6 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.10.2 -Release: 4%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.10.3 +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-end-hovering-touches-in-maybe_end_touch.patch - BuildRequires: git-core BuildRequires: gcc gcc-c++ BuildRequires: meson @@ -111,6 +109,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Wed Mar 14 2018 Peter Hutterer 1.10.3-1 +- libinput 1.10.3 + * Mon Mar 12 2018 Peter Hutterer 1.10.2-4 - Fix occasional crashes on gestures when libinput loses track of hovering fake fingers diff --git a/sources b/sources index 2dbd3d3..ae22223 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.10.2.tar.xz) = c0418b2e0919fe085839a9ce7d4f155ea7a76f5395f5ed0ab7ab2f2226a2085b10ada5006bfb64c65d98a5fcc19395f722de379f0977a6c52a3630a9c0ad556e +SHA512 (libinput-1.10.3.tar.xz) = 4c73673e138a7aff9d6f2d189b8afdfb51c868eca0487c8c487ffd3bb48849994a9095fbd4c5c725ee17fafc2a85298106e0cc7b59b4a8cd13ec28f65d15c01d From b4657862bd3068d2f01d54a98865a12201575cf4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 9 Apr 2018 14:56:29 +1000 Subject: [PATCH 025/184] libinput 1.10.4 --- .gitignore | 1 + libinput.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 70fbda4..2125d0b 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /libinput-1.10.1.tar.xz /libinput-1.10.2.tar.xz /libinput-1.10.3.tar.xz +/libinput-1.10.4.tar.xz diff --git a/libinput.spec b/libinput.spec index 6d4d9d6..e3828a5 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.10.3 +Version: 1.10.4 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -109,6 +109,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Mon Apr 09 2018 Peter Hutterer 1.10.4-1 +- libinput 1.10.4 + * Wed Mar 14 2018 Peter Hutterer 1.10.3-1 - libinput 1.10.3 diff --git a/sources b/sources index ae22223..e890da2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.10.3.tar.xz) = 4c73673e138a7aff9d6f2d189b8afdfb51c868eca0487c8c487ffd3bb48849994a9095fbd4c5c725ee17fafc2a85298106e0cc7b59b4a8cd13ec28f65d15c01d +SHA512 (libinput-1.10.4.tar.xz) = b6f24f135e2396d53c0576a3b3887cd3736f2209fc448c6419cd1f1d7ee6aedff8e067f4b780f50ada5a4418d5bc47a4010cb328f366ee7fd1a2dba1ffc96c38 From a8a7e75373cc15bba39262c5e01615ecf55ed078 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 19 Apr 2018 11:04:57 +1000 Subject: [PATCH 026/184] Disable ABS_MT_TOOL_PALM on the Lenovo Carbon X1 6th (#1565692) --- ...S_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch | 78 +++++++++++++++++++ libinput.spec | 7 +- 2 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 0001-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch diff --git a/0001-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch b/0001-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch new file mode 100644 index 0000000..fe27148 --- /dev/null +++ b/0001-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch @@ -0,0 +1,78 @@ +From 0ae123afac8abffd843efcc899ef4519611f1ee2 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Thu, 19 Apr 2018 11:00:51 +1000 +Subject: [PATCH libinput] evdev: disable ABS_MT_TOOL_PALM on the Lenovo X1 + Carbon 6th gen + +This device randomly decides that a touch is now a palm, based on +the moon phase, the user's starsign and possibly what the dog had for +breakfast. Since libinput assumes that a touchpad that labels a touch as palm +has reasons to do so, let's unassume this for this device by disabling that +axis altogether and relying on the touch pressure only. + +https://bugzilla.redhat.com/show_bug.cgi?id=1565692 + +Signed-off-by: Peter Hutterer +(cherry picked from commit 762c1726f1b633d46ce0415a43fcee93453b8b7a) +--- + src/evdev.c | 8 ++++++++ + src/evdev.h | 1 + + udev/90-libinput-model-quirks.hwdb | 4 ++++ + 3 files changed, 13 insertions(+) + +diff --git a/src/evdev.c b/src/evdev.c +index b98dc32d..8dbf12c6 100644 +--- a/src/evdev.c ++++ b/src/evdev.c +@@ -1265,6 +1265,7 @@ evdev_read_model_flags(struct evdev_device *device) + MODEL(LOGITECH_MARBLE_MOUSE), + MODEL(TABLET_NO_PROXIMITY_OUT), + MODEL(MS_NANO_TRANSCEIVER), ++ MODEL(LENOVO_CARBON_X1_6TH), + #undef MODEL + { "ID_INPUT_TRACKBALL", EVDEV_MODEL_TRACKBALL }, + { NULL, EVDEV_MODEL_DEFAULT }, +@@ -1861,6 +1862,13 @@ evdev_pre_configure_model_quirks(struct evdev_device *device) + /* Logitech Marble Mouse claims to have a middle button */ + if (device->model_flags & EVDEV_MODEL_LOGITECH_MARBLE_MOUSE) + libevdev_disable_event_code(device->evdev, EV_KEY, BTN_MIDDLE); ++ ++ /* Lenovo Carbon X1 6th gen sends bogus ABS_MT_TOOL_TYPE events for ++ * MT_TOOL_PALM */ ++ if (device->model_flags & EVDEV_MODEL_LENOVO_CARBON_X1_6TH) ++ libevdev_disable_event_code(device->evdev, ++ EV_ABS, ++ ABS_MT_TOOL_TYPE); + } + + static void +diff --git a/src/evdev.h b/src/evdev.h +index 060020f9..07941c3d 100644 +--- a/src/evdev.h ++++ b/src/evdev.h +@@ -111,6 +111,7 @@ enum evdev_device_model { + EVDEV_MODEL_SYNAPTICS_SERIAL_TOUCHPAD = (1 << 9), + EVDEV_MODEL_JUMPING_SEMI_MT = (1 << 10), + EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81 = (1 << 12), ++ EVDEV_MODEL_LENOVO_CARBON_X1_6TH = (1 << 13), + EVDEV_MODEL_CYBORG_RAT = (1 << 14), + EVDEV_MODEL_HP_STREAM11_TOUCHPAD = (1 << 16), + EVDEV_MODEL_LENOVO_T450_TOUCHPAD= (1 << 17), +diff --git a/udev/90-libinput-model-quirks.hwdb b/udev/90-libinput-model-quirks.hwdb +index 20975aec..060018b0 100644 +--- a/udev/90-libinput-model-quirks.hwdb ++++ b/udev/90-libinput-model-quirks.hwdb +@@ -210,6 +210,10 @@ libinput:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO:*:pvrThinkPadX1Carbon3rd + libinput:keyboard:input:b0003v17EFp6047* + LIBINPUT_ATTR_KEYBOARD_INTEGRATION=external + ++# Lenovo Carbon X1 6th gen (RMI4 only, PS/2 is broken on this device) ++libinput:name:Synaptics TM3288-010:dmi:*svnLenovo:*pvrThinkPadX1Carbon6th:* ++ LIBINPUT_MODEL_LENOVO_CARBON_X1_6TH=1 ++ + ########################################## + # Logitech + ########################################## +-- +2.14.3 + diff --git a/libinput.spec b/libinput.spec index e3828a5..1ba78ce 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.10.4 -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-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch + BuildRequires: git-core BuildRequires: gcc gcc-c++ BuildRequires: meson @@ -109,6 +111,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Thu Apr 19 2018 Peter Hutterer 1.10.4-2 +- Disable ABS_MT_TOOL_PALM on the Lenovo Carbon X1 6th (#1565692) + * Mon Apr 09 2018 Peter Hutterer 1.10.4-1 - libinput 1.10.4 From 09a826f5ee18749b2436cd4929d2e49a1b1a8f1b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 19 Apr 2018 12:31:15 +1000 Subject: [PATCH 027/184] libinput 1.10.5 --- .gitignore | 1 + ...S_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch | 22 +++++++++---------- libinput.spec | 7 ++++-- sources | 2 +- 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 2125d0b..f0297c4 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /libinput-1.10.2.tar.xz /libinput-1.10.3.tar.xz /libinput-1.10.4.tar.xz +/libinput-1.10.5.tar.xz diff --git a/0001-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch b/0001-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch index fe27148..8d14de1 100644 --- a/0001-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch +++ b/0001-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch @@ -1,4 +1,4 @@ -From 0ae123afac8abffd843efcc899ef4519611f1ee2 Mon Sep 17 00:00:00 2001 +From 4fb3f9e1d4de48853e2cdc43300e4d1fa41550b3 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 19 Apr 2018 11:00:51 +1000 Subject: [PATCH libinput] evdev: disable ABS_MT_TOOL_PALM on the Lenovo X1 @@ -21,10 +21,10 @@ Signed-off-by: Peter Hutterer 3 files changed, 13 insertions(+) diff --git a/src/evdev.c b/src/evdev.c -index b98dc32d..8dbf12c6 100644 +index 13b2b13c..a145a03b 100644 --- a/src/evdev.c +++ b/src/evdev.c -@@ -1265,6 +1265,7 @@ evdev_read_model_flags(struct evdev_device *device) +@@ -1272,6 +1272,7 @@ evdev_read_model_flags(struct evdev_device *device) MODEL(LOGITECH_MARBLE_MOUSE), MODEL(TABLET_NO_PROXIMITY_OUT), MODEL(MS_NANO_TRANSCEIVER), @@ -32,7 +32,7 @@ index b98dc32d..8dbf12c6 100644 #undef MODEL { "ID_INPUT_TRACKBALL", EVDEV_MODEL_TRACKBALL }, { NULL, EVDEV_MODEL_DEFAULT }, -@@ -1861,6 +1862,13 @@ evdev_pre_configure_model_quirks(struct evdev_device *device) +@@ -1868,6 +1869,13 @@ evdev_pre_configure_model_quirks(struct evdev_device *device) /* Logitech Marble Mouse claims to have a middle button */ if (device->model_flags & EVDEV_MODEL_LOGITECH_MARBLE_MOUSE) libevdev_disable_event_code(device->evdev, EV_KEY, BTN_MIDDLE); @@ -47,24 +47,24 @@ index b98dc32d..8dbf12c6 100644 static void diff --git a/src/evdev.h b/src/evdev.h -index 060020f9..07941c3d 100644 +index 496bea7f..cdcaf8f9 100644 --- a/src/evdev.h +++ b/src/evdev.h -@@ -111,6 +111,7 @@ enum evdev_device_model { - EVDEV_MODEL_SYNAPTICS_SERIAL_TOUCHPAD = (1 << 9), +@@ -112,6 +112,7 @@ enum evdev_device_model { EVDEV_MODEL_JUMPING_SEMI_MT = (1 << 10), + EVDEV_MODEL_LOGITECH_K400 = (1 << 11), EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81 = (1 << 12), + EVDEV_MODEL_LENOVO_CARBON_X1_6TH = (1 << 13), EVDEV_MODEL_CYBORG_RAT = (1 << 14), EVDEV_MODEL_HP_STREAM11_TOUCHPAD = (1 << 16), EVDEV_MODEL_LENOVO_T450_TOUCHPAD= (1 << 17), diff --git a/udev/90-libinput-model-quirks.hwdb b/udev/90-libinput-model-quirks.hwdb -index 20975aec..060018b0 100644 +index 7470973f..6f625017 100644 --- a/udev/90-libinput-model-quirks.hwdb +++ b/udev/90-libinput-model-quirks.hwdb -@@ -210,6 +210,10 @@ libinput:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO:*:pvrThinkPadX1Carbon3rd - libinput:keyboard:input:b0003v17EFp6047* - LIBINPUT_ATTR_KEYBOARD_INTEGRATION=external +@@ -232,6 +232,10 @@ libinput:keyboard:input:b0003v17EFp6047* + libinput:name:*ALPS TrackPoint*:svnLENOVO:*:pvrThinkPadX280:* + LIBINPUT_ATTR_TRACKPOINT_RANGE=70 +# Lenovo Carbon X1 6th gen (RMI4 only, PS/2 is broken on this device) +libinput:name:Synaptics TM3288-010:dmi:*svnLenovo:*pvrThinkPadX1Carbon6th:* diff --git a/libinput.spec b/libinput.spec index 1ba78ce..c0940d0 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.10.4 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.10.5 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -111,6 +111,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Thu Apr 19 2018 Peter Hutterer 1.10.5-1 +- libinput 1.10.5 + * Thu Apr 19 2018 Peter Hutterer 1.10.4-2 - Disable ABS_MT_TOOL_PALM on the Lenovo Carbon X1 6th (#1565692) diff --git a/sources b/sources index e890da2..2ce19c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.10.4.tar.xz) = b6f24f135e2396d53c0576a3b3887cd3736f2209fc448c6419cd1f1d7ee6aedff8e067f4b780f50ada5a4418d5bc47a4010cb328f366ee7fd1a2dba1ffc96c38 +SHA512 (libinput-1.10.5.tar.xz) = 61f19ea777b523f0e76869b8e7dbbff5e51132d3c856c6edb9915a695f7903256228e71be2567642866923a800f1283bdd5aff97266ac26c2e42dfce0bffa50b From ecb3f850920259a9951259659a685f1c10e8b64d Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 27 Apr 2018 15:06:13 +1000 Subject: [PATCH 028/184] Fix the T460s halting cursor problem (#1572394) --- ...-trackpoint-event-counter-for-the-T4.patch | 108 ++++++++++++++++++ libinput.spec | 6 +- 2 files changed, 113 insertions(+), 1 deletion(-) create mode 100644 0001-touchpad-fix-the-trackpoint-event-counter-for-the-T4.patch diff --git a/0001-touchpad-fix-the-trackpoint-event-counter-for-the-T4.patch b/0001-touchpad-fix-the-trackpoint-event-counter-for-the-T4.patch new file mode 100644 index 0000000..7866690 --- /dev/null +++ b/0001-touchpad-fix-the-trackpoint-event-counter-for-the-T4.patch @@ -0,0 +1,108 @@ +From d19f775c26223b2482c38c66d73969cfb6556ff9 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Fri, 27 Apr 2018 14:40:57 +1000 +Subject: [PATCH libinput] touchpad: fix the trackpoint event counter for the + T460s + +Introduced in 416fa44d80b0f2c53b652ddfa35dd4a156a65c65 but there was a logic +error: we claimed to require 3 events from a trackpoint before stopping the +touchpad but the timer was only set when we actually stopped the touchpad. So +if a trackpoint sends a single event every second, we'd disable the touchpad +after 3 seconds for the duration of the timeout, then again 3 seconds later, +etc. + +Fix this by always setting the timeout and resetting the event counter if no +activity happened. + +Signed-off-by: Peter Hutterer +(cherry picked from commit 3b019959c2b33de05c5aa073730300e6897b4268) +--- + src/evdev-mt-touchpad.c | 11 +++++++---- + test/test-trackpoint.c | 30 ++++++++++++++++++++++++++++++ + 2 files changed, 37 insertions(+), 4 deletions(-) + +diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c +index cc01976a..953b475d 100644 +--- a/src/evdev-mt-touchpad.c ++++ b/src/evdev-mt-touchpad.c +@@ -1912,8 +1912,10 @@ tp_trackpoint_timeout(uint64_t now, void *data) + { + struct tp_dispatch *tp = data; + +- tp_tap_resume(tp, now); +- tp->palm.trackpoint_active = false; ++ if (tp->palm.trackpoint_active) { ++ tp_tap_resume(tp, now); ++ tp->palm.trackpoint_active = false; ++ } + tp->palm.trackpoint_event_count = 0; + } + +@@ -1930,6 +1932,9 @@ tp_trackpoint_event(uint64_t time, struct libinput_event *event, void *data) + tp->palm.trackpoint_last_event_time = time; + tp->palm.trackpoint_event_count++; + ++ libinput_timer_set(&tp->palm.trackpoint_timer, ++ time + DEFAULT_TRACKPOINT_ACTIVITY_TIMEOUT); ++ + /* Require at least three events before enabling palm detection */ + if (tp->palm.trackpoint_event_count < 3) + return; +@@ -1939,8 +1944,6 @@ tp_trackpoint_event(uint64_t time, struct libinput_event *event, void *data) + tp->palm.trackpoint_active = true; + } + +- libinput_timer_set(&tp->palm.trackpoint_timer, +- time + DEFAULT_TRACKPOINT_ACTIVITY_TIMEOUT); + } + + static void +diff --git a/test/test-trackpoint.c b/test/test-trackpoint.c +index 46a66893..5cca9bc9 100644 +--- a/test/test-trackpoint.c ++++ b/test/test-trackpoint.c +@@ -379,6 +379,35 @@ START_TEST(trackpoint_palmdetect_require_min_events) + } + END_TEST + ++START_TEST(trackpoint_palmdetect_require_min_events_timeout) ++{ ++ struct litest_device *trackpoint = litest_current_device(); ++ struct litest_device *touchpad; ++ struct libinput *li = trackpoint->libinput; ++ ++ touchpad = litest_add_device(li, LITEST_SYNAPTICS_I2C); ++ litest_drain_events(li); ++ ++ for (int i = 0; i < 10; i++) { ++ /* A single event does not trigger palm detection */ ++ litest_event(trackpoint, EV_REL, REL_X, 1); ++ litest_event(trackpoint, EV_REL, REL_Y, 1); ++ litest_event(trackpoint, EV_SYN, SYN_REPORT, 0); ++ libinput_dispatch(li); ++ litest_drain_events(li); ++ ++ litest_touch_down(touchpad, 0, 30, 30); ++ litest_touch_move_to(touchpad, 0, 30, 30, 80, 80, 10, 1); ++ litest_touch_up(touchpad, 0); ++ litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); ++ ++ litest_timeout_trackpoint(); ++ } ++ ++ litest_delete_device(touchpad); ++} ++END_TEST ++ + void + litest_setup_tests_trackpoint(void) + { +@@ -393,4 +422,5 @@ litest_setup_tests_trackpoint(void) + litest_add("trackpoint:palmdetect", trackpoint_palmdetect, LITEST_POINTINGSTICK, LITEST_ANY); + litest_add("trackpoint:palmdetect", trackpoint_palmdetect_resume_touch, LITEST_POINTINGSTICK, LITEST_ANY); + litest_add("trackpoint:palmdetect", trackpoint_palmdetect_require_min_events, LITEST_POINTINGSTICK, LITEST_ANY); ++ litest_add("trackpoint:palmdetect", trackpoint_palmdetect_require_min_events_timeout, LITEST_POINTINGSTICK, LITEST_ANY); + } +-- +2.14.3 + diff --git a/libinput.spec b/libinput.spec index c0940d0..515e65c 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.10.5 -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-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch +Patch02: 0001-touchpad-fix-the-trackpoint-event-counter-for-the-T4.patch BuildRequires: git-core BuildRequires: gcc gcc-c++ @@ -111,6 +112,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Fri Apr 27 2018 Peter Hutterer 1.10.5-2 +- Fix the T460s halting cursor problem (#1572394) + * Thu Apr 19 2018 Peter Hutterer 1.10.5-1 - libinput 1.10.5 From f2700b6bc25b8f81cc0862e4ecc9aa96c38651ef Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 27 Apr 2018 16:00:18 +1000 Subject: [PATCH 029/184] Fix the T460s halting cursor problem harder (#1572394) --- ...-trackpoint-event-counter-for-the-T4.patch | 40 ++++++++++--------- libinput.spec | 5 ++- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/0001-touchpad-fix-the-trackpoint-event-counter-for-the-T4.patch b/0001-touchpad-fix-the-trackpoint-event-counter-for-the-T4.patch index 7866690..f0c7dba 100644 --- a/0001-touchpad-fix-the-trackpoint-event-counter-for-the-T4.patch +++ b/0001-touchpad-fix-the-trackpoint-event-counter-for-the-T4.patch @@ -1,4 +1,4 @@ -From d19f775c26223b2482c38c66d73969cfb6556ff9 Mon Sep 17 00:00:00 2001 +From 4172888e91281df81b226920a28117d24ee57266 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 27 Apr 2018 14:40:57 +1000 Subject: [PATCH libinput] touchpad: fix the trackpoint event counter for the @@ -15,17 +15,25 @@ Fix this by always setting the timeout and resetting the event counter if no activity happened. Signed-off-by: Peter Hutterer -(cherry picked from commit 3b019959c2b33de05c5aa073730300e6897b4268) +(cherry picked from commit c0fd857def5547f612d2c14ae57dda1cef47a92c) --- - src/evdev-mt-touchpad.c | 11 +++++++---- + src/evdev-mt-touchpad.c | 13 ++++++++++--- test/test-trackpoint.c | 30 ++++++++++++++++++++++++++++++ - 2 files changed, 37 insertions(+), 4 deletions(-) + 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c -index cc01976a..953b475d 100644 +index cc01976a..25520526 100644 --- a/src/evdev-mt-touchpad.c +++ b/src/evdev-mt-touchpad.c -@@ -1912,8 +1912,10 @@ tp_trackpoint_timeout(uint64_t now, void *data) +@@ -31,6 +31,7 @@ + #include "evdev-mt-touchpad.h" + + #define DEFAULT_TRACKPOINT_ACTIVITY_TIMEOUT ms2us(300) ++#define DEFAULT_TRACKPOINT_EVENT_TIMEOUT ms2us(40) + #define DEFAULT_KEYBOARD_ACTIVITY_TIMEOUT_1 ms2us(200) + #define DEFAULT_KEYBOARD_ACTIVITY_TIMEOUT_2 ms2us(500) + #define THUMB_MOVE_TIMEOUT ms2us(300) +@@ -1912,8 +1913,10 @@ tp_trackpoint_timeout(uint64_t now, void *data) { struct tp_dispatch *tp = data; @@ -38,25 +46,21 @@ index cc01976a..953b475d 100644 tp->palm.trackpoint_event_count = 0; } -@@ -1930,6 +1932,9 @@ tp_trackpoint_event(uint64_t time, struct libinput_event *event, void *data) +@@ -1930,9 +1933,13 @@ tp_trackpoint_event(uint64_t time, struct libinput_event *event, void *data) tp->palm.trackpoint_last_event_time = time; tp->palm.trackpoint_event_count++; -+ libinput_timer_set(&tp->palm.trackpoint_timer, -+ time + DEFAULT_TRACKPOINT_ACTIVITY_TIMEOUT); + /* Require at least three events before enabling palm detection */ - if (tp->palm.trackpoint_event_count < 3) +- if (tp->palm.trackpoint_event_count < 3) ++ if (tp->palm.trackpoint_event_count < 3) { ++ libinput_timer_set(&tp->palm.trackpoint_timer, ++ time + DEFAULT_TRACKPOINT_EVENT_TIMEOUT); return; -@@ -1939,8 +1944,6 @@ tp_trackpoint_event(uint64_t time, struct libinput_event *event, void *data) - tp->palm.trackpoint_active = true; - } ++ } -- libinput_timer_set(&tp->palm.trackpoint_timer, -- time + DEFAULT_TRACKPOINT_ACTIVITY_TIMEOUT); - } - - static void + if (!tp->palm.trackpoint_active) { + tp_stop_actions(tp, time); diff --git a/test/test-trackpoint.c b/test/test-trackpoint.c index 46a66893..5cca9bc9 100644 --- a/test/test-trackpoint.c diff --git a/libinput.spec b/libinput.spec index 515e65c..922c29a 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.10.5 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -112,6 +112,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Fri Apr 27 2018 Peter Hutterer 1.10.5-3 +- Fix the T460s halting cursor problem harder (#1572394) + * Fri Apr 27 2018 Peter Hutterer 1.10.5-2 - Fix the T460s halting cursor problem (#1572394) From f11bd4ba52c717e00a3755141dbc0a8d7ab45cba Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 1 May 2018 17:52:30 +1000 Subject: [PATCH 030/184] libinput 1.10.6 --- .gitignore | 1 + ...S_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch | 78 ------------------- libinput.spec | 8 +- sources | 2 +- 4 files changed, 7 insertions(+), 82 deletions(-) delete mode 100644 0001-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch diff --git a/.gitignore b/.gitignore index f0297c4..8cb5f9d 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /libinput-1.10.3.tar.xz /libinput-1.10.4.tar.xz /libinput-1.10.5.tar.xz +/libinput-1.10.6.tar.xz diff --git a/0001-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch b/0001-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch deleted file mode 100644 index 8d14de1..0000000 --- a/0001-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 4fb3f9e1d4de48853e2cdc43300e4d1fa41550b3 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 19 Apr 2018 11:00:51 +1000 -Subject: [PATCH libinput] evdev: disable ABS_MT_TOOL_PALM on the Lenovo X1 - Carbon 6th gen - -This device randomly decides that a touch is now a palm, based on -the moon phase, the user's starsign and possibly what the dog had for -breakfast. Since libinput assumes that a touchpad that labels a touch as palm -has reasons to do so, let's unassume this for this device by disabling that -axis altogether and relying on the touch pressure only. - -https://bugzilla.redhat.com/show_bug.cgi?id=1565692 - -Signed-off-by: Peter Hutterer -(cherry picked from commit 762c1726f1b633d46ce0415a43fcee93453b8b7a) ---- - src/evdev.c | 8 ++++++++ - src/evdev.h | 1 + - udev/90-libinput-model-quirks.hwdb | 4 ++++ - 3 files changed, 13 insertions(+) - -diff --git a/src/evdev.c b/src/evdev.c -index 13b2b13c..a145a03b 100644 ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -1272,6 +1272,7 @@ evdev_read_model_flags(struct evdev_device *device) - MODEL(LOGITECH_MARBLE_MOUSE), - MODEL(TABLET_NO_PROXIMITY_OUT), - MODEL(MS_NANO_TRANSCEIVER), -+ MODEL(LENOVO_CARBON_X1_6TH), - #undef MODEL - { "ID_INPUT_TRACKBALL", EVDEV_MODEL_TRACKBALL }, - { NULL, EVDEV_MODEL_DEFAULT }, -@@ -1868,6 +1869,13 @@ evdev_pre_configure_model_quirks(struct evdev_device *device) - /* Logitech Marble Mouse claims to have a middle button */ - if (device->model_flags & EVDEV_MODEL_LOGITECH_MARBLE_MOUSE) - libevdev_disable_event_code(device->evdev, EV_KEY, BTN_MIDDLE); -+ -+ /* Lenovo Carbon X1 6th gen sends bogus ABS_MT_TOOL_TYPE events for -+ * MT_TOOL_PALM */ -+ if (device->model_flags & EVDEV_MODEL_LENOVO_CARBON_X1_6TH) -+ libevdev_disable_event_code(device->evdev, -+ EV_ABS, -+ ABS_MT_TOOL_TYPE); - } - - static void -diff --git a/src/evdev.h b/src/evdev.h -index 496bea7f..cdcaf8f9 100644 ---- a/src/evdev.h -+++ b/src/evdev.h -@@ -112,6 +112,7 @@ enum evdev_device_model { - EVDEV_MODEL_JUMPING_SEMI_MT = (1 << 10), - EVDEV_MODEL_LOGITECH_K400 = (1 << 11), - EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81 = (1 << 12), -+ EVDEV_MODEL_LENOVO_CARBON_X1_6TH = (1 << 13), - EVDEV_MODEL_CYBORG_RAT = (1 << 14), - EVDEV_MODEL_HP_STREAM11_TOUCHPAD = (1 << 16), - EVDEV_MODEL_LENOVO_T450_TOUCHPAD= (1 << 17), -diff --git a/udev/90-libinput-model-quirks.hwdb b/udev/90-libinput-model-quirks.hwdb -index 7470973f..6f625017 100644 ---- a/udev/90-libinput-model-quirks.hwdb -+++ b/udev/90-libinput-model-quirks.hwdb -@@ -232,6 +232,10 @@ libinput:keyboard:input:b0003v17EFp6047* - libinput:name:*ALPS TrackPoint*:svnLENOVO:*:pvrThinkPadX280:* - LIBINPUT_ATTR_TRACKPOINT_RANGE=70 - -+# Lenovo Carbon X1 6th gen (RMI4 only, PS/2 is broken on this device) -+libinput:name:Synaptics TM3288-010:dmi:*svnLenovo:*pvrThinkPadX1Carbon6th:* -+ LIBINPUT_MODEL_LENOVO_CARBON_X1_6TH=1 -+ - ########################################## - # Logitech - ########################################## --- -2.14.3 - diff --git a/libinput.spec b/libinput.spec index 922c29a..ec1119d 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.10.5 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.10.6 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -18,7 +18,6 @@ Source2: commitid Source0: http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz %endif -Patch01: 0001-evdev-disable-ABS_MT_TOOL_PALM-on-the-Lenovo-X1-Carb.patch Patch02: 0001-touchpad-fix-the-trackpoint-event-counter-for-the-T4.patch BuildRequires: git-core @@ -112,6 +111,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Tue May 01 2018 Peter Hutterer 1.10.6-1 +- libinput 1.10.6 + * Fri Apr 27 2018 Peter Hutterer 1.10.5-3 - Fix the T460s halting cursor problem harder (#1572394) diff --git a/sources b/sources index 2ce19c2..43281a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.10.5.tar.xz) = 61f19ea777b523f0e76869b8e7dbbff5e51132d3c856c6edb9915a695f7903256228e71be2567642866923a800f1283bdd5aff97266ac26c2e42dfce0bffa50b +SHA512 (libinput-1.10.6.tar.xz) = b76963c3429c5590ee04f1da94d08775c8bb8584830e678804fb1d4cf0e2af84826782eae71fdd57492461f85df87ac2fc940c280b0672c75cd81d5f34702fe4 From ea254a5f10c3f08854eb333d26d04bca1d963b3a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 14 May 2018 11:09:10 +1000 Subject: [PATCH 031/184] Fix palm threshold on MacBookPro5,5 (#1575260) --- ...-spurious-palm-detections-on-MacBook.patch | 29 ++++++++++ 0001-util-allow-for-palm-pressure-255.patch | 53 +++++++++++++++++++ libinput.spec | 7 ++- 3 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 0001-Add-quirk-to-fix-spurious-palm-detections-on-MacBook.patch create mode 100644 0001-util-allow-for-palm-pressure-255.patch diff --git a/0001-Add-quirk-to-fix-spurious-palm-detections-on-MacBook.patch b/0001-Add-quirk-to-fix-spurious-palm-detections-on-MacBook.patch new file mode 100644 index 0000000..496ca64 --- /dev/null +++ b/0001-Add-quirk-to-fix-spurious-palm-detections-on-MacBook.patch @@ -0,0 +1,29 @@ +From 7ce9766162ee30e54eba544d9d83650e1c313d79 Mon Sep 17 00:00:00 2001 +From: Veli-Jussi Raitila +Date: Fri, 11 May 2018 12:26:16 +0300 +Subject: [PATCH libinput] Add quirk to fix spurious palm detections on MacBook + Pro (13-inch, Mid 2009) + +Signed-off-by: Peter Hutterer +--- + udev/90-libinput-model-quirks.hwdb | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/udev/90-libinput-model-quirks.hwdb b/udev/90-libinput-model-quirks.hwdb +index dd5ae4d9..d5d47682 100644 +--- a/udev/90-libinput-model-quirks.hwdb ++++ b/udev/90-libinput-model-quirks.hwdb +@@ -74,6 +74,10 @@ libinput:touchpad:input:b0005v05ACp030E* + libinput:touchpad:input:b0003v05ACp021A* + LIBINPUT_MODEL_APPLE_TOUCHPAD_ONEBUTTON=1 + ++# MacBookPro5,5 (Mid 2009) ++libinput:name:bcm5974:dmi:*:svnAppleInc.:pnMacBookPro5,5:* ++ LIBINPUT_ATTR_PALM_SIZE_THRESHOLD=1000 ++ + ########################################## + # Asus + ########################################## +-- +2.14.3 + diff --git a/0001-util-allow-for-palm-pressure-255.patch b/0001-util-allow-for-palm-pressure-255.patch new file mode 100644 index 0000000..23856b9 --- /dev/null +++ b/0001-util-allow-for-palm-pressure-255.patch @@ -0,0 +1,53 @@ +From 59eb10e593213403c301a5ce3fbd0a22b6e52efd Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Mon, 30 Apr 2018 10:40:45 +1000 +Subject: [PATCH libinput] util: allow for palm pressure > 255 + +https://bugs.freedesktop.org/show_bug.cgi?id=105753 + +Signed-off-by: Peter Hutterer +--- + src/libinput-util.c | 4 +--- + test/test-misc.c | 3 +-- + 2 files changed, 2 insertions(+), 5 deletions(-) + +diff --git a/src/libinput-util.c b/src/libinput-util.c +index 93d73827..e774fb78 100644 +--- a/src/libinput-util.c ++++ b/src/libinput-util.c +@@ -425,9 +425,7 @@ parse_palm_pressure_property(const char *prop) + if (!prop) + return 0; + +- if (!safe_atoi(prop, &threshold) || +- threshold < 0 || +- threshold > 255) /* No touchpad device has pressure > 255 */ ++ if (!safe_atoi(prop, &threshold) || threshold < 0) + return 0; + + return threshold; +diff --git a/test/test-misc.c b/test/test-misc.c +index c62cd03e..608bba61 100644 +--- a/test/test-misc.c ++++ b/test/test-misc.c +@@ -1055,16 +1055,15 @@ START_TEST(palm_pressure_parser) + { "1", 1 }, + { "10", 10 }, + { "255", 255 }, ++ { "360", 360 }, + + { "-12", 0 }, +- { "360", 0 }, + { "0", 0 }, + { "-0", 0 }, + { "a", 0 }, + { "10a", 0 }, + { "10-", 0 }, + { "sadfasfd", 0 }, +- { "361", 0 }, + { NULL, 0 } + }; + +-- +2.14.3 + diff --git a/libinput.spec b/libinput.spec index ec1119d..5c3753f 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.10.6 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -19,6 +19,8 @@ Source0: http://www.freedesktop.org/software/libinput/libinput-%{version} %endif Patch02: 0001-touchpad-fix-the-trackpoint-event-counter-for-the-T4.patch +Patch03: 0001-util-allow-for-palm-pressure-255.patch +Patch04: 0001-Add-quirk-to-fix-spurious-palm-detections-on-MacBook.patch BuildRequires: git-core BuildRequires: gcc gcc-c++ @@ -111,6 +113,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Mon May 14 2018 Peter Hutterer 1.10.6-2 +- Fix palm threshold on MacBookPro5,5 (#1575260) + * Tue May 01 2018 Peter Hutterer 1.10.6-1 - libinput 1.10.6 From 7dd7fed381a9a6fb3763d69c65df2a052a3e3077 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 17 May 2018 12:26:20 +1000 Subject: [PATCH 032/184] libinput 1.10.7 --- .gitignore | 1 + ...-spurious-palm-detections-on-MacBook.patch | 29 ----- ...-trackpoint-event-counter-for-the-T4.patch | 112 ------------------ 0001-util-allow-for-palm-pressure-255.patch | 53 --------- libinput.spec | 11 +- sources | 2 +- 6 files changed, 7 insertions(+), 201 deletions(-) delete mode 100644 0001-Add-quirk-to-fix-spurious-palm-detections-on-MacBook.patch delete mode 100644 0001-touchpad-fix-the-trackpoint-event-counter-for-the-T4.patch delete mode 100644 0001-util-allow-for-palm-pressure-255.patch diff --git a/.gitignore b/.gitignore index 8cb5f9d..a1e03d1 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /libinput-1.10.4.tar.xz /libinput-1.10.5.tar.xz /libinput-1.10.6.tar.xz +/libinput-1.10.7.tar.xz diff --git a/0001-Add-quirk-to-fix-spurious-palm-detections-on-MacBook.patch b/0001-Add-quirk-to-fix-spurious-palm-detections-on-MacBook.patch deleted file mode 100644 index 496ca64..0000000 --- a/0001-Add-quirk-to-fix-spurious-palm-detections-on-MacBook.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 7ce9766162ee30e54eba544d9d83650e1c313d79 Mon Sep 17 00:00:00 2001 -From: Veli-Jussi Raitila -Date: Fri, 11 May 2018 12:26:16 +0300 -Subject: [PATCH libinput] Add quirk to fix spurious palm detections on MacBook - Pro (13-inch, Mid 2009) - -Signed-off-by: Peter Hutterer ---- - udev/90-libinput-model-quirks.hwdb | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/udev/90-libinput-model-quirks.hwdb b/udev/90-libinput-model-quirks.hwdb -index dd5ae4d9..d5d47682 100644 ---- a/udev/90-libinput-model-quirks.hwdb -+++ b/udev/90-libinput-model-quirks.hwdb -@@ -74,6 +74,10 @@ libinput:touchpad:input:b0005v05ACp030E* - libinput:touchpad:input:b0003v05ACp021A* - LIBINPUT_MODEL_APPLE_TOUCHPAD_ONEBUTTON=1 - -+# MacBookPro5,5 (Mid 2009) -+libinput:name:bcm5974:dmi:*:svnAppleInc.:pnMacBookPro5,5:* -+ LIBINPUT_ATTR_PALM_SIZE_THRESHOLD=1000 -+ - ########################################## - # Asus - ########################################## --- -2.14.3 - diff --git a/0001-touchpad-fix-the-trackpoint-event-counter-for-the-T4.patch b/0001-touchpad-fix-the-trackpoint-event-counter-for-the-T4.patch deleted file mode 100644 index f0c7dba..0000000 --- a/0001-touchpad-fix-the-trackpoint-event-counter-for-the-T4.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 4172888e91281df81b226920a28117d24ee57266 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 27 Apr 2018 14:40:57 +1000 -Subject: [PATCH libinput] touchpad: fix the trackpoint event counter for the - T460s - -Introduced in 416fa44d80b0f2c53b652ddfa35dd4a156a65c65 but there was a logic -error: we claimed to require 3 events from a trackpoint before stopping the -touchpad but the timer was only set when we actually stopped the touchpad. So -if a trackpoint sends a single event every second, we'd disable the touchpad -after 3 seconds for the duration of the timeout, then again 3 seconds later, -etc. - -Fix this by always setting the timeout and resetting the event counter if no -activity happened. - -Signed-off-by: Peter Hutterer -(cherry picked from commit c0fd857def5547f612d2c14ae57dda1cef47a92c) ---- - src/evdev-mt-touchpad.c | 13 ++++++++++--- - test/test-trackpoint.c | 30 ++++++++++++++++++++++++++++++ - 2 files changed, 40 insertions(+), 3 deletions(-) - -diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c -index cc01976a..25520526 100644 ---- a/src/evdev-mt-touchpad.c -+++ b/src/evdev-mt-touchpad.c -@@ -31,6 +31,7 @@ - #include "evdev-mt-touchpad.h" - - #define DEFAULT_TRACKPOINT_ACTIVITY_TIMEOUT ms2us(300) -+#define DEFAULT_TRACKPOINT_EVENT_TIMEOUT ms2us(40) - #define DEFAULT_KEYBOARD_ACTIVITY_TIMEOUT_1 ms2us(200) - #define DEFAULT_KEYBOARD_ACTIVITY_TIMEOUT_2 ms2us(500) - #define THUMB_MOVE_TIMEOUT ms2us(300) -@@ -1912,8 +1913,10 @@ tp_trackpoint_timeout(uint64_t now, void *data) - { - struct tp_dispatch *tp = data; - -- tp_tap_resume(tp, now); -- tp->palm.trackpoint_active = false; -+ if (tp->palm.trackpoint_active) { -+ tp_tap_resume(tp, now); -+ tp->palm.trackpoint_active = false; -+ } - tp->palm.trackpoint_event_count = 0; - } - -@@ -1930,9 +1933,13 @@ tp_trackpoint_event(uint64_t time, struct libinput_event *event, void *data) - tp->palm.trackpoint_last_event_time = time; - tp->palm.trackpoint_event_count++; - -+ - /* Require at least three events before enabling palm detection */ -- if (tp->palm.trackpoint_event_count < 3) -+ if (tp->palm.trackpoint_event_count < 3) { -+ libinput_timer_set(&tp->palm.trackpoint_timer, -+ time + DEFAULT_TRACKPOINT_EVENT_TIMEOUT); - return; -+ } - - if (!tp->palm.trackpoint_active) { - tp_stop_actions(tp, time); -diff --git a/test/test-trackpoint.c b/test/test-trackpoint.c -index 46a66893..5cca9bc9 100644 ---- a/test/test-trackpoint.c -+++ b/test/test-trackpoint.c -@@ -379,6 +379,35 @@ START_TEST(trackpoint_palmdetect_require_min_events) - } - END_TEST - -+START_TEST(trackpoint_palmdetect_require_min_events_timeout) -+{ -+ struct litest_device *trackpoint = litest_current_device(); -+ struct litest_device *touchpad; -+ struct libinput *li = trackpoint->libinput; -+ -+ touchpad = litest_add_device(li, LITEST_SYNAPTICS_I2C); -+ litest_drain_events(li); -+ -+ for (int i = 0; i < 10; i++) { -+ /* A single event does not trigger palm detection */ -+ litest_event(trackpoint, EV_REL, REL_X, 1); -+ litest_event(trackpoint, EV_REL, REL_Y, 1); -+ litest_event(trackpoint, EV_SYN, SYN_REPORT, 0); -+ libinput_dispatch(li); -+ litest_drain_events(li); -+ -+ litest_touch_down(touchpad, 0, 30, 30); -+ litest_touch_move_to(touchpad, 0, 30, 30, 80, 80, 10, 1); -+ litest_touch_up(touchpad, 0); -+ litest_assert_only_typed_events(li, LIBINPUT_EVENT_POINTER_MOTION); -+ -+ litest_timeout_trackpoint(); -+ } -+ -+ litest_delete_device(touchpad); -+} -+END_TEST -+ - void - litest_setup_tests_trackpoint(void) - { -@@ -393,4 +422,5 @@ litest_setup_tests_trackpoint(void) - litest_add("trackpoint:palmdetect", trackpoint_palmdetect, LITEST_POINTINGSTICK, LITEST_ANY); - litest_add("trackpoint:palmdetect", trackpoint_palmdetect_resume_touch, LITEST_POINTINGSTICK, LITEST_ANY); - litest_add("trackpoint:palmdetect", trackpoint_palmdetect_require_min_events, LITEST_POINTINGSTICK, LITEST_ANY); -+ litest_add("trackpoint:palmdetect", trackpoint_palmdetect_require_min_events_timeout, LITEST_POINTINGSTICK, LITEST_ANY); - } --- -2.14.3 - diff --git a/0001-util-allow-for-palm-pressure-255.patch b/0001-util-allow-for-palm-pressure-255.patch deleted file mode 100644 index 23856b9..0000000 --- a/0001-util-allow-for-palm-pressure-255.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 59eb10e593213403c301a5ce3fbd0a22b6e52efd Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Mon, 30 Apr 2018 10:40:45 +1000 -Subject: [PATCH libinput] util: allow for palm pressure > 255 - -https://bugs.freedesktop.org/show_bug.cgi?id=105753 - -Signed-off-by: Peter Hutterer ---- - src/libinput-util.c | 4 +--- - test/test-misc.c | 3 +-- - 2 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/src/libinput-util.c b/src/libinput-util.c -index 93d73827..e774fb78 100644 ---- a/src/libinput-util.c -+++ b/src/libinput-util.c -@@ -425,9 +425,7 @@ parse_palm_pressure_property(const char *prop) - if (!prop) - return 0; - -- if (!safe_atoi(prop, &threshold) || -- threshold < 0 || -- threshold > 255) /* No touchpad device has pressure > 255 */ -+ if (!safe_atoi(prop, &threshold) || threshold < 0) - return 0; - - return threshold; -diff --git a/test/test-misc.c b/test/test-misc.c -index c62cd03e..608bba61 100644 ---- a/test/test-misc.c -+++ b/test/test-misc.c -@@ -1055,16 +1055,15 @@ START_TEST(palm_pressure_parser) - { "1", 1 }, - { "10", 10 }, - { "255", 255 }, -+ { "360", 360 }, - - { "-12", 0 }, -- { "360", 0 }, - { "0", 0 }, - { "-0", 0 }, - { "a", 0 }, - { "10a", 0 }, - { "10-", 0 }, - { "sadfasfd", 0 }, -- { "361", 0 }, - { NULL, 0 } - }; - --- -2.14.3 - diff --git a/libinput.spec b/libinput.spec index 5c3753f..4b54571 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.10.6 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.10.7 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -18,10 +18,6 @@ Source2: commitid Source0: http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz %endif -Patch02: 0001-touchpad-fix-the-trackpoint-event-counter-for-the-T4.patch -Patch03: 0001-util-allow-for-palm-pressure-255.patch -Patch04: 0001-Add-quirk-to-fix-spurious-palm-detections-on-MacBook.patch - BuildRequires: git-core BuildRequires: gcc gcc-c++ BuildRequires: meson @@ -113,6 +109,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-measure-trackpoint-range.1* %changelog +* Thu May 17 2018 Peter Hutterer 1.10.7-2 +- libinput 1.10.7 + * Mon May 14 2018 Peter Hutterer 1.10.6-2 - Fix palm threshold on MacBookPro5,5 (#1575260) diff --git a/sources b/sources index 43281a5..6856db9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.10.6.tar.xz) = b76963c3429c5590ee04f1da94d08775c8bb8584830e678804fb1d4cf0e2af84826782eae71fdd57492461f85df87ac2fc940c280b0672c75cd81d5f34702fe4 +SHA512 (libinput-1.10.7.tar.xz) = b102b8065ceed7511ad26efba34d5d9b0c13f0f7aaa882bb21501f7a5166f4cbe140fcbb488e90e6880bd47bb2b27667a4d6aa79b8726269fa1337897034a684 From 1acd6d12e8c047fc8ab7b999997e9d0c458ad1c3 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 22 May 2018 11:41:52 +1000 Subject: [PATCH 033/184] libinput 1.11 rc1 --- .gitignore | 1 + libinput.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a1e03d1..f5b1f7c 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /libinput-1.10.5.tar.xz /libinput-1.10.6.tar.xz /libinput-1.10.7.tar.xz +/libinput-1.10.901.tar.xz diff --git a/libinput.spec b/libinput.spec index 4b54571..c21fa3d 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.10.7 +Version: 1.10.901 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -88,8 +88,6 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-list-devices.1* %{_mandir}/man1/libinput-debug-events.1* -%{_bindir}/libinput-list-devices -%{_bindir}/libinput-debug-events %files devel %{_includedir}/libinput.h @@ -98,17 +96,26 @@ The %{name}-utils package contains tools to debug hardware and analyze %files utils %{_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-touch-size %{_libexecdir}/libinput/libinput-measure-trackpoint-range +%{_libexecdir}/libinput/libinput-record +%{_libexecdir}/libinput/libinput-replay %{_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-trackpoint-range.1* +%{_mandir}/man1/libinput-record.1* +%{_mandir}/man1/libinput-replay.1* %changelog +* Tue May 22 2018 Peter Hutterer 1.10.901-1 +- libinput 1.11 rc1 + * Thu May 17 2018 Peter Hutterer 1.10.7-2 - libinput 1.10.7 diff --git a/sources b/sources index 6856db9..75f110d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.10.7.tar.xz) = b102b8065ceed7511ad26efba34d5d9b0c13f0f7aaa882bb21501f7a5166f4cbe140fcbb488e90e6880bd47bb2b27667a4d6aa79b8726269fa1337897034a684 +SHA512 (libinput-1.10.901.tar.xz) = b2251e8d33e95e7e6c8a7a54dc8038b540ea4132a0e7662eca11c9afdc7b6b5052f22f07e07c36e47a5b7d27005d8f667184b4ced729c7401747ee8761a394bd From c4ac66d12eb31630847b8377b0d64ea5f96a7795 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 30 May 2018 10:41:49 +1000 Subject: [PATCH 034/184] libinput 1.11 rc2 --- .gitignore | 1 + libinput.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f5b1f7c..93fc81f 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /libinput-1.10.6.tar.xz /libinput-1.10.7.tar.xz /libinput-1.10.901.tar.xz +/libinput-1.10.902.tar.xz diff --git a/libinput.spec b/libinput.spec index c21fa3d..3b1e665 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.10.901 +Version: 1.10.902 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -113,6 +113,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-replay.1* %changelog +* Wed May 30 2018 Peter Hutterer 1.10.902-1 +- libinput 1.11 rc2 + * Tue May 22 2018 Peter Hutterer 1.10.901-1 - libinput 1.11 rc1 diff --git a/sources b/sources index 75f110d..70d0844 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.10.901.tar.xz) = b2251e8d33e95e7e6c8a7a54dc8038b540ea4132a0e7662eca11c9afdc7b6b5052f22f07e07c36e47a5b7d27005d8f667184b4ced729c7401747ee8761a394bd +SHA512 (libinput-1.10.902.tar.xz) = c7c3da905852312e0b522b9356bf03ba5cb424020e0caf41cbd36fc22a6d337c2faebb878c01f958e7c078c9608f311b00190e8690b242000c6197a91d05e9a2 From 398e08b0ede27530e6b3a4bda2b282d2e16800b6 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 1 Jun 2018 11:21:37 +1000 Subject: [PATCH 035/184] Revert direct sensitivity attribute reading (#1583324) --- ...-the-trackpoint-sensitivity-directly.patch | 55 +++++++++++++++++++ libinput.spec | 8 ++- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 0001-Revert-udev-copy-the-trackpoint-sensitivity-directly.patch diff --git a/0001-Revert-udev-copy-the-trackpoint-sensitivity-directly.patch b/0001-Revert-udev-copy-the-trackpoint-sensitivity-directly.patch new file mode 100644 index 0000000..e6186c5 --- /dev/null +++ b/0001-Revert-udev-copy-the-trackpoint-sensitivity-directly.patch @@ -0,0 +1,55 @@ +From 4b9050a0c18ea679bd8ca85ec92c9090b01974ca Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Fri, 1 Jun 2018 11:19:49 +1000 +Subject: [PATCH libinput] Revert "udev: copy the trackpoint sensitivity + directly from sysfs" + +The lenovo compact keyboard with trackpoint has a sensitivity of 5, which +causes the trackpoint range to be 0. + +https://bugzilla.redhat.com/show_bug.cgi?id=1583324 + +This reverts commit a4036a33ca6ca8da7d2417cac6b840a89b295e5f. +--- + src/evdev.c | 4 ++-- + udev/90-libinput-model-quirks.rules.in | 4 ---- + 2 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/src/evdev.c b/src/evdev.c +index 1ac5b4f0..4da80a1f 100644 +--- a/src/evdev.c ++++ b/src/evdev.c +@@ -1194,7 +1194,7 @@ evdev_get_trackpoint_range(struct evdev_device *device) + HTTP_DOC_LINK); + + prop = udev_device_get_property_value(device->udev_device, +- "LIBINPUT_ATTR_TRACKPOINT_SENSITIVITY"); ++ "POINTINGSTICK_SENSITIVITY"); + if (prop) { + int sensitivity; + +@@ -1210,7 +1210,7 @@ evdev_get_trackpoint_range(struct evdev_device *device) + sensitivity/DEFAULT_TRACKPOINT_SENSITIVITY; + + evdev_log_debug(device, +- "trackpoint sensitivity is %d\n", ++ "trackpoint udev sensitivity is %d\n", + sensitivity); + } + +diff --git a/udev/90-libinput-model-quirks.rules.in b/udev/90-libinput-model-quirks.rules.in +index cab8dcda..75d5b368 100644 +--- a/udev/90-libinput-model-quirks.rules.in ++++ b/udev/90-libinput-model-quirks.rules.in +@@ -39,8 +39,4 @@ KERNELS=="input*", \ + KERNELS=="input*", \ + IMPORT{builtin}="hwdb 'libinput:name:$attr{name}:dt:$attr{[devicetree/base]model}'" + +-ENV{ID_INPUT_POINTINGSTICK}=="1", \ +- ATTRS{sensitivity}=="?*", \ +- ENV{LIBINPUT_ATTR_TRACKPOINT_SENSITIVITY}="$attr{sensitivity}" +- + LABEL="libinput_model_quirks_end" +-- +2.14.3 + diff --git a/libinput.spec b/libinput.spec index 3b1e665..9fc7cd9 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.10.902 -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: http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz %endif +# https://bugzilla.redhat.com/show_bug.cgi?id=1583324 +Patch01: 0001-Revert-udev-copy-the-trackpoint-sensitivity-directly.patch + BuildRequires: git-core BuildRequires: gcc gcc-c++ BuildRequires: meson @@ -113,6 +116,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-replay.1* %changelog +* Fri Jun 01 2018 Peter Hutterer 1.10.902-2 +- Revert direct sensitivity attribute reading (#1583324) + * Wed May 30 2018 Peter Hutterer 1.10.902-1 - libinput 1.11 rc2 From 85ae930e2237d1909791b97feb71783dd896d397 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 5 Jun 2018 10:32:36 +1000 Subject: [PATCH 036/184] libinput 1.11.0 --- .gitignore | 1 + ...-the-trackpoint-sensitivity-directly.patch | 55 ------------------- libinput.spec | 10 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 61 deletions(-) delete mode 100644 0001-Revert-udev-copy-the-trackpoint-sensitivity-directly.patch diff --git a/.gitignore b/.gitignore index 93fc81f..dd665e7 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /libinput-1.10.7.tar.xz /libinput-1.10.901.tar.xz /libinput-1.10.902.tar.xz +/libinput-1.11.0.tar.xz diff --git a/0001-Revert-udev-copy-the-trackpoint-sensitivity-directly.patch b/0001-Revert-udev-copy-the-trackpoint-sensitivity-directly.patch deleted file mode 100644 index e6186c5..0000000 --- a/0001-Revert-udev-copy-the-trackpoint-sensitivity-directly.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 4b9050a0c18ea679bd8ca85ec92c9090b01974ca Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 1 Jun 2018 11:19:49 +1000 -Subject: [PATCH libinput] Revert "udev: copy the trackpoint sensitivity - directly from sysfs" - -The lenovo compact keyboard with trackpoint has a sensitivity of 5, which -causes the trackpoint range to be 0. - -https://bugzilla.redhat.com/show_bug.cgi?id=1583324 - -This reverts commit a4036a33ca6ca8da7d2417cac6b840a89b295e5f. ---- - src/evdev.c | 4 ++-- - udev/90-libinput-model-quirks.rules.in | 4 ---- - 2 files changed, 2 insertions(+), 6 deletions(-) - -diff --git a/src/evdev.c b/src/evdev.c -index 1ac5b4f0..4da80a1f 100644 ---- a/src/evdev.c -+++ b/src/evdev.c -@@ -1194,7 +1194,7 @@ evdev_get_trackpoint_range(struct evdev_device *device) - HTTP_DOC_LINK); - - prop = udev_device_get_property_value(device->udev_device, -- "LIBINPUT_ATTR_TRACKPOINT_SENSITIVITY"); -+ "POINTINGSTICK_SENSITIVITY"); - if (prop) { - int sensitivity; - -@@ -1210,7 +1210,7 @@ evdev_get_trackpoint_range(struct evdev_device *device) - sensitivity/DEFAULT_TRACKPOINT_SENSITIVITY; - - evdev_log_debug(device, -- "trackpoint sensitivity is %d\n", -+ "trackpoint udev sensitivity is %d\n", - sensitivity); - } - -diff --git a/udev/90-libinput-model-quirks.rules.in b/udev/90-libinput-model-quirks.rules.in -index cab8dcda..75d5b368 100644 ---- a/udev/90-libinput-model-quirks.rules.in -+++ b/udev/90-libinput-model-quirks.rules.in -@@ -39,8 +39,4 @@ KERNELS=="input*", \ - KERNELS=="input*", \ - IMPORT{builtin}="hwdb 'libinput:name:$attr{name}:dt:$attr{[devicetree/base]model}'" - --ENV{ID_INPUT_POINTINGSTICK}=="1", \ -- ATTRS{sensitivity}=="?*", \ -- ENV{LIBINPUT_ATTR_TRACKPOINT_SENSITIVITY}="$attr{sensitivity}" -- - LABEL="libinput_model_quirks_end" --- -2.14.3 - diff --git a/libinput.spec b/libinput.spec index 9fc7cd9..21eb637 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.10.902 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.11.0 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -18,9 +18,6 @@ Source2: commitid Source0: http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz %endif -# https://bugzilla.redhat.com/show_bug.cgi?id=1583324 -Patch01: 0001-Revert-udev-copy-the-trackpoint-sensitivity-directly.patch - BuildRequires: git-core BuildRequires: gcc gcc-c++ BuildRequires: meson @@ -116,6 +113,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-replay.1* %changelog +* Tue Jun 05 2018 Peter Hutterer 1.11.0-1 +- libinput 1.11.0 + * Fri Jun 01 2018 Peter Hutterer 1.10.902-2 - Revert direct sensitivity attribute reading (#1583324) diff --git a/sources b/sources index 70d0844..d1595ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.10.902.tar.xz) = c7c3da905852312e0b522b9356bf03ba5cb424020e0caf41cbd36fc22a6d337c2faebb878c01f958e7c078c9608f311b00190e8690b242000c6197a91d05e9a2 +SHA512 (libinput-1.11.0.tar.xz) = 382a6c9ec4aaf13ac209ee5a7f507c7a6d2dd399c5104703ac7c6ac62fb3f393de6f4e15d7895b18c8b8d845ce8fc1f551a90aa7532f0de4cc17e57a09cfe857 From eee0356e383310a07389e107ee496e508d8b7240 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 19 Jun 2018 17:53:01 +1000 Subject: [PATCH 037/184] libinput 1.11.1 --- .gitignore | 1 + libinput.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dd665e7..a0fc047 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /libinput-1.10.901.tar.xz /libinput-1.10.902.tar.xz /libinput-1.11.0.tar.xz +/libinput-1.11.1.tar.xz diff --git a/libinput.spec b/libinput.spec index 21eb637..8a66221 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.11.0 +Version: 1.11.1 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -113,6 +113,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-replay.1* %changelog +* Tue Jun 19 2018 Peter Hutterer 1.11.1-1 +- libinput 1.11.1 + * Tue Jun 05 2018 Peter Hutterer 1.11.0-1 - libinput 1.11.0 diff --git a/sources b/sources index d1595ea..9c3c012 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.11.0.tar.xz) = 382a6c9ec4aaf13ac209ee5a7f507c7a6d2dd399c5104703ac7c6ac62fb3f393de6f4e15d7895b18c8b8d845ce8fc1f551a90aa7532f0de4cc17e57a09cfe857 +SHA512 (libinput-1.11.1.tar.xz) = 3dd1a318c89d66f5a66016c6dbfa5277b61a8cb5337d99f85b1eeef40ed894bdc04fd4588a97383988daea0f034df5a72bff318325320a01b857db9deb94a2b0 From 53669d8e66afb4ba5fecefeea059963f644f3ad0 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 20 Jun 2018 11:44:46 +1000 Subject: [PATCH 038/184] Fix segfault in libinput list-devices --- ...valid-grab-parameter-to-list-devices.patch | 58 +++++++++++++++++++ libinput.spec | 7 ++- 2 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 0001-tools-pass-a-valid-grab-parameter-to-list-devices.patch diff --git a/0001-tools-pass-a-valid-grab-parameter-to-list-devices.patch b/0001-tools-pass-a-valid-grab-parameter-to-list-devices.patch new file mode 100644 index 0000000..5334715 --- /dev/null +++ b/0001-tools-pass-a-valid-grab-parameter-to-list-devices.patch @@ -0,0 +1,58 @@ +From 7c51c881dc72827ca50ae9eea3d123eef9cb4a66 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Wed, 20 Jun 2018 07:56:05 +1000 +Subject: [PATCH libinput] tools: pass a valid grab parameter to list-devices + +My kingdome for a compiler warning. Or a scan-build warning. Or a coverity +warning. Or anything... But no, nothing. + +Also make the open_restricted() more robust to a NULL userdata, because +effectively that's what we were passing here. + +Fixes https://gitlab.freedesktop.org/libinput/libinput/issues/50 + +Introduced in 0a13223c39fdf0f079715bf83d498c0dcd9cf4f8 + +Signed-off-by: Peter Hutterer +--- + tools/libinput-list-devices.c | 3 ++- + tools/shared.c | 2 +- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/tools/libinput-list-devices.c b/tools/libinput-list-devices.c +index aa225ca0..4cbdf775 100644 +--- a/tools/libinput-list-devices.c ++++ b/tools/libinput-list-devices.c +@@ -372,6 +372,7 @@ main(int argc, char **argv) + { + struct libinput *li; + struct libinput_event *ev; ++ bool grab = false; + + /* This is kept for backwards-compatibility with the old + libinput-list-devices */ +@@ -388,7 +389,7 @@ main(int argc, char **argv) + } + } + +- li = tools_open_backend(BACKEND_UDEV, "seat0", false, false); ++ li = tools_open_backend(BACKEND_UDEV, "seat0", false, &grab); + if (!li) + return 1; + +diff --git a/tools/shared.c b/tools/shared.c +index d1f02702..d3fb6294 100644 +--- a/tools/shared.c ++++ b/tools/shared.c +@@ -232,7 +232,7 @@ open_restricted(const char *path, int flags, void *user_data) + if (fd < 0) + fprintf(stderr, "Failed to open %s (%s)\n", + path, strerror(errno)); +- else if (*grab && ioctl(fd, EVIOCGRAB, (void*)1) == -1) ++ else if (grab && *grab && ioctl(fd, EVIOCGRAB, (void*)1) == -1) + fprintf(stderr, "Grab requested, but failed for %s (%s)\n", + path, strerror(errno)); + +-- +2.17.1 + diff --git a/libinput.spec b/libinput.spec index 8a66221..a9ff3f9 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.11.1 -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-pass-a-valid-grab-parameter-to-list-devices.patch + BuildRequires: git-core BuildRequires: gcc gcc-c++ BuildRequires: meson @@ -113,6 +115,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-replay.1* %changelog +* Wed Jun 20 2018 Peter Hutterer 1.11.1-2 +- Fix segfault in libinput list-devices + * Tue Jun 19 2018 Peter Hutterer 1.11.1-1 - libinput 1.11.1 From 18f75835c43c8906919f46cfb13e4ec11ec889d1 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 3 Jul 2018 15:05:10 +1000 Subject: [PATCH 039/184] libinput 1.11.2 --- .gitignore | 1 + ...valid-grab-parameter-to-list-devices.patch | 58 ------------------- libinput.spec | 9 +-- sources | 2 +- 4 files changed, 7 insertions(+), 63 deletions(-) delete mode 100644 0001-tools-pass-a-valid-grab-parameter-to-list-devices.patch diff --git a/.gitignore b/.gitignore index a0fc047..512cf0c 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /libinput-1.10.902.tar.xz /libinput-1.11.0.tar.xz /libinput-1.11.1.tar.xz +/libinput-1.11.2.tar.xz diff --git a/0001-tools-pass-a-valid-grab-parameter-to-list-devices.patch b/0001-tools-pass-a-valid-grab-parameter-to-list-devices.patch deleted file mode 100644 index 5334715..0000000 --- a/0001-tools-pass-a-valid-grab-parameter-to-list-devices.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 7c51c881dc72827ca50ae9eea3d123eef9cb4a66 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Wed, 20 Jun 2018 07:56:05 +1000 -Subject: [PATCH libinput] tools: pass a valid grab parameter to list-devices - -My kingdome for a compiler warning. Or a scan-build warning. Or a coverity -warning. Or anything... But no, nothing. - -Also make the open_restricted() more robust to a NULL userdata, because -effectively that's what we were passing here. - -Fixes https://gitlab.freedesktop.org/libinput/libinput/issues/50 - -Introduced in 0a13223c39fdf0f079715bf83d498c0dcd9cf4f8 - -Signed-off-by: Peter Hutterer ---- - tools/libinput-list-devices.c | 3 ++- - tools/shared.c | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/tools/libinput-list-devices.c b/tools/libinput-list-devices.c -index aa225ca0..4cbdf775 100644 ---- a/tools/libinput-list-devices.c -+++ b/tools/libinput-list-devices.c -@@ -372,6 +372,7 @@ main(int argc, char **argv) - { - struct libinput *li; - struct libinput_event *ev; -+ bool grab = false; - - /* This is kept for backwards-compatibility with the old - libinput-list-devices */ -@@ -388,7 +389,7 @@ main(int argc, char **argv) - } - } - -- li = tools_open_backend(BACKEND_UDEV, "seat0", false, false); -+ li = tools_open_backend(BACKEND_UDEV, "seat0", false, &grab); - if (!li) - return 1; - -diff --git a/tools/shared.c b/tools/shared.c -index d1f02702..d3fb6294 100644 ---- a/tools/shared.c -+++ b/tools/shared.c -@@ -232,7 +232,7 @@ open_restricted(const char *path, int flags, void *user_data) - if (fd < 0) - fprintf(stderr, "Failed to open %s (%s)\n", - path, strerror(errno)); -- else if (*grab && ioctl(fd, EVIOCGRAB, (void*)1) == -1) -+ else if (grab && *grab && ioctl(fd, EVIOCGRAB, (void*)1) == -1) - fprintf(stderr, "Grab requested, but failed for %s (%s)\n", - path, strerror(errno)); - --- -2.17.1 - diff --git a/libinput.spec b/libinput.spec index a9ff3f9..2964453 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.11.1 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.11.2 +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-tools-pass-a-valid-grab-parameter-to-list-devices.patch - BuildRequires: git-core BuildRequires: gcc gcc-c++ BuildRequires: meson @@ -115,6 +113,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-replay.1* %changelog +* Tue Jul 03 2018 Peter Hutterer 1.11.2-1 +- libinput 1.11.2 + * Wed Jun 20 2018 Peter Hutterer 1.11.1-2 - Fix segfault in libinput list-devices diff --git a/sources b/sources index 9c3c012..3b0d0a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.11.1.tar.xz) = 3dd1a318c89d66f5a66016c6dbfa5277b61a8cb5337d99f85b1eeef40ed894bdc04fd4588a97383988daea0f034df5a72bff318325320a01b857db9deb94a2b0 +SHA512 (libinput-1.11.2.tar.xz) = cb6ada877fc3c09f634f3db39d5507e66d4b86c3d632bb8f7498c7b01fdf8372b2053a79b641293900b7fcc0aa4e920f7c830d9c7b2d9ff3cd61c58eb7c20b65 From f7a6f4a20f141bbf0124fd4f4ba80e054ef2ff6f Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 6 Jul 2018 13:38:03 +1000 Subject: [PATCH 040/184] Replace all python3 calls with the rpm macro --- libinput.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libinput.spec b/libinput.spec index 2964453..a855332 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.11.2 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?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: python3-devel %description libinput is a library that handles input devices for display servers and other @@ -54,6 +55,8 @@ The %{name}-utils package contains tools to debug hardware and analyze %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') %build %meson -Ddebug-gui=false \ @@ -113,6 +116,9 @@ The %{name}-utils package contains tools to debug hardware and analyze %{_mandir}/man1/libinput-replay.1* %changelog +* Fri Jul 06 2018 Peter Hutterer 1.11.2-2 +- Replace all python3 calls with the rpm macro + * Tue Jul 03 2018 Peter Hutterer 1.11.2-1 - libinput 1.11.2 From ce8e6e33fc4442f64b581ce32211c8b2a75c821a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 08:16:22 +0000 Subject: [PATCH 041/184] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 a855332..047266c 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.11.2 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -116,6 +116,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-replay.1* %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.11.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Jul 06 2018 Peter Hutterer 1.11.2-2 - Replace all python3 calls with the rpm macro From e90a3a52aef22206cb6a570b272948e78b60ade7 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 25 Jul 2018 15:00:22 +1000 Subject: [PATCH 042/184] libinput 1.11.3 --- .gitignore | 1 + libinput.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 512cf0c..683873d 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /libinput-1.11.0.tar.xz /libinput-1.11.1.tar.xz /libinput-1.11.2.tar.xz +/libinput-1.11.3.tar.xz diff --git a/libinput.spec b/libinput.spec index 047266c..90eb200 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.11.2 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.11.3 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -116,6 +116,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-replay.1* %changelog +* Wed Jul 25 2018 Peter Hutterer 1.11.3-1 +- libinput 1.11.3 + * Fri Jul 13 2018 Fedora Release Engineering - 1.11.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 3b0d0a1..2324c1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.11.2.tar.xz) = cb6ada877fc3c09f634f3db39d5507e66d4b86c3d632bb8f7498c7b01fdf8372b2053a79b641293900b7fcc0aa4e920f7c830d9c7b2d9ff3cd61c58eb7c20b65 +SHA512 (libinput-1.11.3.tar.xz) = 5e18daab6202bcbfddeebc35dac4cabb5f726b5b73f5fc87975b58f3019a54a4b1f506a3200e920638ddddfb978a0b96c23c2e90b081942f86d33c16d4836949 From 11ff13d4962759859707b7a80509c75b72847a21 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 25 Jul 2018 15:53:06 +1000 Subject: [PATCH 043/184] simplify gitignore --- .gitignore | 32 +------------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 683873d..9a06e56 100644 --- a/.gitignore +++ b/.gitignore @@ -1,31 +1 @@ -/libinput-1.7.1.tar.xz -/libinput-1.7.2.tar.xz -/libinput-1.7.3.tar.xz -/libinput-1.7.901.tar.xz -/libinput-1.7.902.tar.xz -/libinput-1.8.0.tar.xz -/libinput-1.8.1.tar.xz -/libinput-1.8.2.tar.xz -/libinput-1.8.901.tar.xz -/libinput-1.8.902.tar.xz -/libinput-1.9.0.tar.xz -/libinput-1.9.1.tar.xz -/libinput-1.9.2.tar.xz -/libinput-1.9.3.tar.xz -/libinput-1.9.4.tar.xz -/libinput-1.9.901.tar.xz -/libinput-1.9.902.tar.xz -/libinput-1.10.0.tar.xz -/libinput-1.10.1.tar.xz -/libinput-1.10.2.tar.xz -/libinput-1.10.3.tar.xz -/libinput-1.10.4.tar.xz -/libinput-1.10.5.tar.xz -/libinput-1.10.6.tar.xz -/libinput-1.10.7.tar.xz -/libinput-1.10.901.tar.xz -/libinput-1.10.902.tar.xz -/libinput-1.11.0.tar.xz -/libinput-1.11.1.tar.xz -/libinput-1.11.2.tar.xz -/libinput-1.11.3.tar.xz +/libinput-*.tar.xz From cef6457a000f50b04e742c57dae62ae96b57655c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 31 Jul 2018 12:58:24 +1000 Subject: [PATCH 044/184] libinput 1.12rc1 --- ...name-of-the-measure-touchpad-tap-scr.patch | 27 +++++++++++++++++++ libinput.spec | 14 +++++++--- sources | 2 +- 3 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 0001-meson.build-fix-name-of-the-measure-touchpad-tap-scr.patch diff --git a/0001-meson.build-fix-name-of-the-measure-touchpad-tap-scr.patch b/0001-meson.build-fix-name-of-the-measure-touchpad-tap-scr.patch new file mode 100644 index 0000000..4941bb9 --- /dev/null +++ b/0001-meson.build-fix-name-of-the-measure-touchpad-tap-scr.patch @@ -0,0 +1,27 @@ +From 22faa97f25136981828fae7f99bbc1933d42afc1 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Tue, 31 Jul 2018 13:00:38 +1000 +Subject: [PATCH libinput] meson.build: fix name of the measure touchpad-tap + script + +Signed-off-by: Peter Hutterer +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 74b88548..6f04e4d3 100644 +--- a/meson.build ++++ b/meson.build +@@ -490,7 +490,7 @@ configure_file(input : 'tools/libinput-measure-fuzz.man', + ) + + configure_file(input: 'tools/libinput-measure-touchpad-tap.py', +- output: 'libinput-measure-touchpad_tap', ++ output: 'libinput-measure-touchpad-tap', + configuration : config_noop, + install : true, + install_dir : libinput_tool_path +-- +2.17.1 + diff --git a/libinput.spec b/libinput.spec index 90eb200..ebccd45 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.11.3 +Version: 1.11.901 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -18,6 +18,8 @@ Source2: commitid Source0: http://www.freedesktop.org/software/libinput/libinput-%{version}.tar.xz %endif +Patch01: 0001-meson.build-fix-name-of-the-measure-touchpad-tap-scr.patch + BuildRequires: git-core BuildRequires: gcc gcc-c++ BuildRequires: meson @@ -81,13 +83,12 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{udevdir}/libinput-device-group %{udevdir}/libinput-model-quirks %{udevdir}/rules.d/80-libinput-device-groups.rules -%{udevdir}/rules.d/90-libinput-model-quirks.rules -%{udevdir}/hwdb.d/90-libinput-model-quirks.hwdb %{_bindir}/libinput %dir %{_libexecdir}/libinput/ %{_libexecdir}/libinput/libinput-debug-events %{_libexecdir}/libinput/libinput-list-devices %{_mandir}/man1/libinput.1* +%{_datadir}/libinput/*.quirks %{_mandir}/man1/libinput-list-devices.1* %{_mandir}/man1/libinput-debug-events.1* @@ -104,6 +105,7 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_libexecdir}/libinput/libinput-measure-touchpad-pressure %{_libexecdir}/libinput/libinput-measure-touch-size %{_libexecdir}/libinput/libinput-measure-trackpoint-range +%{_libexecdir}/libinput/libinput-quirks %{_libexecdir}/libinput/libinput-record %{_libexecdir}/libinput/libinput-replay %{_mandir}/man1/libinput-measure.1* @@ -112,10 +114,16 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-measure-touch-size.1* %{_mandir}/man1/libinput-measure-touchpad-pressure.1* %{_mandir}/man1/libinput-measure-trackpoint-range.1* +%{_mandir}/man1/libinput-quirks.1* +%{_mandir}/man1/libinput-quirks-list.1* +%{_mandir}/man1/libinput-quirks-validate.1* %{_mandir}/man1/libinput-record.1* %{_mandir}/man1/libinput-replay.1* %changelog +* Tue Jul 31 2018 Peter Hutterer 1.11.901-1 +- libinput 1.12rc1 + * Wed Jul 25 2018 Peter Hutterer 1.11.3-1 - libinput 1.11.3 diff --git a/sources b/sources index 2324c1f..e3f1503 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.11.3.tar.xz) = 5e18daab6202bcbfddeebc35dac4cabb5f726b5b73f5fc87975b58f3019a54a4b1f506a3200e920638ddddfb978a0b96c23c2e90b081942f86d33c16d4836949 +SHA512 (libinput-1.11.901.tar.xz) = 5b20cde2f63d98a655eb8d841c128af5eb07cc355238e64b3db0e2ecda998cc8f6b9aef210f248840f88bcadc916ee7562158c672bbd23537b9bd5a80310bdcf From 3c4051318cf7ec6a316895bfe72e9fe9b0cf5124 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 14 Aug 2018 09:43:15 +1000 Subject: [PATCH 045/184] libinput 1.12rc2 --- ...name-of-the-measure-touchpad-tap-scr.patch | 27 ------------------- libinput.spec | 7 ++--- sources | 2 +- 3 files changed, 5 insertions(+), 31 deletions(-) delete mode 100644 0001-meson.build-fix-name-of-the-measure-touchpad-tap-scr.patch diff --git a/0001-meson.build-fix-name-of-the-measure-touchpad-tap-scr.patch b/0001-meson.build-fix-name-of-the-measure-touchpad-tap-scr.patch deleted file mode 100644 index 4941bb9..0000000 --- a/0001-meson.build-fix-name-of-the-measure-touchpad-tap-scr.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 22faa97f25136981828fae7f99bbc1933d42afc1 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Tue, 31 Jul 2018 13:00:38 +1000 -Subject: [PATCH libinput] meson.build: fix name of the measure touchpad-tap - script - -Signed-off-by: Peter Hutterer ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 74b88548..6f04e4d3 100644 ---- a/meson.build -+++ b/meson.build -@@ -490,7 +490,7 @@ configure_file(input : 'tools/libinput-measure-fuzz.man', - ) - - configure_file(input: 'tools/libinput-measure-touchpad-tap.py', -- output: 'libinput-measure-touchpad_tap', -+ output: 'libinput-measure-touchpad-tap', - configuration : config_noop, - install : true, - install_dir : libinput_tool_path --- -2.17.1 - diff --git a/libinput.spec b/libinput.spec index ebccd45..1c098c3 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.11.901 +Version: 1.11.902 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-meson.build-fix-name-of-the-measure-touchpad-tap-scr.patch - BuildRequires: git-core BuildRequires: gcc gcc-c++ BuildRequires: meson @@ -121,6 +119,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-replay.1* %changelog +* Tue Aug 14 2018 Peter Hutterer 1.11.902-1 +- libinput 1.12rc2 + * Tue Jul 31 2018 Peter Hutterer 1.11.901-1 - libinput 1.12rc1 diff --git a/sources b/sources index e3f1503..cc9c1f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.11.901.tar.xz) = 5b20cde2f63d98a655eb8d841c128af5eb07cc355238e64b3db0e2ecda998cc8f6b9aef210f248840f88bcadc916ee7562158c672bbd23537b9bd5a80310bdcf +SHA512 (libinput-1.11.902.tar.xz) = 23290f8375225cfb5b3f37126f92bb42a5670a3861a234be9680f3e52299145d0082a35a2910ff1991f537dc14f48c5060e4540667f0272333a164aa8ebb18d0 From 212148a1a9a44a800d8f3444561813533e987ff6 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 4 Sep 2018 11:25:45 +1000 Subject: [PATCH 046/184] libinput 1.12rc3 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 1c098c3..9d0bb86 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.11.902 +Version: 1.11.903 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -119,6 +119,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-replay.1* %changelog +* Tue Sep 04 2018 Peter Hutterer 1.11.903-1 +- libinput 1.12rc3 + * Tue Aug 14 2018 Peter Hutterer 1.11.902-1 - libinput 1.12rc2 diff --git a/sources b/sources index cc9c1f3..ea17c8f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.11.902.tar.xz) = 23290f8375225cfb5b3f37126f92bb42a5670a3861a234be9680f3e52299145d0082a35a2910ff1991f537dc14f48c5060e4540667f0272333a164aa8ebb18d0 +SHA512 (libinput-1.11.903.tar.xz) = a1a307a2d587f78a8ff8c7886c60c32eb6a821d20efb67fddd60986a0d754dc366a15001cfdb37f04f0bf832cff679ed40be605522a76afa510bca538eebfaa6 From 247b223c17719d32bd2c168b58f0fb4d16b79c6d Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 11 Sep 2018 14:20:53 +1000 Subject: [PATCH 047/184] libinput 1.12 --- libinput.spec | 8 +++++--- sources | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libinput.spec b/libinput.spec index 9d0bb86..3b41c01 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.11.903 +Version: 1.12.0 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -81,6 +81,7 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{udevdir}/libinput-device-group %{udevdir}/libinput-model-quirks %{udevdir}/rules.d/80-libinput-device-groups.rules +%{udevdir}/rules.d/90-libinput-model-quirks.rules %{_bindir}/libinput %dir %{_libexecdir}/libinput/ %{_libexecdir}/libinput/libinput-debug-events @@ -102,7 +103,6 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_libexecdir}/libinput/libinput-measure-touchpad-tap %{_libexecdir}/libinput/libinput-measure-touchpad-pressure %{_libexecdir}/libinput/libinput-measure-touch-size -%{_libexecdir}/libinput/libinput-measure-trackpoint-range %{_libexecdir}/libinput/libinput-quirks %{_libexecdir}/libinput/libinput-record %{_libexecdir}/libinput/libinput-replay @@ -111,7 +111,6 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_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-trackpoint-range.1* %{_mandir}/man1/libinput-quirks.1* %{_mandir}/man1/libinput-quirks-list.1* %{_mandir}/man1/libinput-quirks-validate.1* @@ -119,6 +118,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-replay.1* %changelog +* Tue Sep 11 2018 Peter Hutterer 1.12.0-1 +- libinput 1.12 + * Tue Sep 04 2018 Peter Hutterer 1.11.903-1 - libinput 1.12rc3 diff --git a/sources b/sources index ea17c8f..e71a767 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.11.903.tar.xz) = a1a307a2d587f78a8ff8c7886c60c32eb6a821d20efb67fddd60986a0d754dc366a15001cfdb37f04f0bf832cff679ed40be605522a76afa510bca538eebfaa6 +SHA512 (libinput-1.12.0.tar.xz) = 4aee877785f9ac080e4f8ee20f3643bc4f3ddbc568aca6c363a962f8c8f76b8db7dc113c8167092f0277d112346a85b9a7e7c3c3f227ed243aaba32c9092c924 From 0bb2ac11b7d6b49303963c137fb5976e525aa512 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 3 Oct 2018 12:58:11 +1000 Subject: [PATCH 048/184] libinput 1.12.1 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 3b41c01..4e8546b 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.12.0 +Version: 1.12.1 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -118,6 +118,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-replay.1* %changelog +* Wed Oct 03 2018 Peter Hutterer 1.12.1-1 +- libinput 1.12.1 + * Tue Sep 11 2018 Peter Hutterer 1.12.0-1 - libinput 1.12 diff --git a/sources b/sources index e71a767..f8826bc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.12.0.tar.xz) = 4aee877785f9ac080e4f8ee20f3643bc4f3ddbc568aca6c363a962f8c8f76b8db7dc113c8167092f0277d112346a85b9a7e7c3c3f227ed243aaba32c9092c924 +SHA512 (libinput-1.12.1.tar.xz) = de1714526ee1244e3086729efa5b72724b2b989fa8d04418e633d1ef5a8ea777ae3cd4b8c5b015ca0da2b8cf5b07111bff2283c7d6068abcdfa81c3f71b81d68 From d2a72ac83f8814363847aaea76d2d96e7f0d5fdf Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 24 Oct 2018 15:47:57 +1000 Subject: [PATCH 049/184] libinput 1.12.2 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 4e8546b..c6dd334 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.12.1 +Version: 1.12.2 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -118,6 +118,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-replay.1* %changelog +* Wed Oct 24 2018 Peter Hutterer 1.12.2-1 +- libinput 1.12.2 + * Wed Oct 03 2018 Peter Hutterer 1.12.1-1 - libinput 1.12.1 diff --git a/sources b/sources index f8826bc..1416d2b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.12.1.tar.xz) = de1714526ee1244e3086729efa5b72724b2b989fa8d04418e633d1ef5a8ea777ae3cd4b8c5b015ca0da2b8cf5b07111bff2283c7d6068abcdfa81c3f71b81d68 +SHA512 (libinput-1.12.2.tar.xz) = f7122a1d18dd2d0072a34fd9897ebe25a065100b3754052d7ec133bddb56d5c2a5a94950cfc8366ef5d117180c28b3ff99b1a62f3ab95df5ac22f86721fbdc67 From 8ba5655288326e6f43ffcaf0b10cea5dd3035d0b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 7 Nov 2018 15:03:28 +1000 Subject: [PATCH 050/184] libinput 1.12.3 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index c6dd334..2d319c5 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.12.2 +Version: 1.12.3 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -118,6 +118,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-replay.1* %changelog +* Wed Nov 07 2018 Peter Hutterer 1.12.3-1 +- libinput 1.12.3 + * Wed Oct 24 2018 Peter Hutterer 1.12.2-1 - libinput 1.12.2 diff --git a/sources b/sources index 1416d2b..cb31bcc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.12.2.tar.xz) = f7122a1d18dd2d0072a34fd9897ebe25a065100b3754052d7ec133bddb56d5c2a5a94950cfc8366ef5d117180c28b3ff99b1a62f3ab95df5ac22f86721fbdc67 +SHA512 (libinput-1.12.3.tar.xz) = cdc512cb53442ae85d5a23e10db9dd3548bcca0de24d7fcc48954a60773563d84d9b10278b6a693ade95d0789bb5d42bbb8b7cf1c178fe85401cb09a5402ff02 From 4b89c9110708e702046b670757b0d5b1b243df32 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 18 Dec 2018 15:36:10 +1000 Subject: [PATCH 051/184] libinput 1.12.4 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 2d319c5..bab64f1 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.12.3 +Version: 1.12.4 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -118,6 +118,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-replay.1* %changelog +* Tue Dec 18 2018 Peter Hutterer 1.12.4-1 +- libinput 1.12.4 + * Wed Nov 07 2018 Peter Hutterer 1.12.3-1 - libinput 1.12.3 diff --git a/sources b/sources index cb31bcc..9644912 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.12.3.tar.xz) = cdc512cb53442ae85d5a23e10db9dd3548bcca0de24d7fcc48954a60773563d84d9b10278b6a693ade95d0789bb5d42bbb8b7cf1c178fe85401cb09a5402ff02 +SHA512 (libinput-1.12.4.tar.xz) = 4e43ed5213059a481e5a73549c8325e5729d08512c4f580b924d4338a1b69dabd77fb612bec418f294c1da96c738ce26e45f8de8fbc222ab1af71a1535b3240f From 7677320cee1fd4dc7e43f7d2be4d3d87645ada54 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 7 Jan 2019 14:15:00 +1000 Subject: [PATCH 052/184] libinput 1.12.5 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index bab64f1..62f2d99 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.12.4 +Version: 1.12.5 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -118,6 +118,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-replay.1* %changelog +* Mon Jan 07 2019 Peter Hutterer 1.12.5-1 +- libinput 1.12.5 + * Tue Dec 18 2018 Peter Hutterer 1.12.4-1 - libinput 1.12.4 diff --git a/sources b/sources index 9644912..b9b2570 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.12.4.tar.xz) = 4e43ed5213059a481e5a73549c8325e5729d08512c4f580b924d4338a1b69dabd77fb612bec418f294c1da96c738ce26e45f8de8fbc222ab1af71a1535b3240f +SHA512 (libinput-1.12.5.tar.xz) = 9365b91b3ac2c4ff0f9927913242afac7677979682dd7b541001b13d09d7982acd854f6d348101cfa4b0854c6a92b4c683f62593a97870e32ae3d607eaeae3ff From 405e05afdd0f58eeb1286042c9e4acf55b3d60b2 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 21 Jan 2019 11:32:34 +1000 Subject: [PATCH 053/184] libinput 1.12.6 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 62f2d99..bbe9c25 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.12.5 +Version: 1.12.6 Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library @@ -118,6 +118,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-replay.1* %changelog +* Mon Jan 21 2019 Peter Hutterer 1.12.6-1 +- libinput 1.12.6 + * Mon Jan 07 2019 Peter Hutterer 1.12.5-1 - libinput 1.12.5 diff --git a/sources b/sources index b9b2570..c79baaa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.12.5.tar.xz) = 9365b91b3ac2c4ff0f9927913242afac7677979682dd7b541001b13d09d7982acd854f6d348101cfa4b0854c6a92b4c683f62593a97870e32ae3d607eaeae3ff +SHA512 (libinput-1.12.6.tar.xz) = 02ad90c77a0c8c27fd96ec34e1546c5f0947ced49bad386372c1ef7c41b3b2157c39020f0766f20aaf2ab3c97128567e169279bea21115ced39499dda325d2ef From 97dbd1e22b0d579b7b15898a7810cf918db15081 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:39:48 +0100 Subject: [PATCH 054/184] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- libinput.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index bbe9c25..bc37b6a 100644 --- a/libinput.spec +++ b/libinput.spec @@ -69,10 +69,10 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %meson_install %post -/sbin/ldconfig +%{?ldconfig} /usr/bin/udevadm hwdb --update >/dev/null 2>&1 || : -%postun -p /sbin/ldconfig +%ldconfig_postun %files From 00f13486021d316b45150e82bf4e2288480d3078 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 07:23:41 +0000 Subject: [PATCH 055/184] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 bc37b6a..bbf0774 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.12.6 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -118,6 +118,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-replay.1* %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.12.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jan 21 2019 Peter Hutterer 1.12.6-1 - libinput 1.12.6 From bad9712fc366b1ca46d6faa2c240ef3bac5ab464 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 14 Feb 2019 16:56:04 +1000 Subject: [PATCH 056/184] Don't update the hwdb on install, we don't have any hwdb files anymore --- libinput.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index bbf0774..932c907 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.12.6 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -70,7 +70,6 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %post %{?ldconfig} -/usr/bin/udevadm hwdb --update >/dev/null 2>&1 || : %ldconfig_postun @@ -118,6 +117,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-replay.1* %changelog +* Thu Feb 14 2019 Peter Hutterer 1.12.6-3 +- Don't update the hwdb on install, we don't have any hwdb files anymore + * Fri Feb 01 2019 Fedora Release Engineering - 1.12.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 16ed7bef68da53d4d6dba84c1232d95549719746 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 28 Feb 2019 14:13:46 +1000 Subject: [PATCH 057/184] Add some basic testing --- tests/libinput-tool-beakerlib/PURPOSE | 4 +++ tests/libinput-tool-beakerlib/runtest.sh | 34 ++++++++++++++++++++++++ tests/libinput-tool/PURPOSE | 5 ++++ tests/libinput-tool/runtest.sh | 16 +++++++++++ tests/tests.yml | 16 +++++++++++ 5 files changed, 75 insertions(+) create mode 100644 tests/libinput-tool-beakerlib/PURPOSE create mode 100644 tests/libinput-tool-beakerlib/runtest.sh create mode 100644 tests/libinput-tool/PURPOSE create mode 100644 tests/libinput-tool/runtest.sh create mode 100644 tests/tests.yml diff --git a/tests/libinput-tool-beakerlib/PURPOSE b/tests/libinput-tool-beakerlib/PURPOSE new file mode 100644 index 0000000..5ba320c --- /dev/null +++ b/tests/libinput-tool-beakerlib/PURPOSE @@ -0,0 +1,4 @@ +PURPOSE of libinput-tool-beakerlib +Description: Test for the libinput commandline tool +Author: Peter Hutterer + diff --git a/tests/libinput-tool-beakerlib/runtest.sh b/tests/libinput-tool-beakerlib/runtest.sh new file mode 100644 index 0000000..486b100 --- /dev/null +++ b/tests/libinput-tool-beakerlib/runtest.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +# Include rhts environment +. /usr/bin/rhts-environment.sh +. /usr/share/rhts-library/rhtslib.sh + +PACKAGE="libinput" + +rlJournalStart + rlPhaseStartSetup + rlAssertRpm $PACKAGE + rlAssertRpm $PACKAGE-utils + rlPhaseEnd + + rlPhaseStartTest + rlRun "libinput --help" 0 "libinput help exists cleanly" + rlRun "libinput --version" 0 "libinput version exists cleanly" + rlPhaseEnd + + rlPhaseStartTest + rlRun "libinput quirks validate" 0 "libinput quirks parse " + rlPhaseEnd + + rlPhaseStartTest + rlRun "libinput record --help" 0 "libinput record exists" + rlRun "libinput measure --help" 0 "libinput measure exists" + rlRun "libinput measure fuzz --help" 0 "libinput measure fuzz exists" + rlRun "libinput measure touch-size --help" 0 "libinput measure touch-size exists" + rlRun "libinput measure touchpad-pressure --help" 0 "libinput touchpad-pressure exists" + rlRun "libinput measure touchpad-tap --help" 0 "libinput touchpad-tap exists" + rlPhaseEnd +rlJournalPrintText +rlJournalEnd + diff --git a/tests/libinput-tool/PURPOSE b/tests/libinput-tool/PURPOSE new file mode 100644 index 0000000..297a94b --- /dev/null +++ b/tests/libinput-tool/PURPOSE @@ -0,0 +1,5 @@ +PURPOSE of libinput-tool +Description: Test for the libinput commandline tool +Author: Peter Hutterer + + diff --git a/tests/libinput-tool/runtest.sh b/tests/libinput-tool/runtest.sh new file mode 100644 index 0000000..2e77ad2 --- /dev/null +++ b/tests/libinput-tool/runtest.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +# check libinput is in the path, --help and --version need to work +libinput --help +libinput --version + +# this should fail if the quirks failed to install +libinput quirks validate + +# check the various tools exist +libinput record --help +libinput measure --help +libinput measure fuzz --help +libinput measure touch-size --help +libinput measure touchpad-pressure --help +libinput measure touchpad-tap --help diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..bf65561 --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,16 @@ +--- +- hosts: localhost + roles: + - role: standard-test-beakerlib + tags: + - classic + tests: + - libinput-tool-beakerlib + +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + tests: + - libinput-tool From 6884ed088b3357619b9a491d19eb34b3351b6629 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 8 Mar 2019 11:39:32 +1000 Subject: [PATCH 058/184] test: address yamllint errors Signed-off-by: Peter Hutterer --- tests/tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/tests.yml b/tests/tests.yml index bf65561..93ac841 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -3,14 +3,14 @@ roles: - role: standard-test-beakerlib tags: - - classic + - classic tests: - - libinput-tool-beakerlib + - libinput-tool-beakerlib - hosts: localhost roles: - role: standard-test-basic tags: - - classic + - classic tests: - - libinput-tool + - libinput-tool From 71024332133cd4cba8336e9ca1b1dcec9cb16df0 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 8 Mar 2019 12:04:55 +1000 Subject: [PATCH 059/184] Let's try scripts tests and source roles --- tests/libinput-test-suite/PURPOSE | 5 ++++ tests/libinput-test-suite/runtest.sh | 14 ++++++++++ .../libinput-tool-test.sh | 16 +++++++++++ tests/tests.yml | 27 +++++++++++++++++++ 4 files changed, 62 insertions(+) create mode 100644 tests/libinput-test-suite/PURPOSE create mode 100644 tests/libinput-test-suite/runtest.sh create mode 100644 tests/libinput-tool-scripttest/libinput-tool-test.sh diff --git a/tests/libinput-test-suite/PURPOSE b/tests/libinput-test-suite/PURPOSE new file mode 100644 index 0000000..4396bd4 --- /dev/null +++ b/tests/libinput-test-suite/PURPOSE @@ -0,0 +1,5 @@ +PURPOSE of libinput-test-suite +Description: Full test suite run for libinput +Author: Peter Hutterer + + diff --git a/tests/libinput-test-suite/runtest.sh b/tests/libinput-test-suite/runtest.sh new file mode 100644 index 0000000..187dbca --- /dev/null +++ b/tests/libinput-test-suite/runtest.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +export # let's see what's available +ls /dev/input +ls /dev/ + +ls # let's debug where the actual tarball sits in case the next one fails +# Can we use the spec file version number here?? +pushd libinput-* + +meson builddir -Ddocumentation=false -Dtests=true -Ddebug-gui=false +ninja -C builddir test + +popd > /dev/null diff --git a/tests/libinput-tool-scripttest/libinput-tool-test.sh b/tests/libinput-tool-scripttest/libinput-tool-test.sh new file mode 100644 index 0000000..2e77ad2 --- /dev/null +++ b/tests/libinput-tool-scripttest/libinput-tool-test.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +# check libinput is in the path, --help and --version need to work +libinput --help +libinput --version + +# this should fail if the quirks failed to install +libinput quirks validate + +# check the various tools exist +libinput record --help +libinput measure --help +libinput measure fuzz --help +libinput measure touch-size --help +libinput measure touchpad-pressure --help +libinput measure touchpad-tap --help diff --git a/tests/tests.yml b/tests/tests.yml index 93ac841..110111d 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -14,3 +14,30 @@ - classic tests: - libinput-tool + +- hosts: localhost + roles: + - role: standard-test-scripts + tags: + - classic + tests: + - libinput-tool-scripttest/libinput-tool-test.sh + +- hosts: localhost + roles: + - role: standard-test-source + tags: + - always + - role: standard-test-basic + tags: + - classic + required_packages: + - meson + - gcc + - mtdev-devel + - libevdev-devel + - libwacom-devel + - check-devel + - systemd-devel + tests: + - libinput-test-suite From 9e00b5a920eff77c28259cf9ec510420081c614c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 8 Mar 2019 13:12:13 +1000 Subject: [PATCH 060/184] test: comment out the ones we know work --- tests/tests.yml | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/tests/tests.yml b/tests/tests.yml index 110111d..e850623 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -1,27 +1,27 @@ --- -- hosts: localhost - roles: - - role: standard-test-beakerlib - tags: - - classic - tests: - - libinput-tool-beakerlib - -- hosts: localhost - roles: - - role: standard-test-basic - tags: - - classic - tests: - - libinput-tool - -- hosts: localhost - roles: - - role: standard-test-scripts - tags: - - classic - tests: - - libinput-tool-scripttest/libinput-tool-test.sh +#- hosts: localhost +# roles: +# - role: standard-test-beakerlib +# tags: +# - classic +# tests: +# - libinput-tool-beakerlib +# +#- hosts: localhost +# roles: +# - role: standard-test-basic +# tags: +# - classic +# tests: +# - libinput-tool +# +#- hosts: localhost +# roles: +# - role: standard-test-scripts +# tags: +# - classic +# tests: +# - libinput-tool-scripttest/libinput-tool-test.sh - hosts: localhost roles: From 5fc2f172d5aa524e4f1731c31cb3edccd64d5435 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 8 Mar 2019 13:47:25 +1000 Subject: [PATCH 061/184] tests: libinput needs python3-devel before unpacking the source rpm --- tests/tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/tests.yml b/tests/tests.yml index e850623..f9df1d5 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -25,6 +25,10 @@ - hosts: localhost roles: + - role: standard-test-rpm + subjects: python3-devel # for pathfix during srpm prep + tags: + - always - role: standard-test-source tags: - always From 26830ff92db6b9d5a5cf38d3877504c1dda08fad Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 8 Mar 2019 13:49:04 +1000 Subject: [PATCH 062/184] test: add more debugging printf --- tests/libinput-test-suite/runtest.sh | 6 ++++-- tests/tests.yml | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/libinput-test-suite/runtest.sh b/tests/libinput-test-suite/runtest.sh index 187dbca..e3665d8 100644 --- a/tests/libinput-test-suite/runtest.sh +++ b/tests/libinput-test-suite/runtest.sh @@ -1,12 +1,14 @@ #!/bin/bash export # let's see what's available +pwd ls /dev/input ls /dev/ -ls # let's debug where the actual tarball sits in case the next one fails +set -e +tree # figure out where we are # Can we use the spec file version number here?? -pushd libinput-* +pushd tests/source meson builddir -Ddocumentation=false -Dtests=true -Ddebug-gui=false ninja -C builddir test diff --git a/tests/tests.yml b/tests/tests.yml index f9df1d5..2ed83fd 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -43,5 +43,6 @@ - libwacom-devel - check-devel - systemd-devel + - tree # for debugging tests: - libinput-test-suite From b1adeff6f44c2e6202fc67eab481c798416395d7 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 8 Mar 2019 13:57:23 +1000 Subject: [PATCH 063/184] tests: add the tags to the helper roles too because, uhm? --- tests/tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/tests.yml b/tests/tests.yml index 2ed83fd..e0c5597 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -29,9 +29,11 @@ subjects: python3-devel # for pathfix during srpm prep tags: - always + - classic - role: standard-test-source tags: - always + - classic - role: standard-test-basic tags: - classic From cb175af766d4104edc2b6f2ac0ce240349f9e9fa Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 8 Mar 2019 14:30:36 +1000 Subject: [PATCH 064/184] test: so, why does this one always fail --- tests/tests.yml | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/tests/tests.yml b/tests/tests.yml index e0c5597..7dc2448 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -25,26 +25,25 @@ - hosts: localhost roles: - - role: standard-test-rpm - subjects: python3-devel # for pathfix during srpm prep - tags: - - always - - classic +# - role: standard-test-rpm +# subjects: python3-devel # for pathfix during srpm prep +# tags: +# - always +# - classic - role: standard-test-source tags: - always - - classic - - role: standard-test-basic - tags: - - classic - required_packages: - - meson - - gcc - - mtdev-devel - - libevdev-devel - - libwacom-devel - - check-devel - - systemd-devel - - tree # for debugging - tests: - - libinput-test-suite +# - role: standard-test-basic +# tags: +# - classic +# required_packages: +# - meson +# - gcc +# - mtdev-devel +# - libevdev-devel +# - libwacom-devel +# - check-devel +# - systemd-devel +# - tree # for debugging +# tests: +# - libinput-test-suite From b10e42143d20552657b025a171e5a1bfa4a107b6 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 8 Mar 2019 15:12:42 +1000 Subject: [PATCH 065/184] sigh --- tests/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/tests.yml b/tests/tests.yml index 7dc2448..1074f5c 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -33,6 +33,7 @@ - role: standard-test-source tags: - always + - classic # - role: standard-test-basic # tags: # - classic From 3519b52402a8f741e23f1ff11cb783295ce96dae Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 8 Mar 2019 15:50:38 +1000 Subject: [PATCH 066/184] maybe this won't hang if we have some other role --- tests/tests.yml | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/tests/tests.yml b/tests/tests.yml index 1074f5c..1c27406 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -1,4 +1,3 @@ ---- #- hosts: localhost # roles: # - role: standard-test-beakerlib @@ -34,17 +33,17 @@ tags: - always - classic -# - role: standard-test-basic -# tags: -# - classic -# required_packages: -# - meson -# - gcc -# - mtdev-devel -# - libevdev-devel -# - libwacom-devel -# - check-devel -# - systemd-devel -# - tree # for debugging -# tests: -# - libinput-test-suite + - role: standard-test-basic + tags: + - classic + required_packages: + - meson + - gcc + - mtdev-devel + - libevdev-devel + - libwacom-devel + - check-devel + - systemd-devel + - tree # for debugging + tests: + - libinput-test-suite From a0c4d91a3c0579b4f464d584e5931482b625bc53 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 8 Mar 2019 15:59:26 +1000 Subject: [PATCH 067/184] another attempt --- tests/libinput-test-suite/runtest.sh | 2 +- tests/tests.yml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/libinput-test-suite/runtest.sh b/tests/libinput-test-suite/runtest.sh index e3665d8..91e2249 100644 --- a/tests/libinput-test-suite/runtest.sh +++ b/tests/libinput-test-suite/runtest.sh @@ -8,7 +8,7 @@ ls /dev/ set -e tree # figure out where we are # Can we use the spec file version number here?? -pushd tests/source +pushd ../source meson builddir -Ddocumentation=false -Dtests=true -Ddebug-gui=false ninja -C builddir test diff --git a/tests/tests.yml b/tests/tests.yml index 1c27406..71b74f8 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -24,12 +24,12 @@ - hosts: localhost roles: -# - role: standard-test-rpm -# subjects: python3-devel # for pathfix during srpm prep -# tags: -# - always -# - classic - - role: standard-test-source + - role: standard-test-rpm + subjects: python3-devel # for pathfix during srpm prep + tags: + - always + - classic + - role: standard-test-source tags: - always - classic From ad6fa2b778760956f6ec5e1304e40d1f39172835 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 8 Mar 2019 16:32:05 +1000 Subject: [PATCH 068/184] more Signed-off-by: Peter Hutterer --- tests/tests.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/tests.yml b/tests/tests.yml index 71b74f8..2038ba7 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -1,3 +1,4 @@ +--- #- hosts: localhost # roles: # - role: standard-test-beakerlib @@ -25,11 +26,11 @@ - hosts: localhost roles: - role: standard-test-rpm - subjects: python3-devel # for pathfix during srpm prep + subjects: python3-devel # for pathfix during srpm prep tags: - always - classic - - role: standard-test-source + - role: standard-test-source tags: - always - classic @@ -44,6 +45,7 @@ - libwacom-devel - check-devel - systemd-devel - - tree # for debugging + - valgrind + - tree # for debugging tests: - libinput-test-suite From cd9d18ed85c28f8395133042774b1b16dbeaaa71 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 8 Mar 2019 16:52:48 +1000 Subject: [PATCH 069/184] this worked on a local container --- tests/libinput-test-suite/runtest.sh | 12 ++++++------ tests/tests.yml | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/libinput-test-suite/runtest.sh b/tests/libinput-test-suite/runtest.sh index 91e2249..ce7b1ff 100644 --- a/tests/libinput-test-suite/runtest.sh +++ b/tests/libinput-test-suite/runtest.sh @@ -1,13 +1,13 @@ #!/bin/bash -export # let's see what's available +export # let's see what's available pwd -ls /dev/input -ls /dev/ - set -e -tree # figure out where we are -# Can we use the spec file version number here?? + +ls /dev/input # if this fails, we don't have a VM +ls /dev/uinput # same as above + +# this is where the standard-test-source extracts to pushd ../source meson builddir -Ddocumentation=false -Dtests=true -Ddebug-gui=false diff --git a/tests/tests.yml b/tests/tests.yml index 2038ba7..6a7af54 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -40,12 +40,12 @@ required_packages: - meson - gcc + - gcc-c++ - mtdev-devel - libevdev-devel - libwacom-devel - check-devel - systemd-devel - valgrind - - tree # for debugging tests: - libinput-test-suite From 5a01545f08d0d1a6846fd1522382d7148178113c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 8 Mar 2019 20:02:43 +1000 Subject: [PATCH 070/184] try taking the classic bits out again because really, I'm just blindly stabbing into the dark here --- tests/tests.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/tests.yml b/tests/tests.yml index 6a7af54..5caec17 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -29,11 +29,9 @@ subjects: python3-devel # for pathfix during srpm prep tags: - always - - classic - role: standard-test-source tags: - always - - classic - role: standard-test-basic tags: - classic From 20e91094240ae68479ebda7d713d3a0a29a2f686 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 8 Mar 2019 21:13:10 +1000 Subject: [PATCH 071/184] replace the rpm role with a fake test https://pagure.io/standard-test-roles/issue/307 --- tests/tests.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/tests.yml b/tests/tests.yml index 5caec17..4a727af 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -25,8 +25,15 @@ - hosts: localhost roles: - - role: standard-test-rpm - subjects: python3-devel # for pathfix during srpm prep + # standard-test-rpm should do this but it's currently broken. So let's add + # a noop test that requires the package we need + - role: standard-test-basic + required_packages: + - python3-devel # for pathfix during srpm prep + tests: + - simple: + dir: . + command: echo "intentional noop" tags: - always - role: standard-test-source From a877c718b0e21f6feb9592dd608271966d70dfbf Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 8 Mar 2019 21:40:27 +1000 Subject: [PATCH 072/184] run, not command --- tests/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests.yml b/tests/tests.yml index 4a727af..de3e393 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -33,7 +33,7 @@ tests: - simple: dir: . - command: echo "intentional noop" + run: "echo noop" tags: - always - role: standard-test-source From 12ffd8a00fc06213025b72875e61be92f9b26111 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 11 Mar 2019 10:58:04 +1000 Subject: [PATCH 073/184] tests: test the repo standard role --- tests/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/tests.yml b/tests/tests.yml index de3e393..901d59e 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -25,6 +25,9 @@ - hosts: localhost roles: + - role: standard-test-repo + subjects: https://copr-be.cloud.fedoraproject.org/results/whot/libinput-git/fedora-29-x86_64/ + packages: libinput # standard-test-rpm should do this but it's currently broken. So let's add # a noop test that requires the package we need - role: standard-test-basic From f9a35416ea2d967f7c6c816fda4cbe7d891b8d2a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 11 Mar 2019 12:29:08 +1000 Subject: [PATCH 074/184] test: grasping at straws here This cannot possibly the reason why the required_packages is ignored, but... --- tests/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/tests.yml b/tests/tests.yml index 901d59e..ff820e6 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -31,14 +31,14 @@ # standard-test-rpm should do this but it's currently broken. So let's add # a noop test that requires the package we need - role: standard-test-basic - required_packages: - - python3-devel # for pathfix during srpm prep tests: - simple: dir: . run: "echo noop" tags: - always + required_packages: + - python3-devel # for pathfix during srpm prep - role: standard-test-source tags: - always From 0b809079670bfb12e62a4237bfe9c46b0de7ec6a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 11 Mar 2019 12:32:34 +1000 Subject: [PATCH 075/184] tests: tag that test with classic --- tests/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/tests.yml b/tests/tests.yml index ff820e6..81079a2 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -37,6 +37,7 @@ run: "echo noop" tags: - always + - classic required_packages: - python3-devel # for pathfix during srpm prep - role: standard-test-source From 0d3f247766822f6376f792e7d6df9d940237895b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 11 Mar 2019 12:34:24 +1000 Subject: [PATCH 076/184] tests: make the repo test always and don't have always and classic in the same --- tests/tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/tests.yml b/tests/tests.yml index 81079a2..649ab47 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -28,6 +28,8 @@ - role: standard-test-repo subjects: https://copr-be.cloud.fedoraproject.org/results/whot/libinput-git/fedora-29-x86_64/ packages: libinput + tags: + - always # standard-test-rpm should do this but it's currently broken. So let's add # a noop test that requires the package we need - role: standard-test-basic @@ -37,7 +39,6 @@ run: "echo noop" tags: - always - - classic required_packages: - python3-devel # for pathfix during srpm prep - role: standard-test-source From f26839db7a15bc7c7414f1a9f91225fd1c5b212e Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 11 Mar 2019 12:54:24 +1000 Subject: [PATCH 077/184] test: always does not mean always, apparently --- tests/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/tests.yml b/tests/tests.yml index 649ab47..df64e6b 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -29,7 +29,7 @@ subjects: https://copr-be.cloud.fedoraproject.org/results/whot/libinput-git/fedora-29-x86_64/ packages: libinput tags: - - always + - classic # running this with always doesn't do anything # standard-test-rpm should do this but it's currently broken. So let's add # a noop test that requires the package we need - role: standard-test-basic @@ -38,7 +38,7 @@ dir: . run: "echo noop" tags: - - always + - classic # running this with always doesn't do anythign required_packages: - python3-devel # for pathfix during srpm prep - role: standard-test-source From bf49b3f44bcb3e435774acc5616ea2b7da8364cd Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 11 Mar 2019 14:12:17 +1000 Subject: [PATCH 078/184] tests: only have one role with required_packages move the python3-devel package to the other role because https://pagure.io/standard-test-roles/issue/311 --- tests/tests.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/tests/tests.yml b/tests/tests.yml index df64e6b..195e9cc 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -30,17 +30,6 @@ packages: libinput tags: - classic # running this with always doesn't do anything - # standard-test-rpm should do this but it's currently broken. So let's add - # a noop test that requires the package we need - - role: standard-test-basic - tests: - - simple: - dir: . - run: "echo noop" - tags: - - classic # running this with always doesn't do anythign - required_packages: - - python3-devel # for pathfix during srpm prep - role: standard-test-source tags: - always @@ -57,5 +46,6 @@ - check-devel - systemd-devel - valgrind + - python3-devel # for pathfix during srpm prep tests: - libinput-test-suite From 8baca5646627d641e3a38393a50362e343e3c072 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 11 Mar 2019 14:30:09 +1000 Subject: [PATCH 079/184] test: move the required_packages up because of course we need to install this before the -source role --- tests/tests.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tests/tests.yml b/tests/tests.yml index 195e9cc..2565a88 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -30,9 +30,9 @@ packages: libinput tags: - classic # running this with always doesn't do anything - - role: standard-test-source - tags: - - always + # sigh, we need this separately because of + # https://pagure.io/standard-test-roles/issue/307 and + # https://pagure.io/standard-test-roles/issue/311 - role: standard-test-basic tags: - classic @@ -47,5 +47,15 @@ - systemd-devel - valgrind - python3-devel # for pathfix during srpm prep + tests: + - simple: + dir: . + run: "echo noop" + - role: standard-test-source + tags: + - always + - role: standard-test-basic + tags: + - classic tests: - libinput-test-suite From d2fb3d5b28707d4390b2532f575cb31c0c0a0a1c Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 11 Mar 2019 15:13:48 +1000 Subject: [PATCH 080/184] drop the -repo role It's broken, see https://pagure.io/standard-test-roles/issue/312, let someone else figure out how much more it's broken. --- tests/tests.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tests/tests.yml b/tests/tests.yml index 2565a88..39fd007 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -25,11 +25,6 @@ - hosts: localhost roles: - - role: standard-test-repo - subjects: https://copr-be.cloud.fedoraproject.org/results/whot/libinput-git/fedora-29-x86_64/ - packages: libinput - tags: - - classic # running this with always doesn't do anything # sigh, we need this separately because of # https://pagure.io/standard-test-roles/issue/307 and # https://pagure.io/standard-test-roles/issue/311 From 087fb1210fb65e6a0ba62e5538e3b80a1a13f7b1 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 11 Mar 2019 15:33:30 +1000 Subject: [PATCH 081/184] use the same tags everywhere --- tests/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests.yml b/tests/tests.yml index 39fd007..883b832 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -48,7 +48,7 @@ run: "echo noop" - role: standard-test-source tags: - - always + - classic - role: standard-test-basic tags: - classic From 146af17adacd454c7aaf4fd8578edfdc26f95f2f Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 11 Mar 2019 16:51:16 +1000 Subject: [PATCH 082/184] test for pathfix.py --- tests/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tests.yml b/tests/tests.yml index 883b832..3ad4fb7 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -45,7 +45,7 @@ tests: - simple: dir: . - run: "echo noop" + run: test -f /usr/bin/pathfix.py - role: standard-test-source tags: - classic From 51e150c06bef710d55ddc4c11e59e6b43547926a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 14 Mar 2019 15:59:02 +1000 Subject: [PATCH 083/184] libinput 1.12.901 --- libinput.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libinput.spec b/libinput.spec index 932c907..06acbc7 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.12.6 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.12.901 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -117,6 +117,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-replay.1* %changelog +* Thu Mar 14 2019 Peter Hutterer 1.12.901-1 +- libinput 1.12.901 + * Thu Feb 14 2019 Peter Hutterer 1.12.6-3 - Don't update the hwdb on install, we don't have any hwdb files anymore diff --git a/sources b/sources index c79baaa..86a62b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.12.6.tar.xz) = 02ad90c77a0c8c27fd96ec34e1546c5f0947ced49bad386372c1ef7c41b3b2157c39020f0766f20aaf2ab3c97128567e169279bea21115ced39499dda325d2ef +SHA512 (libinput-1.12.901.tar.xz) = 98801fc25cf56126d25d17128f7f344371a0edee5b762709dac22e272abcdf134d69d83fa9c014007fbc193079d447cd20b12563ae8a8c6844b3e3d191663f25 From 8bdce90385ff82b50431c4a0cd758653f5e765fd Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 14 Mar 2019 18:17:38 +1000 Subject: [PATCH 084/184] Require python3-libevdev for the utils subpackage --- libinput.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 06acbc7..e1b6236 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.12.901 -Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -47,7 +47,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 +Requires: python3-evdev python3-pyudev python3-libevdev %description utils The %{name}-utils package contains tools to debug hardware and analyze @@ -117,6 +117,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-replay.1* %changelog +* Fri Mar 15 2019 Peter Hutterer 1.12.901-2 +- Require python3-libevdev for the utils subpackage + * Thu Mar 14 2019 Peter Hutterer 1.12.901-1 - libinput 1.12.901 From c358832c15d97ca970cfc056286c4da6484c5588 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 21 Mar 2019 11:18:49 +1000 Subject: [PATCH 085/184] Package the tests suite as subpackage --- 0001-meson.build-make-valgrind-optional.patch | 66 +++++++++++++++++++ libinput.spec | 23 ++++++- 2 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 0001-meson.build-make-valgrind-optional.patch diff --git a/0001-meson.build-make-valgrind-optional.patch b/0001-meson.build-make-valgrind-optional.patch new file mode 100644 index 0000000..7fa1ba0 --- /dev/null +++ b/0001-meson.build-make-valgrind-optional.patch @@ -0,0 +1,66 @@ +From b8123db0df7f1d358bcd2a1cc984095f4091fe61 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Fri, 15 Mar 2019 10:23:25 +1000 +Subject: [PATCH libinput] meson.build: make valgrind optional + +Now that we're providing the test suite as installed option, distributions +will likely include it as a test package. valgrind is only used for the +meson-specifc test setup. So let's make it optional. + +Signed-off-by: Peter Hutterer +--- + .gitlab-ci.yml | 8 +++++--- + meson.build | 30 +++++++++++++++++------------- + 2 files changed, 22 insertions(+), 16 deletions(-) + +diff --git a/meson.build b/meson.build +index 6e1e5590..cb3218b2 100644 +--- a/meson.build ++++ b/meson.build +@@ -665,7 +665,6 @@ endif + # dependencies + if get_option('tests') + dep_check = dependency('check', version : '>= 0.9.10') +- valgrind = find_program('valgrind') + + leftover_rules = find_program('test/check-leftover-udev-rules.sh') + test('leftover-rules', leftover_rules, is_parallel : false) +@@ -865,18 +864,23 @@ if get_option('tests') + libinput_test_runner, + args: ['--filter-deviceless']) + +- valgrind_env = environment() +- valgrind_env.set('CK_FORK', 'no') +- valgrind_env.set('USING_VALGRIND', '1') +- valgrind_suppressions_file = join_paths(dir_src_test, 'valgrind.suppressions') +- add_test_setup('valgrind', +- exe_wrapper : [ valgrind, +- '--leak-check=full', +- '--gen-suppressions=all', +- '--error-exitcode=3', +- '--suppressions=' + valgrind_suppressions_file ], +- env : valgrind_env, +- timeout_multiplier : 100) ++ valgrind = find_program('valgrind', required : false) ++ if valgrind.found() ++ valgrind_env = environment() ++ valgrind_env.set('CK_FORK', 'no') ++ valgrind_env.set('USING_VALGRIND', '1') ++ valgrind_suppressions_file = join_paths(dir_src_test, 'valgrind.suppressions') ++ add_test_setup('valgrind', ++ exe_wrapper : [ valgrind, ++ '--leak-check=full', ++ '--gen-suppressions=all', ++ '--error-exitcode=3', ++ '--suppressions=' + valgrind_suppressions_file ], ++ env : valgrind_env, ++ timeout_multiplier : 100) ++ else ++ message('valgrind not found, disabling valgrind test suite') ++ endif + configure_file(output : 'litest-config.h', + install : false, + configuration : litest_config_h) +-- +2.20.1 + diff --git a/libinput.spec b/libinput.spec index e1b6236..e1230d1 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.12.901 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?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-meson.build-make-valgrind-optional.patch + BuildRequires: git-core BuildRequires: gcc gcc-c++ BuildRequires: meson @@ -26,6 +28,7 @@ BuildRequires: pkgconfig(mtdev) >= 1.1.0 BuildRequires: pkgconfig(libevdev) >= 0.4 BuildRequires: pkgconfig(libwacom) >= 0.20 BuildRequires: python3-devel +BuildRequires: check-devel %description libinput is a library that handles input devices for display servers and other @@ -53,6 +56,14 @@ Requires: python3-evdev python3-pyudev python3-libevdev The %{name}-utils package contains tools to debug hardware and analyze %{name}. +%package test +Summary: libinput integration test suite +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description test +The %{name}-test package contains the libinput test suite. It is not +intended to be run by users. + %prep %autosetup -S git # Replace whatever the source uses with the approved call @@ -61,7 +72,8 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %build %meson -Ddebug-gui=false \ -Ddocumentation=false \ - -Dtests=false \ + -Dtests=true \ + -Dinstall-tests=true \ -Dudev-dir=%{udevdir} %meson_build @@ -116,7 +128,14 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-record.1* %{_mandir}/man1/libinput-replay.1* +%files test +%{_libexecdir}/libinput/libinput-test-suite +%{_mandir}/man1/libinput-test-suite.1* + %changelog +* Thu Mar 21 2019 Peter Hutterer 1.12.901-3 +- Package the tests suite as subpackage + * Fri Mar 15 2019 Peter Hutterer 1.12.901-2 - Require python3-libevdev for the utils subpackage From b0b7bd9a11754aa3eec5fd3b5fef2df495196c3b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 21 Mar 2019 17:30:41 +1000 Subject: [PATCH 086/184] libinput 1.12.902 --- 0001-meson.build-make-valgrind-optional.patch | 66 ------------------- libinput.spec | 9 +-- sources | 2 +- 3 files changed, 6 insertions(+), 71 deletions(-) delete mode 100644 0001-meson.build-make-valgrind-optional.patch diff --git a/0001-meson.build-make-valgrind-optional.patch b/0001-meson.build-make-valgrind-optional.patch deleted file mode 100644 index 7fa1ba0..0000000 --- a/0001-meson.build-make-valgrind-optional.patch +++ /dev/null @@ -1,66 +0,0 @@ -From b8123db0df7f1d358bcd2a1cc984095f4091fe61 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Fri, 15 Mar 2019 10:23:25 +1000 -Subject: [PATCH libinput] meson.build: make valgrind optional - -Now that we're providing the test suite as installed option, distributions -will likely include it as a test package. valgrind is only used for the -meson-specifc test setup. So let's make it optional. - -Signed-off-by: Peter Hutterer ---- - .gitlab-ci.yml | 8 +++++--- - meson.build | 30 +++++++++++++++++------------- - 2 files changed, 22 insertions(+), 16 deletions(-) - -diff --git a/meson.build b/meson.build -index 6e1e5590..cb3218b2 100644 ---- a/meson.build -+++ b/meson.build -@@ -665,7 +665,6 @@ endif - # dependencies - if get_option('tests') - dep_check = dependency('check', version : '>= 0.9.10') -- valgrind = find_program('valgrind') - - leftover_rules = find_program('test/check-leftover-udev-rules.sh') - test('leftover-rules', leftover_rules, is_parallel : false) -@@ -865,18 +864,23 @@ if get_option('tests') - libinput_test_runner, - args: ['--filter-deviceless']) - -- valgrind_env = environment() -- valgrind_env.set('CK_FORK', 'no') -- valgrind_env.set('USING_VALGRIND', '1') -- valgrind_suppressions_file = join_paths(dir_src_test, 'valgrind.suppressions') -- add_test_setup('valgrind', -- exe_wrapper : [ valgrind, -- '--leak-check=full', -- '--gen-suppressions=all', -- '--error-exitcode=3', -- '--suppressions=' + valgrind_suppressions_file ], -- env : valgrind_env, -- timeout_multiplier : 100) -+ valgrind = find_program('valgrind', required : false) -+ if valgrind.found() -+ valgrind_env = environment() -+ valgrind_env.set('CK_FORK', 'no') -+ valgrind_env.set('USING_VALGRIND', '1') -+ valgrind_suppressions_file = join_paths(dir_src_test, 'valgrind.suppressions') -+ add_test_setup('valgrind', -+ exe_wrapper : [ valgrind, -+ '--leak-check=full', -+ '--gen-suppressions=all', -+ '--error-exitcode=3', -+ '--suppressions=' + valgrind_suppressions_file ], -+ env : valgrind_env, -+ timeout_multiplier : 100) -+ else -+ message('valgrind not found, disabling valgrind test suite') -+ endif - configure_file(output : 'litest-config.h', - install : false, - configuration : litest_config_h) --- -2.20.1 - diff --git a/libinput.spec b/libinput.spec index e1230d1..2c91717 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.12.901 -Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.12.902 +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-meson.build-make-valgrind-optional.patch - BuildRequires: git-core BuildRequires: gcc gcc-c++ BuildRequires: meson @@ -133,6 +131,9 @@ pathfix.py -i %{__python3} -p -n $(git grep -l '#!/usr/bin/.*python3') %{_mandir}/man1/libinput-test-suite.1* %changelog +* Thu Mar 21 2019 Peter Hutterer 1.12.902-1 +- libinput 1.12.902 + * Thu Mar 21 2019 Peter Hutterer 1.12.901-3 - Package the tests suite as subpackage diff --git a/sources b/sources index 86a62b8..d8649e8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.12.901.tar.xz) = 98801fc25cf56126d25d17128f7f344371a0edee5b762709dac22e272abcdf134d69d83fa9c014007fbc193079d447cd20b12563ae8a8c6844b3e3d191663f25 +SHA512 (libinput-1.12.902.tar.xz) = f87379e95b057312b9c908f4b5948b93bc7d6b7cafae2fa6156e2dadd912361fc9a8f50c44419b9941b24e28765bbaab83e16af10caf7d59fd9dd489644aa075 From 3d762402a92d7635a5ad4f13e6778ae2afebceb0 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 22 Mar 2019 10:34:30 +1000 Subject: [PATCH 087/184] Drop the testing bits, accidentally committed to master This was supposed to be a test PR for the test suite, on a private branch. Somehow ended up on master and got accidentally commited with the recent libinput update. Remove it again, this was never supposed to be on master. --- tests/libinput-test-suite/PURPOSE | 5 -- tests/libinput-test-suite/runtest.sh | 16 ------ tests/libinput-tool-beakerlib/PURPOSE | 4 -- tests/libinput-tool-beakerlib/runtest.sh | 34 ----------- .../libinput-tool-test.sh | 16 ------ tests/libinput-tool/PURPOSE | 5 -- tests/libinput-tool/runtest.sh | 16 ------ tests/tests.yml | 56 ------------------- 8 files changed, 152 deletions(-) delete mode 100644 tests/libinput-test-suite/PURPOSE delete mode 100644 tests/libinput-test-suite/runtest.sh delete mode 100644 tests/libinput-tool-beakerlib/PURPOSE delete mode 100644 tests/libinput-tool-beakerlib/runtest.sh delete mode 100644 tests/libinput-tool-scripttest/libinput-tool-test.sh delete mode 100644 tests/libinput-tool/PURPOSE delete mode 100644 tests/libinput-tool/runtest.sh delete mode 100644 tests/tests.yml diff --git a/tests/libinput-test-suite/PURPOSE b/tests/libinput-test-suite/PURPOSE deleted file mode 100644 index 4396bd4..0000000 --- a/tests/libinput-test-suite/PURPOSE +++ /dev/null @@ -1,5 +0,0 @@ -PURPOSE of libinput-test-suite -Description: Full test suite run for libinput -Author: Peter Hutterer - - diff --git a/tests/libinput-test-suite/runtest.sh b/tests/libinput-test-suite/runtest.sh deleted file mode 100644 index ce7b1ff..0000000 --- a/tests/libinput-test-suite/runtest.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -export # let's see what's available -pwd -set -e - -ls /dev/input # if this fails, we don't have a VM -ls /dev/uinput # same as above - -# this is where the standard-test-source extracts to -pushd ../source - -meson builddir -Ddocumentation=false -Dtests=true -Ddebug-gui=false -ninja -C builddir test - -popd > /dev/null diff --git a/tests/libinput-tool-beakerlib/PURPOSE b/tests/libinput-tool-beakerlib/PURPOSE deleted file mode 100644 index 5ba320c..0000000 --- a/tests/libinput-tool-beakerlib/PURPOSE +++ /dev/null @@ -1,4 +0,0 @@ -PURPOSE of libinput-tool-beakerlib -Description: Test for the libinput commandline tool -Author: Peter Hutterer - diff --git a/tests/libinput-tool-beakerlib/runtest.sh b/tests/libinput-tool-beakerlib/runtest.sh deleted file mode 100644 index 486b100..0000000 --- a/tests/libinput-tool-beakerlib/runtest.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -# Include rhts environment -. /usr/bin/rhts-environment.sh -. /usr/share/rhts-library/rhtslib.sh - -PACKAGE="libinput" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlAssertRpm $PACKAGE-utils - rlPhaseEnd - - rlPhaseStartTest - rlRun "libinput --help" 0 "libinput help exists cleanly" - rlRun "libinput --version" 0 "libinput version exists cleanly" - rlPhaseEnd - - rlPhaseStartTest - rlRun "libinput quirks validate" 0 "libinput quirks parse " - rlPhaseEnd - - rlPhaseStartTest - rlRun "libinput record --help" 0 "libinput record exists" - rlRun "libinput measure --help" 0 "libinput measure exists" - rlRun "libinput measure fuzz --help" 0 "libinput measure fuzz exists" - rlRun "libinput measure touch-size --help" 0 "libinput measure touch-size exists" - rlRun "libinput measure touchpad-pressure --help" 0 "libinput touchpad-pressure exists" - rlRun "libinput measure touchpad-tap --help" 0 "libinput touchpad-tap exists" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd - diff --git a/tests/libinput-tool-scripttest/libinput-tool-test.sh b/tests/libinput-tool-scripttest/libinput-tool-test.sh deleted file mode 100644 index 2e77ad2..0000000 --- a/tests/libinput-tool-scripttest/libinput-tool-test.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -# check libinput is in the path, --help and --version need to work -libinput --help -libinput --version - -# this should fail if the quirks failed to install -libinput quirks validate - -# check the various tools exist -libinput record --help -libinput measure --help -libinput measure fuzz --help -libinput measure touch-size --help -libinput measure touchpad-pressure --help -libinput measure touchpad-tap --help diff --git a/tests/libinput-tool/PURPOSE b/tests/libinput-tool/PURPOSE deleted file mode 100644 index 297a94b..0000000 --- a/tests/libinput-tool/PURPOSE +++ /dev/null @@ -1,5 +0,0 @@ -PURPOSE of libinput-tool -Description: Test for the libinput commandline tool -Author: Peter Hutterer - - diff --git a/tests/libinput-tool/runtest.sh b/tests/libinput-tool/runtest.sh deleted file mode 100644 index 2e77ad2..0000000 --- a/tests/libinput-tool/runtest.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -# check libinput is in the path, --help and --version need to work -libinput --help -libinput --version - -# this should fail if the quirks failed to install -libinput quirks validate - -# check the various tools exist -libinput record --help -libinput measure --help -libinput measure fuzz --help -libinput measure touch-size --help -libinput measure touchpad-pressure --help -libinput measure touchpad-tap --help diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 3ad4fb7..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,56 +0,0 @@ ---- -#- hosts: localhost -# roles: -# - role: standard-test-beakerlib -# tags: -# - classic -# tests: -# - libinput-tool-beakerlib -# -#- hosts: localhost -# roles: -# - role: standard-test-basic -# tags: -# - classic -# tests: -# - libinput-tool -# -#- hosts: localhost -# roles: -# - role: standard-test-scripts -# tags: -# - classic -# tests: -# - libinput-tool-scripttest/libinput-tool-test.sh - -- hosts: localhost - roles: - # sigh, we need this separately because of - # https://pagure.io/standard-test-roles/issue/307 and - # https://pagure.io/standard-test-roles/issue/311 - - role: standard-test-basic - tags: - - classic - required_packages: - - meson - - gcc - - gcc-c++ - - mtdev-devel - - libevdev-devel - - libwacom-devel - - check-devel - - systemd-devel - - valgrind - - python3-devel # for pathfix during srpm prep - tests: - - simple: - dir: . - run: test -f /usr/bin/pathfix.py - - role: standard-test-source - tags: - - classic - - role: standard-test-basic - tags: - - classic - tests: - - libinput-test-suite From 2d5c82a8a297157aa9193f54ad529a7141c9c7ed Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 29 Mar 2019 10:28:02 +1000 Subject: [PATCH 088/184] libinput 1.13.0 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 2c91717..d14e1dc 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.12.902 +Version: 1.13.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 +* Fri Mar 29 2019 Peter Hutterer 1.13.0-1 +- libinput 1.13.0 + * Thu Mar 21 2019 Peter Hutterer 1.12.902-1 - libinput 1.12.902 diff --git a/sources b/sources index d8649e8..657351f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.12.902.tar.xz) = f87379e95b057312b9c908f4b5948b93bc7d6b7cafae2fa6156e2dadd912361fc9a8f50c44419b9941b24e28765bbaab83e16af10caf7d59fd9dd489644aa075 +SHA512 (libinput-1.13.0.tar.xz) = 0e3f53acf90fe142ad677b416d1ee830ad7f7f8a83b80023278ea7d3696ff7af5612379b387b1eb5daae6277a8c30d84c21f0086fe3d8b4b6189f239b1eeb4f8 From b3e278f6c01389a0ed414f3e3f5a560da229fb32 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Tue, 9 Apr 2019 12:37:15 +1000 Subject: [PATCH 089/184] libinput 1.13.1 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index d14e1dc..4cbe478 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.13.0 +Version: 1.13.1 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 +* Tue Apr 09 2019 Peter Hutterer 1.13.1-1 +- libinput 1.13.1 + * Fri Mar 29 2019 Peter Hutterer 1.13.0-1 - libinput 1.13.0 diff --git a/sources b/sources index 657351f..4f43368 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.13.0.tar.xz) = 0e3f53acf90fe142ad677b416d1ee830ad7f7f8a83b80023278ea7d3696ff7af5612379b387b1eb5daae6277a8c30d84c21f0086fe3d8b4b6189f239b1eeb4f8 +SHA512 (libinput-1.13.1.tar.xz) = a19deec802e704038df0901c103a82a3370f56e0299f4cc1b6aa84c1832a66fb638e6f9d0fa708b51df6c3b939cdc1271e4ff547c645c566be03dce0bc9ff7e0 From 05efae5b0255a3ddb59b7d44200bcbab0e9c73f5 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 16 Apr 2019 11:40:08 -0700 Subject: [PATCH 090/184] Rebuild with Meson fix for #1699099 --- libinput.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libinput.spec b/libinput.spec index 4cbe478..07a31af 100644 --- a/libinput.spec +++ b/libinput.spec @@ -5,7 +5,7 @@ Name: libinput Version: 1.13.1 -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 +* Tue Apr 16 2019 Adam Williamson - 1.13.1-2 +- Rebuild with Meson fix for #1699099 + * Tue Apr 09 2019 Peter Hutterer 1.13.1-1 - libinput 1.13.1 From 40f47f9381a2c7c3176112c245cfcf4b6a60556f Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 9 May 2019 11:20:17 +1000 Subject: [PATCH 091/184] libinput 1.13.2 --- libinput.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libinput.spec b/libinput.spec index 07a31af..539c5f2 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.13.1 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.13.2 +Release: 1%{?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 May 09 2019 Peter Hutterer 1.13.2-1 +- libinput 1.13.2 + * Tue Apr 16 2019 Adam Williamson - 1.13.1-2 - Rebuild with Meson fix for #1699099 diff --git a/sources b/sources index 4f43368..b910060 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.13.1.tar.xz) = a19deec802e704038df0901c103a82a3370f56e0299f4cc1b6aa84c1832a66fb638e6f9d0fa708b51df6c3b939cdc1271e4ff547c645c566be03dce0bc9ff7e0 +SHA512 (libinput-1.13.2.tar.xz) = 26f11c5274c26acc38b9b5729195010c0799a9563f1eb0e0cd67e323f8ed73b0fc8db8584ec8fdf1b726417f64c2daeb54832167079832626c8c1190fccf459f From 1a30f78cc4ab15d2f5d4a5ef22a58b4406e71f8b Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 24 Jun 2019 15:21:43 +1000 Subject: [PATCH 092/184] libinput 1.13.3 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 539c5f2..377c33c 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.13.2 +Version: 1.13.3 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 +* Mon Jun 24 2019 Peter Hutterer 1.13.3-1 +- libinput 1.13.3 + * Thu May 09 2019 Peter Hutterer 1.13.2-1 - libinput 1.13.2 diff --git a/sources b/sources index b910060..8d4d75f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.13.2.tar.xz) = 26f11c5274c26acc38b9b5729195010c0799a9563f1eb0e0cd67e323f8ed73b0fc8db8584ec8fdf1b726417f64c2daeb54832167079832626c8c1190fccf459f +SHA512 (libinput-1.13.3.tar.xz) = 427ec838975444571770e129ef78fd42e4438a11e89ed0b3fc98793184d00c0ca8ed282eab2045cc6cb345804ad6fce1061af563b4f41d75405cdf2f09cb01e1 From 7f5c82ce7dc7cb797893f03e94e1ab7e8a81d67a Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Fri, 28 Jun 2019 10:51:38 +1000 Subject: [PATCH 093/184] libinput 1.13.4 --- libinput.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libinput.spec b/libinput.spec index 377c33c..243b188 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,7 +4,7 @@ %global gitversion 58abea394 Name: libinput -Version: 1.13.3 +Version: 1.13.4 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 +* Fri Jun 28 2019 Peter Hutterer 1.13.4-1 +- libinput 1.13.4 + * Mon Jun 24 2019 Peter Hutterer 1.13.3-1 - libinput 1.13.3 diff --git a/sources b/sources index 8d4d75f..2f0c91c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.13.3.tar.xz) = 427ec838975444571770e129ef78fd42e4438a11e89ed0b3fc98793184d00c0ca8ed282eab2045cc6cb345804ad6fce1061af563b4f41d75405cdf2f09cb01e1 +SHA512 (libinput-1.13.4.tar.xz) = ccfdfc704dab9ea19a503399ecd4ce3a95b8d9480b8dfddeb80be01236c34c6f2f472be0e12e04dddd68092611470d303351e092141bc7491729639bcf7e64d7 From 65b20246baacae31525bae9a6ff8e8856ac74c59 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 13:32:12 +0000 Subject: [PATCH 094/184] - 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 095/184] 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 096/184] 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 097/184] 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 098/184] 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 099/184] 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 100/184] 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 101/184] 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 102/184] 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 103/184] 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 104/184] - 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 105/184] 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 106/184] 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 107/184] 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 108/184] 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 109/184] 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 110/184] 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 111/184] 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 112/184] 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 113/184] 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 114/184] - 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 115/184] 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 116/184] 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 117/184] 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 118/184] 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 119/184] 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 120/184] - 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 121/184] 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 122/184] 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 123/184] 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 124/184] 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 125/184] 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 126/184] 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 127/184] 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 128/184] 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 129/184] - 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 130/184] 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 131/184] 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 132/184] 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 133/184] 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 134/184] 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 135/184] 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 136/184] 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 137/184] - 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 138/184] 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 139/184] 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 140/184] 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 141/184] 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 142/184] 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 143/184] 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 144/184] 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 145/184] 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 146/184] 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 147/184] 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 148/184] 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 149/184] 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 150/184] 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 151/184] 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 152/184] 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 153/184] 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 154/184] 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 155/184] 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 156/184] 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 157/184] 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 158/184] 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 159/184] 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 160/184] 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 161/184] 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 162/184] 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 163/184] 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 164/184] 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 165/184] 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 166/184] 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 167/184] 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 168/184] 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 169/184] 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 170/184] 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 171/184] 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 172/184] 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 173/184] 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 174/184] 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 175/184] 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 176/184] 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 177/184] 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 178/184] 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 179/184] 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 180/184] 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 181/184] 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 182/184] 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 183/184] 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 184/184] 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