Update to libwacom-2.9.0

linux-surface · Dec 13, 2023 · ada5237 · ada5237
1 parent 22a6d02
commit ada5237
Show file tree

Hide file tree

Showing 18 changed files with 143 additions and 84 deletions.
diff --git a/patches/v2/0001-Add-support-for-BUS_VIRTUAL.patch b/patches/v2/0001-Add-support-for-BUS_VIRTUAL.patch
@@ -1,4 +1,4 @@
-From ca5c3616a3c77b234e35ef953569b0da71084347 Mon Sep 17 00:00:00 2001
+From 808f74da665bb932664b4950fe86e05910c77537 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <[email protected]>
 Date: Sat, 27 Jun 2020 18:21:11 +0200
 Subject: [PATCH 01/16] Add support for BUS_VIRTUAL
@@ -20,10 +20,10 @@ Signed-off-by: Dorian Stoll <[email protected]>
  5 files changed, 12 insertions(+)
 
 diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
-index 804ac3d..96aaa5e 100644
+index 2c17e0d..090d5aa 100644
 --- a/libwacom/libwacom-database.c
 +++ b/libwacom/libwacom-database.c
-@@ -128,6 +128,8 @@ bus_from_str (const char *str)
+@@ -130,6 +130,8 @@ bus_from_str (const char *str)
  		return WBUSTYPE_BLUETOOTH;
  	if (g_str_equal(str, "i2c"))
  		return WBUSTYPE_I2C;
@@ -32,7 +32,7 @@ index 804ac3d..96aaa5e 100644
  	return WBUSTYPE_UNKNOWN;
  }
 
-@@ -146,6 +148,8 @@ bus_to_str (WacomBusType bus)
+@@ -148,6 +150,8 @@ bus_to_str (WacomBusType bus)
  		return "bluetooth";
  	case WBUSTYPE_I2C:
  		return "i2c";
@@ -42,10 +42,10 @@ index 804ac3d..96aaa5e 100644
  	g_assert_not_reached ();
  }
 diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index ccfe43a..d9b8a22 100644
+index d220d14..1ba0740 100644
 --- a/libwacom/libwacom.c
 +++ b/libwacom/libwacom.c
-@@ -149,6 +149,10 @@ get_bus_vid_pid (GUdevDevice  *device,
+@@ -148,6 +148,10 @@ get_bus_vid_pid (GUdevDevice  *device,
  		*bus = WBUSTYPE_I2C;
  		retval = TRUE;
  		break;
@@ -56,7 +56,7 @@ index ccfe43a..d9b8a22 100644
  	}
 
  out:
-@@ -817,6 +821,7 @@ static void print_match(int fd, const WacomMatch *match)
+@@ -826,6 +830,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;
@@ -65,7 +65,7 @@ index ccfe43a..d9b8a22 100644
  		default:			g_assert_not_reached(); break;
  	}
 diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
