Update to libwacom-2.15.0

Author: qzed

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

@@ -1,4 +1,4 @@
-From cc9e93e764de5800a078332cd909f64078045423 Mon Sep 17 00:00:00 2001
+From 483de1767646e8a0cba4eb9c4c6e90a6abe19b23 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
@@ -21,10 +21,10 @@ Signed-off-by: Dorian Stoll <[email protected]>
  6 files changed, 13 insertions(+)
 
 diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
-index 050ee25..7992930 100644
+index 7a6493ac..a6cd54b4 100644
 --- a/libwacom/libwacom-database.c
 +++ b/libwacom/libwacom-database.c
-@@ -130,6 +130,8 @@ bus_from_str (const char *str)
+@@ -174,6 +174,8 @@ bus_from_str (const char *str)
  		return WBUSTYPE_BLUETOOTH;
  	if (g_str_equal(str, "i2c"))
  		return WBUSTYPE_I2C;
@@ -33,7 +33,7 @@ index 050ee25..7992930 100644
  	return WBUSTYPE_UNKNOWN;
  }
 
-@@ -148,6 +150,8 @@ bus_to_str (WacomBusType bus)
+@@ -192,6 +194,8 @@ bus_to_str (WacomBusType bus)
  		return "bluetooth";
  	case WBUSTYPE_I2C:
  		return "i2c";
@@ -43,10 +43,10 @@ index 050ee25..7992930 100644
  	g_assert_not_reached ();
  }
 diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index 40b54b7..5c89f65 100644
+index 646a1525..fac97e65 100644
 --- a/libwacom/libwacom.c
 +++ b/libwacom/libwacom.c
-@@ -149,6 +149,10 @@ get_bus_vid_pid (GUdevDevice  *device,
+@@ -153,6 +153,10 @@ get_bus_vid_pid (GUdevDevice  *device,
  		*bus = WBUSTYPE_I2C;
  		retval = TRUE;
  		break;
@@ -57,7 +57,7 @@ index 40b54b7..5c89f65 100644
  	}
 
  out:
-@@ -1008,6 +1012,7 @@ static void print_match(int fd, const WacomMatch *match)
+@@ -1032,6 +1036,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;
@@ -66,7 +66,7 @@ index 40b54b7..5c89f65 100644
  		default:			g_assert_not_reached(); break;
  	}
 diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
