17 files changed, 54 insertions, 53 deletions
diff --git a/0001-Add-support-for-BUS_VIRTUAL.patch b/0001-Add-support-for-BUS_VIRTUAL.patch
index cabf68a650b1..ed0e1d35e519 100644
--- a/0001-Add-support-for-BUS_VIRTUAL.patch
+++ b/0001-Add-support-for-BUS_VIRTUAL.patch
@@ -1,4 +1,4 @@
-From 6fe89a80a28042bc57fd625ad82181e4092b95f2 Mon Sep 17 00:00:00 2001
+From ca5c3616a3c77b234e35ef953569b0da71084347 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
@@ -101,5 +101,5 @@ index c2db899..476aeca 100755
          assert re.match(
              "[0-9a-f]{4}", vid
 -- 
-2.41.0
+2.42.0
 
diff --git a/0002-Add-support-for-Intel-Management-Engine-bus.patch b/0002-Add-support-for-Intel-Management-Engine-bus.patch
index c636181ad7c7..12ba889e23bb 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 10ef0701cdde200063a73b3db5bfb305a12909c2 Mon Sep 17 00:00:00 2001
+From e2514eca67211f37574b1ef9c227c8f90b66e565 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
@@ -96,5 +96,5 @@ index 476aeca..cc739dd 100755
          assert re.match(
              "[0-9a-f]{4}", vid
 -- 
-2.41.0
+2.42.0
 
diff --git a/0003-data-Add-Microsoft-Surface-Pro-3.patch b/0003-data-Add-Microsoft-Surface-Pro-3.patch
index a8b7609266e5..474dd4ee6680 100644
--- a/0003-data-Add-Microsoft-Surface-Pro-3.patch
+++ b/0003-data-Add-Microsoft-Surface-Pro-3.patch
@@ -1,4 +1,4 @@
-From 77664bc3c0be343b8e6acddb5bcb18bfb591da24 Mon Sep 17 00:00:00 2001
+From ea2503e14cbec0ce0402768ac1ad831625fda2a6 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
@@ -29,5 +29,5 @@ index 0000000..3238d43
 +Touch=true
 +Buttons=0
 -- 
-2.41.0
+2.42.0
 
diff --git a/0004-data-Add-Microsoft-Surface-Pro-4.patch b/0004-data-Add-Microsoft-Surface-Pro-4.patch
index da21955aac6f..f62fa2a5ca0e 100644
--- a/0004-data-Add-Microsoft-Surface-Pro-4.patch
+++ b/0004-data-Add-Microsoft-Surface-Pro-4.patch
@@ -1,4 +1,4 @@
-From fa3a6c733c16529098f5a5066eb8fd3051177d8f Mon Sep 17 00:00:00 2001
+From 82bedd51116db60bd2f033ce6962e78ad85cdbc6 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
@@ -29,5 +29,5 @@ index 0000000..1e0c67c
 +Touch=true
 +Buttons=0
 -- 
-2.41.0
+2.42.0
 
diff --git a/0005-data-Add-Microsoft-Surface-Pro-5.patch b/0005-data-Add-Microsoft-Surface-Pro-5.patch
index 632589998dcf..27af1943b4d1 100644
--- a/0005-data-Add-Microsoft-Surface-Pro-5.patch
+++ b/0005-data-Add-Microsoft-Surface-Pro-5.patch
@@ -1,4 +1,4 @@
-From c1e48260b343e6616f1106ff4769ad11e9a0948b Mon Sep 17 00:00:00 2001
+From 0bb846deb7e80cdf58d24b36818d0f53d9230350 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
@@ -29,5 +29,5 @@ index 0000000..b26af3a
 +Touch=true
 +Buttons=0
 -- 
-2.41.0
+2.42.0
 
diff --git a/0006-data-Add-Microsoft-Surface-Pro-6.patch b/0006-data-Add-Microsoft-Surface-Pro-6.patch
index 2e5eb3476ed9..fde6973ed089 100644
--- a/0006-data-Add-Microsoft-Surface-Pro-6.patch
+++ b/0006-data-Add-Microsoft-Surface-Pro-6.patch
@@ -1,4 +1,4 @@
-From ccacedf0af12ab54bfaacb7f286cf7611d52f2c4 Mon Sep 17 00:00:00 2001
+From 3d86a63e2b2f8a83cdab5780590eb028dbd062d6 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
@@ -29,5 +29,5 @@ index 0000000..e97fad8
 +Touch=true
 +Buttons=0
 -- 
-2.41.0
+2.42.0
 
diff --git a/0007-data-Add-Microsoft-Surface-Pro-7.patch b/0007-data-Add-Microsoft-Surface-Pro-7.patch
index 596ab96d49d9..766554e1e61f 100644
--- a/0007-data-Add-Microsoft-Surface-Pro-7.patch
+++ b/0007-data-Add-Microsoft-Surface-Pro-7.patch
@@ -1,4 +1,4 @@
-From 21fa2ae7428ae749938aef68a8498f23017bf4d0 Mon Sep 17 00:00:00 2001
+From 863d8d86d360c84e0fdd4d4b7deab5dd491e35aa 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
@@ -29,5 +29,5 @@ index 0000000..7961379
 +Touch=true
 +Buttons=0
 -- 
-2.41.0
+2.42.0
 
diff --git a/0008-data-Add-Microsoft-Surface-Pro-7.patch b/0008-data-Add-Microsoft-Surface-Pro-7.patch
index e1edfd0c9531..f82235e50739 100644
--- a/0008-data-Add-Microsoft-Surface-Pro-7.patch
+++ b/0008-data-Add-Microsoft-Surface-Pro-7.patch
@@ -1,4 +1,4 @@
-From 8d02244023aaa7c41fce37ce10fe0275bbe43bd9 Mon Sep 17 00:00:00 2001
+From 3e7603439f3c43b43a5ffb205240c4aee288925f 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+
@@ -30,5 +30,5 @@ index 0000000..36e1e3f
 +Touch=true
 +Buttons=0
 -- 
-2.41.0
+2.42.0
 
diff --git a/0009-data-Add-Microsoft-Surface-Pro-8.patch b/0009-data-Add-Microsoft-Surface-Pro-8.patch
index 62334363589d..2dbf3e490c3d 100644
--- a/0009-data-Add-Microsoft-Surface-Pro-8.patch
+++ b/0009-data-Add-Microsoft-Surface-Pro-8.patch
@@ -1,4 +1,4 @@
-From 96a9c227ff8f8f3d13a361b7356ad925c6dc59bd Mon Sep 17 00:00:00 2001
+From bbb911a4dd661920b19fe7ac93a34a1251039092 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
@@ -30,5 +30,5 @@ index 0000000..fe779af
 +Touch=true
 +Buttons=0
 -- 
-2.41.0
+2.42.0
 
diff --git a/0010-data-Add-Microsoft-Surface-Pro-9.patch b/0010-data-Add-Microsoft-Surface-Pro-9.patch
index afa356767fc7..63848859ddc8 100644
--- a/0010-data-Add-Microsoft-Surface-Pro-9.patch
+++ b/0010-data-Add-Microsoft-Surface-Pro-9.patch
@@ -1,4 +1,4 @@
-From 418eebc98eaed58157ed0298b6eb477e7a87b212 Mon Sep 17 00:00:00 2001
+From bf6c55ab5bcd46c418a4a2ad0a0312e28b70e5e3 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
@@ -30,5 +30,5 @@ index 0000000..e5ccf68
 +Touch=true
 +Buttons=0
 -- 
-2.41.0
+2.42.0
 
diff --git a/0011-data-Add-Microsoft-Surface-Book.patch b/0011-data-Add-Microsoft-Surface-Book.patch
index be8a4296f447..65904a43d5d4 100644
--- a/0011-data-Add-Microsoft-Surface-Book.patch
+++ b/0011-data-Add-Microsoft-Surface-Book.patch
@@ -1,4 +1,4 @@
-From ea57a9536890b5fdc8ad422c504cbd844c57e1f7 Mon Sep 17 00:00:00 2001
+From 9c4344dffb1e06d81113eba3603f4c38457ceb44 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
@@ -29,5 +29,5 @@ index 0000000..e2a5401
 +Touch=true
 +Buttons=0
 -- 
-2.41.0
+2.42.0
 
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 b95cad9f0057..97b607aa526d 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 4ef0a4cf51df9b3bb31cb2dd7e48bb9f8d08ae11 Mon Sep 17 00:00:00 2001
+From a5fd9e35dd06a300a2f50e4cb8724793331b5a47 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")
@@ -29,5 +29,5 @@ index 0000000..b13cb07
 +Touch=true
 +Buttons=0
 -- 
-2.41.0
+2.42.0
 
diff --git a/0013-data-Add-Microsoft-Surface-Book-2-15.patch b/0013-data-Add-Microsoft-Surface-Book-2-15.patch
index d2b9349133a5..ada802188a1b 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 5555df43dff5ec5afc5010ce1bd5f7f1157dee9c Mon Sep 17 00:00:00 2001
+From 6cd78337204a31c3479d077a78d2bd4c469c58bd 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")
@@ -29,5 +29,5 @@ index 0000000..ad98cc7
 +Touch=true
 +Buttons=0
 -- 
-2.41.0
+2.42.0
 
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 a68531a89f9e..5ab36ed261a1 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 2bdb9aa73035098820eed929981efb1784d25955 Mon Sep 17 00:00:00 2001
+From ae98349af0b3a0a7ca2a7676f29d81a8d960bfe1 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")
@@ -29,5 +29,5 @@ index 0000000..a33c9cb
 +Touch=true
 +Buttons=0
 -- 
-2.41.0
+2.42.0
 
diff --git a/0015-data-Add-Microsoft-Surface-Book-3-15.patch b/0015-data-Add-Microsoft-Surface-Book-3-15.patch
index 6da4588d98ac..e0c099df7ad4 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 d16a237d080d3aa735dcaf2abe575a5a881a0996 Mon Sep 17 00:00:00 2001
+From f776cf5680942e0a03b1c6023851086fa0229a6c 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")
@@ -29,5 +29,5 @@ index 0000000..291321f
 +Touch=true
 +Buttons=0
 -- 
-2.41.0
+2.42.0
 
diff --git a/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch b/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch
index dd63fceb7538..6ac0813dee7a 100644
--- a/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch
+++ b/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch
@@ -1,4 +1,4 @@
-From 47abe9cbb71f9bf71fd904a206b8730076b1914a Mon Sep 17 00:00:00 2001
+From 33da22c5f8639c13d152c749cf71339d9caac622 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
@@ -30,5 +30,5 @@ index 0000000..6739b2c
 +Touch=true
 +Buttons=0
 -- 
-2.41.0
+2.42.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 0ef0da07ae3d..71a5045f1714 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Based on official Arch Linux PKGBUILD
 
 pkgname=libwacom-surface
-pkgver=2.7.0
-pkgrel=3
+pkgver=2.8.0
+pkgrel=1
 pkgdesc="Patched libwacom for Microsoft Surface devices"
 arch=('x86_64')
 url="https://github.com/linux-surface/libwacom"
@@ -38,24 +38,24 @@ source=(
     "0015-data-Add-Microsoft-Surface-Book-3-15.patch"
     "0016-data-Add-Microsoft-Surface-Laptop-Studio.patch"
 )
-sha256sums=('853929bd73fba2064b12142dbbee4b3bf84509197ff46a4da559eddf62d32cdf'
+sha256sums=('bb04b12c8688d0ff6a108d47a38d2057d572c4d7227d78138abd5fd0ba59f215'
             'SKIP'
-            '4fd78cf73f4f9c39f21cb63f084bf81d4d863d4bda9fcd98ef9a5c73d4e60ca1'
-            'de33c691c30e1e41d2bde9c4f1fd2c223e43929946a986c404837faf62979615'
-            'bf5813eaa28fa8ec237b7bd2c97084b32d4dc2e51516e1f7c4327eb97eb91ded'
-            'a03d5e2831fceb004dc1d996b5a2bc77f7635454b635acfac5269dbdc92f9fd8'
-            '82216bbd183d0814a9ade1420f44eddec94a48d28ed3f70301fc030975966aac'
-            'ce94a3d93c3d729a4146f97b8b74384e14df9bb99b50ce639c218b5c88798b8c'
-            '4c4d3af8b63d3099b3586911a1eb9aa1c83b1d50b5de5c1f6855cf08100d1fda'
-            'aa1285286eb685b2ea4f8869f5980bf85e5af15793c3c3f22fb4ddda241edba8'
-            'b2dfd6becc1f0abefe57c05b6a65f1428ec37d61cb4bca0ade92a55ccdba5ba8'
-            '5182fbd4e2bdd35cbc8aae2fb3786f633d4c97405aead570a00048699aa67bd9'
-            'd62497be1f8bc947a14b5e1e2be9ec3ed2b94634dd99a05947cc60f2604691d7'
-            '1cb35a7e0a022cc592c580bb8303a47b8e5e01d6e26cb0ac11e1b298fb540821'
-            'f9662bf7db56c1754dba855d20abb1eb13f0f0862dd703106d04d386c5a01899'
-            '04ca5078efaee5e9eb48dfe65dc39830bc26aebe1073250040b32defb64b2800'
-            '43e7d71db1e35ef75feffd0c6e4cc1639b0f8dc542014919bb1360b496120ca0'
-            '439ac1051eaf73e81d8f4b1ef02662808944eb92cd4a2fc2bb184ad376098cdd')
+            '0e00ada152317d16355cbfed8195397f3903f3d3448d19731d839367182d4cb6'
+            'a092cc857a665204fc0284865186fddc7e746f0e4217f1c55a128265929e101f'
+            '7380090427e166e2216742479925c44045cf914e3543615692850168d952f0c8'
+            '33e4867394903376f110b674cc0a0b777313dfb4c7ff3a487e11e3735b95c604'
+            '94903d479d0667870decdd57c51bee29d16feb199dc720844144e13745d77877'
+            'f70a3faf5797b3db86c51fd2bf75a3f7fb95087231e8c998b3ce5b8a009f08da'
+            '93931117dccec37684b8890e5ae28ac6c23e65517581e0269382252c81eeab2b'
+            '57abca80d9be9e4d93d5ba83be92a576d0fef5186efcbb213c92cb5fa85e8b5f'
+            '6886bd9f9a445830972d608f3edcd8381527c6ac553fcb4511559a2274ab4904'
+            '7096f0e8d5b57c5e20e0616be98b77f6f5d300d7913d2e224f8a2b968872765d'
+            'a61577739761a0730ed137cbd4c1151275ecabece7b9c35069e8de7fcf2786bc'
+            '16e4c0124cf126735c321f5b2fd51d303f079a8892727981b2221a36a7d93c8f'
+            'fe511c7ff2b39760aaee0617cedd7277cca4c49627fc476006bfb30bdd4bb35f'
+            '5c4acfc9565d7743686792e6637e28a54f28abd9ab5a05bda072e34fab7f5af7'
+            '227c278f19be81d8cd67556855b0e4e7bc0fd3059f9697b525506be2b076cfa9'
+            '79a11214181e0e912e77e9013c7f35f7a44fc2f839d331371a227e1563985151')
 
 prepare() {
     cd "libwacom-${pkgver}"
@@ -66,8 +66,9 @@ prepare() {
 }
 
 build() {
+    rm -rf build
     meson setup build "libwacom-${pkgver}" --prefix="/usr"
-    ninja -C build
+    meson compile -C build
 }
 
 check() {
@@ -77,6 +78,6 @@ check() {
 }
 
 package() {
-    DESTDIR="${pkgdir}" ninja install -C build
+    DESTDIR="${pkgdir}" meson install -C build
     install -D -m644 "libwacom-${pkgver}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }