Skip to content

Commit abb9e52

Browse files
qzedqzed
committed
Update to libwacom-1.11
1 parent 6575c34 commit abb9e52

14 files changed

+61
-53
lines changed

‎0001-Add-support-for-BUS_VIRTUAL.patch‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From d9cc859360c07ed3baa3810bbd4f2074755dba5b Mon Sep 17 00:00:00 2001
1+
From 9c3f0916ffea701532f3512651792d5f87833330 Mon Sep 17 00:00:00 2001
22
From: Dorian Stoll <[email protected]>
33
Date: Sat, 27 Jun 2020 18:21:11 +0200
44
Subject: [PATCH 01/11] Add support for BUS_VIRTUAL
@@ -12,26 +12,13 @@ as BUS_VIRTUAL.
1212

1313
Signed-off-by: Dorian Stoll <[email protected]>
1414
---
15-
data/test_data_files.py | 2 +-
1615
libwacom/libwacom-database.c | 4 ++++
1716
libwacom/libwacom.c | 5 +++++
1817
libwacom/libwacom.h | 1 +
1918
test/test-tablet-validity.c | 1 +
19+
test/test_data_files.py | 2 +-
2020
5 files changed, 12 insertions(+), 1 deletion(-)
2121

22-
diff --git a/data/test_data_files.py b/data/test_data_files.py
23-
index 1953ada..26d274f 100755
24-
--- a/data/test_data_files.py
25-
+++ b/data/test_data_files.py
26-
@@ -34,7 +34,7 @@ def test_device_match(tabletfile):
27-
continue
28-
29-
bus, vid, pid = match.split(':')[:3] # skip the name part of the match
30-
- assert bus in ['usb', 'bluetooth', 'i2c', 'serial'], f'{tabletfile}: unknown bus type'
31-
+ assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt'], f'{tabletfile}: unknown bus type'
32-
assert re.match('[0-9a-f]{4}', vid), f'{tabletfile}: {vid} must be lowercase hex'
33-
assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
34-
3522
diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
3623
index a8987f7..3c7d0de 100644
3724
--- a/libwacom/libwacom-database.c
@@ -101,6 +88,19 @@ index 2095089..da5fe07 100644
10188
g_assert_cmpint(vid, >, 0);
10289
g_assert_cmpint(pid, >, 0);
10390
break;
91+
diff --git a/test/test_data_files.py b/test/test_data_files.py
92+
index 3953b1e..734463f 100755
93+
--- a/test/test_data_files.py
94+
+++ b/test/test_data_files.py
95+
@@ -41,7 +41,7 @@ def test_device_match(tabletfile):
96+
continue
97+
98+
bus, vid, pid = match.split(':')[:3] # skip the name part of the match
99+
- assert bus in ['usb', 'bluetooth', 'i2c', 'serial'], f'{tabletfile}: unknown bus type'
100+
+ assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt'], f'{tabletfile}: unknown bus type'
101+
assert re.match('[0-9a-f]{4}', vid), f'{tabletfile}: {vid} must be lowercase hex'
102+
assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
103+
104104
--
105-
2.31.1
105+
2.32.0
106106

‎0002-Add-support-for-Intel-Management-Engine-bus.patch‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 08eb08f64150fd93b178069d1109116cf90720de Mon Sep 17 00:00:00 2001
1+
From caf3690c0258119900c91d9595ad7c71896a580c Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <[email protected]>
33
Date: Sat, 1 Jun 2019 21:17:15 +0200
44
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).
77
This is required to support IPTS based devices, such as (among others)
88
the Microsoft Surface Books, Surface Pro 5 and 6, and Surface Laptops.
99
---
10-
data/test_data_files.py | 2 +-
1110
libwacom/libwacom-database.c | 4 ++++
1211
libwacom/libwacom.c | 5 +++++
1312
libwacom/libwacom.h | 1 +
1413
test/test-tablet-validity.c | 1 +
14+
test/test_data_files.py | 2 +-
1515
5 files changed, 12 insertions(+), 1 deletion(-)
1616

17-
diff --git a/data/test_data_files.py b/data/test_data_files.py
18-
index 26d274f..bc92658 100755
19-
--- a/data/test_data_files.py
20-
+++ b/data/test_data_files.py
21-
@@ -34,7 +34,7 @@ def test_device_match(tabletfile):
22-
continue
23-
24-
bus, vid, pid = match.split(':')[:3] # skip the name part of the match
25-
- assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt'], f'{tabletfile}: unknown bus type'
26-
+ assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt', 'mei'], f'{tabletfile}: unknown bus type'
27-
assert re.match('[0-9a-f]{4}', vid), f'{tabletfile}: {vid} must be lowercase hex'
28-
assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
29-
3017
diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
3118
index 3c7d0de..28c0ac5 100644
3219
--- a/libwacom/libwacom-database.c
@@ -96,6 +83,19 @@ index da5fe07..6b45597 100644
9683
g_assert_cmpint(vid, >, 0);
9784
g_assert_cmpint(pid, >, 0);
9885
break;
86+
diff --git a/test/test_data_files.py b/test/test_data_files.py
87+
index 734463f..c9c6312 100755
88+
--- a/test/test_data_files.py
89+
+++ b/test/test_data_files.py
90+
@@ -41,7 +41,7 @@ def test_device_match(tabletfile):
91+
continue
92+
93+
bus, vid, pid = match.split(':')[:3] # skip the name part of the match
94+
- assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt'], f'{tabletfile}: unknown bus type'
95+
+ assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt', 'mei'], f'{tabletfile}: unknown bus type'
96+
assert re.match('[0-9a-f]{4}', vid), f'{tabletfile}: {vid} must be lowercase hex'
97+
assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
98+
9999
--
100-
2.31.1
100+
2.32.0
101101

