Skip to content

Commit 531bec6

Browse files
qzedqzed
committed
Update to libwacom-2.17.0
1 parent 4495539 commit 531bec6

19 files changed

+144
-136
lines changed

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

Lines changed: 44 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From e099370da667288fae5efdc273707028cb829a3d Mon Sep 17 00:00:00 2001
1+
From 147c5f2be436cc25bdd5891b11fdb9c46a0d9417 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/16] Add support for BUS_VIRTUAL
@@ -13,18 +13,18 @@ as BUS_VIRTUAL.
1313
Signed-off-by: Dorian Stoll <[email protected]>
1414
---
1515
libwacom/libwacom-database.c | 4 ++++
16-
libwacom/libwacom.c | 5 +++++
16+
libwacom/libwacom.c | 7 +++++++
1717
libwacom/libwacom.h | 1 +
1818
test/test-tablet-validity.c | 1 +
1919
test/test_data_files.py | 1 +
20-
tools/debug-device.c | 1 +
21-
6 files changed, 13 insertions(+)
20+
tools/debug-device.c | 3 +++
21+
6 files changed, 17 insertions(+)
2222

2323
diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
24-
index ef877287..2c203a10 100644
24+
index eb84df4f..3aa398e5 100644
2525
--- a/libwacom/libwacom-database.c
2626
+++ b/libwacom/libwacom-database.c
27-
@@ -174,6 +174,8 @@ bus_from_str (const char *str)
27+
@@ -175,6 +175,8 @@ bus_from_str(const char *str)
2828
return WBUSTYPE_BLUETOOTH;
2929
if (g_str_equal(str, "i2c"))
3030
return WBUSTYPE_I2C;
@@ -33,20 +33,20 @@ index ef877287..2c203a10 100644
3333
return WBUSTYPE_UNKNOWN;
3434
}
3535

