Update to libwacom-2.7.0

Author: qzed

patches/v2/0001-Add-support-for-BUS_VIRTUAL.patch

@@ -1,4 +1,4 @@
-From a7475cd68d1e76d74bdb192652bdd5b7a879f1d7 Mon Sep 17 00:00:00 2001
+From 6fe89a80a28042bc57fd625ad82181e4092b95f2 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <[email protected]>
 Date: Sat, 27 Jun 2020 18:21:11 +0200
 Subject: [PATCH 01/12] Add support for BUS_VIRTUAL
@@ -16,8 +16,8 @@ Signed-off-by: Dorian Stoll <[email protected]>
  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(-)
+ test/test_data_files.py      | 1 +
+ 5 files changed, 12 insertions(+)
 
 diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
 index 804ac3d..96aaa5e 100644
@@ -89,18 +89,17 @@ index 2095089..da5fe07 100644
  			g_assert_cmpint(pid, >, 0);
  			break;
 diff --git a/test/test_data_files.py b/test/test_data_files.py
-index d732bd1..4b21b6a 100755
+index c2db899..476aeca 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'
- 
+@@ -46,6 +46,7 @@ def test_device_match(tabletfile):
+             "bluetooth",
+             "i2c",
+             "serial",
++            "virt",
+         ], f"{tabletfile}: unknown bus type"
+         assert re.match(
+             "[0-9a-f]{4}", vid
 -- 
-2.39.1
+2.40.1
 

patches/v2/0002-Add-support-for-Intel-Management-Engine-bus.patch

@@ -1,4 +1,4 @@
-From df9f3dc3b76fac2dae92e53250cc5ed8ed8f4c8a Mon Sep 17 00:00:00 2001
+From 10ef0701cdde200063a73b3db5bfb305a12909c2 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Sat, 1 Jun 2019 21:17:15 +0200
 Subject: [PATCH 02/12] Add support for Intel Management Engine bus
@@ -11,8 +11,8 @@ the Microsoft Surface Books, Surface Pro 5 and 6, and Surface Laptops.
  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(-)
+ test/test_data_files.py      | 1 +
+ 5 files changed, 12 insertions(+)
 
 diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
 index 96aaa5e..cc3ecfd 100644
@@ -84,18 +84,17 @@ index da5fe07..6b45597 100644
  			g_assert_cmpint(pid, >, 0);
  			break;
 diff --git a/test/test_data_files.py b/test/test_data_files.py
-index 4b21b6a..04a1310 100755
+index 476aeca..cc739dd 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'
- 
+@@ -47,6 +47,7 @@ def test_device_match(tabletfile):
+             "i2c",
+             "serial",
+             "virt",
++            "mei",
+         ], f"{tabletfile}: unknown bus type"
+         assert re.match(
+             "[0-9a-f]{4}", vid
 -- 
-2.39.1
+2.40.1
 

patches/v2/0003-data-Add-Microsoft-Surface-Pro-3.patch

@@ -1,4 +1,4 @@
-From f0bef3c18c6050f7fd3151a8dc504f777966bef3 Mon Sep 17 00:00:00 2001
+From 77664bc3c0be343b8e6acddb5bcb18bfb591da24 Mon Sep 17 00:00:00 2001
 From: "Antony Jordan (Tablet)" <[email protected]>
 Date: Wed, 8 Jun 2022 22:03:33 +0200
 Subject: [PATCH 03/12] data: Add Microsoft Surface Pro 3
@@ -29,5 +29,5 @@ index 0000000..3238d43
 +Touch=true
 +Buttons=0
 -- 
-2.39.1
+2.40.1
 

patches/v2/0004-data-Add-Microsoft-Surface-Pro-4.patch

@@ -1,4 +1,4 @@
-From 30c13b66db3ab0d7037bfed649eb018dce6d64d4 Mon Sep 17 00:00:00 2001
+From fa3a6c733c16529098f5a5066eb8fd3051177d8f Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:18:55 +0200
 Subject: [PATCH 04/12] data: Add Microsoft Surface Pro 4
@@ -29,5 +29,5 @@ index 0000000..1e0c67c
 +Touch=true
 +Buttons=0
 -- 
-2.39.1
+2.40.1
 

patches/v2/0005-data-Add-Microsoft-Surface-Pro-5.patch

@@ -1,4 +1,4 @@
-From 435890e807f4af7bedd4977627b305b8e448b1b2 Mon Sep 17 00:00:00 2001
+From c1e48260b343e6616f1106ff4769ad11e9a0948b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:19:02 +0200
 Subject: [PATCH 05/12] data: Add Microsoft Surface Pro 5
@@ -29,5 +29,5 @@ index 0000000..b26af3a
 +Touch=true
 +Buttons=0
 -- 
-2.39.1
+2.40.1
 

patches/v2/0006-data-Add-Microsoft-Surface-Pro-6.patch

@@ -1,4 +1,4 @@
-From 73304fe135721875de0bef2dbbde32285a81c4c3 Mon Sep 17 00:00:00 2001
+From ccacedf0af12ab54bfaacb7f286cf7611d52f2c4 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:19:07 +0200
 Subject: [PATCH 06/12] data: Add Microsoft Surface Pro 6
@@ -29,5 +29,5 @@ index 0000000..e97fad8
 +Touch=true
 +Buttons=0
 -- 
-2.39.1
+2.40.1
 

patches/v2/0007-data-Add-Microsoft-Surface-Pro-7.patch

@@ -1,4 +1,4 @@
-From 3dc12d92bd13fd38501e9bb2f6b3e1cc3b94ce5a Mon Sep 17 00:00:00 2001
+From 21fa2ae7428ae749938aef68a8498f23017bf4d0 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:19:13 +0200
 Subject: [PATCH 07/12] data: Add Microsoft Surface Pro 7
@@ -29,5 +29,5 @@ index 0000000..7961379
 +Touch=true
 +Buttons=0
 -- 
-2.39.1
+2.40.1
 

patches/v2/0008-data-Add-Microsoft-Surface-Book.patch

@@ -1,4 +1,4 @@
-From 1f047efd4bd7ab1d77b99d079bde082463ee47f0 Mon Sep 17 00:00:00 2001
+From 45d559ed17e818fd4bd26966c3b4c3fb833ad23b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:19:38 +0200
 Subject: [PATCH 08/12] data: Add Microsoft Surface Book
@@ -29,5 +29,5 @@ index 0000000..e2a5401
 +Touch=true
 +Buttons=0
 -- 
-2.39.1
+2.40.1
 

patches/v2/0009-data-Add-Microsoft-Surface-Book-2-13.5.patch

@@ -1,4 +1,4 @@
-From 65e4bca15a972b86e1fdb8efb00ba6f0f3c89367 Mon Sep 17 00:00:00 2001
+From cad8b471eb747cdc53da8a8a16976352921e6fe2 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:20:04 +0200
 Subject: [PATCH 09/12] data: Add Microsoft Surface Book 2 (13.5")
@@ -29,5 +29,5 @@ index 0000000..b13cb07
 +Touch=true
 +Buttons=0
 -- 
-2.39.1
+2.40.1
 

patches/v2/0010-data-Add-Microsoft-Surface-Book-2-15.patch

@@ -1,4 +1,4 @@
-From e0969b521e5ec1ee8563fe9ba1e1b61386ace57a Mon Sep 17 00:00:00 2001
+From ff81b9f652459ccef960516c2381bfc3cbe1d519 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:20:13 +0200
 Subject: [PATCH 10/12] data: Add Microsoft Surface Book 2 (15")
@@ -29,5 +29,5 @@ index 0000000..ad98cc7
 +Touch=true
 +Buttons=0
 -- 
-2.39.1
+2.40.1