Update patches

qzed · qzed · commit 29dfebedd8b7 · 2023-05-26T13:54:00.000+02:00
Changes:
- Add support for Surface Pro 7+
diff --git a/patches/v1/0001-Add-support-for-BUS_VIRTUAL.patch b/patches/v1/0001-Add-support-for-BUS_VIRTUAL.patch
@@ -1,7 +1,7 @@
 From 3f437a3a53b2159bb385335be0598f8859ff385f Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sat, 27 Jun 2020 18:21:11 +0200
-Subject: [PATCH 01/12] Add support for BUS_VIRTUAL
+Subject: [PATCH 01/13] Add support for BUS_VIRTUAL
 
 This is needed to support IPTS devices through the iptsd userspace
 daemon. It exposes the touchscreen / stylus as uinput, since the parsing
@@ -102,5 +102,5 @@ index 3953b1e..734463f 100755
          assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
  
 -- 
-2.36.1
+2.40.1
 
diff --git a/patches/v1/0002-Add-support-for-Intel-Management-Engine-bus.patch b/patches/v1/0002-Add-support-for-Intel-Management-Engine-bus.patch
@@ -1,7 +1,7 @@
 From 52157eec5eb3c6f172531f741d2897b0401ac6c2 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 1 Jun 2019 21:17:15 +0200
-Subject: [PATCH 02/12] Add support for Intel Management Engine bus
+Subject: [PATCH 02/13] Add support for Intel Management Engine bus
 
 Add support for devices connected via the Intel Management Engine (MEI).
 This is required to support IPTS based devices, such as (among others)
@@ -97,5 +97,5 @@ index 734463f..c9c6312 100755
          assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
  
 -- 
-2.36.1
+2.40.1
 
diff --git a/patches/v1/0003-data-Add-Microsoft-Surface-Pro-3.patch b/patches/v1/0003-data-Add-Microsoft-Surface-Pro-3.patch
@@ -1,7 +1,7 @@
 From 75db7ee0734d19b8d68ee1d2b8e85706e743cfc8 Mon Sep 17 00:00:00 2001
 From: "Antony Jordan (Tablet)" <wiccan.two@gmail.com>
 Date: Wed, 8 Jun 2022 22:03:33 +0200
-Subject: [PATCH 03/12] data: Add Microsoft Surface Pro 3
+Subject: [PATCH 03/13] data: Add Microsoft Surface Pro 3
 
 ---
  data/surface-pro3.tablet | 14 ++++++++++++++
@@ -29,5 +29,5 @@ index 0000000..3238d43
 +Touch=true
 +Buttons=0
 -- 
-2.36.1
+2.40.1
 
diff --git a/patches/v1/0004-data-Add-Microsoft-Surface-Pro-4.patch b/patches/v1/0004-data-Add-Microsoft-Surface-Pro-4.patch
@@ -1,7 +1,7 @@
 From c8700d17bda8620d372e07c9789eba84984c6db1 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:18:55 +0200
-Subject: [PATCH 04/12] data: Add Microsoft Surface Pro 4
+Subject: [PATCH 04/13] data: Add Microsoft Surface Pro 4
 
 ---
  data/surface-pro4.tablet | 14 ++++++++++++++
@@ -29,5 +29,5 @@ index 0000000..1e0c67c
 +Touch=true
 +Buttons=0
 -- 
-2.36.1
+2.40.1
 
diff --git a/patches/v1/0005-data-Add-Microsoft-Surface-Pro-5.patch b/patches/v1/0005-data-Add-Microsoft-Surface-Pro-5.patch
@@ -1,7 +1,7 @@
 From 0531299aabb786c049e7046578f317f2e8999d26 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:02 +0200
-Subject: [PATCH 05/12] data: Add Microsoft Surface Pro 5
+Subject: [PATCH 05/13] data: Add Microsoft Surface Pro 5
 
 ---
  data/surface-pro5.tablet | 14 ++++++++++++++
