From 9278eb34c9a969925a939c1113d17e3097cfb800 Mon Sep 17 00:00:00 2001 From: tigro Date: Mon, 6 Jan 2025 00:17:47 +0300 Subject: [PATCH] import xorg-x11-drv-libinput-1.4.0-3.el10 --- .gitignore | 2 +- .xorg-x11-drv-libinput.metadata | 2 +- ...ctor-option-as-temporary-solution-to.patch | 18 +++--- SPECS/xorg-x11-drv-libinput.spec | 62 ++++++++++++++++--- 4 files changed, 64 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 505c984..bad5eba 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/xf86-input-libinput-1.0.1.tar.bz2 +SOURCES/xf86-input-libinput-1.4.0.tar.xz diff --git a/.xorg-x11-drv-libinput.metadata b/.xorg-x11-drv-libinput.metadata index 8125950..50da915 100644 --- a/.xorg-x11-drv-libinput.metadata +++ b/.xorg-x11-drv-libinput.metadata @@ -1 +1 @@ -e0336d7376379ea3ce60730804e498cdb05f3f5c SOURCES/xf86-input-libinput-1.0.1.tar.bz2 +8448144ab3993805c462568fbad32c5e1a153755 SOURCES/xf86-input-libinput-1.4.0.tar.xz diff --git a/SOURCES/0001-Add-a-DPIScaleFactor-option-as-temporary-solution-to.patch b/SOURCES/0001-Add-a-DPIScaleFactor-option-as-temporary-solution-to.patch index ac58d1b..3a6ac88 100644 --- a/SOURCES/0001-Add-a-DPIScaleFactor-option-as-temporary-solution-to.patch +++ b/SOURCES/0001-Add-a-DPIScaleFactor-option-as-temporary-solution-to.patch @@ -1,4 +1,4 @@ -From badaa13b7193344a3dd1a81b03baa4bc540faa92 Mon Sep 17 00:00:00 2001 +From be5220b31e77b1a3f723def32f69e6aee9f3c7e9 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,13 +11,13 @@ 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 c9fec4e..888891c 100644 +index 7c83ccb..76572f8 100644 --- a/man/libinput.man +++ b/man/libinput.man -@@ -401,6 +401,27 @@ This driver does not work with \fBOption \*qDevice\*q\fR set to an event +@@ -454,6 +454,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__). + appropriate \fBMatch*\fR statement in the xorg.conf(5). +.PP +This driver does not know about the display pixel density and submits motion +events assuming an approximate display density of 96dpi. On high-dpi @@ -43,10 +43,10 @@ index c9fec4e..888891c 100644 .SH AUTHORS Peter Hutterer diff --git a/src/xf86libinput.c b/src/xf86libinput.c -index 92817a5..dd600e6 100644 +index 642f95f..cfee922 100644 --- a/src/xf86libinput.c +++ b/src/xf86libinput.c -@@ -182,6 +182,8 @@ struct xf86libinput { +@@ -214,6 +214,8 @@ struct xf86libinput { struct scale_factor { double x, y; } area_scale_factor; @@ -55,7 +55,7 @@ index 92817a5..dd600e6 100644 }; enum event_handling { -@@ -1448,6 +1450,11 @@ xf86libinput_handle_motion(InputInfoPtr pInfo, struct libinput_event_pointer *ev +@@ -1571,6 +1573,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); @@ -67,7 +67,7 @@ index 92817a5..dd600e6 100644 valuator_mask_zero(mask); { -@@ -3448,6 +3455,25 @@ xf86libinput_pre_init(InputDriverPtr drv, +@@ -3951,6 +3958,25 @@ xf86libinput_pre_init(InputDriverPtr drv, xf86libinput_parse_options(pInfo, driver_data, device); @@ -94,5 +94,5 @@ index 92817a5..dd600e6 100644 * this device, create a separate device instead */ if (!is_subdevice && -- -2.31.1 +2.40.0 diff --git a/SPECS/xorg-x11-drv-libinput.spec b/SPECS/xorg-x11-drv-libinput.spec index faabbab..8b638c2 100644 --- a/SPECS/xorg-x11-drv-libinput.spec +++ b/SPECS/xorg-x11-drv-libinput.spec @@ -7,15 +7,16 @@ Summary: Xorg X11 libinput input driver Name: xorg-x11-drv-libinput -Version: 1.0.1 +Version: 1.4.0 Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} URL: http://www.x.org +# SPDX License: MIT %if 0%{?gitdate} Source0: %{tarball}-%{gitdate}.tar.xz %else -Source0: https://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2 +Source0: https://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.xz %endif Source1: 71-libinput-overrides-wacom.conf @@ -77,18 +78,61 @@ Xorg X11 libinput input driver development files. %dir %{_includedir}/xorg/ %{_includedir}/xorg/libinput-properties.h + %changelog -* Tue Aug 10 2021 Mohan Boddu - 1.0.1-3 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Mon Jan 06 2025 Arkady L. Shane - 1.4.0-3 +- Rebuilt for MSVSphere 10 + +* Sat Jul 20 2024 Fedora Release Engineering - 1.4.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 1.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Tue Sep 05 2023 Peter Hutterer +- SPDX migration: mark license as SPDX compatible + +* Fri Aug 25 2023 Peter Hutterer - 1.4.0-1 +- xf86-input-libinput 1.4.0 + +* Sat Jul 22 2023 Fedora Release Engineering - 1.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Tue Apr 04 2023 Peter Hutterer - 1.3.0-1 +- xf86-input-libinput 1.3.0 + +* Sat Jan 21 2023 Fedora Release Engineering - 1.2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 1.2.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jan 24 2022 Peter Hutterer - 1.2.1-1 +- xf86-input-libinput 1.2.1 + +* Sat Jan 22 2022 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Sep 20 2021 Peter Hutterer - 1.2.0-1 +- xf86-input-libinput 1.2.0 + +* Fri Sep 03 2021 Peter Hutterer - 1.1.0-2 +- Add support for high-resolution wheel scrolling + +* Fri Sep 03 2021 Peter Hutterer - 1.1.0-1 +- xf86-input-libinput 1.1.0 + +* Fri Jul 23 2021 Fedora Release Engineering - 1.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild * 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 +* Fri Apr 16 2021 Peter Hutterer 1.0.1-1 +- xf86-input-libinput 1.0.1 + +* Tue Apr 06 2021 Peter Hutterer 1.0.0-1 +- xf86-input-libinput 1.0.0 * Thu Jan 28 2021 Fedora Release Engineering - 0.30.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild