diff --git a/.gitignore b/.gitignore index a4ef0e1..8f0a0a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/xf86-input-libinput-0.28.0.tar.bz2 +SOURCES/xf86-input-libinput-0.29.0.tar.bz2 diff --git a/.xorg-x11-drv-libinput.metadata b/.xorg-x11-drv-libinput.metadata index 23e62ef..4210c7a 100644 --- a/.xorg-x11-drv-libinput.metadata +++ b/.xorg-x11-drv-libinput.metadata @@ -1 +1 @@ -07f5559bcf0363d4ecaf0b2cecb88ee7d2b16fc6 SOURCES/xf86-input-libinput-0.28.0.tar.bz2 +efa9dbe08ee827949aff0bd752f8270237247c56 SOURCES/xf86-input-libinput-0.29.0.tar.bz2 diff --git a/SOURCES/0001-Use-the-seat-slot-not-the-device-slot-for-touch-even.patch b/SOURCES/0001-Use-the-seat-slot-not-the-device-slot-for-touch-even.patch deleted file mode 100644 index 5bdad60..0000000 --- a/SOURCES/0001-Use-the-seat-slot-not-the-device-slot-for-touch-even.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a759610292a53067fc811e70703bffff8dc0cb16 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer -Date: Thu, 4 Oct 2018 11:45:46 +1000 -Subject: [PATCH xf86-input-libinput] Use the seat slot, not the device slot - for touch events - -The device slot is per-device, so if we have more than one device we may get a -touch down event for a slot already in use. - -Fixes https://gitlab.freedesktop.org/libinput/libinput/issues/153 - -Signed-off-by: Peter Hutterer ---- - src/xf86libinput.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/xf86libinput.c b/src/xf86libinput.c -index 1277a70..a00b0a5 100644 ---- a/src/xf86libinput.c -+++ b/src/xf86libinput.c -@@ -1705,7 +1705,7 @@ xf86libinput_handle_touch(InputInfoPtr pInfo, - if ((driver_data->capabilities & CAP_TOUCH) == 0) - return; - -- slot = libinput_event_touch_get_slot(event); -+ slot = libinput_event_touch_get_seat_slot(event); - - switch (event_type) { - case LIBINPUT_EVENT_TOUCH_DOWN: --- -2.19.1 - diff --git a/SPECS/xorg-x11-drv-libinput.spec b/SPECS/xorg-x11-drv-libinput.spec index bf2bf4f..e1c077f 100644 --- a/SPECS/xorg-x11-drv-libinput.spec +++ b/SPECS/xorg-x11-drv-libinput.spec @@ -7,8 +7,8 @@ Summary: Xorg X11 libinput input driver Name: xorg-x11-drv-libinput -Version: 0.28.0 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 0.29.0 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} URL: http://www.x.org License: MIT @@ -23,9 +23,6 @@ Source1: 71-libinput-overrides-wacom.conf # https://bugzilla.redhat.com/show_bug.cgi?id=1413306 Patch01: 0001-Add-a-DPIScaleFactor-option-as-temporary-solution-to.patch -# Bug 1639059 - Two touchscreens end up with a stuck button -Patch02: 0001-Use-the-seat-slot-not-the-device-slot-for-touch-even.patch - BuildRequires: autoconf automake libtool BuildRequires: xorg-x11-server-devel >= 1.14.0 BuildRequires: libudev-devel libevdev-devel libinput-devel >= 0.6.0-3 @@ -46,7 +43,6 @@ supporting all devices. %prep %setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} %patch01 -p1 -%patch02 -p1 %build autoreconf --force -v --install || exit 1 @@ -82,6 +78,9 @@ Xorg X11 libinput input driver development files. %{_includedir}/xorg/libinput-properties.h %changelog +* Tue Oct 29 2019 Peter Hutterer 0.29.0-1 +- xf86-input-libinput 0.29.0 (#1728820) + * Mon Oct 15 2018 Peter Hutterer 0.28.0-2 - Fix wrong slot to touch ID mapping (#1639059)