Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,22 +1 @@
-/xf86-input-libinput-0.1.2.tar.gz
-/xf86-input-libinput-0.2.0.tar.bz2
-/xf86-input-libinput-0.3.0.tar.bz2
-/xf86-input-libinput-0.4.0.tar.bz2
-/xf86-input-libinput-0.5.0.tar.bz2
-/xf86-input-libinput-0.6.0.tar.bz2
-/xf86-input-libinput-0.7.0.tar.bz2
-/xf86-input-libinput-0.8.0.tar.bz2
-/xf86-input-libinput-0.9.0.tar.bz2
-/xf86-input-libinput-0.10.0.tar.bz2
-/xf86-input-libinput-0.11.0.tar.bz2
-/xf86-input-libinput-0.12.0.tar.bz2
-/xf86-input-libinput-0.13.0.tar.bz2
-/xf86-input-libinput-0.14.0.tar.bz2
-/xf86-input-libinput-0.15.0.tar.bz2
-/xf86-input-libinput-0.16.0.tar.bz2
-/xf86-input-libinput-0.17.0.tar.bz2
-/xf86-input-libinput-0.19.0.tar.bz2
-/xf86-input-libinput-0.19.1.tar.bz2
-/xf86-input-libinput-20160929.tar.xz
-/xf86-input-libinput-0.20.0.tar.bz2
-/xf86-input-libinput-0.22.0.tar.bz2
+/xf86-input-libinput-*.tar.xz

0001-Add-a-DPIScaleFactor-option-as-temporary-solution-to.patch

