Skip to content

Commit 3c7c3f1

Browse files
qzedqzed
committed
Update to libwacom-2.0.0
1 parent 87fe0dd commit 3c7c3f1

17 files changed

+53
-65
lines changed

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
run: |
2121
sed 's/^deb /deb-src /' /etc/apt/sources.list >> /etc/apt/sources.list
2222
apt-get -y update
23-
apt-get -y install build-essential debhelper dpkg-sig fakeroot wget git
23+
apt-get -y install build-essential debhelper dpkg-sig fakeroot wget git meson python3-pyudev python3-pytest python3-libevdev
2424
apt-get -y build-dep libwacom libwacom-dev
2525
2626
- name: Build package

‎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 846cc328cfe536ba49c00d907ca4b737d980a5f8 Mon Sep 17 00:00:00 2001
1+
From 5b2d219b4ef206e6501ae5b2fbd1e90e37986ecf 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
@@ -42,7 +42,7 @@ index a8987f7..3c7d0de 100644
4242
g_assert_not_reached ();
4343
}
4444
diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
45-
index 935344c..88d0777 100644
45+
index ccfe43a..d9b8a22 100644
4646
--- a/libwacom/libwacom.c
4747
+++ b/libwacom/libwacom.c
4848
@@ -149,6 +149,10 @@ get_bus_vid_pid (GUdevDevice *device,
@@ -56,7 +56,7 @@ index 935344c..88d0777 100644
5656
}
5757

5858
out:
59-
@@ -797,6 +801,7 @@ static void print_match(int fd, const WacomMatch *match)
59+
@@ -817,6 +821,7 @@ static void print_match(int fd, const WacomMatch *match)
6060
case WBUSTYPE_USB: bus_name = "usb"; break;
6161
case WBUSTYPE_SERIAL: bus_name = "serial"; break;
6262
case WBUSTYPE_I2C: bus_name = "i2c"; break;
@@ -65,7 +65,7 @@ index 935344c..88d0777 100644
6565
default: g_assert_not_reached(); break;
6666
}
6767
diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
68-
index d611c9d..a4cbb23 100644
68+
index cafed64..b184ed7 100644
6969
--- a/libwacom/libwacom.h
7070
+++ b/libwacom/libwacom.h
7171
@@ -149,6 +149,7 @@ typedef enum {
@@ -102,5 +102,5 @@ index 3953b1e..734463f 100755
102102
assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
103103

104104
--
105-
2.33.0
105+
2.34.1
106106

‎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 0e7b62459bdebcb5aec97e13babcbd792d25f0fd Mon Sep 17 00:00:00 2001
1+
From a5d0ce373887e3c8af7061e02b097fa9e7a95e07 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
@@ -37,7 +37,7 @@ index 3c7d0de..28c0ac5 100644
3737
g_assert_not_reached ();
3838
}
3939
diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
40-
index 88d0777..09e289f 100644
40+
index d9b8a22..e3364f4 100644
4141
--- a/libwacom/libwacom.c
4242
+++ b/libwacom/libwacom.c
4343
@@ -153,6 +153,10 @@ get_bus_vid_pid (GUdevDevice *device,
@@ -51,7 +51,7 @@ index 88d0777..09e289f 100644
5151
}
5252

5353
out:
54-
@@ -802,6 +806,7 @@ static void print_match(int fd, const WacomMatch *match)
54+
@@ -822,6 +826,7 @@ static void print_match(int fd, const WacomMatch *match)
5555
case WBUSTYPE_SERIAL: bus_name = "serial"; break;
5656
case WBUSTYPE_I2C: bus_name = "i2c"; break;
5757
case WBUSTYPE_VIRTUAL: bus_name = "virt"; break;
@@ -60,7 +60,7 @@ index 88d0777..09e289f 100644
6060
default: g_assert_not_reached(); break;
6161
}
6262
diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
63-
index a4cbb23..034a894 100644
63+
index b184ed7..5cd6736 100644
6464
--- a/libwacom/libwacom.h
6565
+++ b/libwacom/libwacom.h
6666
@@ -150,6 +150,7 @@ typedef enum {
@@ -97,5 +97,5 @@ index 734463f..c9c6312 100755
9797
assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
9898

9999
--
100-
2.33.0
100+
2.34.1
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 566c424a73420e4cf2c2894b3a4fa0e95479d373 Mon Sep 17 00:00:00 2001
1+
From d6cd3074ebf929bf6bcdf3f645c279afb18e7b9d 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.33.0
32+
2.34.1
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 0ce2c07b2842e5bce81e16ca184c6cae00269677 Mon Sep 17 00:00:00 2001
1+
From 4cfead3582c875b09f2af992a2a74dce51768c2d 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.33.0
32+
2.34.1
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 38c0df07ddb39d0d6d4116c0c789e2b10dbb790a Mon Sep 17 00:00:00 2001
1+
From 01da7c902d6902285a0d48bf889dc73ec33ee44b 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.33.0
32+
2.34.1
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 e826f7fd620e1cf765ee3fc5b2288fbcdc15eaef Mon Sep 17 00:00:00 2001
1+
From 6369471bb5ca5c3668c05fbdec7dab4cddfd9f3e 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.33.0
32+
2.34.1
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 d9dbf80cb49a359d9951856ae0e3ee223f53c0bc Mon Sep 17 00:00:00 2001
1+
From 77513a1331e9a38cd2e80533d1f6688fe9e4a930 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.33.0
32+
2.34.1
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 aefe50be89e5b84c8fd5cff04ff0ce1b0e4eedb6 Mon Sep 17 00:00:00 2001
1+
From 2a724bfff96cc05394593b8a3ca8a0dab4b2c19b 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.33.0
32+
2.34.1
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 38b03dcc3dd03c482f31b8473b2e39c4fdc308d3 Mon Sep 17 00:00:00 2001
1+
From 6317007aec054989b8a992fa7481d00d4ef89c38 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.33.0
32+
2.34.1
3333

0 commit comments

Comments
 (0)