Update to libwacom-2.6.0

qzed · qzed · commit 08b6362b9076 · 2023-02-02T02:18:10.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 9d10eb342207b97731d2577f6cd3a50283b64a5a Mon Sep 17 00:00:00 2001
+From a7475cd68d1e76d74bdb192652bdd5b7a879f1d7 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/12] Add support for BUS_VIRTUAL
@@ -102,5 +102,5 @@ index d732bd1..4b21b6a 100755
          assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
  
 -- 
-2.38.0
+2.39.1
 
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 4fd524a0397c1364d7963462b0134cb88f1de9bb Mon Sep 17 00:00:00 2001
+From df9f3dc3b76fac2dae92e53250cc5ed8ed8f4c8a 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/12] Add support for Intel Management Engine bus
@@ -97,5 +97,5 @@ index 4b21b6a..04a1310 100755
          assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
  
 -- 
-2.38.0
+2.39.1
 
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 589c61539f8a518a2b65958781f395aafb0b8388 Mon Sep 17 00:00:00 2001
+From f0bef3c18c6050f7fd3151a8dc504f777966bef3 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/12] data: Add Microsoft Surface Pro 3
@@ -29,5 +29,5 @@ index 0000000..3238d43
 +Touch=true
 +Buttons=0
 -- 
-2.38.0
+2.39.1
 
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 1545af0b14af46f137647cf115a7d12f8e6b8d23 Mon Sep 17 00:00:00 2001
+From 30c13b66db3ab0d7037bfed649eb018dce6d64d4 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/12] data: Add Microsoft Surface Pro 4
@@ -29,5 +29,5 @@ index 0000000..1e0c67c
 +Touch=true
 +Buttons=0
 -- 
-2.38.0
+2.39.1
 
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 3f0d519017d62cfed890f14e9a590344a88037bb Mon Sep 17 00:00:00 2001
+From 435890e807f4af7bedd4977627b305b8e448b1b2 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/12] data: Add Microsoft Surface Pro 5
@@ -29,5 +29,5 @@ index 0000000..b26af3a
 +Touch=true
 +Buttons=0
 -- 
-2.38.0
+2.39.1
 
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 0cda0ec5ee39dae761414dd396988fcc600473ed Mon Sep 17 00:00:00 2001
+From 73304fe135721875de0bef2dbbde32285a81c4c3 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/12] data: Add Microsoft Surface Pro 6
@@ -29,5 +29,5 @@ index 0000000..e97fad8
 +Touch=true
 +Buttons=0
 -- 
-2.38.0
+2.39.1
 
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 2ae0860ff8d01cb38e4536f8d274f1ec65354e0e Mon Sep 17 00:00:00 2001
+From 3dc12d92bd13fd38501e9bb2f6b3e1cc3b94ce5a 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/12] data: Add Microsoft Surface Pro 7
@@ -29,5 +29,5 @@ index 0000000..7961379
 +Touch=true
 +Buttons=0
 -- 
-2.38.0
+2.39.1
 
diff --git a/patches/v2/0008-data-Add-Microsoft-Surface-Book.patch b/patches/v2/0008-data-Add-Microsoft-Surface-Book.patch
@@ -1,4 +1,4 @@
-From 575cf1c7bb7b1c025a9f21a8fbf82fd935a5090b Mon Sep 17 00:00:00 2001
+From 1f047efd4bd7ab1d77b99d079bde082463ee47f0 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:38 +0200
 Subject: [PATCH 08/12] data: Add Microsoft Surface Book
@@ -29,5 +29,5 @@ index 0000000..e2a5401
 +Touch=true
 +Buttons=0
 -- 
-2.38.0
+2.39.1
 
