diff --git a/0001-quirks-Add-Apple-MTP-touchpad-quirk.patch b/0001-quirks-Add-Apple-MTP-touchpad-quirk.patch deleted file mode 100644 index a912006..0000000 --- a/0001-quirks-Add-Apple-MTP-touchpad-quirk.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6f417fec0071fa2814d4449cc78db8da8f009d99 Mon Sep 17 00:00:00 2001 -From: Hector Martin -Date: Tue, 22 Nov 2022 13:52:24 +0900 -Subject: [PATCH] quirks: Add Apple MTP touchpad quirk - -Apple M2 (and presumably newer) laptops now embed the touchpad -controller into the main SoC, and use a new internal communications -protocol between it and the main CPU. This isn't really a "bus" like -SPI or I2C, so the downstream kernel driver currently uses the (not -well supported) HOST bus type. MatchBus can't match on that, so let's -just use a name match (plus the vendor ID, which is still valid and -the usual Apple one). - -Signed-off-by: Hector Martin ---- - quirks/50-system-apple.quirks | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/quirks/50-system-apple.quirks b/quirks/50-system-apple.quirks -index 7f7a81cd36d5..a6d6eea91d5a 100644 ---- a/quirks/50-system-apple.quirks -+++ b/quirks/50-system-apple.quirks -@@ -105,6 +105,15 @@ AttrSizeHint=104x75 - AttrTouchSizeRange=150:130 - AttrPalmSizeThreshold=1600 - -+[Apple Laptop Touchpad (MTP)] -+MatchUdevType=touchpad -+MatchName=Apple*MTP* -+MatchVendor=0x5AC -+ModelAppleTouchpad=1 -+AttrSizeHint=104x75 -+AttrTouchSizeRange=150:130 -+AttrPalmSizeThreshold=1600 -+ - # The Linux applespi driver currently uses the Synaptics vendor for some reason - [Apple Laptop Touchpad (SPI)] - MatchUdevType=touchpad --- -2.38.1 - diff --git a/libinput.spec b/libinput.spec index 633a577..5cb8125 100644 --- a/libinput.spec +++ b/libinput.spec @@ -4,8 +4,8 @@ %global gitversion 58abea394 Name: libinput -Version: 1.22.0 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Version: 1.22.1 +Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} Summary: Input device library License: MIT @@ -17,8 +17,6 @@ Source2: commitid %else Source0: https://gitlab.freedesktop.org/libinput/libinput/-/archive/%{version}/libinput-%{version}.tar.bz2 %endif -# Apple MTP touchpad quirk for Apple M2 laptops -Patch0: 0001-quirks-Add-Apple-MTP-touchpad-quirk.patch BuildRequires: git-core BuildRequires: gcc @@ -153,6 +151,9 @@ intended to be run by users. %changelog +* Mon Jan 16 2023 Peter Hutterer - 1.22.1-1 +- libinput 1.22.1 + * Sat Nov 26 2022 Davide Cavalca 1.22.0-2 - Backport upstream patch to add Apple MTP touchpad quirk for Apple M2 laptops diff --git a/sources b/sources index 35daed0..7b353c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libinput-1.22.0.tar.bz2) = 62cc36845daa7bc4b8477dd71abe629309683a93de753382a90e8466915e2b96b9c6914b431747d3462c15d8ab42bc70ee755800eec60c4ad7e9f3b4f7dba76d +SHA512 (libinput-1.22.1.tar.bz2) = 9d1985bc03ae304643fcd3acb762afc53305942e39071a062e7f8950be4929c72bdfeff06039c77f70e53233885df1e2e1a1dc538caeefd2b46f35826d290e9e