Update to libwacom-1.9

14 files changed, 66 insertions, 103 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e8ce2745be1a..42716d339182 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libwacom-surface
 	pkgdesc = Patched libwacom for Microsoft Surface devices
-	pkgver = 1.8
-	pkgrel = 2
+	pkgver = 1.9
+	pkgrel = 1
 	url = https://github.com/linux-surface/libwacom
 	arch = x86_64
 	license = MIT
@@ -13,7 +13,7 @@ pkgbase = libwacom-surface
 	depends = glib2
 	depends = systemd
 	depends = libgudev
-	provides = libwacom=1.8
+	provides = libwacom=1.9
 	conflicts = libwacom
 	source = 0001-Add-support-for-BUS_VIRTUAL.patch
 	source = 0002-Add-support-for-Intel-Management-Engine-bus.patch
@@ -26,23 +26,21 @@ pkgbase = libwacom-surface
 	source = 0009-data-Add-Microsoft-Surface-Book-2-15.patch
 	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.8/libwacom-1.8.tar.bz2
-	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.8/libwacom-1.8.tar.bz2.sig
+	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.9/libwacom-1.9.tar.bz2
+	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.9/libwacom-1.9.tar.bz2.sig
 	validpgpkeys = 3C2C43D9447D5938EF4551EBE23B7E70B467F0BF
-	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 = bee93db7423a1250f24172e5409166116568e47fe951569f178bfe5ce06129a6
+	sha256sums = 6c41619a307cb1325997730fece7aacc0fce728b1c3f80244aa06289cf5611f3
+	sha256sums = 136233738a219c4ee24b293bfdf73e8de2211c14ce6321a60018ad02b7c56c57
+	sha256sums = 06a8b07b8446dc9d32bd0295e1b7c584f4d8e32840578366603e68b995bce6a7
+	sha256sums = af37d7ff44f201e6e7d2f90a8bea2fe1c162e9f1dab420b7e648d52a01549bb9
+	sha256sums = 2cd478c179d42174c3e44c319bb8eb759c0b7a1dd6792523296cfe607e6e6270
+	sha256sums = f464d6f4911545b2fc776defadd231f07289e7aab64ac47e5337072701736cca
+	sha256sums = cefffa6d243215b71c5029db72921c12ac5cfce6f0232d6b1017f0002b8e65fd
+	sha256sums = a8c887074b89f3a2349c9dbe47f2e6a5bd6e4aa0675882f6486fcd0cec4a8243
+	sha256sums = 6de413ca309288ef0daa4145db99cdc615ca5ac8b61250cf9ad336688a6bee97
+	sha256sums = 37384fdd70039443d5d81b77a9bdb6dd00fb4c1143e90f3272fbca1096aee0b1
+	sha256sums = 68b14d4e3b75fed9f590bf6eaea361a72dc23e933b7725094c779477acf665c7
 	sha256sums = SKIP
 
 pkgname = libwacom-surface
diff --git a/0001-Add-support-for-BUS_VIRTUAL.patch b/0001-Add-support-for-BUS_VIRTUAL.patch
index d2af71f60642..562b2f525e24 100644
--- a/0001-Add-support-for-BUS_VIRTUAL.patch
+++ b/0001-Add-support-for-BUS_VIRTUAL.patch
@@ -1,7 +1,7 @@
-From 4c28cc386d3cc5293b91b1b2384f03517e95f2a2 Mon Sep 17 00:00:00 2001
+From c0eaf576f68b2a34136a7c1c3977ff8531d37504 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/11] 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
@@ -32,7 +32,7 @@ index 5acdbac..cb5ca6d 100755
          assert re.match('[0-9a-f]{4}', vid), f'{tabletfile}: {vid} must be lowercase hex'
          assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
 diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
-index 9f2657b..7be5247 100644
+index d57ef2d..17571b6 100644
 --- a/libwacom/libwacom-database.c
 +++ b/libwacom/libwacom-database.c
 @@ -130,6 +130,8 @@ bus_from_str (const char *str)
@@ -101,5 +101,5 @@ index 9e5b02f..3883341 100644
  			g_assert_cmpint(pid, >, 0);
  			break;
 -- 
-2.30.0
+2.30.1
 
