diff --git a/0001-Add-a-DPIScaleFactor-option-as-temporary-solution-to.patch b/0001-Add-a-DPIScaleFactor-option-as-temporary-solution-to.patch index dddd9da..ac58d1b 100644 --- a/0001-Add-a-DPIScaleFactor-option-as-temporary-solution-to.patch +++ b/0001-Add-a-DPIScaleFactor-option-as-temporary-solution-to.patch @@ -1,4 +1,4 @@ -From 41d20d35c1587f3de35acf47f926c97a30680978 Mon Sep 17 00:00:00 2001 +From badaa13b7193344a3dd1a81b03baa4bc540faa92 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 18 May 2017 14:45:18 +1000 Subject: [PATCH xf86-input-libinput] Add a DPIScaleFactor option as temporary @@ -11,10 +11,10 @@ https://bugzilla.redhat.com/show_bug.cgi?id=1413306 2 files changed, 47 insertions(+) diff --git a/man/libinput.man b/man/libinput.man -index ec0f439..bdbdb37 100644 +index c9fec4e..888891c 100644 --- a/man/libinput.man +++ b/man/libinput.man -@@ -386,6 +386,27 @@ This driver does not work with \fBOption \*qDevice\*q\fR set to an event +@@ -401,6 +401,27 @@ This driver does not work with \fBOption \*qDevice\*q\fR set to an event node in \fI/dev/input/by-id\fR and \fI/dev/input/by-path\fR. This can be usually be worked by using \fBSection \*qInputClass\*q\fR with an appropriate \fBMatch*\fR statement in the __xconfigfile__(__filemansuffix__). @@ -43,10 +43,10 @@ index ec0f439..bdbdb37 100644 .SH AUTHORS Peter Hutterer diff --git a/src/xf86libinput.c b/src/xf86libinput.c -index 83ab75d..c1a1ce2 100644 +index 92817a5..dd600e6 100644 --- a/src/xf86libinput.c +++ b/src/xf86libinput.c -@@ -194,6 +194,8 @@ struct xf86libinput { +@@ -182,6 +182,8 @@ struct xf86libinput { struct scale_factor { double x, y; } area_scale_factor; @@ -55,7 +55,7 @@ index 83ab75d..c1a1ce2 100644 }; enum event_handling { -@@ -1463,6 +1465,11 @@ xf86libinput_handle_motion(InputInfoPtr pInfo, struct libinput_event_pointer *ev +@@ -1448,6 +1450,11 @@ xf86libinput_handle_motion(InputInfoPtr pInfo, struct libinput_event_pointer *ev x = libinput_event_pointer_get_dx(event); y = libinput_event_pointer_get_dy(event); @@ -66,8 +66,8 @@ index 83ab75d..c1a1ce2 100644 + valuator_mask_zero(mask); - #if HAVE_VMASK_UNACCEL -@@ -3421,6 +3428,25 @@ xf86libinput_pre_init(InputDriverPtr drv, + { +@@ -3448,6 +3455,25 @@ xf86libinput_pre_init(InputDriverPtr drv, xf86libinput_parse_options(pInfo, driver_data, device); @@ -94,5 +94,5 @@ index 83ab75d..c1a1ce2 100644 * this device, create a separate device instead */ if (!is_subdevice && -- -2.14.3 +2.31.1 diff --git a/sources b/sources index 0f79926..8a34609 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xf86-input-libinput-0.30.0.tar.bz2) = 823f80f7d53866f2f06c1fb7b2d64111bf807329acaaeda4a09413cdb5f3e3235c1dd4f99183aae75adf5a01503e40e35b4449b31f977afd842b4723b062c380 +SHA512 (xf86-input-libinput-1.0.1.tar.bz2) = bb3cc4e9507d5ff6e430aabb5c87e412e8bbc5fd18b85fa4826123cb6be2f8f41078863fda09304f9dbd1264bbf1c3c7d6c11700ede0a5db733fbd1a03ec915b diff --git a/xorg-x11-drv-libinput.spec b/xorg-x11-drv-libinput.spec index 41c0785..65e44dc 100644 --- a/xorg-x11-drv-libinput.spec +++ b/xorg-x11-drv-libinput.spec @@ -7,15 +7,15 @@ Summary: Xorg X11 libinput input driver Name: xorg-x11-drv-libinput -Version: 0.30.0 -Release: 6%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.0.1 +Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} URL: http://www.x.org License: MIT %if 0%{?gitdate} Source0: %{tarball}-%{gitdate}.tar.xz %else -Source0: ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 +Source0: https://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 %endif Source1: 71-libinput-overrides-wacom.conf @@ -42,8 +42,7 @@ A generic input driver for the X.Org X11 X server based on libinput, supporting all devices. %prep -%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} -%patch01 -p1 +%autosetup -p 1 -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} %build autoreconf --force -v --install || exit 1 @@ -79,6 +78,11 @@ Xorg X11 libinput input driver development files. %{_includedir}/xorg/libinput-properties.h %changelog +* Thu Apr 29 2021 Peter Hutterer 1.0.1-2 +- xf86-input-libinput 1.0.1 (#1951879) +- Fix the upstream source URL +- Use autosetup instead of manual patch handling + * Fri Apr 16 2021 Mohan Boddu - 0.30.0-6 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937