@@ -29,5 +29,5 @@ index 0000000..b26af3a
 +Touch=true
 +Buttons=0
 -- 
-2.36.1
+2.40.1
 
diff --git a/patches/v1/0006-data-Add-Microsoft-Surface-Pro-6.patch b/patches/v1/0006-data-Add-Microsoft-Surface-Pro-6.patch
@@ -1,7 +1,7 @@
 From 2c4b1f3e0c2f7b8c06c439cbc01438ef92ba13b7 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:07 +0200
-Subject: [PATCH 06/12] data: Add Microsoft Surface Pro 6
+Subject: [PATCH 06/13] data: Add Microsoft Surface Pro 6
 
 ---
  data/surface-pro6.tablet | 14 ++++++++++++++
@@ -29,5 +29,5 @@ index 0000000..e97fad8
 +Touch=true
 +Buttons=0
 -- 
-2.36.1
+2.40.1
 
diff --git a/patches/v1/0007-data-Add-Microsoft-Surface-Pro-7.patch b/patches/v1/0007-data-Add-Microsoft-Surface-Pro-7.patch
@@ -1,7 +1,7 @@
 From fb983a5b9bd17510c370d0b8d242dd48cd6b77f0 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:13 +0200
-Subject: [PATCH 07/12] data: Add Microsoft Surface Pro 7
+Subject: [PATCH 07/13] data: Add Microsoft Surface Pro 7
 
 ---
  data/surface-pro7.tablet | 14 ++++++++++++++
@@ -29,5 +29,5 @@ index 0000000..7961379
 +Touch=true
 +Buttons=0
 -- 
-2.36.1
+2.40.1
 
diff --git a/patches/v1/0008-data-Add-Microsoft-Surface-Book.patch b/patches/v1/0008-data-Add-Microsoft-Surface-Book.patch
@@ -1,7 +1,7 @@
 From ec23f66a61c3eab3d60d9135550f7ac67d40916f Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:38 +0200
-Subject: [PATCH 08/12] data: Add Microsoft Surface Book
+Subject: [PATCH 08/13] data: Add Microsoft Surface Book
 
 ---
  data/surface-book.tablet | 14 ++++++++++++++
@@ -29,5 +29,5 @@ index 0000000..e2a5401
 +Touch=true
 +Buttons=0
 -- 
-2.36.1
+2.40.1
 
diff --git a/patches/v1/0009-data-Add-Microsoft-Surface-Book-2-13.5.patch b/patches/v1/0009-data-Add-Microsoft-Surface-Book-2-13.5.patch
@@ -1,7 +1,7 @@
 From 0006283ddcbf9641561573a862e32836cfa096db Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:04 +0200
