diff --git a/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch b/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch new file mode 100644 index 0000000..5a33866 --- /dev/null +++ b/0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch @@ -0,0 +1,26 @@ +From cf8b629ebf30d6aa57dd405ce450fb0f33136626 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Mon, 13 Jul 2015 08:30:43 +1000 +Subject: [PATCH xf86-input-libinput] Fedora: use unaccelerated vmask on input + ABI > 21 + +Signed-off-by: Peter Hutterer +--- + src/libinput.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libinput.c b/src/libinput.c +index a06e44f..5eb5adf 100644 +--- a/src/libinput.c ++++ b/src/libinput.c +@@ -47,7 +47,7 @@ + #define XI86_SERVER_FD 0x20 + #endif + +-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) * 1000 + GET_ABI_MINOR(ABI_XINPUT_VERSION) > 22000 ++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) * 1000 + GET_ABI_MINOR(ABI_XINPUT_VERSION) > 21000 + #define HAVE_VMASK_UNACCEL 1 + #else + #undef HAVE_VMASK_UNACCEL +-- +2.4.3 diff --git a/xorg-x11-drv-libinput.spec b/xorg-x11-drv-libinput.spec index c5f76bd..7e451aa 100644 --- a/xorg-x11-drv-libinput.spec +++ b/xorg-x11-drv-libinput.spec @@ -5,13 +5,16 @@ Summary: Xorg X11 libinput input driver Name: xorg-x11-drv-libinput Version: 0.11.0 -Release: 2%{?dist} +Release: 3%{?dist} URL: http://www.x.org License: MIT Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 Source1: 90-libinput.conf +# Fedora-specific unless merged into 1.7.3 at least +Patch00: 0001-Fedora-use-unaccelerated-vmask-on-input-ABI-21.patch + # https://bugzilla.redhat.com/show_bug.cgi?id=1230945 Patch01: 0001-Support-buttons-BTN_BACK-on-mice.patch @@ -36,6 +39,7 @@ supporting all devices. %prep %setup -q -n %{tarball}-%{version} +%patch00 -p1 %patch01 -p1 %build @@ -72,6 +76,9 @@ Xorg X11 libinput input driver development files. %{_includedir}/xorg/libinput-properties.h %changelog +* Mon Jul 13 2015 Peter Hutterer 0.11.0-3 +- Restore unaccelerated valuator masks (#1208992) + * Fri Jun 19 2015 Fedora Release Engineering - 0.11.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild