Skip to content

Commit 33d2368

Browse files
committed
Update to libwacom-2.16.1
1 parent 7abb27b commit 33d2368

19 files changed

+69
-69
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 483de1767646e8a0cba4eb9c4c6e90a6abe19b23 Mon Sep 17 00:00:00 2001
1+
From e099370da667288fae5efdc273707028cb829a3d 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
@@ -21,7 +21,7 @@ Signed-off-by: Dorian Stoll <[email protected]>
2121
6 files changed, 13 insertions(+)
2222

2323
diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
24-
index 7a6493ac..a6cd54b4 100644
24+
index ef877287..2c203a10 100644
2525
--- a/libwacom/libwacom-database.c
2626
+++ b/libwacom/libwacom-database.c
2727
@@ -174,6 +174,8 @@ bus_from_str (const char *str)
@@ -43,7 +43,7 @@ index 7a6493ac..a6cd54b4 100644
4343
g_assert_not_reached ();
4444
}
4545
diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
46-
index 646a1525..fac97e65 100644
46+
index e65bcf29..42bec181 100644
4747
--- a/libwacom/libwacom.c
4848
+++ b/libwacom/libwacom.c
4949
@@ -153,6 +153,10 @@ get_bus_vid_pid (GUdevDevice *device,
@@ -57,7 +57,7 @@ index 646a1525..fac97e65 100644
5757
}
5858

5959
out:
60-
@@ -1032,6 +1036,7 @@ static void print_match(int fd, const WacomMatch *match)
60+
@@ -1009,6 +1013,7 @@ static void print_match(int fd, const WacomMatch *match)
6161
case WBUSTYPE_USB: bus_name = "usb"; break;
6262
case WBUSTYPE_SERIAL: bus_name = "serial"; break;
6363
case WBUSTYPE_I2C: bus_name = "i2c"; break;
@@ -78,7 +78,7 @@ index 3c820f4a..17dd7600 100644
7878

