Update to libwacom-1.11

13 files changed, 79 insertions, 80 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 25776589e0d9..295d3f37eb7f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libwacom-surface
 	pkgdesc = Patched libwacom for Microsoft Surface devices
-	pkgver = 1.10
+	pkgver = 1.11
 	pkgrel = 1
 	url = https://github.com/linux-surface/libwacom
 	arch = x86_64
@@ -13,7 +13,7 @@ pkgbase = libwacom-surface
 	depends = glib2
 	depends = systemd
 	depends = libgudev
-	provides = libwacom=1.10
+	provides = libwacom=1.11
 	conflicts = libwacom
 	source = 0001-Add-support-for-BUS_VIRTUAL.patch
 	source = 0002-Add-support-for-Intel-Management-Engine-bus.patch
@@ -26,22 +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 = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.10/libwacom-1.10.tar.bz2
-	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.10/libwacom-1.10.tar.bz2.sig
+	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.11/libwacom-1.11.tar.bz2
+	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.11/libwacom-1.11.tar.bz2.sig
 	validpgpkeys = 3C2C43D9447D5938EF4551EBE23B7E70B467F0BF
-	sha256sums = 8ac1314696fb3556232d6c43b524064a172c25dbf24f230a774c265ecb616050
-	sha256sums = fcc43235097142335f02bedfe3a77f6438896a0e28add68b515dae3b80e4fbfb
-	sha256sums = 6a69ae3499b04fdf3bd420fec348beda90ab572405c5ed48e57c1aa2fa134976
-	sha256sums = 70dc732f858f54c7ee8ec2ae23372e66a2cbc0a31bd0089aa9d2fdf171708cfb
-	sha256sums = 56e2b1af230e676f4ce275c7407ad1bc2aa08fbf502032d1c02356407530702c
-	sha256sums = 63e51707279045fbc92b7708e8afbc387fea8450a9e86cdd5e277c780296e4bc
-	sha256sums = 60ee616fa0daf70ca3b61eb6148b1a6a13158f8160ff7463bdd89b795cb29f29
-	sha256sums = 3e282597007a916428da5e80fd0b6b4ba19806cbf8e81f67f6ebae00391f7577
-	sha256sums = 2a3978b8ea48a66a01fb93463b56da7d91e491a23404632bcb5861cc48d08cdd
-	sha256sums = e52ac339ab225abcb2582d155e1f980dff93ab8cf5157ae950ded185980bd8e3
-	sha256sums = a651b98bce0714d6f5180daeb55b954e743522ccdbf7b1e4b0c1a842732caabd
-	sha256sums = f6c98c4597a786f967b3c02b9c93e40932a162cc4e279daf7abd4316b4265291
+	sha256sums = 2bcf289265e25bd50bfc0357e948f4058d8252f9bd24a83897c0c948c757c28d
+	sha256sums = 5f6261777bbff8efd75efc7680e0f9d18329095cee55e6bb41b4e20351179875
+	sha256sums = 8d371c20116671c79a6c88b356b0b6bf0707e009042667ea0fc08e7812a2a212
+	sha256sums = 2c15269817129353e081411a9a188c86a3c5ce20b57e9fb4df6862ed9b2b91ae
+	sha256sums = b7518a6c7d478e8d448befa3dd1940a91498ae1f3536ad5dbf82465174d1b2fe
+	sha256sums = aa3c7476b99b35b7eb433cf93d7e8ff0703cd18d412fc540795e5909e2fb862d
+	sha256sums = 51dbc18adbdc0ee2d76b5853931d1fcfb02291ac5a3c59986292fc8fc54ebd79
+	sha256sums = a5bd505bb6a6f6d65021a121520632193dd1fec99e579d06cc51b7dce15c593e
+	sha256sums = c77a23f9c1575f9549341306f01e35838561f375f22a4db2c524b8cf1a2d9434
+	sha256sums = 5ec8f76fcc3925c46fed5e604a86f0c5fe733b5edd40eec4c3dfcb3dc2712b2c
+	sha256sums = c866ce8e5138557b667dfe152f7296880715a514ce31c9540242780a541985c8
+	sha256sums = 4580a8fbad067a5b187abe864ab80d42d8138d0caec394533bec67bf457e4c58
 	sha256sums = SKIP
 
 pkgname = libwacom-surface
-
diff --git a/0001-Add-support-for-BUS_VIRTUAL.patch b/0001-Add-support-for-BUS_VIRTUAL.patch
index fa73f86c8f12..ff2e4c34f7cf 100644
--- a/0001-Add-support-for-BUS_VIRTUAL.patch
+++ b/0001-Add-support-for-BUS_VIRTUAL.patch
@@ -1,4 +1,4 @@
-From d9cc859360c07ed3baa3810bbd4f2074755dba5b Mon Sep 17 00:00:00 2001
+From 9c3f0916ffea701532f3512651792d5f87833330 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/11] Add support for BUS_VIRTUAL
@@ -12,26 +12,13 @@ as BUS_VIRTUAL.
 
 Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
 ---
