Skip to content

Commit a2f1e46

Browse files
committed
Update to libwacom-2.13.0
1 parent 473e8bb commit a2f1e46

File tree

36 files changed

+115
-75
lines changed

36 files changed

+115
-75
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From b89d3ac556baafbf88b34ae2feadbcffc87bc3e4 Mon Sep 17 00:00:00 2001
1+
From cc9e93e764de5800a078332cd909f64078045423 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 eb47510..c5e2fcf 100644
24+
index 050ee25..7992930 100644
2525
--- a/libwacom/libwacom-database.c
2626
+++ b/libwacom/libwacom-database.c
2727
@@ -130,6 +130,8 @@ bus_from_str (const char *str)
@@ -43,7 +43,7 @@ index eb47510..c5e2fcf 100644
4343
g_assert_not_reached ();
4444
}
4545
diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
46-
index 1ffb910..c028bde 100644
46+
index 40b54b7..5c89f65 100644
4747
--- a/libwacom/libwacom.c
4848
+++ b/libwacom/libwacom.c
4949
@@ -149,6 +149,10 @@ get_bus_vid_pid (GUdevDevice *device,
@@ -57,7 +57,7 @@ index 1ffb910..c028bde 100644
5757
}
5858

5959
out:
60-
@@ -1022,6 +1026,7 @@ static void print_match(int fd, const WacomMatch *match)
60+
@@ -1008,6 +1012,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;
@@ -114,5 +114,5 @@ index 2cdac20..51ec53e 100644
114114
func(libwacom_get_bustype, "%s", busstr);
115115
}
116116
--
117-
2.45.1
117+
2.46.0
118118

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From b8dae24b8f4bf24c3d1aeccc3efef81fc0f8b08d Mon Sep 17 00:00:00 2001
1+
From 74022a0f69ddb2e85913329a0aae63a6e30212b9 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 c5e2fcf..d9fc0c4 100644
19+
index 7992930..9e93f4a 100644
2020
--- a/libwacom/libwacom-database.c
2121
+++ b/libwacom/libwacom-database.c
2222
@@ -132,6 +132,8 @@ bus_from_str (const char *str)
@@ -38,7 +38,7 @@ index c5e2fcf..d9fc0c4 100644
3838
g_assert_not_reached ();
3939
}
4040
diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
41-
index c028bde..0d34227 100644
41+
index 5c89f65..f5f3dab 100644
4242
--- a/libwacom/libwacom.c
4343
+++ b/libwacom/libwacom.c
4444
@@ -153,6 +153,10 @@ get_bus_vid_pid (GUdevDevice *device,
@@ -52,7 +52,7 @@ index c028bde..0d34227 100644
5252
}
5353

5454
out:
55-
@@ -1027,6 +1031,7 @@ static void print_match(int fd, const WacomMatch *match)
55+
@@ -1013,6 +1017,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;
@@ -109,5 +109,5 @@ index 51ec53e..6a00f9d 100644
109109
func(libwacom_get_bustype, "%s", busstr);
110110
}
111111
--
112-
2.45.1
112+
2.46.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 2e5f077c87daeeae2dcc841c886668ab596ab952 Mon Sep 17 00:00:00 2001
1+
From 6836969366011dc3608d714e664d742fc7374e8f 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 0000000..2f53541
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.45.1
32+
2.46.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 dc9e16bc247d513f1f468e7c8a7f71506941a320 Mon Sep 17 00:00:00 2001
1+
From 4429de269b7a887766adbdb47a1a2ac945d38ac5 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 0000000..f77f3a2
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.45.1
32+
2.46.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 2ade3bb0de43ade8d0f5d3f326cae2efedbdc015 Mon Sep 17 00:00:00 2001
1+
From a99d93f4aefb84d14905467e530c827c213eddf7 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 0000000..410a0d3
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.45.1
32+
2.46.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 83765f93b8586c5e152593254d9ac55b5d4a8ba9 Mon Sep 17 00:00:00 2001
1+
From 5ac41e97ba92275f23b6f0b3228d0390f31f8c4d 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 0000000..eb89df0
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.45.1
32+
2.46.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 8725c66f88c0bca79542e1069fbbdef98227de1a Mon Sep 17 00:00:00 2001
1+
From 2b1d94138b628881c6e62b075e96b605bcb7a604 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 0000000..f960107
2929
+Touch=true
3030
+Buttons=0
3131
--
32-
2.45.1
32+
2.46.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 fd315e255704f1172ec4940277ba5e28fd66990e Mon Sep 17 00:00:00 2001
1+
From 5055ff180d2521fc2df22ae491cf4c347d14ce14 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 0000000..5c4e540
3030
+Touch=true
3131
+Buttons=0
3232
--
33-
2.45.1
33+
2.46.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 3ebad373725ed6d9415e000b5feffaba301fc4a4 Mon Sep 17 00:00:00 2001
1+
From 55fdc6767d3053618deac68640db2bb24fedf3e0 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 0000000..dcfef11
3030
+Touch=true
3131
+Buttons=0
3232
--
33-
2.45.1
33+
2.46.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 f6b54c01d9167b8caca4e6c986a477efd1d5f62b Mon Sep 17 00:00:00 2001
1+
From 41b05cb241478526ee6f378fffc542b3e827fd54 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 0000000..ee2b3ee
3030
+Touch=true
3131
+Buttons=0
3232
--
33-
2.45.1
33+
2.46.0
3434

0 commit comments

Comments
 (0)