Update to libwacom-1.8

14 files changed, 60 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2bac3594f512..77cac70795be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libwacom-surface
 	pkgdesc = Patched libwacom for Microsoft Surface devices
-	pkgver = 1.7
+	pkgver = 1.8
 	pkgrel = 1
 	url = https://github.com/linux-surface/libwacom
 	arch = x86_64
@@ -10,7 +10,7 @@ pkgbase = libwacom-surface
 	depends = glib2
 	depends = systemd
 	depends = libgudev
-	provides = libwacom=1.7
+	provides = libwacom=1.8
 	conflicts = libwacom
 	source = 0001-Add-support-for-BUS_VIRTUAL.patch
 	source = 0002-Add-support-for-Intel-Management-Engine-bus.patch
@@ -24,22 +24,22 @@ pkgbase = libwacom-surface
 	source = 0010-data-Add-Microsoft-Surface-Book-3-13.5.patch
 	source = 0011-data-Add-Microsoft-Surface-Book-3-15.patch
 	source = 0012-data-Add-Microsoft-Surface-Go.patch
-	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.7/libwacom-1.7.tar.bz2
-	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.7/libwacom-1.7.tar.bz2.sig
+	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.8/libwacom-1.8.tar.bz2
+	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.8/libwacom-1.8.tar.bz2.sig
 	validpgpkeys = 3C2C43D9447D5938EF4551EBE23B7E70B467F0BF
-	sha256sums = 717886cb815bfb7393fb3163615c72d2bfda76f924e1e48c0852d4a667af0323
-	sha256sums = c337255d52f42107b05be6e7ebf38c1797ba8eac209ae94aec08a5a876659a4c
-	sha256sums = dcc39c283c461c600868a6e82445577811e1c5b0a967b51c054c99571421d170
-	sha256sums = c103ed241afe5618c0b6b67664eb7b0ab28f976edc7f921383f4a89ffd5005eb
-	sha256sums = d041d860b7f1baca20d3d79908e690931671f62f2207b9ed9ddebf36fbce97ed
-	sha256sums = 60bfcc69740e3363ebf3b8934737765b584557cf02cc0a5ba135a91abe92146d
-	sha256sums = 4f1319251911a57559f8b0d0eb073f07e79e71e1e30ec9aff26639eb044ee9cb
-	sha256sums = 7d317b1a73522083956900d606f7414301c596542a2c420526c5b106f71642bc
-	sha256sums = 5c390a438360affdea4b0a2cb866734a0ccc3725bbac54b617a0118a76a1a9ed
-	sha256sums = b81f1ca39996e4c49cdec80c2c395e158d60ac46ed7a223665976180c8c934ee
-	sha256sums = 7e6ae8b0a3d5382258ecb42a482ac0dfed1fd148edb4b2f5c0980f391442ab9a
-	sha256sums = 53ed7707cc9a31ac1ee9e326fe499126a5b61c787adf1f1dc28d709159539666
-	sha256sums = 3c875f3bc88c6291528be98bc549e672a0b68640c9cb889d14efb552007b271d
+	sha256sums = 9d42ff25bb041cfcafa97c553b01373cad2d4fdc2d5ec1bcadfa30f724980872
+	sha256sums = 07c75867f9386575ad40f22bcd53dced9eb806829c1945c94e98cd0947c86277
+	sha256sums = 53dc7747c60b77a2595f738819335cf484e2f55fb8d5afcc2ac442d79b395a95
+	sha256sums = e22f9195513bac56f82e0869fd392f757ef2a80c12bee166b69fa6c7be1f63ea
+	sha256sums = f6b930bd7f89b0a6ee548fbcccae92a214feeca850cd1f2338a856c136ddd639
+	sha256sums = 0f7ece1424585153757081a06db17408e7dbaada3e350f92d03cfb0dbb260e88
+	sha256sums = 06d12286c3b710ab1120bc6bbf77f7342cf0354b122d2739a19f8ff84621f24e
+	sha256sums = a70fe06e3294e8b486e34bc608d8e3335c07f038300df8ddd2f905659314921d
+	sha256sums = 7e6d55e081195334138fbc6a5a899cfce7a523142333219a5b84868de2ed8468
+	sha256sums = 4a9851d180b7f456503e4e5a729f15274a940180354bbd389130a35c9c7c4ce4
+	sha256sums = e1e5bb3ea9780af290adfda4bcb45dc84d9ea486e0510e79a768cd0b5befb027
+	sha256sums = e1a74b313d6b265a7ba398633f56cfb39b0ae9fe8d206add9964a5e27ba13462
+	sha256sums = 2e8075e60bbef74fe9c3539b0a0080efab28912b2552784d8b54dbbf1aaa63e5
 	sha256sums = SKIP
 
 pkgname = libwacom-surface