- data/test_data_files.py      | 2 +-
  libwacom/libwacom-database.c | 4 ++++
  libwacom/libwacom.c          | 5 +++++
  libwacom/libwacom.h          | 1 +
  test/test-tablet-validity.c  | 1 +
+ test/test_data_files.py      | 2 +-
  5 files changed, 12 insertions(+), 1 deletion(-)
 
-diff --git a/data/test_data_files.py b/data/test_data_files.py
-index 1953ada..26d274f 100755
---- a/data/test_data_files.py
-+++ b/data/test_data_files.py
-@@ -34,7 +34,7 @@ def test_device_match(tabletfile):
-             continue
- 
-         bus, vid, pid = match.split(':')[:3]  # skip the name part of the match
--        assert bus in ['usb', 'bluetooth', 'i2c', 'serial'], f'{tabletfile}: unknown bus type'
-+        assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt'], f'{tabletfile}: unknown bus type'
-         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 a8987f7..3c7d0de 100644
 --- a/libwacom/libwacom-database.c
@@ -101,6 +88,19 @@ index 2095089..da5fe07 100644
  			g_assert_cmpint(vid, >, 0);
  			g_assert_cmpint(pid, >, 0);
  			break;
+diff --git a/test/test_data_files.py b/test/test_data_files.py
+index 3953b1e..734463f 100755
+--- a/test/test_data_files.py
++++ b/test/test_data_files.py
+@@ -41,7 +41,7 @@ def test_device_match(tabletfile):
+             continue
+ 
+         bus, vid, pid = match.split(':')[:3]  # skip the name part of the match
+-        assert bus in ['usb', 'bluetooth', 'i2c', 'serial'], f'{tabletfile}: unknown bus type'
++        assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt'], f'{tabletfile}: unknown bus type'
+         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'
+ 
 -- 
-2.31.1
+2.32.0
 
diff --git a/0002-Add-support-for-Intel-Management-Engine-bus.patch b/0002-Add-support-for-Intel-Management-Engine-bus.patch
index 82d75cccf549..7ecbc900241b 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 08eb08f64150fd93b178069d1109116cf90720de Mon Sep 17 00:00:00 2001
+From caf3690c0258119900c91d9595ad7c71896a580c 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/11] Add support for Intel Management Engine bus
@@ -7,26 +7,13 @@ Add support for devices connected via the Intel Management Engine (MEI).
 This is required to support IPTS based devices, such as (among others)
 the Microsoft Surface Books, Surface Pro 5 and 6, and Surface Laptops.
 ---
- data/test_data_files.py      | 2 +-
  libwacom/libwacom-database.c | 4 ++++
  libwacom/libwacom.c          | 5 +++++
  libwacom/libwacom.h          | 1 +
  test/test-tablet-validity.c  | 1 +
+ test/test_data_files.py      | 2 +-
  5 files changed, 12 insertions(+), 1 deletion(-)
 
-diff --git a/data/test_data_files.py b/data/test_data_files.py
-index 26d274f..bc92658 100755
---- a/data/test_data_files.py
-+++ b/data/test_data_files.py
-@@ -34,7 +34,7 @@ def test_device_match(tabletfile):
-             continue
- 
-         bus, vid, pid = match.split(':')[:3]  # skip the name part of the match
--        assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt'], f'{tabletfile}: unknown bus type'
-+        assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt', 'mei'], f'{tabletfile}: unknown bus type'
-         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 3c7d0de..28c0ac5 100644
 --- a/libwacom/libwacom-database.c
@@ -96,6 +83,19 @@ index da5fe07..6b45597 100644
  			g_assert_cmpint(vid, >, 0);
  			g_assert_cmpint(pid, >, 0);
  			break;
+diff --git a/test/test_data_files.py b/test/test_data_files.py
+index 734463f..c9c6312 100755
+--- a/test/test_data_files.py
++++ b/test/test_data_files.py
+@@ -41,7 +41,7 @@ def test_device_match(tabletfile):
+             continue
+ 
+         bus, vid, pid = match.split(':')[:3]  # skip the name part of the match
+-        assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt'], f'{tabletfile}: unknown bus type'
++        assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt', 'mei'], f'{tabletfile}: unknown bus type'
+         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'
+ 
 -- 
-2.31.1
+2.32.0
 
