Compare commits

...

No commits in common. "c8" and "c9-beta" have entirely different histories.
c8 ... c9-beta

4 changed files with 63 additions and 23 deletions

2
.gitignore vendored
View File

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

View File

@ -1 +1 @@
efa9dbe08ee827949aff0bd752f8270237247c56 SOURCES/xf86-input-libinput-0.29.0.tar.bz2 e0336d7376379ea3ce60730804e498cdb05f3f5c SOURCES/xf86-input-libinput-1.0.1.tar.bz2

View File

@ -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 <peter.hutterer@who-t.net> From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu, 18 May 2017 14:45:18 +1000 Date: Thu, 18 May 2017 14:45:18 +1000
Subject: [PATCH xf86-input-libinput] Add a DPIScaleFactor option as temporary 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(+) 2 files changed, 47 insertions(+)
diff --git a/man/libinput.man b/man/libinput.man diff --git a/man/libinput.man b/man/libinput.man
index ec0f439..bdbdb37 100644 index c9fec4e..888891c 100644
--- a/man/libinput.man --- a/man/libinput.man
+++ b/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 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 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 __xconfigfile__(__filemansuffix__).
@ -43,10 +43,10 @@ index ec0f439..bdbdb37 100644
.SH AUTHORS .SH AUTHORS
Peter Hutterer Peter Hutterer
diff --git a/src/xf86libinput.c b/src/xf86libinput.c diff --git a/src/xf86libinput.c b/src/xf86libinput.c
index 83ab75d..c1a1ce2 100644 index 92817a5..dd600e6 100644
--- a/src/xf86libinput.c --- a/src/xf86libinput.c
+++ b/src/xf86libinput.c +++ b/src/xf86libinput.c
@@ -194,6 +194,8 @@ struct xf86libinput { @@ -182,6 +182,8 @@ struct xf86libinput {
struct scale_factor { struct scale_factor {
double x, y; double x, y;
} area_scale_factor; } area_scale_factor;
@ -55,7 +55,7 @@ index 83ab75d..c1a1ce2 100644
}; };
enum event_handling { 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); x = libinput_event_pointer_get_dx(event);
y = libinput_event_pointer_get_dy(event); y = libinput_event_pointer_get_dy(event);
@ -66,8 +66,8 @@ index 83ab75d..c1a1ce2 100644
+ +
valuator_mask_zero(mask); 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); xf86libinput_parse_options(pInfo, driver_data, device);
@ -94,5 +94,5 @@ index 83ab75d..c1a1ce2 100644
* this device, create a separate device instead */ * this device, create a separate device instead */
if (!is_subdevice && if (!is_subdevice &&
-- --
2.14.3 2.31.1

View File

@ -7,15 +7,15 @@
Summary: Xorg X11 libinput input driver Summary: Xorg X11 libinput input driver
Name: xorg-x11-drv-libinput Name: xorg-x11-drv-libinput
Version: 0.29.0 Version: 1.0.1
Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT License: MIT
%if 0%{?gitdate} %if 0%{?gitdate}
Source0: %{tarball}-%{gitdate}.tar.xz Source0: %{tarball}-%{gitdate}.tar.xz
%else %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 %endif
Source1: 71-libinput-overrides-wacom.conf Source1: 71-libinput-overrides-wacom.conf
@ -23,6 +23,7 @@ Source1: 71-libinput-overrides-wacom.conf
# https://bugzilla.redhat.com/show_bug.cgi?id=1413306 # https://bugzilla.redhat.com/show_bug.cgi?id=1413306
Patch01: 0001-Add-a-DPIScaleFactor-option-as-temporary-solution-to.patch Patch01: 0001-Add-a-DPIScaleFactor-option-as-temporary-solution-to.patch
BuildRequires: make
BuildRequires: autoconf automake libtool BuildRequires: autoconf automake libtool
BuildRequires: xorg-x11-server-devel >= 1.14.0 BuildRequires: xorg-x11-server-devel >= 1.14.0
BuildRequires: libudev-devel libevdev-devel libinput-devel >= 0.6.0-3 BuildRequires: libudev-devel libevdev-devel libinput-devel >= 0.6.0-3
@ -41,8 +42,7 @@ A generic input driver for the X.Org X11 X server based on libinput,
supporting all devices. supporting all devices.
%prep %prep
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}} %autosetup -p 1 -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
%patch01 -p1
%build %build
autoreconf --force -v --install || exit 1 autoreconf --force -v --install || exit 1
@ -78,18 +78,58 @@ Xorg X11 libinput input driver development files.
%{_includedir}/xorg/libinput-properties.h %{_includedir}/xorg/libinput-properties.h
%changelog %changelog
* Tue Oct 29 2019 Peter Hutterer <peter.hutterer@redhat.com> 0.29.0-1 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.0.1-3
- xf86-input-libinput 0.29.0 (#1728820) - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Mon Oct 15 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.28.0-2 * Thu Apr 29 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.0.1-2
- Fix wrong slot to touch ID mapping (#1639059) - 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 <mboddu@redhat.com> - 0.30.0-6
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* 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 * Wed Jul 11 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.28.0-1
- xf86-input-libinput 0.28.0 - 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 * Thu Apr 12 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.27.1-2
- Build on s390x (#1565062) - Build on s390x (#1565062)