diff --git a/0001-Add-support-for-BUS_VIRTUAL.patch b/0001-Add-support-for-BUS_VIRTUAL.patch
index 2f3ffa8dc8ef..d2af71f60642 100644
--- a/0001-Add-support-for-BUS_VIRTUAL.patch
+++ b/0001-Add-support-for-BUS_VIRTUAL.patch
@@ -1,4 +1,4 @@
-From e5810a27408a5578c892ef77c889d964b8e2a867 Mon Sep 17 00:00:00 2001
+From 4c28cc386d3cc5293b91b1b2384f03517e95f2a2 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
@@ -101,5 +101,5 @@ index 9e5b02f..3883341 100644
  			g_assert_cmpint(pid, >, 0);
  			break;
 -- 
-2.29.2
+2.30.0
 
diff --git a/0002-Add-support-for-Intel-Management-Engine-bus.patch b/0002-Add-support-for-Intel-Management-Engine-bus.patch
index db0b3e874bfc..dd0869f23125 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 dc3f22ed257f40bb2eb086f5379208e4400e8530 Mon Sep 17 00:00:00 2001
+From 77fab263bc722c9f800c29ca3cf3504be5a439be 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
@@ -96,5 +96,5 @@ index 3883341..352bc43 100644
  			g_assert_cmpint(pid, >, 0);
  			break;
 -- 
-2.29.2
+2.30.0
 
diff --git a/0003-data-Add-Microsoft-Surface-pro-4.patch b/0003-data-Add-Microsoft-Surface-pro-4.patch
index 800806210435..e6fed642ec5c 100644
--- a/0003-data-Add-Microsoft-Surface-pro-4.patch
+++ b/0003-data-Add-Microsoft-Surface-pro-4.patch
@@ -1,4 +1,4 @@
-From 146233c4818ab6bb41b19eb91aa7f5b228ac26e8 Mon Sep 17 00:00:00 2001
+From 856500ea39de06e6fbd222f6cb24f50345f42e30 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:18:55 +0200
 Subject: [PATCH 03/12] data: Add Microsoft Surface pro 4
@@ -29,5 +29,5 @@ index 0000000..1e0c67c
 +Touch=true
 +Buttons=0
 -- 
-2.29.2
+2.30.0
 
diff --git a/0004-data-Add-Microsoft-Surface-pro-5.patch b/0004-data-Add-Microsoft-Surface-pro-5.patch
index 29bca358dae1..a3293f1a787a 100644
--- a/0004-data-Add-Microsoft-Surface-pro-5.patch
+++ b/0004-data-Add-Microsoft-Surface-pro-5.patch
@@ -1,4 +1,4 @@
-From 39fa36b6378be6090321f304477e5e2112c830a1 Mon Sep 17 00:00:00 2001
+From 493a2052cfba381b87cd99b1ed03dd717a4af39e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:02 +0200
 Subject: [PATCH 04/12] data: Add Microsoft Surface pro 5