-Subject: [PATCH 09/12] data: Add Microsoft Surface Book 2 (13.5")
+Subject: [PATCH 09/13] data: Add Microsoft Surface Book 2 (13.5")
 
 ---
  data/surface-book2-13.tablet | 14 ++++++++++++++
@@ -29,5 +29,5 @@ index 0000000..b13cb07
 +Touch=true
 +Buttons=0
 -- 
-2.36.1
+2.40.1
 
diff --git a/patches/v1/0010-data-Add-Microsoft-Surface-Book-2-15.patch b/patches/v1/0010-data-Add-Microsoft-Surface-Book-2-15.patch
@@ -1,7 +1,7 @@
 From 8716bc994c30261d470c96f5f2c70421d12901f8 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:13 +0200
-Subject: [PATCH 10/12] data: Add Microsoft Surface Book 2 (15")
+Subject: [PATCH 10/13] data: Add Microsoft Surface Book 2 (15")
 
 ---
  data/surface-book2-15.tablet | 14 ++++++++++++++
@@ -29,5 +29,5 @@ index 0000000..ad98cc7
 +Touch=true
 +Buttons=0
 -- 
-2.36.1
+2.40.1
 
diff --git a/patches/v1/0011-data-Add-Microsoft-Surface-Book-3-13.5.patch b/patches/v1/0011-data-Add-Microsoft-Surface-Book-3-13.5.patch
@@ -1,7 +1,7 @@
 From 00bcf252dbb0a6da7908bbbce7fdba99ad648148 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:29 +0200
-Subject: [PATCH 11/12] data: Add Microsoft Surface Book 3 (13.5")
+Subject: [PATCH 11/13] data: Add Microsoft Surface Book 3 (13.5")
 
 ---
  data/surface-book3-13.tablet | 14 ++++++++++++++
@@ -29,5 +29,5 @@ index 0000000..a33c9cb
 +Touch=true
 +Buttons=0
 -- 
-2.36.1
+2.40.1
 
diff --git a/patches/v1/0012-data-Add-Microsoft-Surface-Book-3-15.patch b/patches/v1/0012-data-Add-Microsoft-Surface-Book-3-15.patch
@@ -1,7 +1,7 @@
 From 9a339c382ec155c37181c149739750ac144f0c4a Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:42 +0200
-Subject: [PATCH 12/12] data: Add Microsoft Surface Book 3 (15")
+Subject: [PATCH 12/13] data: Add Microsoft Surface Book 3 (15")
 
 ---
  data/surface-book3-15.tablet | 14 ++++++++++++++
@@ -29,5 +29,5 @@ index 0000000..291321f
 +Touch=true
 +Buttons=0
 -- 
-2.36.1
+2.40.1
 
diff --git a/patches/v1/0013-data-Add-Microsoft-Surface-Pro-7.patch b/patches/v1/0013-data-Add-Microsoft-Surface-Pro-7.patch
@@ -0,0 +1,34 @@
+From e373547d5e27d454945b6c0730c0981c48f43e77 Mon Sep 17 00:00:00 2001
+From: Maximilian Luz <luzmaximilian@gmail.com>
+Date: Fri, 26 May 2023 12:32:21 +0200
+Subject: [PATCH 13/13] data: Add Microsoft Surface Pro 7+
+
+Based on https://github.com/linux-surface/libwacom-surface/issues/12
+---
+ data/surface-pro7-plus.tablet | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+ create mode 100644 data/surface-pro7-plus.tablet
+
+diff --git a/data/surface-pro7-plus.tablet b/data/surface-pro7-plus.tablet
+new file mode 100644
+index 0000000..36e1e3f
+--- /dev/null
++++ b/data/surface-pro7-plus.tablet
+@@ -0,0 +1,14 @@
++# This is for the Microsoft Surface Pro 7+
++
++[Device]
++Name=Microsoft Surface Pro 7+
++Class=PenDisplay
++DeviceMatch=virt:045e:0c1a
++Width=10
++Height=6
++IntegratedIn=Display;System;
++
++[Features]
++Stylus=false
++Touch=true
++Buttons=0
+-- 
+2.40.1
+
diff --git a/patches/v2/0001-Add-support-for-BUS_VIRTUAL.patch b/patches/v2/0001-Add-support-for-BUS_VIRTUAL.patch
@@ -1,7 +1,7 @@
 From 6fe89a80a28042bc57fd625ad82181e4092b95f2 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sat, 27 Jun 2020 18:21:11 +0200
-Subject: [PATCH 01/12] Add support for BUS_VIRTUAL
+Subject: [PATCH 01/13] Add support for BUS_VIRTUAL
 
 This is needed to support IPTS devices through the iptsd userspace
 daemon. It exposes the touchscreen / stylus as uinput, since the parsing
diff --git a/patches/v2/0002-Add-support-for-Intel-Management-Engine-bus.patch b/patches/v2/0002-Add-support-for-Intel-Management-Engine-bus.patch
@@ -1,7 +1,7 @@
 From 10ef0701cdde200063a73b3db5bfb305a12909c2 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 1 Jun 2019 21:17:15 +0200
-Subject: [PATCH 02/12] Add support for Intel Management Engine bus
+Subject: [PATCH 02/13] Add support for Intel Management Engine bus
 
 Add support for devices connected via the Intel Management Engine (MEI).
 This is required to support IPTS based devices, such as (among others)
diff --git a/patches/v2/0003-data-Add-Microsoft-Surface-Pro-3.patch b/patches/v2/0003-data-Add-Microsoft-Surface-Pro-3.patch
@@ -1,7 +1,7 @@
 From 77664bc3c0be343b8e6acddb5bcb18bfb591da24 Mon Sep 17 00:00:00 2001
 From: "Antony Jordan (Tablet)" <wiccan.two@gmail.com>
 Date: Wed, 8 Jun 2022 22:03:33 +0200
-Subject: [PATCH 03/12] data: Add Microsoft Surface Pro 3
+Subject: [PATCH 03/13] data: Add Microsoft Surface Pro 3
 
 ---
  data/surface-pro3.tablet | 14 ++++++++++++++
diff --git a/patches/v2/0004-data-Add-Microsoft-Surface-Pro-4.patch b/patches/v2/0004-data-Add-Microsoft-Surface-Pro-4.patch
@@ -1,7 +1,7 @@
 From fa3a6c733c16529098f5a5066eb8fd3051177d8f Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:18:55 +0200
-Subject: [PATCH 04/12] data: Add Microsoft Surface Pro 4
+Subject: [PATCH 04/13] data: Add Microsoft Surface Pro 4
 
 ---
  data/surface-pro4.tablet | 14 ++++++++++++++
diff --git a/patches/v2/0005-data-Add-Microsoft-Surface-Pro-5.patch b/patches/v2/0005-data-Add-Microsoft-Surface-Pro-5.patch
@@ -1,7 +1,7 @@
 From c1e48260b343e6616f1106ff4769ad11e9a0948b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:02 +0200
-Subject: [PATCH 05/12] data: Add Microsoft Surface Pro 5
+Subject: [PATCH 05/13] data: Add Microsoft Surface Pro 5
 
 ---
  data/surface-pro5.tablet | 14 ++++++++++++++
diff --git a/patches/v2/0006-data-Add-Microsoft-Surface-Pro-6.patch b/patches/v2/0006-data-Add-Microsoft-Surface-Pro-6.patch
@@ -1,7 +1,7 @@
 From ccacedf0af12ab54bfaacb7f286cf7611d52f2c4 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:07 +0200
-Subject: [PATCH 06/12] data: Add Microsoft Surface Pro 6
+Subject: [PATCH 06/13] data: Add Microsoft Surface Pro 6
 
 ---
  data/surface-pro6.tablet | 14 ++++++++++++++
diff --git a/patches/v2/0007-data-Add-Microsoft-Surface-Pro-7.patch b/patches/v2/0007-data-Add-Microsoft-Surface-Pro-7.patch
@@ -1,7 +1,7 @@
 From 21fa2ae7428ae749938aef68a8498f23017bf4d0 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:13 +0200
-Subject: [PATCH 07/12] data: Add Microsoft Surface Pro 7
+Subject: [PATCH 07/13] data: Add Microsoft Surface Pro 7
 
 ---
  data/surface-pro7.tablet | 14 ++++++++++++++
diff --git a/patches/v2/0008-data-Add-Microsoft-Surface-Book.patch b/patches/v2/0008-data-Add-Microsoft-Surface-Book.patch
@@ -1,7 +1,7 @@
 From 45d559ed17e818fd4bd26966c3b4c3fb833ad23b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:38 +0200
-Subject: [PATCH 08/12] data: Add Microsoft Surface Book
+Subject: [PATCH 08/13] data: Add Microsoft Surface Book
 
 ---
  data/surface-book.tablet | 14 ++++++++++++++
diff --git a/patches/v2/0009-data-Add-Microsoft-Surface-Book-2-13.5.patch b/patches/v2/0009-data-Add-Microsoft-Surface-Book-2-13.5.patch
@@ -1,7 +1,7 @@
 From cad8b471eb747cdc53da8a8a16976352921e6fe2 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:04 +0200
-Subject: [PATCH 09/12] data: Add Microsoft Surface Book 2 (13.5")
+Subject: [PATCH 09/13] data: Add Microsoft Surface Book 2 (13.5")
 
 ---
  data/surface-book2-13.tablet | 14 ++++++++++++++
diff --git a/patches/v2/0010-data-Add-Microsoft-Surface-Book-2-15.patch b/patches/v2/0010-data-Add-Microsoft-Surface-Book-2-15.patch
@@ -1,7 +1,7 @@
 From ff81b9f652459ccef960516c2381bfc3cbe1d519 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:13 +0200
-Subject: [PATCH 10/12] data: Add Microsoft Surface Book 2 (15")
+Subject: [PATCH 10/13] data: Add Microsoft Surface Book 2 (15")
 
 ---
  data/surface-book2-15.tablet | 14 ++++++++++++++
diff --git a/patches/v2/0011-data-Add-Microsoft-Surface-Book-3-13.5.patch b/patches/v2/0011-data-Add-Microsoft-Surface-Book-3-13.5.patch
@@ -1,7 +1,7 @@
 From 315ed87e3e8ed8b288c43655c237887cea668562 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:29 +0200
-Subject: [PATCH 11/12] data: Add Microsoft Surface Book 3 (13.5")
+Subject: [PATCH 11/13] data: Add Microsoft Surface Book 3 (13.5")
 
 ---
  data/surface-book3-13.tablet | 14 ++++++++++++++
diff --git a/patches/v2/0012-data-Add-Microsoft-Surface-Book-3-15.patch b/patches/v2/0012-data-Add-Microsoft-Surface-Book-3-15.patch
@@ -1,7 +1,7 @@
 From 9f0d51ad149595a1c9189222e556efb57412842b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:42 +0200
-Subject: [PATCH 12/12] data: Add Microsoft Surface Book 3 (15")
+Subject: [PATCH 12/13] data: Add Microsoft Surface Book 3 (15")
 
 ---
  data/surface-book3-15.tablet | 14 ++++++++++++++
diff --git a/patches/v2/0013-data-Add-Microsoft-Surface-Pro-7.patch b/patches/v2/0013-data-Add-Microsoft-Surface-Pro-7.patch
@@ -0,0 +1,34 @@
+From c748e1e7d0b37d6513717446b63eabbc3871bc0d Mon Sep 17 00:00:00 2001
+From: Maximilian Luz <luzmaximilian@gmail.com>
+Date: Fri, 26 May 2023 12:32:21 +0200
+Subject: [PATCH 13/13] data: Add Microsoft Surface Pro 7+
+
+Based on https://github.com/linux-surface/libwacom-surface/issues/12
+---
+ data/surface-pro7-plus.tablet | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+ create mode 100644 data/surface-pro7-plus.tablet
+
+diff --git a/data/surface-pro7-plus.tablet b/data/surface-pro7-plus.tablet
+new file mode 100644
+index 0000000..36e1e3f
+--- /dev/null
++++ b/data/surface-pro7-plus.tablet
+@@ -0,0 +1,14 @@
++# This is for the Microsoft Surface Pro 7+
++
++[Device]
++Name=Microsoft Surface Pro 7+
++Class=PenDisplay
++DeviceMatch=virt:045e:0c1a
++Width=10
++Height=6
++IntegratedIn=Display;System;
++
++[Features]
++Stylus=false
++Touch=true
++Buttons=0
+-- 
+2.40.1
+
