.gitignore

@@ -1 +1 @@
-SOURCES/xf86-input-libinput-0.29.0.tar.bz2
+/xf86-input-libinput-*.tar.xz

.xorg-x11-drv-libinput.metadata

@@ -1 +0,0 @@
-efa9dbe08ee827949aff0bd752f8270237247c56 SOURCES/xf86-input-libinput-0.29.0.tar.bz2

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

@@ -1,4 +1,4 @@
-From 41d20d35c1587f3de35acf47f926c97a30680978 Mon Sep 17 00:00:00 2001
+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
@@ -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 ec0f439..bdbdb37 100644
+index 7c83ccb..76572f8 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
+@@ -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 ec0f439..bdbdb37 100644
  .SH AUTHORS
  Peter Hutterer
 diff --git a/src/xf86libinput.c b/src/xf86libinput.c
-index 83ab75d..c1a1ce2 100644
+index 642f95f..cfee922 100644
 --- a/src/xf86libinput.c
 +++ b/src/xf86libinput.c
-@@ -194,6 +194,8 @@ struct xf86libinput {
+@@ -214,6 +214,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
+@@ -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);
  
@@ -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,
+ 	{
+@@ -3951,6 +3958,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.40.0
 

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-10
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

make-git-snapshot.sh

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Usage: ./make-git-snapshot.sh [COMMIT]
+#
+# to make a snapshot of the given tag/branch.  Defaults to HEAD.
+# Point env var REF to a local mesa repo to reduce clone time.
+
+DIRNAME=xf86-input-libinput-$( date +%Y%m%d )
+
+echo REF ${REF:+--reference $REF}
+echo DIRNAME $DIRNAME
+echo HEAD ${1:-HEAD}
+
+rm -rf $DIRNAME
+
+git clone ${REF:+--reference $REF} \
+	git://git.freedesktop.org/git/xorg/driver/xf86-input-libinput $DIRNAME
+
+GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
+	| xz > $DIRNAME.tar.xz
+
+# rm -rf $DIRNAME

sources

@@ -0,0 +1 @@
+b286b5425aeda5cfecd1de7f59663d169b95ffc55474dfbf28c2e13e5221cbeecd472d40b6094c0a937f83db67bf58a7fe0e07d25b6a6945d3fd669e717fc0bf xf86-input-libinput-1.4.0.tar.xz

xorg-x11-drv-libinput.spec

@@ -7,15 +7,16 @@
 
 Summary:    Xorg X11 libinput input driver
 Name:       xorg-x11-drv-libinput
-Version:    0.29.0
-Release:    1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+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:    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
 
@@ -23,6 +24,7 @@ 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
 
+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
@@ -41,8 +43,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
@@ -77,19 +78,99 @@ Xorg X11 libinput input driver development files.
 %dir %{_includedir}/xorg/
 %{_includedir}/xorg/libinput-properties.h
 
-%changelog
-* Tue Oct 29 2019 Peter Hutterer <peter.hutterer@redhat.com> 0.29.0-1
-- xf86-input-libinput 0.29.0 (#1728820)
 
-* Mon Oct 15 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.28.0-2
-- Fix wrong slot to touch ID mapping (#1639059)
+%changelog
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.4.0-3
+- Bump release for June 2024 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
 
-* Mon May 14 2018 Adam Jackson <ajax@redhat.com> - 0.27.1-2.1
-- Rebuild for xserver 1.20
-
 * Thu Apr 12 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.27.1-2
 - Build on s390x (#1565062)