diff --git a/0002-Add-support-for-Intel-Management-Engine-bus.patch b/0002-Add-support-for-Intel-Management-Engine-bus.patch
index dd0869f23125..7868073347e6 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 77fab263bc722c9f800c29ca3cf3504be5a439be Mon Sep 17 00:00:00 2001
+From 02df4e0f272dff001ee280ab93e8e1c4600375ff 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/11] 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)
@@ -27,7 +27,7 @@ index cb5ca6d..466b18a 100755
          assert re.match('[0-9a-f]{4}', vid), f'{tabletfile}: {vid} must be lowercase hex'
          assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
 diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
-index 7be5247..37ffd37 100644
+index 17571b6..4c6df4e 100644
 --- a/libwacom/libwacom-database.c
 +++ b/libwacom/libwacom-database.c
 @@ -132,6 +132,8 @@ bus_from_str (const char *str)
@@ -96,5 +96,5 @@ index 3883341..352bc43 100644
  			g_assert_cmpint(pid, >, 0);
  			break;
 -- 
-2.30.0
+2.30.1
 
diff --git a/0003-data-Add-Microsoft-Surface-pro-4.patch b/0003-data-Add-Microsoft-Surface-pro-4.patch
index e6fed642ec5c..2fe0ed9292f2 100644
--- a/0003-data-Add-Microsoft-Surface-pro-4.patch
+++ b/0003-data-Add-Microsoft-Surface-pro-4.patch
@@ -1,7 +1,7 @@
-From 856500ea39de06e6fbd222f6cb24f50345f42e30 Mon Sep 17 00:00:00 2001
+From 29c9b7283741e717b61f07bdf14b678c13a6768d 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
+Subject: [PATCH 03/11] data: Add Microsoft Surface pro 4
 
 ---
  data/surface-pro4.tablet | 14 ++++++++++++++
@@ -29,5 +29,5 @@ index 0000000..1e0c67c
 +Touch=true
 +Buttons=0
 -- 
-2.30.0
+2.30.1
 
diff --git a/0004-data-Add-Microsoft-Surface-pro-5.patch b/0004-data-Add-Microsoft-Surface-pro-5.patch
index a3293f1a787a..ad295a54feec 100644
--- a/0004-data-Add-Microsoft-Surface-pro-5.patch
+++ b/0004-data-Add-Microsoft-Surface-pro-5.patch
@@ -1,7 +1,7 @@
-From 493a2052cfba381b87cd99b1ed03dd717a4af39e Mon Sep 17 00:00:00 2001
+From ccfc97812543a3db11a2c3dcd0ed25903730dfe3 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
+Subject: [PATCH 04/11] data: Add Microsoft Surface pro 5
 
 ---
  data/surface-pro5.tablet | 14 ++++++++++++++
@@ -29,5 +29,5 @@ index 0000000..b26af3a
 +Touch=true
 +Buttons=0
 -- 
-2.30.0
+2.30.1
 
diff --git a/0005-data-Add-Microsoft-Surface-pro-6.patch b/0005-data-Add-Microsoft-Surface-pro-6.patch
index 795f1ff6d08d..e5b28a73dd4b 100644
--- a/0005-data-Add-Microsoft-Surface-pro-6.patch
+++ b/0005-data-Add-Microsoft-Surface-pro-6.patch
@@ -1,7 +1,7 @@
-From 970b140cd5be9b5234296890d710564e53e748fb Mon Sep 17 00:00:00 2001
+From b378c3636c71c29470b8274de3e69f0fa3dbaa7e 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
+Subject: [PATCH 05/11] data: Add Microsoft Surface pro 6
 
 ---
  data/surface-pro6.tablet | 14 ++++++++++++++
@@ -29,5 +29,5 @@ index 0000000..e97fad8
 +Touch=true
 +Buttons=0
 -- 
-2.30.0
+2.30.1
 
diff --git a/0006-data-Add-Microsoft-Surface-pro-7.patch b/0006-data-Add-Microsoft-Surface-pro-7.patch
index 0ec2b07256e3..23f744e05c81 100644
--- a/0006-data-Add-Microsoft-Surface-pro-7.patch
+++ b/0006-data-Add-Microsoft-Surface-pro-7.patch
@@ -1,7 +1,7 @@
-From 816fc952863e780af66606aef526f29af0446633 Mon Sep 17 00:00:00 2001
+From 0b12a623e70d877fa6bf1df615d06229f7b2eb83 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
+Subject: [PATCH 06/11] data: Add Microsoft Surface pro 7
 
 ---
  data/surface-pro7.tablet | 14 ++++++++++++++
