aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO28
-rw-r--r--0001-Add-support-for-BUS_VIRTUAL.patch2
-rw-r--r--0002-Add-support-for-Intel-Management-Engine-bus.patch2
-rw-r--r--0003-data-Add-Microsoft-Surface-Pro-3.patch2
-rw-r--r--0004-data-Add-Microsoft-Surface-Pro-4.patch2
-rw-r--r--0005-data-Add-Microsoft-Surface-Pro-5.patch2
-rw-r--r--0006-data-Add-Microsoft-Surface-Pro-6.patch2
-rw-r--r--0007-data-Add-Microsoft-Surface-Pro-7.patch2
-rw-r--r--0008-data-Add-Microsoft-Surface-Book.patch2
-rw-r--r--0009-data-Add-Microsoft-Surface-Book-2-13.5.patch2
-rw-r--r--0010-data-Add-Microsoft-Surface-Book-2-15.patch2
-rw-r--r--0011-data-Add-Microsoft-Surface-Book-3-13.5.patch2
-rw-r--r--0012-data-Add-Microsoft-Surface-Book-3-15.patch2
-rw-r--r--0013-data-Add-Microsoft-Surface-Pro-7.patch34
-rw-r--r--PKGBUILD28
15 files changed, 76 insertions, 38 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e2097fcce3f8..b6042fbaadb6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = libwacom-surface
pkgdesc = Patched libwacom for Microsoft Surface devices
pkgver = 2.7.0
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/linux-surface/libwacom
arch = x86_64
license = MIT
@@ -30,21 +30,23 @@ pkgbase = libwacom-surface
source = 0010-data-Add-Microsoft-Surface-Book-2-15.patch
source = 0011-data-Add-Microsoft-Surface-Book-3-13.5.patch
source = 0012-data-Add-Microsoft-Surface-Book-3-15.patch
+ source = 0013-data-Add-Microsoft-Surface-Pro-7.patch
validpgpkeys = 594ABBA066118C7A02D10A80A8AF906D9307FBAD
validpgpkeys = 3C2C43D9447D5938EF4551EBE23B7E70B467F0BF
sha256sums = 853929bd73fba2064b12142dbbee4b3bf84509197ff46a4da559eddf62d32cdf
sha256sums = SKIP
- sha256sums = 0041920d4d29b02d0e2b05fc63ad9e4b3c4cc28579f3a9a4638a4505d1fb9f6b
- sha256sums = 1be62a8e1b901cb6f89da71a76f073a03a3c14d56edc936fac7f5eaa71baf420
- sha256sums = 7b15be0134391de1df67ba6f23bb8f5ae2c820d924b73216b0d45b179f0fbf69
- sha256sums = 570e905787ebd1b26610ea47faaf245eb1af1d61891ab433a5c6684ffb507ed2
- sha256sums = c6558d5f996a360633259b01e036870439eaf1d20f8d1baab18a26f9698bf8a7
- sha256sums = 4527ef6685744f012ca791b7b118344250b3bec67e1973eba80119876e28ff20
- sha256sums = 2f0286c0c6cb76bc9c1cd3db44f281754f43ea4a839b0cc604dce12400aafe90
- sha256sums = bd4fc2ccabff9830985c8c36f42d3913d7eacf3406731f71a08114f016542601
- sha256sums = f93e3769f881c2834f442da0b67fd94ab369d0cc6bdb9b09e15c86b1caa67482
- sha256sums = e33b4edb33413d9e97c57bee71b6cdbffb5efb6a83c8452b62307255c1c9b6ce
- sha256sums = 93a45c1f4755a7fb41572dbe70f3b9f2dcbbcdaf8eb0cf8baf55d897d4309526
- sha256sums = 5ab4afb7208b91eb93b5dafde1ace9b8139cfd2e7aa47c0e8c977b5d40ae8286
+ sha256sums = 416bd97440be1bc602e79086f128b931e09c3895563995d227eb993b0c8ee57d
+ sha256sums = 15179a1929df962e239521e8c15ec709e54d324fdecf45c96524a0c8d63dbd98
+ sha256sums = db77bc0f6cf9419708d1088a1a9bf38dbcc9dc8e7c6a2cd8342e7e1fea991381
+ sha256sums = ff24ca67ba308802301a9a917a2df10654fbb865381538b43cb66b86a4ca10f8
+ sha256sums = e55921b4f067cea62b7395b1d8e74fef5ea5e2674b2feaebd5d73743fc481268
+ sha256sums = 58129638de2d12d43c65a552baf131d9ec3b128bdb207c3fa791491009929d3f
+ sha256sums = 4c7a75a339d07edb81fe2e6ca2399064d83f2238c05b6b438491ce5f3d7c2b7c
+ sha256sums = 414f998826d081905f654a92480899bf00f42324b29066e936e867c2e0c4ed4e
+ sha256sums = e7e7238f044c43171ad4f45afd1fd6fd4cd583858bcc6a1c7ad81b4bb5e379cb
+ sha256sums = 8781f138968cd7a6b01c38bedcb84d13b5f572277c49d2ef878349e5f4cf7945
+ sha256sums = ec25e26b22d3a21f09357eb88cef8b148849d24c96882cf29064e4fa506f64a4
+ sha256sums = 2cd13ac5b7d4bed85eefcfcaccbe2947a5c2db222da6b2515eba78fff45fedca
+ sha256sums = 93a1dd06fe6a75ad93a3dd17c258e235bd45591d9346befb0759ff10cb658e69
pkgname = libwacom-surface
diff --git a/0001-Add-support-for-BUS_VIRTUAL.patch b/0001-Add-support-for-BUS_VIRTUAL.patch
index 945b8faa3f09..778bc298bf87 100644
--- a/0001-Add-support-for-BUS_VIRTUAL.patch
+++ b/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/0002-Add-support-for-Intel-Management-Engine-bus.patch b/0002-Add-support-for-Intel-Management-Engine-bus.patch
index 59c7bf562849..267a31a2192b 100644
--- a/0002-Add-support-for-Intel-Management-Engine-bus.patch
+++ b/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/0003-data-Add-Microsoft-Surface-Pro-3.patch b/0003-data-Add-Microsoft-Surface-Pro-3.patch
index 101c8750b31a..413ae82cadaf 100644
--- a/0003-data-Add-Microsoft-Surface-Pro-3.patch
+++ b/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/0004-data-Add-Microsoft-Surface-Pro-4.patch b/0004-data-Add-Microsoft-Surface-Pro-4.patch
index 582b68e055d7..5c2cfed1e77f 100644
--- a/0004-data-Add-Microsoft-Surface-Pro-4.patch
+++ b/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/0005-data-Add-Microsoft-Surface-Pro-5.patch b/0005-data-Add-Microsoft-Surface-Pro-5.patch
index a7cc58ba52fa..229ce079ac97 100644
--- a/0005-data-Add-Microsoft-Surface-Pro-5.patch
+++ b/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/0006-data-Add-Microsoft-Surface-Pro-6.patch b/0006-data-Add-Microsoft-Surface-Pro-6.patch
index 9f1b58dccdd3..9897d7560f71 100644
--- a/0006-data-Add-Microsoft-Surface-Pro-6.patch
+++ b/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/0007-data-Add-Microsoft-Surface-Pro-7.patch b/0007-data-Add-Microsoft-Surface-Pro-7.patch
index f923a7c34983..1faeb8500e40 100644
--- a/0007-data-Add-Microsoft-Surface-Pro-7.patch
+++ b/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/0008-data-Add-Microsoft-Surface-Book.patch b/0008-data-Add-Microsoft-Surface-Book.patch
index 3b521411ab1f..773ebd7d305e 100644
--- a/0008-data-Add-Microsoft-Surface-Book.patch
+++ b/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/0009-data-Add-Microsoft-Surface-Book-2-13.5.patch b/0009-data-Add-Microsoft-Surface-Book-2-13.5.patch
index 77f278839a52..ce1699ac4535 100644
--- a/0009-data-Add-Microsoft-Surface-Book-2-13.5.patch
+++ b/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/0010-data-Add-Microsoft-Surface-Book-2-15.patch b/0010-data-Add-Microsoft-Surface-Book-2-15.patch
index 384706bfcc53..32aa16d90053 100644
--- a/0010-data-Add-Microsoft-Surface-Book-2-15.patch
+++ b/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/0011-data-Add-Microsoft-Surface-Book-3-13.5.patch b/0011-data-Add-Microsoft-Surface-Book-3-13.5.patch
index 03b173d4e921..12951243dceb 100644
--- a/0011-data-Add-Microsoft-Surface-Book-3-13.5.patch
+++ b/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/0012-data-Add-Microsoft-Surface-Book-3-15.patch b/0012-data-Add-Microsoft-Surface-Book-3-15.patch
index 0a86c9c19c36..57e611f26e63 100644
--- a/0012-data-Add-Microsoft-Surface-Book-3-15.patch
+++ b/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/0013-data-Add-Microsoft-Surface-Pro-7.patch b/0013-data-Add-Microsoft-Surface-Pro-7.patch
new file mode 100644
index 000000000000..4a0b0cb34904
--- /dev/null
+++ b/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
+
diff --git a/PKGBUILD b/PKGBUILD
index ce621be361b9..d14c4d9fa5b4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=libwacom-surface
pkgver=2.7.0
-pkgrel=1
+pkgrel=2
pkgdesc="Patched libwacom for Microsoft Surface devices"
arch=('x86_64')
url="https://github.com/linux-surface/libwacom"
@@ -33,21 +33,23 @@ source=(
"0010-data-Add-Microsoft-Surface-Book-2-15.patch"
"0011-data-Add-Microsoft-Surface-Book-3-13.5.patch"
"0012-data-Add-Microsoft-Surface-Book-3-15.patch"
+ "0013-data-Add-Microsoft-Surface-Pro-7.patch"
)
sha256sums=('853929bd73fba2064b12142dbbee4b3bf84509197ff46a4da559eddf62d32cdf'
'SKIP'
- '0041920d4d29b02d0e2b05fc63ad9e4b3c4cc28579f3a9a4638a4505d1fb9f6b'
- '1be62a8e1b901cb6f89da71a76f073a03a3c14d56edc936fac7f5eaa71baf420'
- '7b15be0134391de1df67ba6f23bb8f5ae2c820d924b73216b0d45b179f0fbf69'
- '570e905787ebd1b26610ea47faaf245eb1af1d61891ab433a5c6684ffb507ed2'
- 'c6558d5f996a360633259b01e036870439eaf1d20f8d1baab18a26f9698bf8a7'
- '4527ef6685744f012ca791b7b118344250b3bec67e1973eba80119876e28ff20'
- '2f0286c0c6cb76bc9c1cd3db44f281754f43ea4a839b0cc604dce12400aafe90'
- 'bd4fc2ccabff9830985c8c36f42d3913d7eacf3406731f71a08114f016542601'
- 'f93e3769f881c2834f442da0b67fd94ab369d0cc6bdb9b09e15c86b1caa67482'
- 'e33b4edb33413d9e97c57bee71b6cdbffb5efb6a83c8452b62307255c1c9b6ce'
- '93a45c1f4755a7fb41572dbe70f3b9f2dcbbcdaf8eb0cf8baf55d897d4309526'
- '5ab4afb7208b91eb93b5dafde1ace9b8139cfd2e7aa47c0e8c977b5d40ae8286')
+ '416bd97440be1bc602e79086f128b931e09c3895563995d227eb993b0c8ee57d'
+ '15179a1929df962e239521e8c15ec709e54d324fdecf45c96524a0c8d63dbd98'
+ 'db77bc0f6cf9419708d1088a1a9bf38dbcc9dc8e7c6a2cd8342e7e1fea991381'
+ 'ff24ca67ba308802301a9a917a2df10654fbb865381538b43cb66b86a4ca10f8'
+ 'e55921b4f067cea62b7395b1d8e74fef5ea5e2674b2feaebd5d73743fc481268'
+ '58129638de2d12d43c65a552baf131d9ec3b128bdb207c3fa791491009929d3f'
+ '4c7a75a339d07edb81fe2e6ca2399064d83f2238c05b6b438491ce5f3d7c2b7c'
+ '414f998826d081905f654a92480899bf00f42324b29066e936e867c2e0c4ed4e'
+ 'e7e7238f044c43171ad4f45afd1fd6fd4cd583858bcc6a1c7ad81b4bb5e379cb'
+ '8781f138968cd7a6b01c38bedcb84d13b5f572277c49d2ef878349e5f4cf7945'
+ 'ec25e26b22d3a21f09357eb88cef8b148849d24c96882cf29064e4fa506f64a4'
+ '2cd13ac5b7d4bed85eefcfcaccbe2947a5c2db222da6b2515eba78fff45fedca'
+ '93a1dd06fe6a75ad93a3dd17c258e235bd45591d9346befb0759ff10cb658e69')
prepare() {
cd "libwacom-${pkgver}"