7979
/**
8080
diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
81-
index c20e582e..77ff1327 100644
81+
index f84a327b..4bc09b88 100644
8282
--- a/test/test-tablet-validity.c
8383
+++ b/test/test-tablet-validity.c
8484
@@ -177,6 +177,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
@@ -102,10 +102,10 @@ index 4cff174f..ee6ffcd3 100755
102102
assert re.match("[0-9a-f]{4}", vid), (
103103
f"{tabletfile}: {vid} must be lowercase hex"
104104
diff --git a/tools/debug-device.c b/tools/debug-device.c
105-
index c15bf41b..286e9148 100644
105+
index 83915a20..0c4efe06 100644
106106
--- a/tools/debug-device.c
107107
+++ b/tools/debug-device.c
108-
@@ -177,6 +177,7 @@ handle_device(WacomDeviceDatabase *db, const char *path)
108+
@@ -176,6 +176,7 @@ handle_device(WacomDeviceDatabase *db, const char *path)
109109
case WBUSTYPE_SERIAL: busstr = "SERIAL"; break;
110110
case WBUSTYPE_BLUETOOTH: busstr = "BLUETOOTH"; break;
111111
case WBUSTYPE_I2C: busstr = "I2C"; break;
@@ -114,5 +114,5 @@ index c15bf41b..286e9148 100644
114114
func(libwacom_get_bustype, "%s", busstr);
115115
}
116116
--
117-
2.49.0
117+
2.50.0
118118

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 2f55d3df2ef4908bc09ee3349793192acbb2042e Mon Sep 17 00:00:00 2001
1+
From 499d865ff2cd575746ed2f971d84e6d5248a92d0 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
@@ -16,7 +16,7 @@ the Microsoft Surface Books, Surface Pro 5 and 6, and Surface Laptops.
1616
6 files changed, 13 insertions(+)
1717

1818
diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
19-
index a6cd54b4..2883bccb 100644
19+
index 2c203a10..0c02cfd2 100644
2020
--- a/libwacom/libwacom-database.c
2121
+++ b/libwacom/libwacom-database.c
2222
@@ -176,6 +176,8 @@ bus_from_str (const char *str)
@@ -38,7 +38,7 @@ index a6cd54b4..2883bccb 100644
3838
g_assert_not_reached ();
3939
}
4040
diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
41-
index fac97e65..17f8607d 100644
41+
index 42bec181..a906e930 100644
4242
--- a/libwacom/libwacom.c
4343
+++ b/libwacom/libwacom.c
4444
@@ -157,6 +157,10 @@ get_bus_vid_pid (GUdevDevice *device,
@@ -52,7 +52,7 @@ index fac97e65..17f8607d 100644
5252
}
5353

5454
out:
55-
@@ -1037,6 +1041,7 @@ static void print_match(int fd, const WacomMatch *match)
55+
@@ -1014,6 +1018,7 @@ static void print_match(int fd, const WacomMatch *match)
5656
case WBUSTYPE_SERIAL: bus_name = "serial"; break;
5757
case WBUSTYPE_I2C: bus_name = "i2c"; break;
5858
case WBUSTYPE_VIRTUAL: bus_name = "virt"; break;
@@ -73,7 +73,7 @@ index 17dd7600..798a31dd 100644
7373

7474
/**
7575
diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
76-
index 77ff1327..ad350912 100644
76+
index 4bc09b88..bd7160b2 100644
7777
--- a/test/test-tablet-validity.c
7878
+++ b/test/test-tablet-validity.c
7979
@@ -178,6 +178,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
@@ -97,10 +97,10 @@ index ee6ffcd3..bd7d798f 100755
9797
assert re.match("[0-9a-f]{4}", vid), (
9898
f"{tabletfile}: {vid} must be lowercase hex"
9999
diff --git a/tools/debug-device.c b/tools/debug-device.c
100-
index 286e9148..f5b17b56 100644
100+
index 0c4efe06..e36a5208 100644
101101
--- a/tools/debug-device.c
102102
+++ b/tools/debug-device.c
103-
@@ -178,6 +178,7 @@ handle_device(WacomDeviceDatabase *db, const char *path)
103+
@@ -177,6 +177,7 @@ handle_device(WacomDeviceDatabase *db, const char *path)
104104
case WBUSTYPE_BLUETOOTH: busstr = "BLUETOOTH"; break;
105105
case WBUSTYPE_I2C: busstr = "I2C"; break;
106106
case WBUSTYPE_VIRTUAL: busstr = "VIRTUAL"; break;
@@ -109,5 +109,5 @@ index 286e9148..f5b17b56 100644
109109
func(libwacom_get_bustype, "%s", busstr);
110110
}
111111
--
112-
2.49.0
112+
2.50.0
113113

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 761db70bf8c45f2e4d9d3a6c3f729ba02a3f896e Mon Sep 17 00:00:00 2001
1+
From 64dcadb2762b2c262d356526f74b9de30abe2fc5 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.49.0
32+
2.50.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 1c6924a7d9e239086d3a4241a841c9c2261c40cd Mon Sep 17 00:00:00 2001
1+
From bb5fd2aa2f92e2e26fcb408702d3aa080201511e 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.49.0
32+
2.50.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 0ea86d1e42bb69c20ac4526a21f581dc9c5bb7ee Mon Sep 17 00:00:00 2001
1+
From 72523f40fba0556319e40d5c0ab4bfb82d40ffd7 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.49.0
32+
2.50.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 6071bde57d05b256b40b1ba462458c61ef27fd60 Mon Sep 17 00:00:00 2001
1+
From 0145189e1e050ee466e2aa389a956bfc1442efea 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.49.0
32+
2.50.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 5af4100c1d91fc8b4d7addd622086e9e99b1d3fc Mon Sep 17 00:00:00 2001
1+
From 7fea40da3e094cbd5b309e42c20c1a2fadcaa88e 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.49.0
32+
2.50.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 70653ee99139d138dc62922dacddb36ad141f5ed Mon Sep 17 00:00:00 2001
1+
From a00aae5a241acba835095ce0fc41de80efc449bf 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.49.0
33+
2.50.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 cc85faa92c8f56bc133200825d45510d355703db Mon Sep 17 00:00:00 2001
1+
From ce56c3456cfd7925f5508fff5ee4261a7ec51854 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.49.0
33+
2.50.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 8b29c5fd2a5a5dcc4cbaa4d6faddb4b14cf344cb Mon Sep 17 00:00:00 2001
1+
From dc21877c5146fef3b0d45e6a85136033a164b0f4 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.49.0
33+
2.50.0
3434

0 commit comments

Comments
 (0)