@@ -29,5 +29,5 @@ index 0000000..7961379
 +Touch=true
 +Buttons=0
 -- 
-2.30.0
+2.30.1
 
diff --git a/0007-data-Add-Microsoft-Surface-Book.patch b/0007-data-Add-Microsoft-Surface-Book.patch
index ee7e13d6206b..cd594b99786e 100644
--- a/0007-data-Add-Microsoft-Surface-Book.patch
+++ b/0007-data-Add-Microsoft-Surface-Book.patch
@@ -1,7 +1,7 @@
-From 9363815bb6c7d9956f6a9d9755328671f4ede5ae Mon Sep 17 00:00:00 2001
+From da5c0255ab397bc5537861f9b48d3036f2fc8e98 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
+Subject: [PATCH 07/11] data: Add Microsoft Surface Book
 
 ---
  data/surface-book.tablet | 14 ++++++++++++++
@@ -29,5 +29,5 @@ index 0000000..e2a5401
 +Touch=true
 +Buttons=0
 -- 
-2.30.0
+2.30.1
 
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 7049bbd0ea0b..2da32ddb03b8 100644
--- a/0008-data-Add-Microsoft-Surface-Book-2-13.5.patch
+++ b/0008-data-Add-Microsoft-Surface-Book-2-13.5.patch
@@ -1,7 +1,7 @@
-From f6878bf6718790af4870f82d071a89d745088020 Mon Sep 17 00:00:00 2001
+From 3779329faa2e5e4d974ef2ad92dee3e0a8c90888 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")
+Subject: [PATCH 08/11] 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.30.0
+2.30.1
 
diff --git a/0009-data-Add-Microsoft-Surface-Book-2-15.patch b/0009-data-Add-Microsoft-Surface-Book-2-15.patch
index 4a73b34b7c84..676ac5288809 100644
--- a/0009-data-Add-Microsoft-Surface-Book-2-15.patch
+++ b/0009-data-Add-Microsoft-Surface-Book-2-15.patch
@@ -1,7 +1,7 @@
-From 0e7554f7dfe9b36425ff057a470093897ed3de07 Mon Sep 17 00:00:00 2001
+From 13e81b74340251dba524b6f414e3452e93458929 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")
+Subject: [PATCH 09/11] 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.30.0
+2.30.1
 
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 b177052fb181..3013c7c43734 100644
--- a/0010-data-Add-Microsoft-Surface-Book-3-13.5.patch
+++ b/0010-data-Add-Microsoft-Surface-Book-3-13.5.patch
@@ -1,7 +1,7 @@
-From a329f65f0b326992f7238a33f3b25b247b20adf7 Mon Sep 17 00:00:00 2001
+From 84f8519285c39cf3b35175f94a38cd48b3a7d922 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")
+Subject: [PATCH 10/11] 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.30.0
+2.30.1
 
diff --git a/0011-data-Add-Microsoft-Surface-Book-3-15.patch b/0011-data-Add-Microsoft-Surface-Book-3-15.patch
index ec9025b42a43..41e25375fcc7 100644
--- a/0011-data-Add-Microsoft-Surface-Book-3-15.patch
+++ b/0011-data-Add-Microsoft-Surface-Book-3-15.patch
@@ -1,7 +1,7 @@
-From 05a9e0efc31b249a6bc7b2c998e2de666e7c11bb Mon Sep 17 00:00:00 2001
+From d105e4c6fd7512eefa4c703224a24cea19e0f457 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")
+Subject: [PATCH 11/11] 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.30.0
+2.30.1
 
diff --git a/0012-data-Add-Microsoft-Surface-Go.patch b/0012-data-Add-Microsoft-Surface-Go.patch
deleted file mode 100644
index 7556d275dbed..000000000000
--- a/0012-data-Add-Microsoft-Surface-Go.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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
-
----
- data/surface-go.tablet | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
- create mode 100644 data/surface-go.tablet
-
-diff --git a/data/surface-go.tablet b/data/surface-go.tablet
-new file mode 100644
-index 0000000..60a1e3d
---- /dev/null
-+++ b/data/surface-go.tablet
-@@ -0,0 +1,14 @@
-+# This is for the Microsoft Surface Go
-+
-+[Device]
-+Name=Microsoft Surface Go
-+Class=PenDisplay
-+DeviceMatch=i2c:04f3:261a
-+Width=8
-+Height=5
-+IntegratedIn=Display;System;
-+
-+[Features]
-+Stylus=true
-+Touch=true
-+Buttons=0
--- 
-2.30.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 13b05b82287d..06a569993c65 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Based on official Arch Linux PKGBUILD
 
 pkgname=libwacom-surface
