diff options
| author | Maximilian Luz | 2021-04-29 02:16:09 +0200 |
|---|---|---|
| committer | Maximilian Luz | 2021-04-29 02:16:09 +0200 |
| commit | ab756c684d0d8ed263bac8399ac604978d161b5f (patch) | |
| tree | a5ce51c450ae96cdfc171d06db5aba670bedf989 /0001-Add-support-for-BUS_VIRTUAL.patch | |
| parent | b0e3de0d659063cee083434c429f360650d95adf (diff) | |
| download | aur-ab756c684d0d8ed263bac8399ac604978d161b5f.tar.gz | |
Update to libwacom-1.10
Diffstat (limited to '0001-Add-support-for-BUS_VIRTUAL.patch')
| -rw-r--r-- | 0001-Add-support-for-BUS_VIRTUAL.patch | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/0001-Add-support-for-BUS_VIRTUAL.patch b/0001-Add-support-for-BUS_VIRTUAL.patch index 562b2f525e24..fa73f86c8f12 100644 --- a/0001-Add-support-for-BUS_VIRTUAL.patch +++ b/0001-Add-support-for-BUS_VIRTUAL.patch @@ -1,4 +1,4 @@ -From c0eaf576f68b2a34136a7c1c3977ff8531d37504 Mon Sep 17 00:00:00 2001 +From d9cc859360c07ed3baa3810bbd4f2074755dba5b 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 @@ -20,10 +20,10 @@ Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io> 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/data/test_data_files.py b/data/test_data_files.py -index 5acdbac..cb5ca6d 100755 +index 1953ada..26d274f 100755 --- a/data/test_data_files.py +++ b/data/test_data_files.py -@@ -29,6 +29,6 @@ def test_device_match(tabletfile): +@@ -34,7 +34,7 @@ def test_device_match(tabletfile): continue bus, vid, pid = match.split(':')[:3] # skip the name part of the match @@ -31,20 +31,21 @@ index 5acdbac..cb5ca6d 100755 + 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 d57ef2d..17571b6 100644 +index a8987f7..3c7d0de 100644 --- a/libwacom/libwacom-database.c +++ b/libwacom/libwacom-database.c -@@ -130,6 +130,8 @@ bus_from_str (const char *str) +@@ -128,6 +128,8 @@ bus_from_str (const char *str) return WBUSTYPE_BLUETOOTH; - if (streq(str, "i2c")) + if (g_str_equal(str, "i2c")) return WBUSTYPE_I2C; -+ if (streq(str, "virt")) ++ if (g_str_equal(str, "virt")) + return WBUSTYPE_VIRTUAL; return WBUSTYPE_UNKNOWN; } -@@ -148,6 +150,8 @@ bus_to_str (WacomBusType bus) +@@ -146,6 +148,8 @@ bus_to_str (WacomBusType bus) return "bluetooth"; case WBUSTYPE_I2C: return "i2c"; @@ -54,10 +55,10 @@ index d57ef2d..17571b6 100644 g_assert_not_reached (); } diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c -index 062b313..7b97bb1 100644 +index 935344c..88d0777 100644 --- a/libwacom/libwacom.c +++ b/libwacom/libwacom.c -@@ -147,6 +147,10 @@ get_bus_vid_pid (GUdevDevice *device, +@@ -149,6 +149,10 @@ get_bus_vid_pid (GUdevDevice *device, *bus = WBUSTYPE_I2C; retval = TRUE; break; @@ -68,7 +69,7 @@ index 062b313..7b97bb1 100644 } out: -@@ -765,6 +769,7 @@ static void print_match(int fd, const WacomMatch *match) +@@ -797,6 +801,7 @@ static void print_match(int fd, const WacomMatch *match) case WBUSTYPE_USB: bus_name = "usb"; break; case WBUSTYPE_SERIAL: bus_name = "serial"; break; case WBUSTYPE_I2C: bus_name = "i2c"; break; @@ -89,10 +90,10 @@ index 1b9bc2c..24e99cd 100644 /** diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c -index 9e5b02f..3883341 100644 +index 2095089..da5fe07 100644 --- a/test/test-tablet-validity.c +++ b/test/test-tablet-validity.c -@@ -179,6 +179,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid) +@@ -177,6 +177,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid) break; case WBUSTYPE_BLUETOOTH: case WBUSTYPE_I2C: @@ -101,5 +102,5 @@ index 9e5b02f..3883341 100644 g_assert_cmpint(pid, >, 0); break; -- -2.30.1 +2.31.1 |