Skip to content

Commit 12628e0

Browse files
qzedqzed
committed
Update to libwacom-1.7
1 parent f721fd5 commit 12628e0

16 files changed

+106
-41
lines changed

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

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 232486e70e95297ac1e5f9cb32974f69e762c93f Mon Sep 17 00:00:00 2001
1+
From e5810a27408a5578c892ef77c889d964b8e2a867 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/12] Add support for BUS_VIRTUAL
@@ -12,12 +12,25 @@ as BUS_VIRTUAL.
1212

1313
Signed-off-by: Dorian Stoll <[email protected]>
1414
---
15+
data/test_data_files.py | 2 +-
1516
libwacom/libwacom-database.c | 4 ++++
1617
libwacom/libwacom.c | 5 +++++
1718
libwacom/libwacom.h | 1 +
1819
test/test-tablet-validity.c | 1 +
19-
4 files changed, 11 insertions(+)
20+
5 files changed, 12 insertions(+), 1 deletion(-)
2021

22+
diff --git a/data/test_data_files.py b/data/test_data_files.py
23+
index 5acdbac..cb5ca6d 100755
24+
--- a/data/test_data_files.py
25+
+++ b/data/test_data_files.py
26+
@@ -29,6 +29,6 @@ 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'
2134
diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
2235
index 9f2657b..7be5247 100644
2336
--- a/libwacom/libwacom-database.c

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

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 1b05921d0832770f31544ec252a8fedbd3b8db2c Mon Sep 17 00:00:00 2001
1+
From dc3f22ed257f40bb2eb086f5379208e4400e8530 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/12] Add support for Intel Management Engine bus
@@ -7,12 +7,25 @@ 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 +-
1011
libwacom/libwacom-database.c | 4 ++++
1112
libwacom/libwacom.c | 5 +++++
1213
libwacom/libwacom.h | 1 +
1314
test/test-tablet-validity.c | 1 +
14-
4 files changed, 11 insertions(+)
15+
5 files changed, 12 insertions(+), 1 deletion(-)
1516

17+
diff --git a/data/test_data_files.py b/data/test_data_files.py
18+
index cb5ca6d..466b18a 100755
19+
--- a/data/test_data_files.py
20+
+++ b/data/test_data_files.py
21+
@@ -29,6 +29,6 @@ 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'
1629
diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
1730
index 7be5247..37ffd37 100644
1831
--- a/libwacom/libwacom-database.c

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 75c107b81586f6bcc8c44eb815a7ff62203a6ba5 Mon Sep 17 00:00:00 2001
1+
From 146233c4818ab6bb41b19eb91aa7f5b228ac26e8 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/12] data: Add Microsoft Surface pro 4
@@ -10,7 +10,7 @@ Subject: [PATCH 03/12] data: Add Microsoft Surface pro 4
1010

1111
diff --git a/data/surface-pro4.tablet b/data/surface-pro4.tablet
1212
new file mode 100644
13-
index 0000000..bfbe809
13+
index 0000000..1e0c67c
1414
--- /dev/null
1515
+++ b/data/surface-pro4.tablet
1616
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..bfbe809
1919
+[Device]
2020
+Name=Microsoft Surface Pro 4
2121
+Class=PenDisplay
22-
+DeviceMatch=virt:1B96:006A;virt:1B96:0021;mei:1B96:006A;mei:1B96:0021
22+
+DeviceMatch=virt:1b96:006a;virt:1b96:0021;mei:1b96:006a;mei:1b96:0021
2323
+Width=10
2424
+Height=6
2525
+IntegratedIn=Display;System;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From b046b8f1caadcd191e8ab7ac93e6a3190f09779d Mon Sep 17 00:00:00 2001
1+
From 39fa36b6378be6090321f304477e5e2112c830a1 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/12] data: Add Microsoft Surface pro 5
@@ -10,7 +10,7 @@ Subject: [PATCH 04/12] data: Add Microsoft Surface pro 5
1010

1111
diff --git a/data/surface-pro5.tablet b/data/surface-pro5.tablet
1212
new file mode 100644
13-
index 0000000..4fdbac6
13+
index 0000000..b26af3a
1414
--- /dev/null
1515
+++ b/data/surface-pro5.tablet
1616
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..4fdbac6
1919
+[Device]
2020
+Name=Microsoft Surface Pro 5
2121
+Class=PenDisplay
22-
+DeviceMatch=virt:1B96:001F;mei:1B96:001F
22+
+DeviceMatch=virt:1b96:001f;mei:1b96:001f
2323
+Width=10
2424
+Height=6
2525
+IntegratedIn=Display;System;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 204eed54bb339d927f2291bc6d8abb47b7ddccc3 Mon Sep 17 00:00:00 2001
1+
From b9027ca78c80b82434a4c22f38b706c55bc9c03b 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/12] data: Add Microsoft Surface pro 6
@@ -10,7 +10,7 @@ Subject: [PATCH 05/12] data: Add Microsoft Surface pro 6
1010