@@ -0,0 +1,98 @@
+From be5220b31e77b1a3f723def32f69e6aee9f3c7e9 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu, 18 May 2017 14:45:18 +1000
+Subject: [PATCH xf86-input-libinput] Add a DPIScaleFactor option as temporary
+ solution to the hidpi issue
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1413306
+---
+ man/libinput.man   | 21 +++++++++++++++++++++
+ src/xf86libinput.c | 26 ++++++++++++++++++++++++++
+ 2 files changed, 47 insertions(+)
+
+diff --git a/man/libinput.man b/man/libinput.man
+index 7c83ccb..76572f8 100644
+--- a/man/libinput.man
++++ b/man/libinput.man
+@@ -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 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
++screens this results in a slower physical motion of the cursor (a one-pixel
++movement is a smaller physical movement on the screen). This can make
++interaction with the desktop difficult.
++.PP
++.TP 7
++.BI "Option \*qDPIScaleFactor\*q float
++This is a
++.B temporary
++solution. The factor should be set to the approximate ratio of the host display
++compared to the default 96dpi. For example, a display with 200dpi should set
++a factor of 2.0.
++.PP
++If set, x/y motion will be unconditionally multiplied by this factor,
++resulting in faster movement of the cursor. Note that this may make some
++pixels unadressable and should be used with caution.
++.PP
++.B This option is a temporary solution.
++It may be removed in any future update of this driver.
+ 
+ .SH AUTHORS
+ Peter Hutterer
+diff --git a/src/xf86libinput.c b/src/xf86libinput.c
+index 642f95f..cfee922 100644
+--- a/src/xf86libinput.c
++++ b/src/xf86libinput.c
+@@ -214,6 +214,8 @@ struct xf86libinput {
+ 	struct scale_factor {
+ 		double x, y;
+ 	} area_scale_factor;
++
++	double dpi_scale_factor; /* Fedora hack */
+ };
+ 
+ enum event_handling {
+@@ -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);
+ 
++	if (driver_data->dpi_scale_factor > 0.0) {
++		x *= driver_data->dpi_scale_factor;
++		y *= driver_data->dpi_scale_factor;
++	}
++
+ 	valuator_mask_zero(mask);
+ 
+ 	{
+@@ -3951,6 +3958,25 @@ xf86libinput_pre_init(InputDriverPtr drv,
+ 
+ 	xf86libinput_parse_options(pInfo, driver_data, device);
+ 
++	/* XXX:
++	   Fedora hack for bug https://bugzilla.redhat.com/show_bug.cgi?id=1413306
++	   This is temporary only, but at least makes it work for now.
++	 */
++
++	if (xf86CheckRealOption(pInfo->options, "DPIScaleFactor", 0.0) != 0.0) {
++		xf86IDrvMsg(pInfo, X_WARNING,
++			    "\n"
++			    "******************** WARNING ********************\n"
++			    "* DPIScaleFactor option is a temporary solution *\n"
++			    "* and may cease to work without warning!        *\n"
++			    "******************** WARNING ********************\n");
++		driver_data->dpi_scale_factor = xf86SetRealOption(pInfo->options, "DPIScaleFactor", 0.0);
++		if (driver_data->dpi_scale_factor < 0.0) {
++			xf86IDrvMsg(pInfo, X_ERROR, "Invalid DPIScaleFactor, ignoring value\n");
++			driver_data->dpi_scale_factor = 0.0;
++		}
++	}
++
+ 	/* Device is both keyboard and pointer. Drop the keyboard cap from
+ 	 * this device, create a separate device instead */
+ 	if (!is_subdevice &&
+-- 
+2.40.0
+

71-libinput-overrides-wacom.conf

@@ -0,0 +1,7 @@
+# Assign libinput back to touchpads on Wacom tablets
+Section "InputClass"
+	Identifier "libinput overrides wacom touchpads"
+	MatchDriver "wacom"
+	MatchIsTouchpad "true"
+	Driver "libinput"
+EndSection

sources

@@ -1 +1 @@
-e4364319f15f97dc2ef0ef62c8616826  xf86-input-libinput-0.22.0.tar.bz2
+SHA512 (xf86-input-libinput-1.5.0.tar.xz) = 03090beb7c162fdf55e9bb9da41ffb8601b20047e4a53895bad27de47b3197fc920e710f26fa23e7322b367ab65fa56ba5f9a195ec69801529af3958632c2d6e

xorg-x11-drv-libinput.spec

@@ -7,19 +7,24 @@
 
 Summary:    Xorg X11 libinput input driver
 Name:       xorg-x11-drv-libinput
-Version:    0.22.0
-Release:    1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Version:    1.5.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:    ftp://ftp.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
 
-ExcludeArch: s390 s390x
+# Fedora-only hack for hidpi screens
+# https://bugzilla.redhat.com/show_bug.cgi?id=1413306
+Patch01:    0001-Add-a-DPIScaleFactor-option-as-temporary-solution-to.patch
 
+BuildRequires: make
 BuildRequires: autoconf automake libtool
 BuildRequires: xorg-x11-server-devel >= 1.14.0
 BuildRequires: libudev-devel libevdev-devel libinput-devel >= 0.6.0-3
@@ -30,12 +35,15 @@ Requires: Xorg %(xserver-sdk-abi-requires xinput)
 Requires: xkeyboard-config
 Requires: libinput >= 0.21.0
 
+Provides: xorg-x11-drv-synaptics = 1.9.0-3
+Obsoletes: xorg-x11-drv-synaptics < 1.9.0-3
+
 %description
 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}}
+%autosetup -p 1 -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 
 %build
 autoreconf --force -v --install || exit 1
@@ -49,15 +57,13 @@ make %{?_smp_mflags}
 # should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
-# Keep libinput.conf at priority 60 for now, until we've obsoleted
-# synaptics
-mv $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/40-libinput.conf \
-   $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/60-libinput.conf
+cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/
 
 %files
 %doc COPYING
 %{driverdir}/libinput_drv.so
-%{_datadir}/X11/xorg.conf.d/60-libinput.conf
+%{_datadir}/X11/xorg.conf.d/40-libinput.conf
+%{_datadir}/X11/xorg.conf.d/71-libinput-overrides-wacom.conf
 %{_mandir}/man4/libinput.4*
 
 %package devel
@@ -72,7 +78,169 @@ Xorg X11 libinput input driver development files.
 %dir %{_includedir}/xorg/
 %{_includedir}/xorg/libinput-properties.h
 
+
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Tue Oct 15 2024 Peter Hutterer <peter.hutterer@redhat.com> - 1.5.0-1
+- xf86-input-libinput 1.5.0
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Sep 05 2023 Peter Hutterer <peter.hutterer@redhat.com>
+- SPDX migration: mark license as SPDX compatible
+
+* Fri Aug 25 2023 Peter Hutterer <peter.hutterer@redhat.com> - 1.4.0-1
+- xf86-input-libinput 1.4.0
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Apr 04 2023 Peter Hutterer <peter.hutterer@redhat.com> - 1.3.0-1
+- xf86-input-libinput 1.3.0
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon Jan 24 2022 Peter Hutterer <peter.hutterer@redhat.com> - 1.2.1-1
+- xf86-input-libinput 1.2.1
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Sep 20 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.2.0-1
+- xf86-input-libinput 1.2.0
+
+* Fri Sep 03 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.1.0-2
+- Add support for high-resolution wheel scrolling
+
+* Fri Sep 03 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.1.0-1
+- xf86-input-libinput 1.1.0
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Apr 29 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.0.1-2
+- Use autosetup instead of manual patch handling
+
+* Fri Apr 16 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.0.1-1
+- xf86-input-libinput 1.0.1
+
+* Tue Apr 06 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.0.0-1
+- xf86-input-libinput 1.0.0
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Nov  5 10:09:04 AEST 2020 Peter Hutterer <peter.hutterer@redhat.com> - 0.30.0-4
+- Add BuildRequires for make
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.30.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue May 19 2020 Peter Hutterer <peter.hutterer@redhat.com> 0.30.0-1
+- xf86-input-libinput 0.30.0
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.29.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Aug 12 2019 Peter Hutterer <peter.hutterer@redhat.com> 0.29.0-1
+- xf86-input-libinput 0.29.0
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.28.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Feb 04 2019 Peter Hutterer <peter.hutterer@redhat.com> 0.28.2-1
+- xf86-input-libinput 0.28.2
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.28.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Oct 15 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.28.1-1
+- xf86-input-libinput 0.28.1
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.28.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jul 11 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.28.0-1
+- xf86-input-libinput 0.28.0
+
+* Thu Apr 12 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.27.1-2
+- Build on s390x (#1565062)
+
+* Tue Apr 10 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.27.1-1
+- xorg-x11-drv-libinput 0.27.1
+
+* Mon Apr 02 2018 Adam Jackson <ajax@redhat.com> - 0.27.0-3
+- Rebuild for xserver 1.20
+
+* Thu Mar 22 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.27.0-2
+- Fix left-handed property missing on all but the first pointer device
+
+* Tue Mar 20 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.27.0-1
+- xorg-x11-drv-libinput 0.27.0
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.26.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Sep 15 2017 Peter Hutterer <peter.hutterer@redhat.com> 0.26.0-1
+- xorg-x11-drv-libinput 0.26.0
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.25.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.25.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Thu May 18 2017 Peter Hutterer <peter.hutterer@redhat.com> 0.25.1-2
+- Add a new option to provide a workaround for the slow pointer movement on
+  hidpi displays (#1413306) .
+  That's a fedora-only patch for now, no idea what the permanent upstream
+  solution will be here.
+
+* Fri May 05 2017 Peter Hutterer <peter.hutterer@redhat.com> 0.25.1-1
+- xorg-x11-drv-libinput 0.25.1
+
+* Thu Mar 09 2017 Peter Hutterer <peter.hutterer@redhat.com> 0.25.0-1
+- libinput 0.25.0
+
+* Thu Feb 09 2017 Peter Hutterer <peter.hutterer@redhat.com> 0.24.0-1
+- libinput 0.24.0
+
+* Wed Dec 21 2016 Peter Hutterer <peter.hutterer@redhat.com> 0.23.0-2
+- Ignore LED updates for disabled devices, avoids a null-pointer dereference
+  when an AccessX timeout is set
+
+* Mon Dec 12 2016 Peter Hutterer <peter.hutterer@redhat.com> 0.23.0-1
+- libnput 0.23.0
+
+* Fri Nov 25 2016 Peter Hutterer <peter.hutterer@redhat.com> 0.22.0-4
+- Override touchpads assigned the wacom driver with libinput again
+  (#1397477)
+
+* Fri Nov 18 2016 Peter Hutterer <peter.hutterer@redhat.com> 0.22.0-3
+- Provide xorg-x11-drv-synaptics. The actual content is now provided by
+  xorg-x11-drv-synaptics-legacy (#1394836). For details, see
+  https://fedoraproject.org/wiki/Changes/RetireSynapticsDriver
+
+* Tue Nov 01 2016 Peter Hutterer <peter.hutterer@redhat.com> 0.22.0-2
+- Match against tablets too
+
 * Wed Oct 19 2016 Peter Hutterer <peter.hutterer@redhat.com> 0.22.0-1
 - xf86-input-libinput 0.22.0