36-
@@ -192,6 +194,8 @@ bus_to_str (WacomBusType bus)
36+
@@ -193,6 +195,8 @@ bus_to_str(WacomBusType bus)
3737
return "bluetooth";
3838
case WBUSTYPE_I2C:
3939
return "i2c";
4040
+ case WBUSTYPE_VIRTUAL:
4141
+ return "virt";
4242
}
43-
g_assert_not_reached ();
43+
g_assert_not_reached();
4444
}
4545
diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
46-
index e65bcf29..42bec181 100644
46+
index ab8b4e47..e6bab4ea 100644
4747
--- a/libwacom/libwacom.c
4848
+++ b/libwacom/libwacom.c
49-
@@ -153,6 +153,10 @@ get_bus_vid_pid (GUdevDevice *device,
49+
@@ -156,6 +156,10 @@ get_bus_vid_pid(GUdevDevice *device,
5050
*bus = WBUSTYPE_I2C;
5151
retval = TRUE;
5252
break;
@@ -57,38 +57,40 @@ index e65bcf29..42bec181 100644
5757
}
5858

5959
out:
60-
@@ -1009,6 +1013,7 @@ static void print_match(int fd, const WacomMatch *match)
61-
case WBUSTYPE_USB: bus_name = "usb"; break;
62-
case WBUSTYPE_SERIAL: bus_name = "serial"; break;
63-
case WBUSTYPE_I2C: bus_name = "i2c"; break;
64-
+ case WBUSTYPE_VIRTUAL: bus_name = "virt"; break;
65-
case WBUSTYPE_UNKNOWN: bus_name = "unknown"; break;
66-
default: g_assert_not_reached(); break;
67-
}
60+
@@ -1100,6 +1104,9 @@ print_match(int fd,
61+
case WBUSTYPE_I2C:
62+
bus_name = "i2c";
63+
break;
64+
+ case WBUSTYPE_VIRTUAL:
65+
+ bus_name = "virt";
66+
+ break;
67+
case WBUSTYPE_UNKNOWN:
68+
bus_name = "unknown";
69+
break;
6870
diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
69-
index 3c820f4a..17dd7600 100644
71+
index 9d9fe650..6b07c23d 100644
7072
--- a/libwacom/libwacom.h
7173
+++ b/libwacom/libwacom.h
72-
@@ -154,6 +154,7 @@ typedef enum {
73-
WBUSTYPE_SERIAL, /**< Serial tablet */
74-
WBUSTYPE_BLUETOOTH, /**< Bluetooth tablet */
75-
WBUSTYPE_I2C, /**< I2C tablet */
76-
+ WBUSTYPE_VIRTUAL, /**< Virtual (uinput) tablet */
74+
@@ -153,6 +153,7 @@ typedef enum {
75+
WBUSTYPE_SERIAL, /**< Serial tablet */
76+
WBUSTYPE_BLUETOOTH, /**< Bluetooth tablet */
77+
WBUSTYPE_I2C, /**< I2C tablet */
78+
+ WBUSTYPE_VIRTUAL, /**< Virtual (uinput) tablet */
7779
} WacomBusType;
7880

7981
/**
8082
diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
81-
index f84a327b..4bc09b88 100644
83+
index bf4609b7..24078f64 100644
8284
--- a/test/test-tablet-validity.c
8385
+++ b/test/test-tablet-validity.c
84-
@@ -177,6 +177,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
85-
break;
86-
case WBUSTYPE_BLUETOOTH:
87-
case WBUSTYPE_I2C:
88-
+ case WBUSTYPE_VIRTUAL:
89-
g_assert_cmpint(vid, >, 0);
90-
g_assert_cmpint(pid, >, 0);
91-
break;
86+
@@ -180,6 +180,7 @@ assert_vidpid(WacomBusType bus,
87+
break;
88+
case WBUSTYPE_BLUETOOTH:
89+
case WBUSTYPE_I2C:
90+
+ case WBUSTYPE_VIRTUAL:
91+
g_assert_cmpint(vid, >, 0);
92+
g_assert_cmpint(pid, >, 0);
93+
break;
9294
diff --git a/test/test_data_files.py b/test/test_data_files.py
9395
index 4cff174f..ee6ffcd3 100755
9496
--- a/test/test_data_files.py
@@ -102,17 +104,19 @@ index 4cff174f..ee6ffcd3 100755
102104
assert re.match("[0-9a-f]{4}", vid), (
103105
f"{tabletfile}: {vid} must be lowercase hex"
104106
diff --git a/tools/debug-device.c b/tools/debug-device.c
105-
index 83915a20..0c4efe06 100644
107+
index 4f9762e9..43a6072d 100644
106108
--- a/tools/debug-device.c
107109
+++ b/tools/debug-device.c
108-
@@ -176,6 +176,7 @@ handle_device(WacomDeviceDatabase *db, const char *path)
109-
case WBUSTYPE_SERIAL: busstr = "SERIAL"; break;
110-
case WBUSTYPE_BLUETOOTH: busstr = "BLUETOOTH"; break;
111-
case WBUSTYPE_I2C: busstr = "I2C"; break;
112-
+ case WBUSTYPE_VIRTUAL: busstr = "VIRTUAL"; break;
110+
@@ -191,6 +191,9 @@ handle_device(WacomDeviceDatabase *db,
111+
case WBUSTYPE_I2C:
112+
busstr = "I2C";
113+
break;
114+
+ case WBUSTYPE_VIRTUAL:
115+
+ busstr = "VIRTUAL";
116+
+ break;
113117
}
114118
func(libwacom_get_bustype, "%s", busstr);
115119
}
116120
--
117-
2.50.0
121+
2.52.0
118122

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

Lines changed: 44 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 499d865ff2cd575746ed2f971d84e6d5248a92d0 Mon Sep 17 00:00:00 2001
1+
From e0a76b8bf65076825880652c0f4ed52cada8e26d 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/16] Add support for Intel Management Engine bus
@@ -8,18 +8,18 @@ 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
---
1010
libwacom/libwacom-database.c | 4 ++++
11-
libwacom/libwacom.c | 5 +++++
11+
libwacom/libwacom.c | 7 +++++++
1212
libwacom/libwacom.h | 1 +
1313
test/test-tablet-validity.c | 1 +
1414
test/test_data_files.py | 1 +
15-
tools/debug-device.c | 1 +
16-
6 files changed, 13 insertions(+)
15+
tools/debug-device.c | 3 +++
16+
6 files changed, 17 insertions(+)
1717

1818
diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
19-
index 2c203a10..0c02cfd2 100644
19+
index 3aa398e5..44f08742 100644
2020
--- a/libwacom/libwacom-database.c
2121
+++ b/libwacom/libwacom-database.c
22-
@@ -176,6 +176,8 @@ bus_from_str (const char *str)
22+
@@ -177,6 +177,8 @@ bus_from_str(const char *str)
2323
return WBUSTYPE_I2C;
2424
if (g_str_equal(str, "virt"))
2525
return WBUSTYPE_VIRTUAL;
@@ -28,20 +28,20 @@ index 2c203a10..0c02cfd2 100644
2828
return WBUSTYPE_UNKNOWN;
2929
}
3030

31-
@@ -196,6 +198,8 @@ bus_to_str (WacomBusType bus)
31+
@@ -197,6 +199,8 @@ bus_to_str(WacomBusType bus)
3232
return "i2c";
3333
case WBUSTYPE_VIRTUAL:
3434
return "virt";
3535
+ case WBUSTYPE_MEI:
3636
+ return "mei";
3737
}
38-
g_assert_not_reached ();
38+
g_assert_not_reached();
3939
}
4040
diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
41-
index 42bec181..a906e930 100644
41+
index e6bab4ea..497b0608 100644
4242
--- a/libwacom/libwacom.c
4343
+++ b/libwacom/libwacom.c
44-
@@ -157,6 +157,10 @@ get_bus_vid_pid (GUdevDevice *device,
44+
@@ -160,6 +160,10 @@ get_bus_vid_pid(GUdevDevice *device,
4545
*bus = WBUSTYPE_VIRTUAL;
4646
retval = TRUE;
4747
break;
@@ -52,38 +52,40 @@ index 42bec181..a906e930 100644
5252
}
5353

5454
out:
55-
@@ -1014,6 +1018,7 @@ static void print_match(int fd, const WacomMatch *match)
56-
case WBUSTYPE_SERIAL: bus_name = "serial"; break;
57-
case WBUSTYPE_I2C: bus_name = "i2c"; break;
58-
case WBUSTYPE_VIRTUAL: bus_name = "virt"; break;
59-
+ case WBUSTYPE_MEI: bus_name = "mei"; break;
60-
case WBUSTYPE_UNKNOWN: bus_name = "unknown"; break;
61-
default: g_assert_not_reached(); break;
62-
}
55+
@@ -1107,6 +1111,9 @@ print_match(int fd,
56+
case WBUSTYPE_VIRTUAL:
57+
bus_name = "virt";
58+
break;
59+
+ case WBUSTYPE_MEI:
60+
+ bus_name = "mei";
61+
+ break;
62+
case WBUSTYPE_UNKNOWN:
63+
bus_name = "unknown";
64+
break;
6365
diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
64-
index 17dd7600..798a31dd 100644
66+
index 6b07c23d..34cfbff0 100644
6567
--- a/libwacom/libwacom.h
6668
+++ b/libwacom/libwacom.h
67-
@@ -155,6 +155,7 @@ typedef enum {
68-
WBUSTYPE_BLUETOOTH, /**< Bluetooth tablet */
69-
WBUSTYPE_I2C, /**< I2C tablet */
70-
WBUSTYPE_VIRTUAL, /**< Virtual (uinput) tablet */
71-
+ WBUSTYPE_MEI, /**< MEI */
69+
@@ -154,6 +154,7 @@ typedef enum {
70+
WBUSTYPE_BLUETOOTH, /**< Bluetooth tablet */
71+
WBUSTYPE_I2C, /**< I2C tablet */
72+
WBUSTYPE_VIRTUAL, /**< Virtual (uinput) tablet */
73+
+ WBUSTYPE_MEI, /**< MEI */
7274
} WacomBusType;
7375

7476
/**
7577
diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
76-
index 4bc09b88..bd7160b2 100644
78+
index 24078f64..50b931c2 100644
7779
--- a/test/test-tablet-validity.c
7880
+++ b/test/test-tablet-validity.c
79-
@@ -178,6 +178,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
80-
case WBUSTYPE_BLUETOOTH:
81-
case WBUSTYPE_I2C:
82-
case WBUSTYPE_VIRTUAL:
83-
+ case WBUSTYPE_MEI:
84-
g_assert_cmpint(vid, >, 0);
85-
g_assert_cmpint(pid, >, 0);
86-
break;
81+
@@ -181,6 +181,7 @@ assert_vidpid(WacomBusType bus,
82+
case WBUSTYPE_BLUETOOTH:
83+
case WBUSTYPE_I2C:
84+
case WBUSTYPE_VIRTUAL:
85+
+ case WBUSTYPE_MEI:
86+
g_assert_cmpint(vid, >, 0);
87+
g_assert_cmpint(pid, >, 0);
88+
break;
8789
diff --git a/test/test_data_files.py b/test/test_data_files.py
8890
index ee6ffcd3..bd7d798f 100755
8991
--- a/test/test_data_files.py
@@ -97,17 +99,19 @@ index ee6ffcd3..bd7d798f 100755
9799
assert re.match("[0-9a-f]{4}", vid), (
98100
f"{tabletfile}: {vid} must be lowercase hex"
99101
diff --git a/tools/debug-device.c b/tools/debug-device.c
100-
index 0c4efe06..e36a5208 100644
102+
index 43a6072d..91553316 100644
101103
--- a/tools/debug-device.c
102104
+++ b/tools/debug-device.c
103-
@@ -177,6 +177,7 @@ handle_device(WacomDeviceDatabase *db, const char *path)
104-
case WBUSTYPE_BLUETOOTH: busstr = "BLUETOOTH"; break;
105-
case WBUSTYPE_I2C: busstr = "I2C"; break;
106-
case WBUSTYPE_VIRTUAL: busstr = "VIRTUAL"; break;
107-
+ case WBUSTYPE_MEI: busstr = "MEI"; break;
105+
@@ -194,6 +194,9 @@ handle_device(WacomDeviceDatabase *db,
106+
case WBUSTYPE_VIRTUAL:
107+
busstr = "VIRTUAL";
108+
break;
109+
+ case WBUSTYPE_MEI:
110+
+ busstr = "MEI";
111+
+ break;
108112
}
109113
func(libwacom_get_bustype, "%s", busstr);
110114
}
111115
--
112-
2.50.0
116+
2.52.0
113117

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 64dcadb2762b2c262d356526f74b9de30abe2fc5 Mon Sep 17 00:00:00 2001
1+
From f24a2cafee7a356b82377d7c8fffdb0931df959c Mon Sep 17 00:00:00 2001
22
From: "Antony Jordan (Tablet)" <[email protected]>
33
Date: Wed, 8 Jun 2022 22:03:33 +0200
44
Subject: [PATCH 03/16] data: Add Microsoft Surface Pro 3
@@ -29,5 +29,5 @@ index 00000000..2f535410
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.50.0
32+
2.52.0
3333

‎patches/v2/0004-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 bb5fd2aa2f92e2e26fcb408702d3aa080201511e Mon Sep 17 00:00:00 2001
1+
From 7cdbe797e2c38cb97f2e89700e6965e33c040b8b 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 04/16] data: Add Microsoft Surface Pro 4
@@ -29,5 +29,5 @@ index 00000000..f77f3a2b
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.50.0
32+
2.52.0
3333

‎patches/v2/0005-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 72523f40fba0556319e40d5c0ab4bfb82d40ffd7 Mon Sep 17 00:00:00 2001
1+
From eff6b609d266db23e61316538016dd8f59f887ea 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 05/16] data: Add Microsoft Surface Pro 5
@@ -29,5 +29,5 @@ index 00000000..410a0d3f
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.50.0
32+
2.52.0
3333

‎patches/v2/0006-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 0145189e1e050ee466e2aa389a956bfc1442efea Mon Sep 17 00:00:00 2001
1+
From d3bf424a70e01a4ad670d7329e2ea42c3bf1ae77 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 06/16] data: Add Microsoft Surface Pro 6
@@ -29,5 +29,5 @@ index 00000000..eb89df02
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.50.0
32+
2.52.0
3333

‎patches/v2/0007-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 7fea40da3e094cbd5b309e42c20c1a2fadcaa88e Mon Sep 17 00:00:00 2001
1+
From 9a49d50070a67622a1715f210db0b5128ed6a4b0 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 07/16] data: Add Microsoft Surface Pro 7
@@ -29,5 +29,5 @@ index 00000000..f9601079
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.50.0
32+
2.52.0
3333

‎patches/v2/0008-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 a00aae5a241acba835095ce0fc41de80efc449bf Mon Sep 17 00:00:00 2001
1+
From f437a692428e19f12e6acecbebb2f3b9b032f9d2 Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <[email protected]>
33
Date: Fri, 26 May 2023 12:32:21 +0200
44
Subject: [PATCH 08/16] data: Add Microsoft Surface Pro 7+
@@ -30,5 +30,5 @@ index 00000000..5c4e540f
3030
+Touch=true
3131
+Buttons=0
3232
--
33-
2.50.0
33+
2.52.0
3434

‎patches/v2/0009-data-Add-Microsoft-Surface-Pro-8.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From ce56c3456cfd7925f5508fff5ee4261a7ec51854 Mon Sep 17 00:00:00 2001
1+
From 945a192ce9e5324528f5a0a6209ec3010ef758a6 Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <[email protected]>
33
Date: Sun, 11 Jun 2023 21:29:52 +0200
44
Subject: [PATCH 09/16] data: Add Microsoft Surface Pro 8
@@ -30,5 +30,5 @@ index 00000000..dcfef119
3030
+Touch=true
3131
+Buttons=0
3232
--
33-
2.50.0
33+
2.52.0
3434

‎patches/v2/0010-data-Add-Microsoft-Surface-Pro-9.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From dc21877c5146fef3b0d45e6a85136033a164b0f4 Mon Sep 17 00:00:00 2001
1+
From 95d76814f237270815bc4d8ddbb626befb0ab9a8 Mon Sep 17 00:00:00 2001
22
From: Maximilian Luz <[email protected]>
33
Date: Wed, 14 Jun 2023 21:11:36 +0200
44
Subject: [PATCH 10/16] data: Add Microsoft Surface Pro 9
@@ -30,5 +30,5 @@ index 00000000..ee2b3eea
3030
+Touch=true
3131
+Buttons=0
3232
--
33-
2.50.0
33+
2.52.0
3434

0 commit comments

Comments
 (0)