Update to libwacom-2.13.0

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

@@ -1,4 +1,4 @@
-From b89d3ac556baafbf88b34ae2feadbcffc87bc3e4 Mon Sep 17 00:00:00 2001
+From cc9e93e764de5800a078332cd909f64078045423 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,7 +21,7 @@ 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 eb47510..c5e2fcf 100644
+index 050ee25..7992930 100644
 --- a/libwacom/libwacom-database.c
 +++ b/libwacom/libwacom-database.c
 @@ -130,6 +130,8 @@ bus_from_str (const char *str)
@@ -43,7 +43,7 @@ index eb47510..c5e2fcf 100644
  	g_assert_not_reached ();
  }
 diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index 1ffb910..c028bde 100644
+index 40b54b7..5c89f65 100644
 --- a/libwacom/libwacom.c
 +++ b/libwacom/libwacom.c
 @@ -149,6 +149,10 @@ get_bus_vid_pid (GUdevDevice  *device,
@@ -57,7 +57,7 @@ index 1ffb910..c028bde 100644
  	}
 
  out:
-@@ -1022,6 +1026,7 @@ static void print_match(int fd, const WacomMatch *match)
+@@ -1008,6 +1012,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;
@@ -114,5 +114,5 @@ index 2cdac20..51ec53e 100644
  		func(libwacom_get_bustype, "%s", busstr);
  	}
 -- 
-2.45.1
+2.46.0
 

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

@@ -1,4 +1,4 @@
-From b8dae24b8f4bf24c3d1aeccc3efef81fc0f8b08d Mon Sep 17 00:00:00 2001
+From 74022a0f69ddb2e85913329a0aae63a6e30212b9 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,7 +16,7 @@ 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 c5e2fcf..d9fc0c4 100644
+index 7992930..9e93f4a 100644
 --- a/libwacom/libwacom-database.c
 +++ b/libwacom/libwacom-database.c
 @@ -132,6 +132,8 @@ bus_from_str (const char *str)
@@ -38,7 +38,7 @@ index c5e2fcf..d9fc0c4 100644
  	g_assert_not_reached ();
  }
 diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index c028bde..0d34227 100644
+index 5c89f65..f5f3dab 100644
 --- a/libwacom/libwacom.c
 +++ b/libwacom/libwacom.c
 @@ -153,6 +153,10 @@ get_bus_vid_pid (GUdevDevice  *device,
@@ -52,7 +52,7 @@ index c028bde..0d34227 100644
  	}
 
  out:
-@@ -1027,6 +1031,7 @@ static void print_match(int fd, const WacomMatch *match)
+@@ -1013,6 +1017,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;
@@ -109,5 +109,5 @@ index 51ec53e..6a00f9d 100644
  		func(libwacom_get_bustype, "%s", busstr);
  	}
 -- 
-2.45.1
+2.46.0
 

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

@@ -1,4 +1,4 @@
-From 2e5f077c87daeeae2dcc841c886668ab596ab952 Mon Sep 17 00:00:00 2001
+From 6836969366011dc3608d714e664d742fc7374e8f 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..2f53541
 +Touch=true
 +Buttons=0
 -- 
-2.45.1
+2.46.0
 

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

@@ -1,4 +1,4 @@
-From dc9e16bc247d513f1f468e7c8a7f71506941a320 Mon Sep 17 00:00:00 2001
+From 4429de269b7a887766adbdb47a1a2ac945d38ac5 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..f77f3a2
 +Touch=true
 +Buttons=0
 -- 
-2.45.1
+2.46.0
 

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

@@ -1,4 +1,4 @@
-From 2ade3bb0de43ade8d0f5d3f326cae2efedbdc015 Mon Sep 17 00:00:00 2001
+From a99d93f4aefb84d14905467e530c827c213eddf7 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..410a0d3
 +Touch=true
 +Buttons=0
 -- 
-2.45.1
+2.46.0
 

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

@@ -1,4 +1,4 @@
-From 83765f93b8586c5e152593254d9ac55b5d4a8ba9 Mon Sep 17 00:00:00 2001
+From 5ac41e97ba92275f23b6f0b3228d0390f31f8c4d 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..eb89df0
 +Touch=true
 +Buttons=0
 -- 
-2.45.1
+2.46.0
 

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

@@ -1,4 +1,4 @@
-From 8725c66f88c0bca79542e1069fbbdef98227de1a Mon Sep 17 00:00:00 2001
+From 2b1d94138b628881c6e62b075e96b605bcb7a604 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..f960107
 +Touch=true
 +Buttons=0
 -- 