‎0003-data-Add-Microsoft-Surface-pro-4.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From dacd69611f2659f3471bec57b37c842547121b30 Mon Sep 17 00:00:00 2001
1+
From f8cdf277f03f76f8b433f1185afd9ebf222e410d Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <[email protected]>
33
Date: Tue, 18 Aug 2020 20:18:55 +0200
44
Subject: [PATCH 03/11] data: Add Microsoft Surface pro 4
@@ -29,5 +29,5 @@ index 0000000..1e0c67c
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.31.1
32+
2.32.0
3333

‎0004-data-Add-Microsoft-Surface-pro-5.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From f1cf0375b3e8c2e3e2ffa9c1ecff6266e0defa47 Mon Sep 17 00:00:00 2001
1+
From ce2b91701ecc5e23eb6459bd809696904b7dc908 Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <[email protected]>
33
Date: Tue, 18 Aug 2020 20:19:02 +0200
44
Subject: [PATCH 04/11] data: Add Microsoft Surface pro 5
@@ -29,5 +29,5 @@ index 0000000..b26af3a
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.31.1
32+
2.32.0
3333

‎0005-data-Add-Microsoft-Surface-pro-6.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From df44bc318ba3be62d71a02f7ae5f7945e1bc84d1 Mon Sep 17 00:00:00 2001
1+
From eb91fe238e9ff06a7c5eebfe1b1c9d6b2cc82978 Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <[email protected]>
33
Date: Tue, 18 Aug 2020 20:19:07 +0200
44
Subject: [PATCH 05/11] data: Add Microsoft Surface pro 6
@@ -29,5 +29,5 @@ index 0000000..e97fad8
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.31.1
32+
2.32.0
3333

‎0006-data-Add-Microsoft-Surface-pro-7.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From d7375f57f1ce83c43663d3dd3f9e8e7acd0642b4 Mon Sep 17 00:00:00 2001
1+
From 238255745b66eea534b14e71e960f338d46110bf Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <[email protected]>
33
Date: Tue, 18 Aug 2020 20:19:13 +0200
44
Subject: [PATCH 06/11] data: Add Microsoft Surface pro 7
@@ -29,5 +29,5 @@ index 0000000..7961379
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.31.1
32+
2.32.0
3333

‎0007-data-Add-Microsoft-Surface-Book.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 97a7c34729ac47a2589583356bce90db0f8dcdc0 Mon Sep 17 00:00:00 2001
1+
From 3fbb464b277d9b99ecbbdf8adbf8fe8549439879 Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <[email protected]>
33
Date: Tue, 18 Aug 2020 20:19:38 +0200
44
Subject: [PATCH 07/11] data: Add Microsoft Surface Book
@@ -29,5 +29,5 @@ index 0000000..e2a5401
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.31.1
32+
2.32.0
3333

‎0008-data-Add-Microsoft-Surface-Book-2-13.5.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From f2dc8dffdfc0d48fbdd5a12fe7faccf1ceebcdb8 Mon Sep 17 00:00:00 2001
1+
From c774a06073507c0dc8a4bd9708704fc4659f297a Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <[email protected]>
33
Date: Tue, 18 Aug 2020 20:20:04 +0200
44
Subject: [PATCH 08/11] data: Add Microsoft Surface Book 2 (13.5")
@@ -29,5 +29,5 @@ index 0000000..b13cb07
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.31.1
32+
2.32.0
3333

‎0009-data-Add-Microsoft-Surface-Book-2-15.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 677edc8b43d57546f756e94d81f789bfddeb8541 Mon Sep 17 00:00:00 2001
1+
From bf1e694868b9e617bd89400687051fb64a5a3b05 Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <[email protected]>
33
Date: Tue, 18 Aug 2020 20:20:13 +0200
44
Subject: [PATCH 09/11] data: Add Microsoft Surface Book 2 (15")
@@ -29,5 +29,5 @@ index 0000000..ad98cc7
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.31.1
32+
2.32.0
3333

‎0010-data-Add-Microsoft-Surface-Book-3-13.5.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 5febbddb27f61c4b0bb2b2dc551c2dc6e3930c16 Mon Sep 17 00:00:00 2001
1+
From 3e34af3089b2e441ace7f172bfcc28cc4f9f0888 Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <[email protected]>
33
Date: Tue, 18 Aug 2020 20:20:29 +0200
44
Subject: [PATCH 10/11] data: Add Microsoft Surface Book 3 (13.5")
@@ -29,5 +29,5 @@ index 0000000..a33c9cb
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.31.1
32+
2.32.0
3333

0 commit comments

Comments
 (0)