-index c0d380c..a4fbb17 100644
+index 3c820f4a..17dd7600 100644
 --- a/libwacom/libwacom.h
 +++ b/libwacom/libwacom.h
 @@ -154,6 +154,7 @@ typedef enum {
@@ -78,7 +78,7 @@ index c0d380c..a4fbb17 100644
 
  /**
 diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
-index 69d34c8..964fce0 100644
+index c20e582e..77ff1327 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)
@@ -90,7 +90,7 @@ index 69d34c8..964fce0 100644
  			g_assert_cmpint(pid, >, 0);
  			break;
 diff --git a/test/test_data_files.py b/test/test_data_files.py
-index 9385b1c..f76c3f3 100755
+index 4cff174f..ee6ffcd3 100755
 --- a/test/test_data_files.py
 +++ b/test/test_data_files.py
 @@ -47,6 +47,7 @@ def test_device_match(tabletfile):
@@ -99,13 +99,13 @@ index 9385b1c..f76c3f3 100755
              "serial",
 +            "virt",
          ], f"{tabletfile}: unknown bus type"
-         assert re.match(
-             "[0-9a-f]{4}", vid
+         assert re.match("[0-9a-f]{4}", vid), (
+             f"{tabletfile}: {vid} must be lowercase hex"
 diff --git a/tools/debug-device.c b/tools/debug-device.c
-index 2cdac20..51ec53e 100644
+index c15bf41b..286e9148 100644
 --- a/tools/debug-device.c
 +++ b/tools/debug-device.c
-@@ -122,6 +122,7 @@ handle_device(WacomDeviceDatabase *db, const char *path)
+@@ -177,6 +177,7 @@ handle_device(WacomDeviceDatabase *db, const char *path)
  			case WBUSTYPE_SERIAL: busstr = "SERIAL"; break;
  			case WBUSTYPE_BLUETOOTH: busstr = "BLUETOOTH"; break;
  			case WBUSTYPE_I2C: busstr = "I2C"; break;
@@ -114,5 +114,5 @@ index 2cdac20..51ec53e 100644
  		func(libwacom_get_bustype, "%s", busstr);
  	}
 -- 
-2.46.0
+2.49.0
 

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

@@ -1,4 +1,4 @@
-From 74022a0f69ddb2e85913329a0aae63a6e30212b9 Mon Sep 17 00:00:00 2001
+From 2f55d3df2ef4908bc09ee3349793192acbb2042e 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
@@ -16,10 +16,10 @@ the Microsoft Surface Books, Surface Pro 5 and 6, and Surface Laptops.
  6 files changed, 13 insertions(+)
 
 diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
-index 7992930..9e93f4a 100644
+index a6cd54b4..2883bccb 100644
 --- a/libwacom/libwacom-database.c
 +++ b/libwacom/libwacom-database.c
-@@ -132,6 +132,8 @@ bus_from_str (const char *str)
+@@ -176,6 +176,8 @@ bus_from_str (const char *str)
  		return WBUSTYPE_I2C;
  	if (g_str_equal(str, "virt"))
  		return WBUSTYPE_VIRTUAL;
@@ -28,7 +28,7 @@ index 7992930..9e93f4a 100644
  	return WBUSTYPE_UNKNOWN;
  }
 
-@@ -152,6 +154,8 @@ bus_to_str (WacomBusType bus)
+@@ -196,6 +198,8 @@ bus_to_str (WacomBusType bus)
  		return "i2c";
  	case WBUSTYPE_VIRTUAL:
  		return "virt";
@@ -38,10 +38,10 @@ index 7992930..9e93f4a 100644
  	g_assert_not_reached ();
  }
 diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index 5c89f65..f5f3dab 100644
+index fac97e65..17f8607d 100644
 --- a/libwacom/libwacom.c
 +++ b/libwacom/libwacom.c
-@@ -153,6 +153,10 @@ get_bus_vid_pid (GUdevDevice  *device,
+@@ -157,6 +157,10 @@ get_bus_vid_pid (GUdevDevice  *device,
  		*bus = WBUSTYPE_VIRTUAL;
  		retval = TRUE;
  		break;
@@ -52,7 +52,7 @@ index 5c89f65..f5f3dab 100644
  	}
 
  out:
-@@ -1013,6 +1017,7 @@ static void print_match(int fd, const WacomMatch *match)
+@@ -1037,6 +1041,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;
@@ -61,7 +61,7 @@ index 5c89f65..f5f3dab 100644
  		default:			g_assert_not_reached(); break;
  	}
 diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
-index a4fbb17..dfc6d7b 100644
+index 17dd7600..798a31dd 100644
 --- a/libwacom/libwacom.h
 +++ b/libwacom/libwacom.h
 @@ -155,6 +155,7 @@ typedef enum {
@@ -73,7 +73,7 @@ index a4fbb17..dfc6d7b 100644
 
  /**
 diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
-index 964fce0..5178583 100644
+index 77ff1327..ad350912 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)
@@ -85,7 +85,7 @@ index 964fce0..5178583 100644
  			g_assert_cmpint(pid, >, 0);
  			break;
 diff --git a/test/test_data_files.py b/test/test_data_files.py
-index f76c3f3..f7cf9bc 100755
+index ee6ffcd3..bd7d798f 100755
 --- a/test/test_data_files.py
 +++ b/test/test_data_files.py
 @@ -48,6 +48,7 @@ def test_device_match(tabletfile):
@@ -94,13 +94,13 @@ index f76c3f3..f7cf9bc 100755
              "virt",
 +            "mei",
          ], f"{tabletfile}: unknown bus type"
-         assert re.match(
-             "[0-9a-f]{4}", vid
+         assert re.match("[0-9a-f]{4}", vid), (
+             f"{tabletfile}: {vid} must be lowercase hex"
 diff --git a/tools/debug-device.c b/tools/debug-device.c
-index 51ec53e..6a00f9d 100644
+index 286e9148..f5b17b56 100644
 --- a/tools/debug-device.c
 +++ b/tools/debug-device.c
-@@ -123,6 +123,7 @@ handle_device(WacomDeviceDatabase *db, const char *path)
+@@ -178,6 +178,7 @@ handle_device(WacomDeviceDatabase *db, const char *path)
  			case WBUSTYPE_BLUETOOTH: busstr = "BLUETOOTH"; break;
  			case WBUSTYPE_I2C: busstr = "I2C"; break;
  			case WBUSTYPE_VIRTUAL: busstr = "VIRTUAL"; break;
@@ -109,5 +109,5 @@ index 51ec53e..6a00f9d 100644
  		func(libwacom_get_bustype, "%s", busstr);
  	}
 -- 
-2.46.0
+2.49.0
 

patches/v2/0003-data-Add-Microsoft-Surface-Pro-3.patch

@@ -1,4 +1,4 @@
-From 6836969366011dc3608d714e664d742fc7374e8f Mon Sep 17 00:00:00 2001
+From 761db70bf8c45f2e4d9d3a6c3f729ba02a3f896e 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
@@ -10,7 +10,7 @@ Subject: [PATCH 03/16] data: Add Microsoft Surface Pro 3
 
 diff --git a/data/surface-pro3.tablet b/data/surface-pro3.tablet
 new file mode 100644
-index 0000000..2f53541
+index 00000000..2f535410
 --- /dev/null
 +++ b/data/surface-pro3.tablet
 @@ -0,0 +1,14 @@
@@ -29,5 +29,5 @@ index 0000000..2f53541
 +Touch=true
 +Buttons=0
 -- 
-2.46.0
+2.49.0
 

patches/v2/0004-data-Add-Microsoft-Surface-Pro-4.patch

@@ -1,4 +1,4 @@
-From 4429de269b7a887766adbdb47a1a2ac945d38ac5 Mon Sep 17 00:00:00 2001
+From 1c6924a7d9e239086d3a4241a841c9c2261c40cd 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
@@ -10,7 +10,7 @@ Subject: [PATCH 04/16] data: Add Microsoft Surface Pro 4
 
 diff --git a/data/surface-pro4.tablet b/data/surface-pro4.tablet
 new file mode 100644
-index 0000000..f77f3a2
+index 00000000..f77f3a2b
 --- /dev/null
 +++ b/data/surface-pro4.tablet
 @@ -0,0 +1,14 @@
@@ -29,5 +29,5 @@ index 0000000..f77f3a2
 +Touch=true
 +Buttons=0
 -- 
-2.46.0
+2.49.0
 

patches/v2/0005-data-Add-Microsoft-Surface-Pro-5.patch

@@ -1,4 +1,4 @@
-From a99d93f4aefb84d14905467e530c827c213eddf7 Mon Sep 17 00:00:00 2001
+From 0ea86d1e42bb69c20ac4526a21f581dc9c5bb7ee 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
@@ -10,7 +10,7 @@ Subject: [PATCH 05/16] data: Add Microsoft Surface Pro 5
 
 diff --git a/data/surface-pro5.tablet b/data/surface-pro5.tablet
 new file mode 100644
-index 0000000..410a0d3
+index 00000000..410a0d3f
 --- /dev/null
 +++ b/data/surface-pro5.tablet
 @@ -0,0 +1,14 @@
@@ -29,5 +29,5 @@ index 0000000..410a0d3
 +Touch=true
 +Buttons=0
 -- 
-2.46.0
+2.49.0
 

patches/v2/0006-data-Add-Microsoft-Surface-Pro-6.patch

@@ -1,4 +1,4 @@
-From 5ac41e97ba92275f23b6f0b3228d0390f31f8c4d Mon Sep 17 00:00:00 2001
+From 6071bde57d05b256b40b1ba462458c61ef27fd60 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
@@ -10,7 +10,7 @@ Subject: [PATCH 06/16] data: Add Microsoft Surface Pro 6
 
 diff --git a/data/surface-pro6.tablet b/data/surface-pro6.tablet
 new file mode 100644
-index 0000000..eb89df0
+index 00000000..eb89df02
 --- /dev/null
 +++ b/data/surface-pro6.tablet
 @@ -0,0 +1,14 @@
@@ -29,5 +29,5 @@ index 0000000..eb89df0
 +Touch=true
 +Buttons=0
 -- 
-2.46.0
+2.49.0
 

patches/v2/0007-data-Add-Microsoft-Surface-Pro-7.patch

@@ -1,4 +1,4 @@
-From 2b1d94138b628881c6e62b075e96b605bcb7a604 Mon Sep 17 00:00:00 2001
+From 5af4100c1d91fc8b4d7addd622086e9e99b1d3fc 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
@@ -10,7 +10,7 @@ Subject: [PATCH 07/16] data: Add Microsoft Surface Pro 7
 
 diff --git a/data/surface-pro7.tablet b/data/surface-pro7.tablet
 new file mode 100644
-index 0000000..f960107
+index 00000000..f9601079
 --- /dev/null
 +++ b/data/surface-pro7.tablet
 @@ -0,0 +1,14 @@
@@ -29,5 +29,5 @@ index 0000000..f960107
 +Touch=true
 +Buttons=0
 -- 
-2.46.0
+2.49.0
 

patches/v2/0008-data-Add-Microsoft-Surface-Pro-7.patch

@@ -1,4 +1,4 @@
-From 5055ff180d2521fc2df22ae491cf4c347d14ce14 Mon Sep 17 00:00:00 2001
+From 70653ee99139d138dc62922dacddb36ad141f5ed 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+
@@ -11,7 +11,7 @@ Based on https://github.com/linux-surface/libwacom-surface/issues/12
 
 diff --git a/data/surface-pro7-plus.tablet b/data/surface-pro7-plus.tablet
 new file mode 100644
-index 0000000..5c4e540
+index 00000000..5c4e540f
 --- /dev/null
 +++ b/data/surface-pro7-plus.tablet
 @@ -0,0 +1,14 @@
@@ -30,5 +30,5 @@ index 0000000..5c4e540
 +Touch=true
 +Buttons=0
 -- 
-2.46.0
+2.49.0
 

patches/v2/0009-data-Add-Microsoft-Surface-Pro-8.patch

@@ -1,4 +1,4 @@
-From 55fdc6767d3053618deac68640db2bb24fedf3e0 Mon Sep 17 00:00:00 2001
+From cc85faa92c8f56bc133200825d45510d355703db 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
@@ -11,7 +11,7 @@ Based on https://github.com/linux-surface/libwacom-surface/issues/13
 
 diff --git a/data/surface-pro8.tablet b/data/surface-pro8.tablet
 new file mode 100644
-index 0000000..dcfef11
+index 00000000..dcfef119
 --- /dev/null
 +++ b/data/surface-pro8.tablet
 @@ -0,0 +1,14 @@
@@ -30,5 +30,5 @@ index 0000000..dcfef11
 +Touch=true
 +Buttons=0
 -- 
-2.46.0
+2.49.0
 

patches/v2/0010-data-Add-Microsoft-Surface-Pro-9.patch

@@ -1,4 +1,4 @@
-From 41b05cb241478526ee6f378fffc542b3e827fd54 Mon Sep 17 00:00:00 2001
+From 8b29c5fd2a5a5dcc4cbaa4d6faddb4b14cf344cb 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
@@ -11,7 +11,7 @@ IDs taken from https://github.com/quo/ithc-linux/issues/5
 
 diff --git a/data/surface-pro9.tablet b/data/surface-pro9.tablet
 new file mode 100644
-index 0000000..ee2b3ee
+index 00000000..ee2b3eea
 --- /dev/null
 +++ b/data/surface-pro9.tablet
 @@ -0,0 +1,14 @@
@@ -30,5 +30,5 @@ index 0000000..ee2b3ee
 +Touch=true
 +Buttons=0
 -- 
-2.46.0
+2.49.0