-pkgver=1.8
-pkgrel=2
+pkgver=1.9
+pkgrel=1
 pkgdesc="Patched libwacom for Microsoft Surface devices"
 arch=('x86_64')
 url="https://github.com/linux-surface/libwacom"
@@ -27,22 +27,20 @@ source=(
     '0009-data-Add-Microsoft-Surface-Book-2-15.patch'
     '0010-data-Add-Microsoft-Surface-Book-3-13.5.patch'
     '0011-data-Add-Microsoft-Surface-Book-3-15.patch'
-    '0012-data-Add-Microsoft-Surface-Go.patch'
     "https://github.com/linuxwacom/libwacom/releases/download/libwacom-${pkgver}/libwacom-${pkgver}.tar.bz2"{,.sig}
 )
-sha256sums=('9d42ff25bb041cfcafa97c553b01373cad2d4fdc2d5ec1bcadfa30f724980872'
-            '07c75867f9386575ad40f22bcd53dced9eb806829c1945c94e98cd0947c86277'
-            '53dc7747c60b77a2595f738819335cf484e2f55fb8d5afcc2ac442d79b395a95'
-            'e22f9195513bac56f82e0869fd392f757ef2a80c12bee166b69fa6c7be1f63ea'
-            'f6b930bd7f89b0a6ee548fbcccae92a214feeca850cd1f2338a856c136ddd639'
-            '0f7ece1424585153757081a06db17408e7dbaada3e350f92d03cfb0dbb260e88'
-            '06d12286c3b710ab1120bc6bbf77f7342cf0354b122d2739a19f8ff84621f24e'
-            'a70fe06e3294e8b486e34bc608d8e3335c07f038300df8ddd2f905659314921d'
-            '7e6d55e081195334138fbc6a5a899cfce7a523142333219a5b84868de2ed8468'
-            '4a9851d180b7f456503e4e5a729f15274a940180354bbd389130a35c9c7c4ce4'
-            'e1e5bb3ea9780af290adfda4bcb45dc84d9ea486e0510e79a768cd0b5befb027'
-            'e1a74b313d6b265a7ba398633f56cfb39b0ae9fe8d206add9964a5e27ba13462'
-            '2e8075e60bbef74fe9c3539b0a0080efab28912b2552784d8b54dbbf1aaa63e5'
+sha256sums=('bee93db7423a1250f24172e5409166116568e47fe951569f178bfe5ce06129a6'
+            '6c41619a307cb1325997730fece7aacc0fce728b1c3f80244aa06289cf5611f3'
+            '136233738a219c4ee24b293bfdf73e8de2211c14ce6321a60018ad02b7c56c57'
+            '06a8b07b8446dc9d32bd0295e1b7c584f4d8e32840578366603e68b995bce6a7'
+            'af37d7ff44f201e6e7d2f90a8bea2fe1c162e9f1dab420b7e648d52a01549bb9'
+            '2cd478c179d42174c3e44c319bb8eb759c0b7a1dd6792523296cfe607e6e6270'
+            'f464d6f4911545b2fc776defadd231f07289e7aab64ac47e5337072701736cca'
+            'cefffa6d243215b71c5029db72921c12ac5cfce6f0232d6b1017f0002b8e65fd'
+            'a8c887074b89f3a2349c9dbe47f2e6a5bd6e4aa0675882f6486fcd0cec4a8243'
+            '6de413ca309288ef0daa4145db99cdc615ca5ac8b61250cf9ad336688a6bee97'
+            '37384fdd70039443d5d81b77a9bdb6dd00fb4c1143e90f3272fbca1096aee0b1'
+            '68b14d4e3b75fed9f590bf6eaea361a72dc23e933b7725094c779477acf665c7'
             'SKIP')
 
 prepare() {