-2.45.1
+2.46.0
 

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

@@ -1,4 +1,4 @@
-From fd315e255704f1172ec4940277ba5e28fd66990e Mon Sep 17 00:00:00 2001
+From 5055ff180d2521fc2df22ae491cf4c347d14ce14 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..5c4e540
 +Touch=true
 +Buttons=0
 -- 
-2.45.1
+2.46.0
 

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

@@ -1,4 +1,4 @@
-From 3ebad373725ed6d9415e000b5feffaba301fc4a4 Mon Sep 17 00:00:00 2001
+From 55fdc6767d3053618deac68640db2bb24fedf3e0 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..dcfef11
 +Touch=true
 +Buttons=0
 -- 
-2.45.1
+2.46.0
 

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

@@ -1,4 +1,4 @@
-From f6b54c01d9167b8caca4e6c986a477efd1d5f62b Mon Sep 17 00:00:00 2001
+From 41b05cb241478526ee6f378fffc542b3e827fd54 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..ee2b3ee
 +Touch=true
 +Buttons=0
 -- 
-2.45.1
+2.46.0
 

patches/v2/0011-data-Add-Microsoft-Surface-Book.patch

@@ -1,4 +1,4 @@
-From 51b2a3a1d62175da158ea8cd6332683e86a0aaee Mon Sep 17 00:00:00 2001
+From adca46c2a0d747258a4af2e1ebb9292083f2ef2b 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..6daf5b6
 +Touch=true
 +Buttons=0
 -- 
-2.45.1
+2.46.0
 

patches/v2/0012-data-Add-Microsoft-Surface-Book-2-13.5.patch

@@ -1,4 +1,4 @@
-From 4afaa31b2cf6475d2687b9f9e0bab25ab2262f83 Mon Sep 17 00:00:00 2001
+From f8e02d69daf7fd238a3ea2147f67b8e81a7de31b 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..7cf7ba3
 +Touch=true
 +Buttons=0
 -- 
-2.45.1
+2.46.0
 

patches/v2/0013-data-Add-Microsoft-Surface-Book-2-15.patch

@@ -1,4 +1,4 @@
-From 7c7ec57b1aed65386dd7388979099f9a428f9275 Mon Sep 17 00:00:00 2001
+From 3553b993850f0e1f6d95e7a479a160e20a609044 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..3266fca
 +Touch=true
 +Buttons=0
 -- 
-2.45.1
+2.46.0
 

patches/v2/0014-data-Add-Microsoft-Surface-Book-3-13.5.patch

@@ -1,4 +1,4 @@
-From 9d213e720946ea4bc7a815ce273d68c3a534a09c Mon Sep 17 00:00:00 2001
+From d0bcd29e443a106ac06263644c90d0fc52ab80a9 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..e363f33
 +Touch=true
 +Buttons=0
 -- 
-2.45.1
+2.46.0
 

patches/v2/0015-data-Add-Microsoft-Surface-Book-3-15.patch

@@ -1,4 +1,4 @@
-From cb410da1d83550efcd2a7a25286fc3a4bf5e8b86 Mon Sep 17 00:00:00 2001
+From 77cf5d635759f081fac5f7f695442a2cfcd1a7bf 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..4954b61
 +Touch=true
 +Buttons=0
 -- 
-2.45.1
+2.46.0
 

patches/v2/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch

@@ -1,4 +1,4 @@
-From 9a6737f4aae99f5fcad86c0843fc68f3123cee2f Mon Sep 17 00:00:00 2001
+From 2c1f919b14d923588313cf905909d6bada0b5299 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..6077403
 +Touch=true
 +Buttons=0
 -- 
-2.45.1
+2.46.0
 

pkg/debian/0001-Revert-minimum-meson-version-to-v0.53.0.patch

@@ -1,26 +1,34 @@
-From d95e1ae36c73d125f1f2574b57fbd1f540c467a5 Mon Sep 17 00:00:00 2001
+From d6f725da0e037ae900f404fe4bb671582cbd5128 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <[email protected]>
-Date: Tue, 11 Jun 2024 21:13:08 +0200
+Date: Sat, 14 Sep 2024 19:15:21 +0200
 Subject: [PATCH] Revert minimum meson version to v0.53.0
 
 ---
- meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ meson.build | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index c1787b5..0b31e5b 100644
+index 58ec3e3..b77f340 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -2,7 +2,7 @@ project('libwacom', 'c',
- 	version: '2.12.0',
+ 	version: '2.13.0',
  	license: 'HPND',
  	default_options: [ 'c_std=gnu99', 'warning_level=2' ],
--	meson_version: '>= 0.56.0')
+-	meson_version: '>= 0.57.0')
 +	meson_version: '>= 0.53.0')
 
- dir_bin     = get_option('prefix') / get_option('bindir')
- dir_data    = get_option('prefix') / get_option('datadir') / 'libwacom'
-@@ -304,7 +304,7 @@ if get_option('tests').enabled()
+ dir_bin      = get_option('prefix') / get_option('bindir')
+ dir_data     = get_option('prefix') / get_option('datadir') / 'libwacom'
+@@ -279,7 +279,6 @@ if get_option('tests').enabled()
+ 	if valgrind.found()
+ 		valgrind_suppressions_file = dir_test / 'valgrind.suppressions'
+ 		add_test_setup('valgrind',
+-			       exclude_suites: ['not-in-valgrind'],
+ 			       exe_wrapper: [valgrind,
+ 					     '--leak-check=full',
+ 					     '--gen-suppressions=all',
+@@ -309,7 +308,7 @@ if get_option('tests').enabled()
  			     args: ['--verbose',
  				     '-rfES',
  				     '--log-level=DEBUG',
@@ -30,5 +38,5 @@ index c1787b5..0b31e5b 100644
  				     meson.current_source_dir() / 'test' / f,
  			     ],
 -- 
-2.45.1
+2.46.0
 

pkg/debian/PKGBUILD

@@ -10,8 +10,8 @@ pkgname=(
     libwacom-surface
 )
 _pkgver1=1.12.1
-_pkgver2=2.12.2
-pkgver=2.12.2
+_pkgver2=2.13.0
+pkgver=2.13.0
 pkgrel=1
 pkgdesc="Patched libwacom for Microsoft Surface devices"
 arch=('amd64')
@@ -75,9 +75,9 @@ source=(
 )
 sha256sums=('053687f64fdb1c8947cf0e54743c47bfcfba8ef3cb22466a1faa1e2c37ccb315'
             'SKIP'
-            'c8319c40c70edd05d1839c0d3f449c23bdc90cd1f0d819bd0c1ec7c00b117700'
+            'acd18121441bbc00fc5c881fca08a33319ab814b798eac8d0be6354923f8fb08'
             'SKIP'
-            'c6bf372cf0ff9001add9dea672a5c23702bbb697d98dba83a034e52fc2805979'
+            '53b91d9e85d3542181873940cc9cf72ec042ae575cc23904fb49f4ee8a63933c'
             'c504893656f851832116616e6e5bd50b3d0ac36f7288042dc7eb50e396212bc4'
             'c64275d8129ed21c58442cda159c90bea6e97813ee91e3911344dd0760a6f35c'
             '279ad2b83cc9d7ee855ee24b5fe952472483b8d4d2f8884b10a9cc12fac7256d'
@@ -94,22 +94,22 @@ sha256sums=('053687f64fdb1c8947cf0e54743c47bfcfba8ef3cb22466a1faa1e2c37ccb315'
             '3113ca84ad91f05a5c7f5076e3802ed6c8cd3805ea6bb8cd60c44d0cfe234ced'
             '554b6f6bd1f283094daf8911dfc288b4f88f3ae9e63cd450bb24fef89fc07d5a'
             'e780cf1f85edb37a675109574873d671ccc4e9bbac191e8f9685a4a1a79ced0c'
-            '7c04ca0e57093f1e942ef41490f0b029fb0286914e1559b76165d0b14daf89b5'
-            '6be7da91006cd120b4fed933a1b17c27a6fcb1ce04381775b7060b1a0c39d885'
-            'bfbc0fdd5985a731a2c1a8fdea78d221bd4173c5c76b1a94c338c609845ee2eb'
-            '42f94cb4312842e33233b8e1195be00d371a7b070cdccaa29220bba488bd3a4d'
-            '1ed950b8968780ffd30245ad3481b7213e36f632ebffba26049419236ace2160'
-            'a50e1c38db3e18ca28d4b62788a57e04806bc5f5c1dbacb27a68e12add83cba3'
-            'd3bd6325a80439c645ce664460c76867094f9652521705501a9d852995b41979'
-            '01ff12b4a4f569feea0f869548d7cc2f6a295525157e0188468189130c6e4e74'
-            '80ffaa494ab055e4863578c462dde74029235e39a2bae58c282d59fe136402d6'
-            'd553efe7a31d34f67c52a3748993d8e07ab236686207a0163ca4bbee6ab571bc'
-            '35b31550b133ec8f607635b8898eab1d31aa13b03b2af34e8003eb71ab1d32ef'
-            'e48269db908628d5f153094a08c7cf3e04bff5e5aa674ea071020389e4be100e'
-            '77aa08c2e1401add8387a1248ea23c85c8fa40a7a96a95820eefe53aaf154351'
-            'c8b723002a7b33bf9e2ba93a73fa35cdd101ae100f4519d36b910379a58e16fb'
-            '3eea2d2d28d1fe3eea4b5f578f912e5d9dbd15a0e7c2f30b6c9283e30b00ff30'
-            'fffb14de0426a9a8ecdbb83f5531399dbcb16b66d283a7e3098d27d344216499')
+            '696164b851014a204cb42dcee0b04e98680df4154494454aed499e1928811668'
+            'd7ba3b1fa5d29d3905be5bc6b70bb351afebd1343b57ca8b213af1279b7ded49'
+            'cf8051976e8c2a52484cb66e9aba57dffef234931d879bd33704b9012656b517'
+            'f8b1dbff6cd13e7da6bfa5dc6b009f19588c8fccaff1d262960b0345604ecc9a'
+            '13bbaafb309cd900e8d9292955075521390849933fd6d8481ea34ac9b992f909'
+            '09d92bec44dadf9655d881dbb0c71edd32c5a897c40bd9edf13314c5c8ac46d2'
+            '29a7da851ea01ea1ff5403318a40c4da5f8ab842cbffa221891a2d68f17d5ee7'
+            '6360efe22f06676396adccdf48ed66349aa47a595bebcfab4a8ff04eee8537bf'
+            '93b04852ad3e1441e1c49541227c188d1dbf23ebeab94ba26d36e29818b0cf59'
+            '46cf653beb245639cc7044a5c03a1a654d5072d8ab6d9d1aebe9810fdc2f2393'
+            'a32dcf496234bbb960f519cfa49127bdb15de9d3aa965c40e4ec9ea561d55eb1'
+            '0b14ea69e7038169d309618a5767bfc2de2b5895e1bcc8ec4c4b606466835524'
+            '5787ed06c0c0c5b099666927b232fc4299bd9589c3971f3affb00b982356753a'
+            'df9a4d9cb980dff8644e8e5070e396079397fac4a941cdbf5417742842f9c7f1'
+            '6baf29f63a1d7366ee6b9a8ca11359eb57cac9fcaf276caa3e7ac9e29fcbefce'
+            '77afbd2151461fb0a4e3353a3c7e3af7ec37dbdaf0edd519d69e1894ccecaa0d')
 
 prepare() {
     msg2 "patching libwacom-${_pkgver1}"

pkg/fedora/0001-Add-support-for-BUS_VIRTUAL.patch

@@ -0,0 +1 @@
+../../patches/v2/0001-Add-support-for-BUS_VIRTUAL.patch

pkg/fedora/0002-Add-support-for-Intel-Management-Engine-bus.patch

@@ -0,0 +1 @@
+../../patches/v2/0002-Add-support-for-Intel-Management-Engine-bus.patch

pkg/fedora/0003-data-Add-Microsoft-Surface-Pro-3.patch

@@ -0,0 +1 @@
+../../patches/v2/0003-data-Add-Microsoft-Surface-Pro-3.patch

pkg/fedora/0004-data-Add-Microsoft-Surface-Pro-4.patch

@@ -0,0 +1 @@
+../../patches/v2/0004-data-Add-Microsoft-Surface-Pro-4.patch

pkg/fedora/0005-data-Add-Microsoft-Surface-Pro-5.patch

@@ -0,0 +1 @@
+../../patches/v2/0005-data-Add-Microsoft-Surface-Pro-5.patch

pkg/fedora/0006-data-Add-Microsoft-Surface-Pro-6.patch

@@ -0,0 +1 @@
+../../patches/v2/0006-data-Add-Microsoft-Surface-Pro-6.patch

pkg/fedora/0007-data-Add-Microsoft-Surface-Pro-7.patch

@@ -0,0 +1 @@
+../../patches/v2/0007-data-Add-Microsoft-Surface-Pro-7.patch

pkg/fedora/0008-data-Add-Microsoft-Surface-Pro-7.patch

@@ -0,0 +1 @@
+../../patches/v2/0008-data-Add-Microsoft-Surface-Pro-7.patch