Update to libwacom-2.10.0

qzed · qzed · commit 8357a6c7d4f4 · 2024-03-14T22:40:33.000+01:00
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 808f74da665bb932664b4950fe86e05910c77537 Mon Sep 17 00:00:00 2001
+From 2d6eb3775056be6c00993aa55eac79cac7678d6d 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/16] Add support for BUS_VIRTUAL
@@ -42,7 +42,7 @@ index 2c17e0d..090d5aa 100644
  	g_assert_not_reached ();
  }
 diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index d220d14..1ba0740 100644
+index c606e48..2f6bddd 100644
 --- a/libwacom/libwacom.c
 +++ b/libwacom/libwacom.c
 @@ -148,6 +148,10 @@ get_bus_vid_pid (GUdevDevice  *device,
@@ -101,5 +101,5 @@ index 4cca787..8ab1fea 100755
          assert re.match(
              "[0-9a-f]{4}", vid
 -- 
-2.43.0
+2.43.2
 
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 ff253e558ddc2cafed7ba1cf2bd93e3544debb30 Mon Sep 17 00:00:00 2001
+From 4348064ccdd80d1ded743bf63369116ccb165add Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 1 Jun 2019 21:17:15 +0200
 Subject: [PATCH 02/16] Add support for Intel Management Engine bus
@@ -37,7 +37,7 @@ index 090d5aa..5a749c9 100644
  	g_assert_not_reached ();
  }
 diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index 1ba0740..1de4dc3 100644
+index 2f6bddd..c838c6d 100644
 --- a/libwacom/libwacom.c
 +++ b/libwacom/libwacom.c
 @@ -152,6 +152,10 @@ get_bus_vid_pid (GUdevDevice  *device,
@@ -96,5 +96,5 @@ index 8ab1fea..a3f1d9d 100755
          assert re.match(
              "[0-9a-f]{4}", vid
 -- 
-2.43.0
+2.43.2
 
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 b2cd1fd0ecd63b4cb78de9111333e5ebd7ce8be6 Mon Sep 17 00:00:00 2001
+From 0a1d7af22cf6669f54a17c4c1f22578e46e37a3f Mon Sep 17 00:00:00 2001
 From: "Antony Jordan (Tablet)" <wiccan.two@gmail.com>
 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.43.0
+2.43.2
 
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 22d88608f2d8275c7903e99bbf6adb25917444b7 Mon Sep 17 00:00:00 2001
+From ddd387ca3f2bdc1b468243224cb2aa87193fef64 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.43.0
+2.43.2
 
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 817645f017e59fd6c52b055f6a84964bc2eb7ece Mon Sep 17 00:00:00 2001
+From 8ce0dca3d800e16527f50b8d67d4aefc728f1a4e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.43.0
+2.43.2
 
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 e220b3f08175713b573ae6442d1a78bd9d736523 Mon Sep 17 00:00:00 2001
+From 2befbc9238f317037db002a2739055ff4fd5ad66 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.43.0
+2.43.2
 
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 4ca473d97213ba21b44d802a97c08e6d1d5fa313 Mon Sep 17 00:00:00 2001
+From 8706ad3569c54a99996e05dedd60d2c3c0ca5bd7 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.43.0
+2.43.2
 
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 9b63f2d4a734c5939d79d3647b6f7b786aeb6be1 Mon Sep 17 00:00:00 2001
+From ffa37875474a83c5adc0edf84626531cdefd4fa8 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.43.0
+2.43.2
 
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 ed65256b6fe211840687af577c2e79961ba9827b Mon Sep 17 00:00:00 2001
+From b5bc8bc86d599a204bfb045ee10baaceb0fa5ed1 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.43.0
+2.43.2
 
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 9c11b480b22f200ace8fb3d67c48932a85938277 Mon Sep 17 00:00:00 2001
+From 2365ff0873af0160ffcc5393364633ce3ed26360 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.43.0
+2.43.2
 
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 be3ea124cbd482f4b4f7082f05cd96bbcf031acf Mon Sep 17 00:00:00 2001
+From 0e52c0a30996127aa46310aee4232cf3baa38085 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.43.0
+2.43.2
 
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 13159050c79d2fa615a5558457fe716c71628278 Mon Sep 17 00:00:00 2001
+From 96a93fff01751bbe25fd4878fcab5f2559fd0d5f Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.43.0
+2.43.2
 
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 55cefd38d6b74fe822ef2e18fc0cc8d97f21679a Mon Sep 17 00:00:00 2001
+From abd2697552066869d17ff871706e107c83ea6080 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.43.0
+2.43.2
 
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 4dbf2e50785b775ce18473b990810d162d27ab80 Mon Sep 17 00:00:00 2001
+From 0c16e4a3042ebf8c07ced8669e36bd71ee2979e1 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.43.0
+2.43.2
 
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 4a47f0eef0e3d7bb44b3b34f85e25d5b7e4ccc07 Mon Sep 17 00:00:00 2001
+From 344c77c54b5ae6977521172fa36870a144b40821 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.43.0
+2.43.2
 
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 8603173ac0a99578e1e7ed18f0864d002f6a2500 Mon Sep 17 00:00:00 2001
+From 2be0254453a4169dc9ce0dbab2d5eca7a6caf928 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 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.43.0
+2.43.2
 
diff --git a/pkg/debian/PKGBUILD b/pkg/debian/PKGBUILD
@@ -10,8 +10,8 @@ pkgname=(
     libwacom-surface
 )
 _pkgver1=1.12.1
-_pkgver2=2.9.0
-pkgver=2.9.0
+_pkgver2=2.10.0
+pkgver=2.10.0
 pkgrel=1
 pkgdesc="Patched libwacom for Microsoft Surface devices"
 arch=('amd64')
@@ -74,7 +74,7 @@ source=(
 )
 sha256sums=('053687f64fdb1c8947cf0e54743c47bfcfba8ef3cb22466a1faa1e2c37ccb315'
             'SKIP'
-            '6f678156797becc4f1537a19aadcc48ed7a54e1ff3cbf591d1233f8a2d82e242'
+            '3f8ef37de78ac3d08af1bdcb5d5828ec8284dcb7154bbec4995238728914aa0e'
             'SKIP'
             'c504893656f851832116616e6e5bd50b3d0ac36f7288042dc7eb50e396212bc4'
             'c64275d8129ed21c58442cda159c90bea6e97813ee91e3911344dd0760a6f35c'
@@ -92,22 +92,22 @@ sha256sums=('053687f64fdb1c8947cf0e54743c47bfcfba8ef3cb22466a1faa1e2c37ccb315'
             '3113ca84ad91f05a5c7f5076e3802ed6c8cd3805ea6bb8cd60c44d0cfe234ced'
             '554b6f6bd1f283094daf8911dfc288b4f88f3ae9e63cd450bb24fef89fc07d5a'
             'e780cf1f85edb37a675109574873d671ccc4e9bbac191e8f9685a4a1a79ced0c'
-            '7db8188ca1afd8655fd79b606428e403baefdec13484d4807ace4b992bed6807'
-            '5ec7cf7f5e0a4e0278563cb05e6a446c3a26ca82cd2e2a6c129d5d8cc35828e5'
-            'f14740304f43c336bdf7e1d78991717b504331f48c577d2c512ae276981c8f1e'
-            '649bfef25ae14d9cc44818ad466f1bcfab56b890acfbdbddd5f8a546cbfecebb'
-            'd54044d69ee002d891e554149d350462618329477d0e1900528c34973bcb315e'
-            '634e552757df946f997f0f682802828f6540b5eff9eb60965714e4c9a8c3a3f5'
-            'b3d7197f92d7e02e73b2f06a0b7770164f5052d38afa36843099468dd5eafafa'
-            'bd8ae40ec5e3214fab8a92861a1e07ba92c89aebd2ecfbe59f2649a92150d1fb'
-            '9dee7840ac3231adbd5c23c57a09a289e3cc3fe4a24fcb2c56e78ab2c86f86cd'
-            '101e8ba35a6493359667a3c119e6f792bde16e77c04642127e7dd81bc2d56d41'
-            '0b38005851833200cf31a4bc99a4bac40a560db14bf32f4c4ebcfe77f635e06b'
-            'f1236857310a8362abb8fc55e67a7013b61f03d593a89acf6ceae86cefc4ec37'
-            '5da915726aba84add16f5c509dc1be343db66f70a294b411759353b0ffaef0c2'
-            '8bb8c1aab143185a05b91cacaf600e147fcee55fc1abe67af0e1d6fed0b6e99f'
-            'bd6c8a319845ec161106b85859ab42b22ded1f6515676449a00bb3cc776acb43'
-            'bc4398d29b3a49e617cb7d9acd7a045c2a8c248c2065c96fd38ecc59e1a6d86f')
+            'a48d8009135e34b5a6e5ce7655167ff0cf371bc33610c49132bd1cd8922a3ba7'
+            '79ca3bca1c0635b0d49dfa189b36e9ee198a1b7ef7b6688dd473864f496ea7d2'
+            '2c6ccc2555829085482a9ac07db3be3970da39febaebdc4f5e1ee72ec8ee4090'
+            'be00652d92d8883c01fe0caeaab2ce0c2601dd8c5364e17768e56130c883e2a0'
+            '636e8b724b694eb33066cb486f62c10ae490fc22c76d82a4bd43c1b1705fec9d'
+            '96ceafb79ed3247c3008d51b4ff84b00fc59b3ae2c4a1147b747e04e3e186826'
+            '98c30e7e336d3ee99251ec95332a3940fbb70208e302a430d6c4821c5524f784'
+            '09cb5fcf17185e7c9f51bef673f1c2046b8c9890fafe6ab4fd8b47f196c7dd47'
+            '94125d8059d6f093c13c8ed1a4af000476701760d1478703f325feb751a46783'
+            '9e75a46ec9a68662842b61ce7525b5498515a9ec6cb0cf7f3beb93e1d54dd75c'
+            '38ba71d545cc3a087db2dc736b54a0207ac790d1cc07d5081418ffcada1074db'
+            'add6714be40db235e869599bf19c5120c53ad002bd24506f0ef32781df92835f'
+            'e47f4ed69a4b5a16d609185a20acb950bad14a3b6e3d024a37b350d9328b6d40'
+            '058a476aaa2799a4cfcd04b8ddd67bd3770df2b812b42bc8df1ea5b286d8c652'
+            '4284e113f1f34f7139805692fdb11c6b75ef1b647eaabc75af50f7acd23300a1'
+            'a9aca842b9372e3f4a397110a0768250b001dc4a5be1715af1081681ec7ebf4b')
 
 prepare() {
     msg2 "patching libwacom-${_pkgver1}"
diff --git a/pkg/fedora/libwacom-surface.spec b/pkg/fedora/libwacom-surface.spec
@@ -1,7 +1,7 @@
 %global debug_package %{nil}
 
 Name:           libwacom-surface
-Version:        2.9.0
+Version:        2.10.0
 Release:        1%{?dist}
 Summary:        Tablet Information Client Library
 Requires:       %{name}-data
@@ -107,6 +107,12 @@ install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir}
 %{_mandir}/man1/libwacom-list-devices.1*
 
 %changelog
+* Thu Mar 14 2024 Maximilian Luz <luzmaximilian@gmail.com> - 2.10.0-1
+- libwacom 2.10.0 surface
+
+* Wed Feb 07 2024 Peter Hutterer <peter.hutterer@redhat.com> - 2.10.0-1
+- libwacom 2.10.0 
+
 * Wed Dec 13 2023 Maximilian Luz <luzmaximilian@gmail.com> - 2.9.0-1
 - libwacom 2.9.0 surface
 