diff --git a/patches/v2/0009-data-Add-Microsoft-Surface-Book-2-13.5.patch b/patches/v2/0009-data-Add-Microsoft-Surface-Book-2-13.5.patch
@@ -1,4 +1,4 @@
-From 4aeb66bc104959078be387b4d7772fe5b50de83e Mon Sep 17 00:00:00 2001
+From 65e4bca15a972b86e1fdb8efb00ba6f0f3c89367 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:04 +0200
 Subject: [PATCH 09/12] data: Add Microsoft Surface Book 2 (13.5")
@@ -29,5 +29,5 @@ index 0000000..b13cb07
 +Touch=true
 +Buttons=0
 -- 
-2.38.0
+2.39.1
 
diff --git a/patches/v2/0010-data-Add-Microsoft-Surface-Book-2-15.patch b/patches/v2/0010-data-Add-Microsoft-Surface-Book-2-15.patch
@@ -1,4 +1,4 @@
-From 5c0f9befb9207cc6031f5a98f76f2dbfa310a741 Mon Sep 17 00:00:00 2001
+From e0969b521e5ec1ee8563fe9ba1e1b61386ace57a Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:13 +0200
 Subject: [PATCH 10/12] data: Add Microsoft Surface Book 2 (15")
@@ -29,5 +29,5 @@ index 0000000..ad98cc7
 +Touch=true
 +Buttons=0
 -- 
-2.38.0
+2.39.1
 
diff --git a/patches/v2/0011-data-Add-Microsoft-Surface-Book-3-13.5.patch b/patches/v2/0011-data-Add-Microsoft-Surface-Book-3-13.5.patch
@@ -1,4 +1,4 @@
-From 5478a259e51dcb0fa383b59dc0b50cf19d918c8f Mon Sep 17 00:00:00 2001
+From 2ba86d198e221d6e74eb4cf47f80c12654cda37e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:29 +0200
 Subject: [PATCH 11/12] data: Add Microsoft Surface Book 3 (13.5")
@@ -29,5 +29,5 @@ index 0000000..a33c9cb
 +Touch=true
 +Buttons=0
 -- 
-2.38.0
+2.39.1
 
diff --git a/patches/v2/0012-data-Add-Microsoft-Surface-Book-3-15.patch b/patches/v2/0012-data-Add-Microsoft-Surface-Book-3-15.patch
@@ -1,4 +1,4 @@
-From 7487dd6a7e80d597283ba5cca8a7069b0cec26b8 Mon Sep 17 00:00:00 2001
+From b0380862020fc69f77023b2f240be330030a2a49 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:42 +0200
 Subject: [PATCH 12/12] data: Add Microsoft Surface Book 3 (15")
@@ -29,5 +29,5 @@ index 0000000..291321f
 +Touch=true
 +Buttons=0
 -- 
-2.38.0
+2.39.1
 
diff --git a/pkg/debian/PKGBUILD b/pkg/debian/PKGBUILD
@@ -10,8 +10,8 @@ pkgname=(
     libwacom-surface
 )
 _pkgver1=1.12.1
-_pkgver2=2.5.0
-pkgver=2.5.0
+_pkgver2=2.6.0
+pkgver=2.6.0
 pkgrel=1
 pkgdesc="Patched libwacom for Microsoft Surface devices"
 arch=('amd64')
@@ -65,7 +65,7 @@ source=(
 )
 sha256sums=('053687f64fdb1c8947cf0e54743c47bfcfba8ef3cb22466a1faa1e2c37ccb315'
             'SKIP'
-            '40b69a4c38bbcbc80b1231bc115551107ebbc0ba14d2ad1c3e54355dcd876816'
+            '2376cca99475235b75053a2cfbc7ed40fd8763d5a516941a664870ff1f3aa98f'
             'SKIP'
             '1ed944ebfff70925d7b72014892a861056eb3c92d06978ba344aac9b90dba921'
             '26be090f8f4a8da4ce4729612126cc6178cbbc7dc574d240fd7d054dbd65e543'
@@ -79,18 +79,18 @@ sha256sums=('053687f64fdb1c8947cf0e54743c47bfcfba8ef3cb22466a1faa1e2c37ccb315'
             'bd444fa63e2c2125727ebdb8dd62119f9bcc3934c53339f7f4ebf108618ec59e'
             'ce780091102ec9cc5acf2e029bd43b2beebd1e181a9f8bed16da44f9b3ce17fe'
             '9963560ed413c5340d870c7221d7682734fa85235e3131f77076262a6962e899'
-            'df74a5120abd8b36387910f7a10bcc6e55d27d78e7870fac86d0209cfe0ec690'
-            '2479522c18575c673c822614d680d59d4a3e61aab53bcfc8b214504924db3b77'
-            '120efc9ccfcf159f8f5bce9d48838dd9febc3661827cf37bd4d2b01f78487569'
-            '167c55b625c98b9620ae65b82bb6b83ad59326a73ef2952e65fb57622ab9d43b'
-            '85e767c6b981c83a80e435f9aa313eac92b6e5056272e484e9881de91fc06965'
-            'dd9c3ad59d6f51368616afc1485abab09a5d5300fb48a92fb03f1e59074d3f11'
-            '8f4572ef5a45a09160a85e2483bedc53f0e299ddae681b9b24f7b6b2dcc7241a'
-            '20267f19f35476fa915cdbcec310995efb6af0d64ba0ebc321b1661fe686ba26'
-            '44770f5dc6d019021f5ee8dd59f8fca2e2b687f817d4f889d635c4e18aa5a7a4'
-            'a13b958804c3a76e8feab26b544552ae6f536b9dcf1391128537be597eb6fc80'
-            '4db44bd2f0923325dbcc95cb83bd2507d9c7dcecebcaece3f78c183dca22f737'
-            '4e8786a24b412f51c07db9f45e72da532c2524ff4ba8a71339a6ba3a021a37d7')
+            '30f8ea4c4f6e5d0e93e746edc6c45f9f51ce5de51919bacd6dcd9d6ad45c2485'
+            '37021ba70f4c721bdca081364ff966e665b44841b9ec8165fa81469dc4f3ac4b'
+            'd2d63a9f88e4e902a84af6ec66658a5b9befcc66b8e62472c087ff5f724328c5'
+            '0a276d6242bcc2f3baf5cca8574f24b79f0d6933ad15071c967cab6e85a0287c'
+            'b2cf2ba543a90fd909f0c982edf1f2283f773d997921fdfee4e436e5ac16352e'
+            '5804607b73770d9b26c2c8a8ac49d695c565c7472e4cb87e6ce6f89b6cf07b74'
+            'eec88ac7eb7b618f9c2cd61df599a524155e852cb0b99fa248c8bf4efe4ed278'
+            '5f9314d3d676591d9fcb3f8a37def8ce77ff4e2d55907b82143051e6d6f2b960'
+            '5bae7be9cafca3f98e9dd59c3d103bc983280585044610208152cd43e6b3d78d'
+            'a4226a479ff74deddf38cffda99447c18e0175fa2cfdc8b50dbd3473e1d94e2e'
+            'ca7161b4991b1915e82a55e3e5f44c7ed34b52daff34062a950697755b99e97e'
+            '05b88326d0ad49936412052707a9e65d31c624da299119db8d1f9bd600b4d830')
 
 prepare() {
     msg2 "patching libwacom-${_pkgver1}"
diff --git a/pkg/fedora/libwacom-surface.spec b/pkg/fedora/libwacom-surface.spec
@@ -2,11 +2,11 @@
 
 Name:           libwacom-surface
 %if %{fedora} >= 36
-Version:        2.5.0
+Version:        2.6.0
 Release:        1%{?dist}
 %else
 Version:        1.12.1
-Release:        8%{?dist}
+Release:        9%{?dist}
 %endif
 Summary:        Tablet Information Client Library
 Requires:       %{name}-data
