Update to libwacom-1.11

1 files changed, 16 insertions, 16 deletions

diff --git a/0001-Add-support-for-BUS_VIRTUAL.patch b/0001-Add-support-for-BUS_VIRTUAL.patch
index fa73f86c8f12..ff2e4c34f7cf 100644
--- a/0001-Add-support-for-BUS_VIRTUAL.patch
+++ b/0001-Add-support-for-BUS_VIRTUAL.patch
@@ -1,4 +1,4 @@
-From d9cc859360c07ed3baa3810bbd4f2074755dba5b Mon Sep 17 00:00:00 2001
+From 9c3f0916ffea701532f3512651792d5f87833330 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sat, 27 Jun 2020 18:21:11 +0200
 Subject: [PATCH 01/11] Add support for BUS_VIRTUAL
@@ -12,26 +12,13 @@ as BUS_VIRTUAL.
 
 Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
 ---
- data/test_data_files.py      | 2 +-
  libwacom/libwacom-database.c | 4 ++++
  libwacom/libwacom.c          | 5 +++++
  libwacom/libwacom.h          | 1 +
  test/test-tablet-validity.c  | 1 +
+ test/test_data_files.py      | 2 +-
  5 files changed, 12 insertions(+), 1 deletion(-)
 
-diff --git a/data/test_data_files.py b/data/test_data_files.py
-index 1953ada..26d274f 100755
---- a/data/test_data_files.py
-+++ b/data/test_data_files.py
-@@ -34,7 +34,7 @@ def test_device_match(tabletfile):
-             continue
- 
-         bus, vid, pid = match.split(':')[:3]  # skip the name part of the match
--        assert bus in ['usb', 'bluetooth', 'i2c', 'serial'], f'{tabletfile}: unknown bus type'
-+        assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt'], f'{tabletfile}: unknown bus type'
-         assert re.match('[0-9a-f]{4}', vid), f'{tabletfile}: {vid} must be lowercase hex'
-         assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
- 
 diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
 index a8987f7..3c7d0de 100644
 --- a/libwacom/libwacom-database.c
@@ -101,6 +88,19 @@ index 2095089..da5fe07 100644
  			g_assert_cmpint(vid, >, 0);
  			g_assert_cmpint(pid, >, 0);
  			break;
+diff --git a/test/test_data_files.py b/test/test_data_files.py
+index 3953b1e..734463f 100755
+--- a/test/test_data_files.py
++++ b/test/test_data_files.py
+@@ -41,7 +41,7 @@ def test_device_match(tabletfile):
+             continue
+ 
+         bus, vid, pid = match.split(':')[:3]  # skip the name part of the match
+-        assert bus in ['usb', 'bluetooth', 'i2c', 'serial'], f'{tabletfile}: unknown bus type'
++        assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt'], f'{tabletfile}: unknown bus type'
+         assert re.match('[0-9a-f]{4}', vid), f'{tabletfile}: {vid} must be lowercase hex'
+         assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
+ 
 -- 
-2.31.1
+2.32.0