diff --git a/0003-data-Add-Microsoft-Surface-pro-4.patch b/0003-data-Add-Microsoft-Surface-pro-4.patch
index b6b48e3955f7..ea9cf3b72ecf 100644
--- a/0003-data-Add-Microsoft-Surface-pro-4.patch
+++ b/0003-data-Add-Microsoft-Surface-pro-4.patch
@@ -1,4 +1,4 @@
-From dacd69611f2659f3471bec57b37c842547121b30 Mon Sep 17 00:00:00 2001
+From f8cdf277f03f76f8b433f1185afd9ebf222e410d 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/11] data: Add Microsoft Surface pro 4
@@ -29,5 +29,5 @@ index 0000000..1e0c67c
 +Touch=true
 +Buttons=0
 -- 
-2.31.1
+2.32.0
 
diff --git a/0004-data-Add-Microsoft-Surface-pro-5.patch b/0004-data-Add-Microsoft-Surface-pro-5.patch
index 202b1c896c9d..540b0929ba1d 100644
--- a/0004-data-Add-Microsoft-Surface-pro-5.patch
+++ b/0004-data-Add-Microsoft-Surface-pro-5.patch
@@ -1,4 +1,4 @@
-From f1cf0375b3e8c2e3e2ffa9c1ecff6266e0defa47 Mon Sep 17 00:00:00 2001
+From ce2b91701ecc5e23eb6459bd809696904b7dc908 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/11] data: Add Microsoft Surface pro 5
@@ -29,5 +29,5 @@ index 0000000..b26af3a
 +Touch=true
 +Buttons=0
 -- 
-2.31.1
+2.32.0
 
diff --git a/0005-data-Add-Microsoft-Surface-pro-6.patch b/0005-data-Add-Microsoft-Surface-pro-6.patch
index 9f64da1b0c62..a35dfa5cb2e7 100644
--- a/0005-data-Add-Microsoft-Surface-pro-6.patch
+++ b/0005-data-Add-Microsoft-Surface-pro-6.patch
@@ -1,4 +1,4 @@
-From df44bc318ba3be62d71a02f7ae5f7945e1bc84d1 Mon Sep 17 00:00:00 2001
+From eb91fe238e9ff06a7c5eebfe1b1c9d6b2cc82978 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/11] data: Add Microsoft Surface pro 6
@@ -29,5 +29,5 @@ index 0000000..e97fad8
 +Touch=true
 +Buttons=0
 -- 
-2.31.1
+2.32.0
 
diff --git a/0006-data-Add-Microsoft-Surface-pro-7.patch b/0006-data-Add-Microsoft-Surface-pro-7.patch
index 3ed094098aa8..061cb447c86a 100644
--- a/0006-data-Add-Microsoft-Surface-pro-7.patch
+++ b/0006-data-Add-Microsoft-Surface-pro-7.patch
@@ -1,4 +1,4 @@
-From d7375f57f1ce83c43663d3dd3f9e8e7acd0642b4 Mon Sep 17 00:00:00 2001
+From 238255745b66eea534b14e71e960f338d46110bf 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/11] data: Add Microsoft Surface pro 7
@@ -29,5 +29,5 @@ index 0000000..7961379
 +Touch=true
 +Buttons=0
 -- 
-2.31.1
+2.32.0
 
diff --git a/0007-data-Add-Microsoft-Surface-Book.patch b/0007-data-Add-Microsoft-Surface-Book.patch
index 032a00e06214..ffcb39265e0c 100644
--- a/0007-data-Add-Microsoft-Surface-Book.patch
+++ b/0007-data-Add-Microsoft-Surface-Book.patch
@@ -1,4 +1,4 @@
-From 97a7c34729ac47a2589583356bce90db0f8dcdc0 Mon Sep 17 00:00:00 2001
+From 3fbb464b277d9b99ecbbdf8adbf8fe8549439879 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/11] data: Add Microsoft Surface Book
@@ -29,5 +29,5 @@ index 0000000..e2a5401
 +Touch=true
 +Buttons=0
 -- 