1111
diff --git a/data/surface-pro6.tablet b/data/surface-pro6.tablet
1212
new file mode 100644
13-
index 0000000..787fd7a
13+
index 0000000..e97fad8
1414
--- /dev/null
1515
+++ b/data/surface-pro6.tablet
1616
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..787fd7a
1919
+[Device]
2020
+Name=Microsoft Surface Pro 6
2121
+Class=PenDisplay
22-
+DeviceMatch=virt:045E:001F;mei:045E:001F
22+
+DeviceMatch=virt:045e:001f;mei:045e:001f
2323
+Width=10
2424
+Height=6
2525
+IntegratedIn=Display;System;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 2130681ccb33f538e4000ce219b2f6c861dcd024 Mon Sep 17 00:00:00 2001
1+
From 94d3588f4375f0121c5b602db33d02c87a0f6190 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/12] data: Add Microsoft Surface pro 7
@@ -10,7 +10,7 @@ Subject: [PATCH 06/12] data: Add Microsoft Surface pro 7
1010

1111
diff --git a/data/surface-pro7.tablet b/data/surface-pro7.tablet
1212
new file mode 100644
13-
index 0000000..4659131
13+
index 0000000..7961379
1414
--- /dev/null
1515
+++ b/data/surface-pro7.tablet
1616
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..4659131
1919
+[Device]
2020
+Name=Microsoft Surface Pro 7
2121
+Class=PenDisplay
22-
+DeviceMatch=virt:045E:099F;mei:045E:099F
22+
+DeviceMatch=virt:045e:099f;mei:045e:099f
2323
+Width=10
2424
+Height=6
2525
+IntegratedIn=Display;System;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From ce150a5ca89aba8c5985b90a81f8bcbff046780c Mon Sep 17 00:00:00 2001
1+
From c4910de17af81cb510d84a0c783a0f5ed484a63c 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/12] data: Add Microsoft Surface Book
@@ -10,7 +10,7 @@ Subject: [PATCH 07/12] data: Add Microsoft Surface Book
1010

1111
diff --git a/data/surface-book.tablet b/data/surface-book.tablet
1212
new file mode 100644
13-
index 0000000..a551c9b
13+
index 0000000..e2a5401
1414
--- /dev/null
1515
+++ b/data/surface-book.tablet
1616
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..a551c9b
1919
+[Device]
2020
+Name=Microsoft Surface Book
2121
+Class=PenDisplay
22-
+DeviceMatch=virt:1B96:005e;mei:1B96:005e
22+
+DeviceMatch=virt:1b96:005e;mei:1b96:005e
2323
+Width=11
2424
+Height=7
2525
+IntegratedIn=Display;System;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From f3117e7ff8e213672f532b609d98c0e5d8d30d41 Mon Sep 17 00:00:00 2001
1+
From 91ac17c9ff9d0930a164fa674b159890f74b2bf8 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/12] data: Add Microsoft Surface Book 2 (13.5")
@@ -10,7 +10,7 @@ Subject: [PATCH 08/12] data: Add Microsoft Surface Book 2 (13.5")
1010

1111
diff --git a/data/surface-book2-13.tablet b/data/surface-book2-13.tablet
1212
new file mode 100644
13-
index 0000000..6e770e9
13+
index 0000000..b13cb07
1414
--- /dev/null
1515
+++ b/data/surface-book2-13.tablet
1616
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..6e770e9
1919
+[Device]
2020
+Name=Microsoft Surface Book 2 (13.5")
2121
+Class=PenDisplay
22-
+DeviceMatch=virt:045E:0021;mei:045E:0021
22+
+DeviceMatch=virt:045e:0021;mei:045e:0021
2323
+Width=11
2424
+Height=7
2525
+IntegratedIn=Display;System;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From c5bc7f543e56e2110af2538a6a1385c4323ecc00 Mon Sep 17 00:00:00 2001
1+
From daa169c373e1a541bf9d752371581b32de5c5fad 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/12] data: Add Microsoft Surface Book 2 (15")
@@ -10,7 +10,7 @@ Subject: [PATCH 09/12] data: Add Microsoft Surface Book 2 (15")
1010

1111
diff --git a/data/surface-book2-15.tablet b/data/surface-book2-15.tablet
1212
new file mode 100644
13-
index 0000000..c07e60f
13+
index 0000000..ad98cc7
1414
--- /dev/null
1515
+++ b/data/surface-book2-15.tablet
1616
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..c07e60f
1919
+[Device]
2020
+Name=Microsoft Surface Book 2 (15")
2121
+Class=PenDisplay
22-
+DeviceMatch=virt:045E:0020;mei:045E:0020
22+
+DeviceMatch=virt:045e:0020;mei:045e:0020
2323
+Width=12
2424
+Height=8
2525
+IntegratedIn=Display;System;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From f8b1b9f4edde20df98af37d849661d64bcecf093 Mon Sep 17 00:00:00 2001
1+
From 5362189bdb53ec688c633fef60b246b58a9734cd 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/12] data: Add Microsoft Surface Book 3 (13.5")
@@ -10,7 +10,7 @@ Subject: [PATCH 10/12] data: Add Microsoft Surface Book 3 (13.5")
1010

1111
diff --git a/data/surface-book3-13.tablet b/data/surface-book3-13.tablet
1212
new file mode 100644
13-
index 0000000..212ef93
13+
index 0000000..a33c9cb
1414
--- /dev/null
1515
+++ b/data/surface-book3-13.tablet
1616
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..212ef93
1919
+[Device]
2020
+Name=Microsoft Surface Book 3 (13.5")
2121
+Class=PenDisplay
22-
+DeviceMatch=virt:045E:09B2;mei:045E:09B2
22+
+DeviceMatch=virt:045e:09b2;mei:045e:09b2
2323
+Width=11
2424
+Height=7
2525
+IntegratedIn=Display;System;

0 commit comments

Comments
 (0)