aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO42
-rw-r--r--0001-Add-support-for-BUS_VIRTUAL.patch37
-rw-r--r--0002-Add-support-for-Intel-Management-Engine-bus.patch37
-rw-r--r--0003-data-Add-Microsoft-Surface-Pro-3.patch8
-rw-r--r--0004-data-Add-Microsoft-Surface-Pro-4.patch8
-rw-r--r--0005-data-Add-Microsoft-Surface-Pro-5.patch8
-rw-r--r--0006-data-Add-Microsoft-Surface-Pro-6.patch8
-rw-r--r--0007-data-Add-Microsoft-Surface-Pro-7.patch8
-rw-r--r--0008-data-Add-Microsoft-Surface-Pro-7.patch8
-rw-r--r--0009-data-Add-Microsoft-Surface-Pro-8.patch8
-rw-r--r--0010-data-Add-Microsoft-Surface-Pro-9.patch8
-rw-r--r--0011-data-Add-Microsoft-Surface-Book.patch8
-rw-r--r--0012-data-Add-Microsoft-Surface-Book-2-13.5.patch8
-rw-r--r--0013-data-Add-Microsoft-Surface-Book-2-15.patch8
-rw-r--r--0014-data-Add-Microsoft-Surface-Book-3-13.5.patch8
-rw-r--r--0015-data-Add-Microsoft-Surface-Book-3-15.patch8
-rw-r--r--0016-data-Add-Microsoft-Surface-Laptop-Studio.patch8
-rw-r--r--PKGBUILD36
18 files changed, 145 insertions, 119 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6142e71dd523..6b8be200c986 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = libwacom-surface
pkgdesc = Library to identify Wacom tablets and their features - Patched for Microsoft Surface devices
- pkgver = 2.10.0
+ pkgver = 2.12.0
pkgrel = 1
url = https://github.com/linux-surface/libwacom
arch = x86_64
@@ -16,10 +16,10 @@ pkgbase = libwacom-surface
depends = glibc
optdepends = python-libevdev: for libwacom-show-stylus
optdepends = python-pyudev: for libwacom-show-stylus
- provides = libwacom=2.10.0
+ provides = libwacom=2.12.0
conflicts = libwacom
- source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.10.0/libwacom-2.10.0.tar.xz
- source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.10.0/libwacom-2.10.0.tar.xz.sig
+ source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.12.0/libwacom-2.12.0.tar.xz
+ source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.12.0/libwacom-2.12.0.tar.xz.sig
source = 0001-Add-support-for-BUS_VIRTUAL.patch
source = 0002-Add-support-for-Intel-Management-Engine-bus.patch
source = 0003-data-Add-Microsoft-Surface-Pro-3.patch
@@ -38,23 +38,23 @@ pkgbase = libwacom-surface
source = 0016-data-Add-Microsoft-Surface-Laptop-Studio.patch
validpgpkeys = 594ABBA066118C7A02D10A80A8AF906D9307FBAD
validpgpkeys = 3C2C43D9447D5938EF4551EBE23B7E70B467F0BF
- sha256sums = 3f8ef37de78ac3d08af1bdcb5d5828ec8284dcb7154bbec4995238728914aa0e
+ sha256sums = 40462434a8568e3c0a75c18a5452aa50e041819363853090c4e7ba7e23a4a180
sha256sums = SKIP
- sha256sums = a48d8009135e34b5a6e5ce7655167ff0cf371bc33610c49132bd1cd8922a3ba7
- sha256sums = 79ca3bca1c0635b0d49dfa189b36e9ee198a1b7ef7b6688dd473864f496ea7d2
- sha256sums = 2c6ccc2555829085482a9ac07db3be3970da39febaebdc4f5e1ee72ec8ee4090
- sha256sums = be00652d92d8883c01fe0caeaab2ce0c2601dd8c5364e17768e56130c883e2a0
- sha256sums = 636e8b724b694eb33066cb486f62c10ae490fc22c76d82a4bd43c1b1705fec9d
- sha256sums = 96ceafb79ed3247c3008d51b4ff84b00fc59b3ae2c4a1147b747e04e3e186826
- sha256sums = 98c30e7e336d3ee99251ec95332a3940fbb70208e302a430d6c4821c5524f784
- sha256sums = 09cb5fcf17185e7c9f51bef673f1c2046b8c9890fafe6ab4fd8b47f196c7dd47
- sha256sums = 94125d8059d6f093c13c8ed1a4af000476701760d1478703f325feb751a46783
- sha256sums = 9e75a46ec9a68662842b61ce7525b5498515a9ec6cb0cf7f3beb93e1d54dd75c
- sha256sums = 38ba71d545cc3a087db2dc736b54a0207ac790d1cc07d5081418ffcada1074db
- sha256sums = add6714be40db235e869599bf19c5120c53ad002bd24506f0ef32781df92835f
- sha256sums = e47f4ed69a4b5a16d609185a20acb950bad14a3b6e3d024a37b350d9328b6d40
- sha256sums = 058a476aaa2799a4cfcd04b8ddd67bd3770df2b812b42bc8df1ea5b286d8c652
- sha256sums = 4284e113f1f34f7139805692fdb11c6b75ef1b647eaabc75af50f7acd23300a1
- sha256sums = a9aca842b9372e3f4a397110a0768250b001dc4a5be1715af1081681ec7ebf4b
+ sha256sums = d64414287f19d13174f72c4e473f757b45c753c07bb9173c5835d7e040cbbeb2
+ sha256sums = 263e3775b3097e54a801a1d7739b322c4846af173d6aa330a80fe977a1934c98
+ sha256sums = 2eec141a7e497c602df0e530510e181b27a9ef0ec74b0763466ccc486abc387a
+ sha256sums = c9c512d5c53636cc32001a8618befb13453d7e436e1ae8c7266c290cfa2e3266
+ sha256sums = 3c2d87844c4494404ae7b8d7714cb7b67a178ba5980da98da7cddc5487bf72b5
+ sha256sums = 2d9e697820fd0deeea6bd2e1857c1797fc2bdfb5004beea492f8ac479eba2450
+ sha256sums = 616f24ec191971777294d7972ba9d182cf8d8b1ebaa2a04c24d780fd5dbcd51e
+ sha256sums = 554a92d5aec8447f7b9ad01a306a706e964090b3a55f604c396fb0881460c05e
+ sha256sums = 20bc44a2cfca8ddb714c0e10d833d5de27dc3a7b973755d90dea2dd2528f6691
+ sha256sums = 0caa2e94fec733ede6bd4355dfcbe68ecfb004c80d71863741db5b17e4d071a7
+ sha256sums = c92e0ac558394bb46a1391ddcfc0f26336c05afa546ff6124c851fbbb1580eef
+ sha256sums = 9359a4f57bfe70b13275217e0c0136c8702407ab531f6d49ca307676fa3fb931
+ sha256sums = 679cbd7450653795961d488083f3ee0bf8b73c7520627f0be576d6ecff702de5
+ sha256sums = a5f3e4574ac1ab1ec0b2c3e026c91abdfa88728026c0daaad2f6e804bd01f2cc
+ sha256sums = 942c16ea3116edd1251bbf124bd1125501792bc2932648c65ca8d8609bb92767
+ sha256sums = 600f722f44bbdebf8e02f7f14d12f9208ddfea735b70e340d8dc33749f4f4b49
pkgname = libwacom-surface
diff --git a/0001-Add-support-for-BUS_VIRTUAL.patch b/0001-Add-support-for-BUS_VIRTUAL.patch
index 30b26b7b5ef8..58c89c7f9d51 100644
--- a/0001-Add-support-for-BUS_VIRTUAL.patch
+++ b/0001-Add-support-for-BUS_VIRTUAL.patch
@@ -1,4 +1,4 @@
-From 2d6eb3775056be6c00993aa55eac79cac7678d6d Mon Sep 17 00:00:00 2001
+From 90a64d7efe111a10b623e179b040bdf5c5e1d406 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/16] Add support for BUS_VIRTUAL
@@ -17,10 +17,11 @@ Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
libwacom/libwacom.h | 1 +
test/test-tablet-validity.c | 1 +
test/test_data_files.py | 1 +
- 5 files changed, 12 insertions(+)
+ tools/debug-device.c | 1 +
+ 6 files changed, 13 insertions(+)
diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
-index 2c17e0d..090d5aa 100644
+index 0dfb5f0..0f1b180 100644
--- a/libwacom/libwacom-database.c
+++ b/libwacom/libwacom-database.c
@@ -130,6 +130,8 @@ bus_from_str (const char *str)
@@ -42,10 +43,10 @@ index 2c17e0d..090d5aa 100644
g_assert_not_reached ();
}
diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index c606e48..2f6bddd 100644
+index 349608d..b6d1f4c 100644
--- a/libwacom/libwacom.c
+++ b/libwacom/libwacom.c
-@@ -148,6 +148,10 @@ get_bus_vid_pid (GUdevDevice *device,
+@@ -149,6 +149,10 @@ get_bus_vid_pid (GUdevDevice *device,
*bus = WBUSTYPE_I2C;
retval = TRUE;
break;
@@ -56,7 +57,7 @@ index c606e48..2f6bddd 100644
}
out:
-@@ -826,6 +830,7 @@ static void print_match(int fd, const WacomMatch *match)
+@@ -1022,6 +1026,7 @@ static void print_match(int fd, const WacomMatch *match)
case WBUSTYPE_USB: bus_name = "usb"; break;
case WBUSTYPE_SERIAL: bus_name = "serial"; break;
case WBUSTYPE_I2C: bus_name = "i2c"; break;
@@ -65,10 +66,10 @@ index c606e48..2f6bddd 100644
default: g_assert_not_reached(); break;
}
diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
-index 389681d..040c51e 100644
+index c0d380c..a4fbb17 100644
--- a/libwacom/libwacom.h
+++ b/libwacom/libwacom.h
-@@ -149,6 +149,7 @@ typedef enum {
+@@ -154,6 +154,7 @@ typedef enum {
WBUSTYPE_SERIAL, /**< Serial tablet */
WBUSTYPE_BLUETOOTH, /**< Bluetooth tablet */
WBUSTYPE_I2C, /**< I2C tablet */
@@ -77,7 +78,7 @@ index 389681d..040c51e 100644
/**
diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
-index 4b7983d..91e83de 100644
+index 69d34c8..964fce0 100644
--- a/test/test-tablet-validity.c
+++ b/test/test-tablet-validity.c
@@ -177,6 +177,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
@@ -89,10 +90,10 @@ index 4b7983d..91e83de 100644
g_assert_cmpint(pid, >, 0);
break;
diff --git a/test/test_data_files.py b/test/test_data_files.py
-index 4cca787..8ab1fea 100755
+index 9385b1c..f76c3f3 100755
--- a/test/test_data_files.py
+++ b/test/test_data_files.py
-@@ -46,6 +46,7 @@ def test_device_match(tabletfile):
+@@ -47,6 +47,7 @@ def test_device_match(tabletfile):
"bluetooth",
"i2c",
"serial",
@@ -100,6 +101,18 @@ index 4cca787..8ab1fea 100755
], f"{tabletfile}: unknown bus type"
assert re.match(
"[0-9a-f]{4}", vid
+diff --git a/tools/debug-device.c b/tools/debug-device.c
+index 2cdac20..51ec53e 100644
+--- a/tools/debug-device.c
++++ b/tools/debug-device.c
+@@ -122,6 +122,7 @@ handle_device(WacomDeviceDatabase *db, const char *path)
+ case WBUSTYPE_SERIAL: busstr = "SERIAL"; break;
+ case WBUSTYPE_BLUETOOTH: busstr = "BLUETOOTH"; break;
+ case WBUSTYPE_I2C: busstr = "I2C"; break;
++ case WBUSTYPE_VIRTUAL: busstr = "VIRTUAL"; break;
+ }
+ func(libwacom_get_bustype, "%s", busstr);
+ }
--
-2.43.2
+2.45.1
diff --git a/0002-Add-support-for-Intel-Management-Engine-bus.patch b/0002-Add-support-for-Intel-Management-Engine-bus.patch
index a965018ceb50..c5595ac6f596 100644
--- a/0002-Add-support-for-Intel-Management-Engine-bus.patch
+++ b/0002-Add-support-for-Intel-Management-Engine-bus.patch
@@ -1,4 +1,4 @@
-From 4348064ccdd80d1ded743bf63369116ccb165add Mon Sep 17 00:00:00 2001
+From b977a08585515b82d225e1b811dc74c1640f842b 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/16] Add support for Intel Management Engine bus
@@ -12,10 +12,11 @@ the Microsoft Surface Books, Surface Pro 5 and 6, and Surface Laptops.
libwacom/libwacom.h | 1 +
test/test-tablet-validity.c | 1 +
test/test_data_files.py | 1 +
- 5 files changed, 12 insertions(+)
+ tools/debug-device.c | 1 +
+ 6 files changed, 13 insertions(+)
diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
-index 090d5aa..5a749c9 100644
+index 0f1b180..c4c4afb 100644
--- a/libwacom/libwacom-database.c
+++ b/libwacom/libwacom-database.c
@@ -132,6 +132,8 @@ bus_from_str (const char *str)
@@ -37,10 +38,10 @@ index 090d5aa..5a749c9 100644
g_assert_not_reached ();
}
diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index 2f6bddd..c838c6d 100644
+index b6d1f4c..fccdb5e 100644
--- a/libwacom/libwacom.c
+++ b/libwacom/libwacom.c
-@@ -152,6 +152,10 @@ get_bus_vid_pid (GUdevDevice *device,
+@@ -153,6 +153,10 @@ get_bus_vid_pid (GUdevDevice *device,
*bus = WBUSTYPE_VIRTUAL;
retval = TRUE;
break;
@@ -51,7 +52,7 @@ index 2f6bddd..c838c6d 100644
}
out:
-@@ -831,6 +835,7 @@ static void print_match(int fd, const WacomMatch *match)
+@@ -1027,6 +1031,7 @@ static void print_match(int fd, const WacomMatch *match)
case WBUSTYPE_SERIAL: bus_name = "serial"; break;
case WBUSTYPE_I2C: bus_name = "i2c"; break;
case WBUSTYPE_VIRTUAL: bus_name = "virt"; break;
@@ -60,10 +61,10 @@ index 2f6bddd..c838c6d 100644
default: g_assert_not_reached(); break;
}
diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
-index 040c51e..a937c08 100644
+index a4fbb17..dfc6d7b 100644
--- a/libwacom/libwacom.h
+++ b/libwacom/libwacom.h
-@@ -150,6 +150,7 @@ typedef enum {
+@@ -155,6 +155,7 @@ typedef enum {
WBUSTYPE_BLUETOOTH, /**< Bluetooth tablet */
WBUSTYPE_I2C, /**< I2C tablet */
WBUSTYPE_VIRTUAL, /**< Virtual (uinput) tablet */
@@ -72,7 +73,7 @@ index 040c51e..a937c08 100644
/**
diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
-index 91e83de..9c8af44 100644
+index 964fce0..5178583 100644
--- a/test/test-tablet-validity.c
+++ b/test/test-tablet-validity.c
@@ -178,6 +178,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
@@ -84,10 +85,10 @@ index 91e83de..9c8af44 100644
g_assert_cmpint(pid, >, 0);
break;
diff --git a/test/test_data_files.py b/test/test_data_files.py
-index 8ab1fea..a3f1d9d 100755
+index f76c3f3..f7cf9bc 100755
--- a/test/test_data_files.py
+++ b/test/test_data_files.py
-@@ -47,6 +47,7 @@ def test_device_match(tabletfile):
+@@ -48,6 +48,7 @@ def test_device_match(tabletfile):
"i2c",
"serial",
"virt",
@@ -95,6 +96,18 @@ index 8ab1fea..a3f1d9d 100755
], f"{tabletfile}: unknown bus type"
assert re.match(
"[0-9a-f]{4}", vid
+diff --git a/tools/debug-device.c b/tools/debug-device.c
+index 51ec53e..6a00f9d 100644
+--- a/tools/debug-device.c
++++ b/tools/debug-device.c
+@@ -123,6 +123,7 @@ handle_device(WacomDeviceDatabase *db, const char *path)
+ case WBUSTYPE_BLUETOOTH: busstr = "BLUETOOTH"; break;
+ case WBUSTYPE_I2C: busstr = "I2C"; break;
+ case WBUSTYPE_VIRTUAL: busstr = "VIRTUAL"; break;
++ case WBUSTYPE_MEI: busstr = "MEI"; break;
+ }
+ func(libwacom_get_bustype, "%s", busstr);
+ }
--
-2.43.2
+2.45.1
diff --git a/0003-data-Add-Microsoft-Surface-Pro-3.patch b/0003-data-Add-Microsoft-Surface-Pro-3.patch
index bd70dfea4a07..1e4c418ffed9 100644
--- a/0003-data-Add-Microsoft-Surface-Pro-3.patch
+++ b/0003-data-Add-Microsoft-Surface-Pro-3.patch
@@ -1,4 +1,4 @@
-From 0a1d7af22cf6669f54a17c4c1f22578e46e37a3f Mon Sep 17 00:00:00 2001
+From 64376efb36d8dbe5e383883e768c9c4a5e8b1d65 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/16] data: Add Microsoft Surface Pro 3
@@ -10,7 +10,7 @@ Subject: [PATCH 03/16] data: Add Microsoft Surface Pro 3
diff --git a/data/surface-pro3.tablet b/data/surface-pro3.tablet
new file mode 100644
-index 0000000..3238d43
+index 0000000..2f53541
--- /dev/null
+++ b/data/surface-pro3.tablet
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..3238d43
+[Device]
+Name=Microsoft Surface Pro 3
+Class=PenDisplay
-+DeviceMatch=i2c:1b96:1b05
++DeviceMatch=i2c|1b96|1b05
+Width=10
+Height=6
+IntegratedIn=Display;System;
@@ -29,5 +29,5 @@ index 0000000..3238d43
+Touch=true
+Buttons=0
--
-2.43.2
+2.45.1
diff --git a/0004-data-Add-Microsoft-Surface-Pro-4.patch b/0004-data-Add-Microsoft-Surface-Pro-4.patch
index f744e6308446..6977d9c48ee6 100644
--- a/0004-data-Add-Microsoft-Surface-Pro-4.patch
+++ b/0004-data-Add-Microsoft-Surface-Pro-4.patch
@@ -1,4 +1,4 @@
-From ddd387ca3f2bdc1b468243224cb2aa87193fef64 Mon Sep 17 00:00:00 2001
+From 69d4b09160d7a459c03ed86237bb0b6c40af75b9 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/16] data: Add Microsoft Surface Pro 4
@@ -10,7 +10,7 @@ Subject: [PATCH 04/16] data: Add Microsoft Surface Pro 4
diff --git a/data/surface-pro4.tablet b/data/surface-pro4.tablet
new file mode 100644
-index 0000000..1e0c67c
+index 0000000..f77f3a2
--- /dev/null
+++ b/data/surface-pro4.tablet
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..1e0c67c
+[Device]
+Name=Microsoft Surface Pro 4
+Class=PenDisplay
-+DeviceMatch=virt:1b96:006a;virt:1b96:0021;mei:1b96:006a;mei:1b96:0021
++DeviceMatch=virt|1b96|006a;virt|1b96|0021;mei|1b96|006a;mei|1b96|0021
+Width=10
+Height=6
+IntegratedIn=Display;System;
@@ -29,5 +29,5 @@ index 0000000..1e0c67c
+Touch=true
+Buttons=0
--
-2.43.2
+2.45.1
diff --git a/0005-data-Add-Microsoft-Surface-Pro-5.patch b/0005-data-Add-Microsoft-Surface-Pro-5.patch
index a2045e5d9689..f1be8e87b5cf 100644
--- a/0005-data-Add-Microsoft-Surface-Pro-5.patch
+++ b/0005-data-Add-Microsoft-Surface-Pro-5.patch
@@ -1,4 +1,4 @@
-From 8ce0dca3d800e16527f50b8d67d4aefc728f1a4e Mon Sep 17 00:00:00 2001
+From 751c24fe083f656b853adf46f809dacf1e6ddece 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/16] data: Add Microsoft Surface Pro 5
@@ -10,7 +10,7 @@ Subject: [PATCH 05/16] data: Add Microsoft Surface Pro 5
diff --git a/data/surface-pro5.tablet b/data/surface-pro5.tablet
new file mode 100644
-index 0000000..b26af3a
+index 0000000..410a0d3
--- /dev/null
+++ b/data/surface-pro5.tablet
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..b26af3a
+[Device]
+Name=Microsoft Surface Pro 5
+Class=PenDisplay
-+DeviceMatch=virt:1b96:001f;mei:1b96:001f
++DeviceMatch=virt|1b96|001f;mei|1b96|001f
+Width=10
+Height=6
+IntegratedIn=Display;System;
@@ -29,5 +29,5 @@ index 0000000..b26af3a
+Touch=true
+Buttons=0
--
-2.43.2
+2.45.1
diff --git a/0006-data-Add-Microsoft-Surface-Pro-6.patch b/0006-data-Add-Microsoft-Surface-Pro-6.patch
index 3ad308e8ed64..35556670a0b9 100644
--- a/0006-data-Add-Microsoft-Surface-Pro-6.patch
+++ b/0006-data-Add-Microsoft-Surface-Pro-6.patch
@@ -1,4 +1,4 @@
-From 2befbc9238f317037db002a2739055ff4fd5ad66 Mon Sep 17 00:00:00 2001
+From 1a37e3b1355c83b651f864b7765c4b084a31dcdd 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/16] data: Add Microsoft Surface Pro 6
@@ -10,7 +10,7 @@ Subject: [PATCH 06/16] data: Add Microsoft Surface Pro 6
diff --git a/data/surface-pro6.tablet b/data/surface-pro6.tablet
new file mode 100644
-index 0000000..e97fad8
+index 0000000..eb89df0
--- /dev/null
+++ b/data/surface-pro6.tablet
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..e97fad8
+[Device]
+Name=Microsoft Surface Pro 6
+Class=PenDisplay
-+DeviceMatch=virt:045e:001f;mei:045e:001f
++DeviceMatch=virt|045e|001f;mei|045e|001f
+Width=10
+Height=6
+IntegratedIn=Display;System;
@@ -29,5 +29,5 @@ index 0000000..e97fad8
+Touch=true
+Buttons=0
--
-2.43.2
+2.45.1
diff --git a/0007-data-Add-Microsoft-Surface-Pro-7.patch b/0007-data-Add-Microsoft-Surface-Pro-7.patch
index 72bbe12e0fda..02dfb478a594 100644
--- a/0007-data-Add-Microsoft-Surface-Pro-7.patch
+++ b/0007-data-Add-Microsoft-Surface-Pro-7.patch
@@ -1,4 +1,4 @@
-From 8706ad3569c54a99996e05dedd60d2c3c0ca5bd7 Mon Sep 17 00:00:00 2001
+From 7cb8964f880a129a514fd6eea4a84b6aa1051c05 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/16] data: Add Microsoft Surface Pro 7
@@ -10,7 +10,7 @@ Subject: [PATCH 07/16] data: Add Microsoft Surface Pro 7
diff --git a/data/surface-pro7.tablet b/data/surface-pro7.tablet
new file mode 100644
-index 0000000..7961379
+index 0000000..f960107
--- /dev/null
+++ b/data/surface-pro7.tablet
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..7961379
+[Device]
+Name=Microsoft Surface Pro 7
+Class=PenDisplay
-+DeviceMatch=virt:045e:099f;mei:045e:099f
++DeviceMatch=virt|045e|099f;mei|045e|099f
+Width=10
+Height=6
+IntegratedIn=Display;System;
@@ -29,5 +29,5 @@ index 0000000..7961379
+Touch=true
+Buttons=0
--
-2.43.2
+2.45.1
diff --git a/0008-data-Add-Microsoft-Surface-Pro-7.patch b/0008-data-Add-Microsoft-Surface-Pro-7.patch
index 50976ca571f6..f2da32890776 100644
--- a/0008-data-Add-Microsoft-Surface-Pro-7.patch
+++ b/0008-data-Add-Microsoft-Surface-Pro-7.patch
@@ -1,4 +1,4 @@
-From ffa37875474a83c5adc0edf84626531cdefd4fa8 Mon Sep 17 00:00:00 2001
+From 608d8072314c2aaf6ca341d5e824bb10465d9bfd Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Fri, 26 May 2023 12:32:21 +0200
Subject: [PATCH 08/16] data: Add Microsoft Surface Pro 7+
@@ -11,7 +11,7 @@ Based on https://github.com/linux-surface/libwacom-surface/issues/12
diff --git a/data/surface-pro7-plus.tablet b/data/surface-pro7-plus.tablet
new file mode 100644
-index 0000000..36e1e3f
+index 0000000..5c4e540
--- /dev/null
+++ b/data/surface-pro7-plus.tablet
@@ -0,0 +1,14 @@
@@ -20,7 +20,7 @@ index 0000000..36e1e3f
+[Device]
+Name=Microsoft Surface Pro 7+
+Class=PenDisplay
-+DeviceMatch=virt:045e:0c1a
++DeviceMatch=virt|045e|0c1a
+Width=10
+Height=6
+IntegratedIn=Display;System;
@@ -30,5 +30,5 @@ index 0000000..36e1e3f
+Touch=true
+Buttons=0
--
-2.43.2
+2.45.1
diff --git a/0009-data-Add-Microsoft-Surface-Pro-8.patch b/0009-data-Add-Microsoft-Surface-Pro-8.patch
index 7a8bced3379a..173c5bdac331 100644
--- a/0009-data-Add-Microsoft-Surface-Pro-8.patch
+++ b/0009-data-Add-Microsoft-Surface-Pro-8.patch
@@ -1,4 +1,4 @@
-From b5bc8bc86d599a204bfb045ee10baaceb0fa5ed1 Mon Sep 17 00:00:00 2001
+From 1611a4dc4d8cb99c86b7b4c50e6963e24cbb7edb Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sun, 11 Jun 2023 21:29:52 +0200
Subject: [PATCH 09/16] data: Add Microsoft Surface Pro 8
@@ -11,7 +11,7 @@ Based on https://github.com/linux-surface/libwacom-surface/issues/13
diff --git a/data/surface-pro8.tablet b/data/surface-pro8.tablet
new file mode 100644
-index 0000000..fe779af
+index 0000000..dcfef11
--- /dev/null
+++ b/data/surface-pro8.tablet
@@ -0,0 +1,14 @@
@@ -20,7 +20,7 @@ index 0000000..fe779af
+[Device]
+Name=Microsoft Surface Pro 8
+Class=PenDisplay
-+DeviceMatch=virt:045e:0c37
++DeviceMatch=virt|045e|0c37
+Width=10
+Height=6
+IntegratedIn=Display;System;
@@ -30,5 +30,5 @@ index 0000000..fe779af
+Touch=true
+Buttons=0
--
-2.43.2
+2.45.1
diff --git a/0010-data-Add-Microsoft-Surface-Pro-9.patch b/0010-data-Add-Microsoft-Surface-Pro-9.patch
index 31620879c86f..5b2611384ba9 100644
--- a/0010-data-Add-Microsoft-Surface-Pro-9.patch
+++ b/0010-data-Add-Microsoft-Surface-Pro-9.patch
@@ -1,4 +1,4 @@
-From 2365ff0873af0160ffcc5393364633ce3ed26360 Mon Sep 17 00:00:00 2001
+From 063c60aae655c3c3a261de4a76e90b18a1e88fb5 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Wed, 14 Jun 2023 21:11:36 +0200
Subject: [PATCH 10/16] data: Add Microsoft Surface Pro 9
@@ -11,7 +11,7 @@ IDs taken from https://github.com/quo/ithc-linux/issues/5
diff --git a/data/surface-pro9.tablet b/data/surface-pro9.tablet
new file mode 100644
-index 0000000..e5ccf68
+index 0000000..ee2b3ee
--- /dev/null
+++ b/data/surface-pro9.tablet
@@ -0,0 +1,14 @@
@@ -20,7 +20,7 @@ index 0000000..e5ccf68
+[Device]
+Name=Microsoft Surface Pro 9
+Class=PenDisplay
-+DeviceMatch=virt:045e:0c52
++DeviceMatch=virt|045e|0c52
+Width=10
+Height=6
+IntegratedIn=Display;System;
@@ -30,5 +30,5 @@ index 0000000..e5ccf68
+Touch=true
+Buttons=0
--
-2.43.2
+2.45.1
diff --git a/0011-data-Add-Microsoft-Surface-Book.patch b/0011-data-Add-Microsoft-Surface-Book.patch
index bc7d82726392..a8620e863de0 100644
--- a/0011-data-Add-Microsoft-Surface-Book.patch
+++ b/0011-data-Add-Microsoft-Surface-Book.patch
@@ -1,4 +1,4 @@
-From 0e52c0a30996127aa46310aee4232cf3baa38085 Mon Sep 17 00:00:00 2001
+From 945c7d86896735b0ac7c475a9ec238f96ad8883e Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Tue, 18 Aug 2020 20:19:38 +0200
Subject: [PATCH 11/16] data: Add Microsoft Surface Book
@@ -10,7 +10,7 @@ Subject: [PATCH 11/16] data: Add Microsoft Surface Book
diff --git a/data/surface-book.tablet b/data/surface-book.tablet
new file mode 100644
-index 0000000..e2a5401
+index 0000000..6daf5b6
--- /dev/null
+++ b/data/surface-book.tablet
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..e2a5401
+[Device]
+Name=Microsoft Surface Book
+Class=PenDisplay
-+DeviceMatch=virt:1b96:005e;mei:1b96:005e
++DeviceMatch=virt|1b96|005e;mei|1b96|005e
+Width=11
+Height=7
+IntegratedIn=Display;System;
@@ -29,5 +29,5 @@ index 0000000..e2a5401
+Touch=true
+Buttons=0
--
-2.43.2
+2.45.1
diff --git a/0012-data-Add-Microsoft-Surface-Book-2-13.5.patch b/0012-data-Add-Microsoft-Surface-Book-2-13.5.patch
index c64b7c6e030a..7a27f154c146 100644
--- a/0012-data-Add-Microsoft-Surface-Book-2-13.5.patch
+++ b/0012-data-Add-Microsoft-Surface-Book-2-13.5.patch
@@ -1,4 +1,4 @@
-From 96a93fff01751bbe25fd4878fcab5f2559fd0d5f Mon Sep 17 00:00:00 2001
+From c8025cb6f42a55272546f7b5ca8ab73eef4b8025 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Tue, 18 Aug 2020 20:20:04 +0200
Subject: [PATCH 12/16] data: Add Microsoft Surface Book 2 (13.5")
@@ -10,7 +10,7 @@ Subject: [PATCH 12/16] data: Add Microsoft Surface Book 2 (13.5")
diff --git a/data/surface-book2-13.tablet b/data/surface-book2-13.tablet
new file mode 100644
-index 0000000..b13cb07
+index 0000000..7cf7ba3
--- /dev/null
+++ b/data/surface-book2-13.tablet
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..b13cb07
+[Device]
+Name=Microsoft Surface Book 2 (13.5")
+Class=PenDisplay
-+DeviceMatch=virt:045e:0021;mei:045e:0021
++DeviceMatch=virt|045e|0021;mei|045e|0021
+Width=11
+Height=7
+IntegratedIn=Display;System;
@@ -29,5 +29,5 @@ index 0000000..b13cb07
+Touch=true
+Buttons=0
--
-2.43.2
+2.45.1
diff --git a/0013-data-Add-Microsoft-Surface-Book-2-15.patch b/0013-data-Add-Microsoft-Surface-Book-2-15.patch
index e45cf46fb087..cfeffdde7925 100644
--- a/0013-data-Add-Microsoft-Surface-Book-2-15.patch
+++ b/0013-data-Add-Microsoft-Surface-Book-2-15.patch
@@ -1,4 +1,4 @@
-From abd2697552066869d17ff871706e107c83ea6080 Mon Sep 17 00:00:00 2001
+From 1288be7c30e214cd0f11c7b98b35d7ffee28963d Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Tue, 18 Aug 2020 20:20:13 +0200
Subject: [PATCH 13/16] data: Add Microsoft Surface Book 2 (15")
@@ -10,7 +10,7 @@ Subject: [PATCH 13/16] data: Add Microsoft Surface Book 2 (15")
diff --git a/data/surface-book2-15.tablet b/data/surface-book2-15.tablet
new file mode 100644
-index 0000000..ad98cc7
+index 0000000..3266fca
--- /dev/null
+++ b/data/surface-book2-15.tablet
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..ad98cc7
+[Device]
+Name=Microsoft Surface Book 2 (15")
+Class=PenDisplay
-+DeviceMatch=virt:045e:0020;mei:045e:0020
++DeviceMatch=virt|045e|0020;mei|045e|0020
+Width=12
+Height=8
+IntegratedIn=Display;System;
@@ -29,5 +29,5 @@ index 0000000..ad98cc7
+Touch=true
+Buttons=0
--
-2.43.2
+2.45.1
diff --git a/0014-data-Add-Microsoft-Surface-Book-3-13.5.patch b/0014-data-Add-Microsoft-Surface-Book-3-13.5.patch
index d11fe7734531..94b97d65f243 100644
--- a/0014-data-Add-Microsoft-Surface-Book-3-13.5.patch
+++ b/0014-data-Add-Microsoft-Surface-Book-3-13.5.patch
@@ -1,4 +1,4 @@
-From 0c16e4a3042ebf8c07ced8669e36bd71ee2979e1 Mon Sep 17 00:00:00 2001
+From 0440320ba66ab7e01f690702ced27cc9675e1986 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Tue, 18 Aug 2020 20:20:29 +0200
Subject: [PATCH 14/16] data: Add Microsoft Surface Book 3 (13.5")
@@ -10,7 +10,7 @@ Subject: [PATCH 14/16] data: Add Microsoft Surface Book 3 (13.5")
diff --git a/data/surface-book3-13.tablet b/data/surface-book3-13.tablet
new file mode 100644
-index 0000000..a33c9cb
+index 0000000..e363f33
--- /dev/null
+++ b/data/surface-book3-13.tablet
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..a33c9cb
+[Device]
+Name=Microsoft Surface Book 3 (13.5")
+Class=PenDisplay
-+DeviceMatch=virt:045e:09b2;mei:045e:09b2
++DeviceMatch=virt|045e|09b2;mei|045e|09b2
+Width=11
+Height=7
+IntegratedIn=Display;System;
@@ -29,5 +29,5 @@ index 0000000..a33c9cb
+Touch=true
+Buttons=0
--
-2.43.2
+2.45.1
diff --git a/0015-data-Add-Microsoft-Surface-Book-3-15.patch b/0015-data-Add-Microsoft-Surface-Book-3-15.patch
index 6b417c498e34..b38baf142fba 100644
--- a/0015-data-Add-Microsoft-Surface-Book-3-15.patch
+++ b/0015-data-Add-Microsoft-Surface-Book-3-15.patch
@@ -1,4 +1,4 @@
-From 344c77c54b5ae6977521172fa36870a144b40821 Mon Sep 17 00:00:00 2001
+From 6dfc9e6dfed24c1f41747708b7f5fabaac467ef0 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Tue, 18 Aug 2020 20:20:42 +0200
Subject: [PATCH 15/16] data: Add Microsoft Surface Book 3 (15")
@@ -10,7 +10,7 @@ Subject: [PATCH 15/16] data: Add Microsoft Surface Book 3 (15")
diff --git a/data/surface-book3-15.tablet b/data/surface-book3-15.tablet
new file mode 100644
-index 0000000..291321f
+index 0000000..4954b61
--- /dev/null
+++ b/data/surface-book3-15.tablet
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..291321f
+[Device]
+Name=Microsoft Surface Book 3 (15")
+Class=PenDisplay
-+DeviceMatch=virt:045e:09b1;mei:045e:09b1
++DeviceMatch=virt|045e|09b1;mei|045e|09b1
+Width=12
+Height=8
+IntegratedIn=Display;System;
@@ -29,5 +29,5 @@ index 0000000..291321f
+Touch=true
+Buttons=0
--
-2.43.2
+2.45.1
diff --git a/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch b/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch
index c7bbeeec9e05..f4e9c671a0c3 100644
--- a/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch
+++ b/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch
@@ -1,4 +1,4 @@
-From 2be0254453a4169dc9ce0dbab2d5eca7a6caf928 Mon Sep 17 00:00:00 2001
+From 88604677e97533773ecf2404b3b90c71d2221223 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Wed, 14 Jun 2023 21:12:41 +0200
Subject: [PATCH 16/16] data: Add Microsoft Surface Laptop Studio
@@ -11,7 +11,7 @@ IDs taken from https://github.com/quo/ithc-linux/issues/5
diff --git a/data/surface-laptop-studio.tablet b/data/surface-laptop-studio.tablet
new file mode 100644
-index 0000000..6739b2c
+index 0000000..6077403
--- /dev/null
+++ b/data/surface-laptop-studio.tablet
@@ -0,0 +1,14 @@
@@ -20,7 +20,7 @@ index 0000000..6739b2c
+[Device]
+Name=Microsoft Surface Laptop Studio
+Class=PenDisplay
-+DeviceMatch=virt:045e:0c1b
++DeviceMatch=virt|045e|0c1b
+Width=10
+Height=6
+IntegratedIn=Display;System;
@@ -30,5 +30,5 @@ index 0000000..6739b2c
+Touch=true
+Buttons=0
--
-2.43.2
+2.45.1
diff --git a/PKGBUILD b/PKGBUILD
index 824d2790c0aa..9107081a3195 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Based on official Arch Linux PKGBUILD
pkgname=libwacom-surface
-pkgver=2.10.0
+pkgver=2.12.0
pkgrel=1
pkgdesc="Library to identify Wacom tablets and their features - Patched for Microsoft Surface devices"
arch=('x86_64')
@@ -39,24 +39,24 @@ source=(
"0015-data-Add-Microsoft-Surface-Book-3-15.patch"
"0016-data-Add-Microsoft-Surface-Laptop-Studio.patch"
)
-sha256sums=('3f8ef37de78ac3d08af1bdcb5d5828ec8284dcb7154bbec4995238728914aa0e'
+sha256sums=('40462434a8568e3c0a75c18a5452aa50e041819363853090c4e7ba7e23a4a180'
'SKIP'
- 'a48d8009135e34b5a6e5ce7655167ff0cf371bc33610c49132bd1cd8922a3ba7'
- '79ca3bca1c0635b0d49dfa189b36e9ee198a1b7ef7b6688dd473864f496ea7d2'
- '2c6ccc2555829085482a9ac07db3be3970da39febaebdc4f5e1ee72ec8ee4090'
- 'be00652d92d8883c01fe0caeaab2ce0c2601dd8c5364e17768e56130c883e2a0'
- '636e8b724b694eb33066cb486f62c10ae490fc22c76d82a4bd43c1b1705fec9d'
- '96ceafb79ed3247c3008d51b4ff84b00fc59b3ae2c4a1147b747e04e3e186826'
- '98c30e7e336d3ee99251ec95332a3940fbb70208e302a430d6c4821c5524f784'
- '09cb5fcf17185e7c9f51bef673f1c2046b8c9890fafe6ab4fd8b47f196c7dd47'
- '94125d8059d6f093c13c8ed1a4af000476701760d1478703f325feb751a46783'
- '9e75a46ec9a68662842b61ce7525b5498515a9ec6cb0cf7f3beb93e1d54dd75c'
- '38ba71d545cc3a087db2dc736b54a0207ac790d1cc07d5081418ffcada1074db'
- 'add6714be40db235e869599bf19c5120c53ad002bd24506f0ef32781df92835f'
- 'e47f4ed69a4b5a16d609185a20acb950bad14a3b6e3d024a37b350d9328b6d40'
- '058a476aaa2799a4cfcd04b8ddd67bd3770df2b812b42bc8df1ea5b286d8c652'
- '4284e113f1f34f7139805692fdb11c6b75ef1b647eaabc75af50f7acd23300a1'
- 'a9aca842b9372e3f4a397110a0768250b001dc4a5be1715af1081681ec7ebf4b')
+ 'd64414287f19d13174f72c4e473f757b45c753c07bb9173c5835d7e040cbbeb2'
+ '263e3775b3097e54a801a1d7739b322c4846af173d6aa330a80fe977a1934c98'
+ '2eec141a7e497c602df0e530510e181b27a9ef0ec74b0763466ccc486abc387a'
+ 'c9c512d5c53636cc32001a8618befb13453d7e436e1ae8c7266c290cfa2e3266'
+ '3c2d87844c4494404ae7b8d7714cb7b67a178ba5980da98da7cddc5487bf72b5'
+ '2d9e697820fd0deeea6bd2e1857c1797fc2bdfb5004beea492f8ac479eba2450'
+ '616f24ec191971777294d7972ba9d182cf8d8b1ebaa2a04c24d780fd5dbcd51e'
+ '554a92d5aec8447f7b9ad01a306a706e964090b3a55f604c396fb0881460c05e'
+ '20bc44a2cfca8ddb714c0e10d833d5de27dc3a7b973755d90dea2dd2528f6691'
+ '0caa2e94fec733ede6bd4355dfcbe68ecfb004c80d71863741db5b17e4d071a7'
+ 'c92e0ac558394bb46a1391ddcfc0f26336c05afa546ff6124c851fbbb1580eef'
+ '9359a4f57bfe70b13275217e0c0136c8702407ab531f6d49ca307676fa3fb931'
+ '679cbd7450653795961d488083f3ee0bf8b73c7520627f0be576d6ecff702de5'
+ 'a5f3e4574ac1ab1ec0b2c3e026c91abdfa88728026c0daaad2f6e804bd01f2cc'
+ '942c16ea3116edd1251bbf124bd1125501792bc2932648c65ca8d8609bb92767'
+ '600f722f44bbdebf8e02f7f14d12f9208ddfea735b70e340d8dc33749f4f4b49')
prepare() {
cd "libwacom-${pkgver}"