-2.31.1
+2.32.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 5462a8b4b3a6..b335a16bcc00 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 f2dc8dffdfc0d48fbdd5a12fe7faccf1ceebcdb8 Mon Sep 17 00:00:00 2001
+From c774a06073507c0dc8a4bd9708704fc4659f297a 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/11] data: Add Microsoft Surface Book 2 (13.5")
@@ -29,5 +29,5 @@ index 0000000..b13cb07
 +Touch=true
 +Buttons=0
 -- 
-2.31.1
+2.32.0
 
diff --git a/0009-data-Add-Microsoft-Surface-Book-2-15.patch b/0009-data-Add-Microsoft-Surface-Book-2-15.patch
index 7b8c3c7317ff..59c8546ba3b4 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 677edc8b43d57546f756e94d81f789bfddeb8541 Mon Sep 17 00:00:00 2001
+From bf1e694868b9e617bd89400687051fb64a5a3b05 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/11] data: Add Microsoft Surface Book 2 (15")
@@ -29,5 +29,5 @@ index 0000000..ad98cc7
 +Touch=true
 +Buttons=0
 -- 
-2.31.1
+2.32.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 325e7657bd7f..26ca26ccc034 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 5febbddb27f61c4b0bb2b2dc551c2dc6e3930c16 Mon Sep 17 00:00:00 2001
+From 3e34af3089b2e441ace7f172bfcc28cc4f9f0888 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/11] data: Add Microsoft Surface Book 3 (13.5")
@@ -29,5 +29,5 @@ index 0000000..a33c9cb
 +Touch=true
 +Buttons=0
 -- 
-2.31.1
+2.32.0
 
diff --git a/0011-data-Add-Microsoft-Surface-Book-3-15.patch b/0011-data-Add-Microsoft-Surface-Book-3-15.patch
index 15442c862c1d..84aee2a0b491 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 bccca7dd7b78c22c42234efcc74cd3d2acd4d3eb Mon Sep 17 00:00:00 2001
+From 9c9f8b985fd4ef893712c205987343b891973762 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/11] data: Add Microsoft Surface Book 3 (15")
@@ -29,5 +29,5 @@ index 0000000..291321f
 +Touch=true
 +Buttons=0
 -- 
-2.31.1
+2.32.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 22e81d883ab5..a07a6cbb6ed4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Based on official Arch Linux PKGBUILD
 
 pkgname=libwacom-surface
-pkgver=1.10
+pkgver=1.11
 pkgrel=1
 pkgdesc="Patched libwacom for Microsoft Surface devices"
 arch=('x86_64')
@@ -29,18 +29,18 @@ source=(
     '0011-data-Add-Microsoft-Surface-Book-3-15.patch'
     "https://github.com/linuxwacom/libwacom/releases/download/libwacom-${pkgver}/libwacom-${pkgver}.tar.bz2"{,.sig}
 )
-sha256sums=('8ac1314696fb3556232d6c43b524064a172c25dbf24f230a774c265ecb616050'
-            'fcc43235097142335f02bedfe3a77f6438896a0e28add68b515dae3b80e4fbfb'
-            '6a69ae3499b04fdf3bd420fec348beda90ab572405c5ed48e57c1aa2fa134976'
-            '70dc732f858f54c7ee8ec2ae23372e66a2cbc0a31bd0089aa9d2fdf171708cfb'
-            '56e2b1af230e676f4ce275c7407ad1bc2aa08fbf502032d1c02356407530702c'
-            '63e51707279045fbc92b7708e8afbc387fea8450a9e86cdd5e277c780296e4bc'
-            '60ee616fa0daf70ca3b61eb6148b1a6a13158f8160ff7463bdd89b795cb29f29'
-            '3e282597007a916428da5e80fd0b6b4ba19806cbf8e81f67f6ebae00391f7577'
-            '2a3978b8ea48a66a01fb93463b56da7d91e491a23404632bcb5861cc48d08cdd'
-            'e52ac339ab225abcb2582d155e1f980dff93ab8cf5157ae950ded185980bd8e3'
-            'a651b98bce0714d6f5180daeb55b954e743522ccdbf7b1e4b0c1a842732caabd'
-            'f6c98c4597a786f967b3c02b9c93e40932a162cc4e279daf7abd4316b4265291'
+sha256sums=('2bcf289265e25bd50bfc0357e948f4058d8252f9bd24a83897c0c948c757c28d'
+            '5f6261777bbff8efd75efc7680e0f9d18329095cee55e6bb41b4e20351179875'
+            '8d371c20116671c79a6c88b356b0b6bf0707e009042667ea0fc08e7812a2a212'
+            '2c15269817129353e081411a9a188c86a3c5ce20b57e9fb4df6862ed9b2b91ae'
+            'b7518a6c7d478e8d448befa3dd1940a91498ae1f3536ad5dbf82465174d1b2fe'
+            'aa3c7476b99b35b7eb433cf93d7e8ff0703cd18d412fc540795e5909e2fb862d'
+            '51dbc18adbdc0ee2d76b5853931d1fcfb02291ac5a3c59986292fc8fc54ebd79'
+            'a5bd505bb6a6f6d65021a121520632193dd1fec99e579d06cc51b7dce15c593e'
+            'c77a23f9c1575f9549341306f01e35838561f375f22a4db2c524b8cf1a2d9434'
+            '5ec8f76fcc3925c46fed5e604a86f0c5fe733b5edd40eec4c3dfcb3dc2712b2c'
+            'c866ce8e5138557b667dfe152f7296880715a514ce31c9540242780a541985c8'
+            '4580a8fbad067a5b187abe864ab80d42d8138d0caec394533bec67bf457e4c58'
             'SKIP')
 
 prepare() {