@@ -29,5 +29,5 @@ index 0000000..b26af3a
 +Touch=true
 +Buttons=0
 -- 
-2.29.2
+2.30.0
 
diff --git a/0005-data-Add-Microsoft-Surface-pro-6.patch b/0005-data-Add-Microsoft-Surface-pro-6.patch
index 0885add6feaa..795f1ff6d08d 100644
--- a/0005-data-Add-Microsoft-Surface-pro-6.patch
+++ b/0005-data-Add-Microsoft-Surface-pro-6.patch
@@ -1,4 +1,4 @@
-From b9027ca78c80b82434a4c22f38b706c55bc9c03b Mon Sep 17 00:00:00 2001
+From 970b140cd5be9b5234296890d710564e53e748fb Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:07 +0200
 Subject: [PATCH 05/12] data: Add Microsoft Surface pro 6
@@ -29,5 +29,5 @@ index 0000000..e97fad8
 +Touch=true
 +Buttons=0
 -- 
-2.29.2
+2.30.0
 
diff --git a/0006-data-Add-Microsoft-Surface-pro-7.patch b/0006-data-Add-Microsoft-Surface-pro-7.patch
index 8fe772f7ccca..0ec2b07256e3 100644
--- a/0006-data-Add-Microsoft-Surface-pro-7.patch
+++ b/0006-data-Add-Microsoft-Surface-pro-7.patch
@@ -1,4 +1,4 @@
-From 94d3588f4375f0121c5b602db33d02c87a0f6190 Mon Sep 17 00:00:00 2001
+From 816fc952863e780af66606aef526f29af0446633 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:13 +0200
 Subject: [PATCH 06/12] data: Add Microsoft Surface pro 7
@@ -29,5 +29,5 @@ index 0000000..7961379
 +Touch=true
 +Buttons=0
 -- 
-2.29.2
+2.30.0
 
diff --git a/0007-data-Add-Microsoft-Surface-Book.patch b/0007-data-Add-Microsoft-Surface-Book.patch
index 6ca48522ef00..ee7e13d6206b 100644
--- a/0007-data-Add-Microsoft-Surface-Book.patch
+++ b/0007-data-Add-Microsoft-Surface-Book.patch
@@ -1,4 +1,4 @@
-From c4910de17af81cb510d84a0c783a0f5ed484a63c Mon Sep 17 00:00:00 2001
+From 9363815bb6c7d9956f6a9d9755328671f4ede5ae Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:38 +0200
 Subject: [PATCH 07/12] data: Add Microsoft Surface Book
@@ -29,5 +29,5 @@ index 0000000..e2a5401
 +Touch=true
 +Buttons=0
 -- 
-2.29.2
+2.30.0
 