-index cafed64..b184ed7 100644
+index 389681d..040c51e 100644
 --- a/libwacom/libwacom.h
 +++ b/libwacom/libwacom.h
 @@ -149,6 +149,7 @@ typedef enum {
@@ -77,7 +77,7 @@ index cafed64..b184ed7 100644
 
  /**
 diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
-index 2095089..da5fe07 100644
+index 4b7983d..91e83de 100644
 --- a/test/test-tablet-validity.c
 +++ b/test/test-tablet-validity.c
 @@ -177,6 +177,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
@@ -89,7 +89,7 @@ index 2095089..da5fe07 100644
  			g_assert_cmpint(pid, >, 0);
  			break;
 diff --git a/test/test_data_files.py b/test/test_data_files.py
-index c2db899..476aeca 100755
+index 4cca787..8ab1fea 100755
 --- a/test/test_data_files.py
 +++ b/test/test_data_files.py
 @@ -46,6 +46,7 @@ def test_device_match(tabletfile):
@@ -101,5 +101,5 @@ index c2db899..476aeca 100755
          assert re.match(
              "[0-9a-f]{4}", vid
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0002-Add-support-for-Intel-Management-Engine-bus.patch b/patches/v2/0002-Add-support-for-Intel-Management-Engine-bus.patch
@@ -1,4 +1,4 @@
-From e2514eca67211f37574b1ef9c227c8f90b66e565 Mon Sep 17 00:00:00 2001
+From ff253e558ddc2cafed7ba1cf2bd93e3544debb30 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Sat, 1 Jun 2019 21:17:15 +0200
 Subject: [PATCH 02/16] Add support for Intel Management Engine bus
@@ -15,10 +15,10 @@ the Microsoft Surface Books, Surface Pro 5 and 6, and Surface Laptops.
  5 files changed, 12 insertions(+)
 
 diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
-index 96aaa5e..cc3ecfd 100644
+index 090d5aa..5a749c9 100644
 --- a/libwacom/libwacom-database.c
 +++ b/libwacom/libwacom-database.c
-@@ -130,6 +130,8 @@ bus_from_str (const char *str)
+@@ -132,6 +132,8 @@ bus_from_str (const char *str)
  		return WBUSTYPE_I2C;
  	if (g_str_equal(str, "virt"))
  		return WBUSTYPE_VIRTUAL;
@@ -27,7 +27,7 @@ index 96aaa5e..cc3ecfd 100644
  	return WBUSTYPE_UNKNOWN;
  }
 
-@@ -150,6 +152,8 @@ bus_to_str (WacomBusType bus)
+@@ -152,6 +154,8 @@ bus_to_str (WacomBusType bus)
  		return "i2c";
  	case WBUSTYPE_VIRTUAL:
  		return "virt";
@@ -37,10 +37,10 @@ index 96aaa5e..cc3ecfd 100644
  	g_assert_not_reached ();
  }
 diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index d9b8a22..e3364f4 100644
+index 1ba0740..1de4dc3 100644
 --- a/libwacom/libwacom.c
 +++ b/libwacom/libwacom.c
-@@ -153,6 +153,10 @@ get_bus_vid_pid (GUdevDevice  *device,
+@@ -152,6 +152,10 @@ get_bus_vid_pid (GUdevDevice  *device,
  		*bus = WBUSTYPE_VIRTUAL;
  		retval = TRUE;
  		break;
@@ -51,7 +51,7 @@ index d9b8a22..e3364f4 100644
  	}
 
  out:
-@@ -822,6 +826,7 @@ static void print_match(int fd, const WacomMatch *match)
+@@ -831,6 +835,7 @@ static void print_match(int fd, const WacomMatch *match)
  		case WBUSTYPE_SERIAL:		bus_name = "serial";	break;
  		case WBUSTYPE_I2C:		bus_name = "i2c";	break;
  		case WBUSTYPE_VIRTUAL:		bus_name = "virt";	break;
@@ -60,7 +60,7 @@ index d9b8a22..e3364f4 100644
  		default:			g_assert_not_reached(); break;
  	}
 diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
-index b184ed7..5cd6736 100644
+index 040c51e..a937c08 100644
 --- a/libwacom/libwacom.h
 +++ b/libwacom/libwacom.h
 @@ -150,6 +150,7 @@ typedef enum {
@@ -72,7 +72,7 @@ index b184ed7..5cd6736 100644
 
  /**
 diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
-index da5fe07..6b45597 100644
+index 91e83de..9c8af44 100644
 --- a/test/test-tablet-validity.c
 +++ b/test/test-tablet-validity.c
 @@ -178,6 +178,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
@@ -84,7 +84,7 @@ index da5fe07..6b45597 100644
  			g_assert_cmpint(pid, >, 0);
  			break;
 diff --git a/test/test_data_files.py b/test/test_data_files.py
-index 476aeca..cc739dd 100755
+index 8ab1fea..a3f1d9d 100755
 --- a/test/test_data_files.py
 +++ b/test/test_data_files.py
 @@ -47,6 +47,7 @@ def test_device_match(tabletfile):
@@ -96,5 +96,5 @@ index 476aeca..cc739dd 100755
          assert re.match(
              "[0-9a-f]{4}", vid
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0003-data-Add-Microsoft-Surface-Pro-3.patch b/patches/v2/0003-data-Add-Microsoft-Surface-Pro-3.patch
@@ -1,4 +1,4 @@
-From ea2503e14cbec0ce0402768ac1ad831625fda2a6 Mon Sep 17 00:00:00 2001
+From b2cd1fd0ecd63b4cb78de9111333e5ebd7ce8be6 Mon Sep 17 00:00:00 2001
 From: "Antony Jordan (Tablet)" <[email protected]>
 Date: Wed, 8 Jun 2022 22:03:33 +0200
 Subject: [PATCH 03/16] data: Add Microsoft Surface Pro 3
@@ -29,5 +29,5 @@ index 0000000..3238d43
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0004-data-Add-Microsoft-Surface-Pro-4.patch b/patches/v2/0004-data-Add-Microsoft-Surface-Pro-4.patch
@@ -1,4 +1,4 @@
-From 82bedd51116db60bd2f033ce6962e78ad85cdbc6 Mon Sep 17 00:00:00 2001
+From 22d88608f2d8275c7903e99bbf6adb25917444b7 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:18:55 +0200
 Subject: [PATCH 04/16] data: Add Microsoft Surface Pro 4
@@ -29,5 +29,5 @@ index 0000000..1e0c67c
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0005-data-Add-Microsoft-Surface-Pro-5.patch b/patches/v2/0005-data-Add-Microsoft-Surface-Pro-5.patch
@@ -1,4 +1,4 @@
-From 0bb846deb7e80cdf58d24b36818d0f53d9230350 Mon Sep 17 00:00:00 2001
+From 817645f017e59fd6c52b055f6a84964bc2eb7ece Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:19:02 +0200
 Subject: [PATCH 05/16] data: Add Microsoft Surface Pro 5
@@ -29,5 +29,5 @@ index 0000000..b26af3a
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0006-data-Add-Microsoft-Surface-Pro-6.patch b/patches/v2/0006-data-Add-Microsoft-Surface-Pro-6.patch
@@ -1,4 +1,4 @@
-From 3d86a63e2b2f8a83cdab5780590eb028dbd062d6 Mon Sep 17 00:00:00 2001
+From e220b3f08175713b573ae6442d1a78bd9d736523 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:19:07 +0200
 Subject: [PATCH 06/16] data: Add Microsoft Surface Pro 6
@@ -29,5 +29,5 @@ index 0000000..e97fad8
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0007-data-Add-Microsoft-Surface-Pro-7.patch b/patches/v2/0007-data-Add-Microsoft-Surface-Pro-7.patch
@@ -1,4 +1,4 @@
-From 863d8d86d360c84e0fdd4d4b7deab5dd491e35aa Mon Sep 17 00:00:00 2001
+From 4ca473d97213ba21b44d802a97c08e6d1d5fa313 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:19:13 +0200
 Subject: [PATCH 07/16] data: Add Microsoft Surface Pro 7
@@ -29,5 +29,5 @@ index 0000000..7961379
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0008-data-Add-Microsoft-Surface-Pro-7.patch b/patches/v2/0008-data-Add-Microsoft-Surface-Pro-7.patch
@@ -1,4 +1,4 @@
-From 3e7603439f3c43b43a5ffb205240c4aee288925f Mon Sep 17 00:00:00 2001
+From 9b63f2d4a734c5939d79d3647b6f7b786aeb6be1 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Fri, 26 May 2023 12:32:21 +0200
 Subject: [PATCH 08/16] data: Add Microsoft Surface Pro 7+
@@ -30,5 +30,5 @@ index 0000000..36e1e3f
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0009-data-Add-Microsoft-Surface-Pro-8.patch b/patches/v2/0009-data-Add-Microsoft-Surface-Pro-8.patch
@@ -1,4 +1,4 @@
-From bbb911a4dd661920b19fe7ac93a34a1251039092 Mon Sep 17 00:00:00 2001
+From ed65256b6fe211840687af577c2e79961ba9827b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Sun, 11 Jun 2023 21:29:52 +0200
 Subject: [PATCH 09/16] data: Add Microsoft Surface Pro 8
@@ -30,5 +30,5 @@ index 0000000..fe779af
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0010-data-Add-Microsoft-Surface-Pro-9.patch b/patches/v2/0010-data-Add-Microsoft-Surface-Pro-9.patch
@@ -1,4 +1,4 @@
-From bf6c55ab5bcd46c418a4a2ad0a0312e28b70e5e3 Mon Sep 17 00:00:00 2001
+From 9c11b480b22f200ace8fb3d67c48932a85938277 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Wed, 14 Jun 2023 21:11:36 +0200
 Subject: [PATCH 10/16] data: Add Microsoft Surface Pro 9
@@ -30,5 +30,5 @@ index 0000000..e5ccf68
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0011-data-Add-Microsoft-Surface-Book.patch b/patches/v2/0011-data-Add-Microsoft-Surface-Book.patch
@@ -1,4 +1,4 @@
-From 9c4344dffb1e06d81113eba3603f4c38457ceb44 Mon Sep 17 00:00:00 2001
+From be3ea124cbd482f4b4f7082f05cd96bbcf031acf Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:19:38 +0200
 Subject: [PATCH 11/16] data: Add Microsoft Surface Book
@@ -29,5 +29,5 @@ index 0000000..e2a5401
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0012-data-Add-Microsoft-Surface-Book-2-13.5.patch b/patches/v2/0012-data-Add-Microsoft-Surface-Book-2-13.5.patch
@@ -1,4 +1,4 @@
-From a5fd9e35dd06a300a2f50e4cb8724793331b5a47 Mon Sep 17 00:00:00 2001
+From 13159050c79d2fa615a5558457fe716c71628278 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:20:04 +0200
 Subject: [PATCH 12/16] data: Add Microsoft Surface Book 2 (13.5")
@@ -29,5 +29,5 @@ index 0000000..b13cb07
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0013-data-Add-Microsoft-Surface-Book-2-15.patch b/patches/v2/0013-data-Add-Microsoft-Surface-Book-2-15.patch
@@ -1,4 +1,4 @@
-From 6cd78337204a31c3479d077a78d2bd4c469c58bd Mon Sep 17 00:00:00 2001
+From 55cefd38d6b74fe822ef2e18fc0cc8d97f21679a Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:20:13 +0200
 Subject: [PATCH 13/16] data: Add Microsoft Surface Book 2 (15")
@@ -29,5 +29,5 @@ index 0000000..ad98cc7
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0014-data-Add-Microsoft-Surface-Book-3-13.5.patch b/patches/v2/0014-data-Add-Microsoft-Surface-Book-3-13.5.patch
@@ -1,4 +1,4 @@
-From ae98349af0b3a0a7ca2a7676f29d81a8d960bfe1 Mon Sep 17 00:00:00 2001
+From 4dbf2e50785b775ce18473b990810d162d27ab80 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:20:29 +0200
 Subject: [PATCH 14/16] data: Add Microsoft Surface Book 3 (13.5")
@@ -29,5 +29,5 @@ index 0000000..a33c9cb
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0015-data-Add-Microsoft-Surface-Book-3-15.patch b/patches/v2/0015-data-Add-Microsoft-Surface-Book-3-15.patch
@@ -1,4 +1,4 @@
-From f776cf5680942e0a03b1c6023851086fa0229a6c Mon Sep 17 00:00:00 2001
+From 4a47f0eef0e3d7bb44b3b34f85e25d5b7e4ccc07 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Tue, 18 Aug 2020 20:20:42 +0200
 Subject: [PATCH 15/16] data: Add Microsoft Surface Book 3 (15")
@@ -29,5 +29,5 @@ index 0000000..291321f
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0
 
diff --git a/patches/v2/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch b/patches/v2/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch
@@ -1,4 +1,4 @@
-From 33da22c5f8639c13d152c749cf71339d9caac622 Mon Sep 17 00:00:00 2001
+From 8603173ac0a99578e1e7ed18f0864d002f6a2500 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
 Date: Wed, 14 Jun 2023 21:12:41 +0200
 Subject: [PATCH 16/16] data: Add Microsoft Surface Laptop Studio
@@ -30,5 +30,5 @@ index 0000000..6739b2c
 +Touch=true
 +Buttons=0
 -- 
-2.42.0
+2.43.0