diff --git a/0008-data-Add-Microsoft-Surface-Book-2-13.5.patch b/0008-data-Add-Microsoft-Surface-Book-2-13.5.patch
index 076a2953d589..7049bbd0ea0b 100644
--- a/0008-data-Add-Microsoft-Surface-Book-2-13.5.patch
+++ b/0008-data-Add-Microsoft-Surface-Book-2-13.5.patch
@@ -1,4 +1,4 @@
-From 91ac17c9ff9d0930a164fa674b159890f74b2bf8 Mon Sep 17 00:00:00 2001
+From f6878bf6718790af4870f82d071a89d745088020 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:04 +0200
 Subject: [PATCH 08/12] data: Add Microsoft Surface Book 2 (13.5")
@@ -29,5 +29,5 @@ index 0000000..b13cb07
 +Touch=true
 +Buttons=0
 -- 
-2.29.2
+2.30.0
 
diff --git a/0009-data-Add-Microsoft-Surface-Book-2-15.patch b/0009-data-Add-Microsoft-Surface-Book-2-15.patch
index 3dd8506455dc..4a73b34b7c84 100644
--- a/0009-data-Add-Microsoft-Surface-Book-2-15.patch
+++ b/0009-data-Add-Microsoft-Surface-Book-2-15.patch
@@ -1,4 +1,4 @@
-From daa169c373e1a541bf9d752371581b32de5c5fad Mon Sep 17 00:00:00 2001
+From 0e7554f7dfe9b36425ff057a470093897ed3de07 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:13 +0200
 Subject: [PATCH 09/12] data: Add Microsoft Surface Book 2 (15")
@@ -29,5 +29,5 @@ index 0000000..ad98cc7
 +Touch=true
 +Buttons=0
 -- 
-2.29.2
+2.30.0
 
diff --git a/0010-data-Add-Microsoft-Surface-Book-3-13.5.patch b/0010-data-Add-Microsoft-Surface-Book-3-13.5.patch
index 501c9825bf8e..b177052fb181 100644
--- a/0010-data-Add-Microsoft-Surface-Book-3-13.5.patch
+++ b/0010-data-Add-Microsoft-Surface-Book-3-13.5.patch
@@ -1,4 +1,4 @@
-From 5362189bdb53ec688c633fef60b246b58a9734cd Mon Sep 17 00:00:00 2001
+From a329f65f0b326992f7238a33f3b25b247b20adf7 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:29 +0200
 Subject: [PATCH 10/12] data: Add Microsoft Surface Book 3 (13.5")
@@ -29,5 +29,5 @@ index 0000000..a33c9cb
 +Touch=true
 +Buttons=0
 -- 
-2.29.2
+2.30.0
 
diff --git a/0011-data-Add-Microsoft-Surface-Book-3-15.patch b/0011-data-Add-Microsoft-Surface-Book-3-15.patch
index 1284915f4d57..ec9025b42a43 100644
--- a/0011-data-Add-Microsoft-Surface-Book-3-15.patch
+++ b/0011-data-Add-Microsoft-Surface-Book-3-15.patch
@@ -1,4 +1,4 @@
-From 28c63f47f1b2cbc913994d10d3115722ea0492e9 Mon Sep 17 00:00:00 2001
+From 05a9e0efc31b249a6bc7b2c998e2de666e7c11bb Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:42 +0200
 Subject: [PATCH 11/12] data: Add Microsoft Surface Book 3 (15")
@@ -29,5 +29,5 @@ index 0000000..291321f
 +Touch=true
 +Buttons=0
 -- 
-2.29.2
+2.30.0
 
diff --git a/0012-data-Add-Microsoft-Surface-Go.patch b/0012-data-Add-Microsoft-Surface-Go.patch
index bc7d9a50814d..7556d275dbed 100644
--- a/0012-data-Add-Microsoft-Surface-Go.patch
+++ b/0012-data-Add-Microsoft-Surface-Go.patch
@@ -1,4 +1,4 @@
-From 9a6ad48ee884b28e077450eba4121d712938c8f0 Mon Sep 17 00:00:00 2001
+From 183b9b76421d8520c37a7657786579c34af46d0e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:56 +0200
 Subject: [PATCH 12/12] data: Add Microsoft Surface Go
@@ -29,5 +29,5 @@ index 0000000..60a1e3d
 +Touch=true
 +Buttons=0
 -- 
-2.29.2
+2.30.0
 
diff --git a/PKGBUILD b/PKGBUILD
index a2947fce3a58..8c46bce3f6f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Based on official Arch Linux PKGBUILD
 
 pkgname=libwacom-surface
-pkgver=1.7
+pkgver=1.8
 pkgrel=1
 pkgdesc="Patched libwacom for Microsoft Surface devices"
 arch=('x86_64')
@@ -29,19 +29,19 @@ source=(
     '0012-data-Add-Microsoft-Surface-Go.patch'
     "https://github.com/linuxwacom/libwacom/releases/download/libwacom-${pkgver}/libwacom-${pkgver}.tar.bz2"{,.sig}
 )
-sha256sums=('717886cb815bfb7393fb3163615c72d2bfda76f924e1e48c0852d4a667af0323'
-            'c337255d52f42107b05be6e7ebf38c1797ba8eac209ae94aec08a5a876659a4c'
-            'dcc39c283c461c600868a6e82445577811e1c5b0a967b51c054c99571421d170'
-            'c103ed241afe5618c0b6b67664eb7b0ab28f976edc7f921383f4a89ffd5005eb'
-            'd041d860b7f1baca20d3d79908e690931671f62f2207b9ed9ddebf36fbce97ed'
-            '60bfcc69740e3363ebf3b8934737765b584557cf02cc0a5ba135a91abe92146d'
-            '4f1319251911a57559f8b0d0eb073f07e79e71e1e30ec9aff26639eb044ee9cb'
-            '7d317b1a73522083956900d606f7414301c596542a2c420526c5b106f71642bc'
-            '5c390a438360affdea4b0a2cb866734a0ccc3725bbac54b617a0118a76a1a9ed'
-            'b81f1ca39996e4c49cdec80c2c395e158d60ac46ed7a223665976180c8c934ee'
-            '7e6ae8b0a3d5382258ecb42a482ac0dfed1fd148edb4b2f5c0980f391442ab9a'
-            '53ed7707cc9a31ac1ee9e326fe499126a5b61c787adf1f1dc28d709159539666'
-            '3c875f3bc88c6291528be98bc549e672a0b68640c9cb889d14efb552007b271d'
+sha256sums=('9d42ff25bb041cfcafa97c553b01373cad2d4fdc2d5ec1bcadfa30f724980872'
+            '07c75867f9386575ad40f22bcd53dced9eb806829c1945c94e98cd0947c86277'
+            '53dc7747c60b77a2595f738819335cf484e2f55fb8d5afcc2ac442d79b395a95'
+            'e22f9195513bac56f82e0869fd392f757ef2a80c12bee166b69fa6c7be1f63ea'
+            'f6b930bd7f89b0a6ee548fbcccae92a214feeca850cd1f2338a856c136ddd639'
+            '0f7ece1424585153757081a06db17408e7dbaada3e350f92d03cfb0dbb260e88'
+            '06d12286c3b710ab1120bc6bbf77f7342cf0354b122d2739a19f8ff84621f24e'
+            'a70fe06e3294e8b486e34bc608d8e3335c07f038300df8ddd2f905659314921d'
+            '7e6d55e081195334138fbc6a5a899cfce7a523142333219a5b84868de2ed8468'
+            '4a9851d180b7f456503e4e5a729f15274a940180354bbd389130a35c9c7c4ce4'
+            'e1e5bb3ea9780af290adfda4bcb45dc84d9ea486e0510e79a768cd0b5befb027'
+            'e1a74b313d6b265a7ba398633f56cfb39b0ae9fe8d206add9964a5e27ba13462'
+            '2e8075e60bbef74fe9c3539b0a0080efab28912b2552784d8b54dbbf1aaa63e5'
             'SKIP')
 
 prepare() {
@@ -53,21 +53,15 @@ prepare() {
 }
 
 build() {
-    cd "libwacom-${pkgver}"
-    ./configure --prefix="/usr"
-    make
+    meson build "libwacom-${pkgver}" --prefix="/usr"
+    ninja -C build
 }
 
 check() {
-    cd "libwacom-${pkgver}"
-    make check
+    ninja test -C build
 }
 
 package() {
-    cd "libwacom-${pkgver}"
-    make DESTDIR="$pkgdir" install
-    install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    install -m755 -d "${pkgdir}"/usr/lib/udev/rules.d
-    cd tools
-    ./generate-hwdb > "${pkgdir}"/usr/lib/udev/hwdb.d/65-libwacom.hwdb
+    DESTDIR="${pkgdir}" ninja install -C build
+    install -D -m644 "libwacom-${pkgver}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }