Update to libwacom-2.0.0

13 files changed, 58 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1e6e49492749..7d8374569eb5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libwacom-surface
 	pkgdesc = Patched libwacom for Microsoft Surface devices
-	pkgver = 1.12
+	pkgver = 2.0.0
 	pkgrel = 1
 	url = https://github.com/linux-surface/libwacom
 	arch = x86_64
@@ -13,7 +13,7 @@ pkgbase = libwacom-surface
 	depends = glib2
 	depends = systemd
 	depends = libgudev
-	provides = libwacom=1.12
+	provides = libwacom=2.0.0
 	conflicts = libwacom
 	source = 0001-Add-support-for-BUS_VIRTUAL.patch
 	source = 0002-Add-support-for-Intel-Management-Engine-bus.patch
@@ -26,21 +26,21 @@ pkgbase = libwacom-surface
 	source = 0009-data-Add-Microsoft-Surface-Book-2-15.patch
 	source = 0010-data-Add-Microsoft-Surface-Book-3-13.5.patch
 	source = 0011-data-Add-Microsoft-Surface-Book-3-15.patch
-	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.12/libwacom-1.12.tar.bz2
-	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.12/libwacom-1.12.tar.bz2.sig
+	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.0.0/libwacom-2.0.0.tar.xz
+	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.0.0/libwacom-2.0.0.tar.xz.sig
 	validpgpkeys = 3C2C43D9447D5938EF4551EBE23B7E70B467F0BF
-	sha256sums = f5fce00cc3fa80e6bad42c6baa96480014ef7244a3da235b5bb2fc270c6812f5
-	sha256sums = 73ab975b884bf45269c680fcfd6c4ee96e17f984b98978b3301d5cb492bee733
-	sha256sums = 12d054857e2bd1bdcbdda55dd326928f386916284aed3e64c87fd8221ab25338
-	sha256sums = 2405d843de802644eb3bd9cd8f33c5def1d6b985b69b59e0a9b0b83a89b6949e
-	sha256sums = c02b0444d411f4485de7b5c34ddc237ffe8800386adf64642f4ab78b64512352
-	sha256sums = 5e376b3a90ac9d8ff080462d7b2ad5a126696601c184f47ac029d5ee8d92e944
-	sha256sums = cc61efcac4b62437a8b03186da837482305e684e055bf6c668328f820cf31896
-	sha256sums = b24a49d1ef7f16b6af37196d074e99fc7d059c6de3c40bb72a426c9708daa7eb
-	sha256sums = 21f0dab7f1727b7ac1f0491c1758c3b839017cba6e97790e8bf11ff82a957e03
-	sha256sums = b4263d845e180b6deb94002bd9c6fba1b7243994e37fb7b9ec336a8ad4b58683
-	sha256sums = bd5140879a449a3ca5443d7cae7c32426a2ffb78fafe20ad5f1998b0d226d40f
-	sha256sums = 290450d604f78bbd956eddb69f79f8d56f8ed1a5ccbb5e88e22fa84fa2fceb4f
+	sha256sums = b2110eced57007d601e4ed18644f0f44ceff357aede0ee321794d214fa038881
+	sha256sums = 0f43297b2248df9df0d315edb25a1f9e30e86a9a2c13d1260cf66ec7c7c42d3c
+	sha256sums = 7a2886015574ddaffdbf3462255064831a03e4a6df0152d10516e1639824ab19
+	sha256sums = 0cc9ae1d12bb2d72f2c465326ae94bb0ce6bd3fb85a8c21ad4d64ee386bdce22
+	sha256sums = 8026b2bbf840fe8e24897a740b4cc8ee0eb807440c9cd4502750823b022eeaef
+	sha256sums = 51c09e64e452d41a3a2ed98fa01a1283c51f6e3e517083baaba42af2262894fe
+	sha256sums = 25d3831c5d090d9053690f6b8d683e155789d05db116b14c23a3f8604e58b2db
+	sha256sums = b9633f0c292a0f385fdd8e8a2d1fa0214e0dd5aedf18460a92230b021dcb8b07
+	sha256sums = 4cd9ac66a493ec2a363154f682066aabb3c3b1f89f459addabcef3a4a00efcdf
+	sha256sums = 55e2dabee35ad1d6e8df0703afdd75344a08b2e56898255e31c722eb07341b47
+	sha256sums = 447507d06e842d1e83d90fa454b828e1a7a487619c57b1d62ac73bbdeb2cb4b1
+	sha256sums = 4923bdf3e7b4940bd81d3e7c1b8ab1843597a1bdf1e6f627840e0c87c381fe0a
 	sha256sums = SKIP
 
 pkgname = libwacom-surface
diff --git a/0001-Add-support-for-BUS_VIRTUAL.patch b/0001-Add-support-for-BUS_VIRTUAL.patch
index e981ab914169..68d1dfa97d2c 100644
--- a/0001-Add-support-for-BUS_VIRTUAL.patch
+++ b/0001-Add-support-for-BUS_VIRTUAL.patch
@@ -1,4 +1,4 @@
-From 846cc328cfe536ba49c00d907ca4b737d980a5f8 Mon Sep 17 00:00:00 2001
+From 5b2d219b4ef206e6501ae5b2fbd1e90e37986ecf 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/11] Add support for BUS_VIRTUAL
@@ -42,7 +42,7 @@ index a8987f7..3c7d0de 100644
  	g_assert_not_reached ();
  }
 diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index 935344c..88d0777 100644
+index ccfe43a..d9b8a22 100644
 --- a/libwacom/libwacom.c
 +++ b/libwacom/libwacom.c
 @@ -149,6 +149,10 @@ get_bus_vid_pid (GUdevDevice  *device,
@@ -56,7 +56,7 @@ index 935344c..88d0777 100644
  	}
  
  out:
-@@ -797,6 +801,7 @@ static void print_match(int fd, const WacomMatch *match)
+@@ -817,6 +821,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 935344c..88d0777 100644
  		default:			g_assert_not_reached(); break;
  	}
 diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
-index d611c9d..a4cbb23 100644
+index cafed64..b184ed7 100644
 --- a/libwacom/libwacom.h
 +++ b/libwacom/libwacom.h
 @@ -149,6 +149,7 @@ typedef enum {
@@ -102,5 +102,5 @@ index 3953b1e..734463f 100755
          assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
  
 -- 
-2.33.0
+2.34.1
 
diff --git a/0002-Add-support-for-Intel-Management-Engine-bus.patch b/0002-Add-support-for-Intel-Management-Engine-bus.patch
index b2ac1597874a..b32b32632916 100644
--- a/0002-Add-support-for-Intel-Management-Engine-bus.patch
+++ b/0002-Add-support-for-Intel-Management-Engine-bus.patch
@@ -1,4 +1,4 @@
-From 0e7b62459bdebcb5aec97e13babcbd792d25f0fd Mon Sep 17 00:00:00 2001
+From a5d0ce373887e3c8af7061e02b097fa9e7a95e07 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/11] Add support for Intel Management Engine bus
@@ -37,7 +37,7 @@ index 3c7d0de..28c0ac5 100644
  	g_assert_not_reached ();
  }
 diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index 88d0777..09e289f 100644
+index d9b8a22..e3364f4 100644
 --- a/libwacom/libwacom.c
 +++ b/libwacom/libwacom.c
 @@ -153,6 +153,10 @@ get_bus_vid_pid (GUdevDevice  *device,
@@ -51,7 +51,7 @@ index 88d0777..09e289f 100644
  	}
  
  out:
-@@ -802,6 +806,7 @@ static void print_match(int fd, const WacomMatch *match)
+@@ -822,6 +826,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 88d0777..09e289f 100644
  		default:			g_assert_not_reached(); break;
  	}
 diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
-index a4cbb23..034a894 100644
+index b184ed7..5cd6736 100644
 --- a/libwacom/libwacom.h
 +++ b/libwacom/libwacom.h
 @@ -150,6 +150,7 @@ typedef enum {
@@ -97,5 +97,5 @@ index 734463f..c9c6312 100755
          assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
  
 -- 
-2.33.0
+2.34.1
 
diff --git a/0003-data-Add-Microsoft-Surface-pro-4.patch b/0003-data-Add-Microsoft-Surface-pro-4.patch
index 6159d34fcc45..90caa746b094 100644
--- a/0003-data-Add-Microsoft-Surface-pro-4.patch
+++ b/0003-data-Add-Microsoft-Surface-pro-4.patch
@@ -1,4 +1,4 @@
-From 566c424a73420e4cf2c2894b3a4fa0e95479d373 Mon Sep 17 00:00:00 2001
+From d6cd3074ebf929bf6bcdf3f645c279afb18e7b9d Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:18:55 +0200
 Subject: [PATCH 03/11] data: Add Microsoft Surface pro 4
@@ -29,5 +29,5 @@ index 0000000..1e0c67c
 +Touch=true
 +Buttons=0
 -- 
-2.33.0
+2.34.1
 
diff --git a/0004-data-Add-Microsoft-Surface-pro-5.patch b/0004-data-Add-Microsoft-Surface-pro-5.patch
index d518e3f17f97..a9455303c573 100644
--- a/0004-data-Add-Microsoft-Surface-pro-5.patch
+++ b/0004-data-Add-Microsoft-Surface-pro-5.patch
@@ -1,4 +1,4 @@
-From 0ce2c07b2842e5bce81e16ca184c6cae00269677 Mon Sep 17 00:00:00 2001
+From 4cfead3582c875b09f2af992a2a74dce51768c2d Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:02 +0200
 Subject: [PATCH 04/11] data: Add Microsoft Surface pro 5
@@ -29,5 +29,5 @@ index 0000000..b26af3a
 +Touch=true
 +Buttons=0
 -- 
-2.33.0
+2.34.1
 
diff --git a/0005-data-Add-Microsoft-Surface-pro-6.patch b/0005-data-Add-Microsoft-Surface-pro-6.patch
index c33af6325fdb..12637cc683d6 100644
--- a/0005-data-Add-Microsoft-Surface-pro-6.patch
+++ b/0005-data-Add-Microsoft-Surface-pro-6.patch
@@ -1,4 +1,4 @@
-From 38c0df07ddb39d0d6d4116c0c789e2b10dbb790a Mon Sep 17 00:00:00 2001
+From 01da7c902d6902285a0d48bf889dc73ec33ee44b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:07 +0200
 Subject: [PATCH 05/11] data: Add Microsoft Surface pro 6
@@ -29,5 +29,5 @@ index 0000000..e97fad8
 +Touch=true
 +Buttons=0
 -- 
-2.33.0
+2.34.1
 
diff --git a/0006-data-Add-Microsoft-Surface-pro-7.patch b/0006-data-Add-Microsoft-Surface-pro-7.patch
index f2cef9ad3cd1..624d8c5ffe02 100644
--- a/0006-data-Add-Microsoft-Surface-pro-7.patch
+++ b/0006-data-Add-Microsoft-Surface-pro-7.patch
@@ -1,4 +1,4 @@
-From e826f7fd620e1cf765ee3fc5b2288fbcdc15eaef Mon Sep 17 00:00:00 2001
+From 6369471bb5ca5c3668c05fbdec7dab4cddfd9f3e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:13 +0200
 Subject: [PATCH 06/11] data: Add Microsoft Surface pro 7
@@ -29,5 +29,5 @@ index 0000000..7961379
 +Touch=true
 +Buttons=0
 -- 
-2.33.0
+2.34.1
 
diff --git a/0007-data-Add-Microsoft-Surface-Book.patch b/0007-data-Add-Microsoft-Surface-Book.patch
index 68208a7ef838..841be42a994d 100644
--- a/0007-data-Add-Microsoft-Surface-Book.patch
+++ b/0007-data-Add-Microsoft-Surface-Book.patch
@@ -1,4 +1,4 @@
-From d9dbf80cb49a359d9951856ae0e3ee223f53c0bc Mon Sep 17 00:00:00 2001
+From 77513a1331e9a38cd2e80533d1f6688fe9e4a930 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:19:38 +0200
 Subject: [PATCH 07/11] data: Add Microsoft Surface Book
@@ -29,5 +29,5 @@ index 0000000..e2a5401
 +Touch=true
 +Buttons=0
 -- 
-2.33.0
+2.34.1
 
diff --git a/0008-data-Add-Microsoft-Surface-Book-2-13.5.patch b/0008-data-Add-Microsoft-Surface-Book-2-13.5.patch
index c9667c78394c..40926608c768 100644
--- a/0008-data-Add-Microsoft-Surface-Book-2-13.5.patch
+++ b/0008-data-Add-Microsoft-Surface-Book-2-13.5.patch
@@ -1,4 +1,4 @@
-From aefe50be89e5b84c8fd5cff04ff0ce1b0e4eedb6 Mon Sep 17 00:00:00 2001
+From 2a724bfff96cc05394593b8a3ca8a0dab4b2c19b Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:04 +0200
 Subject: [PATCH 08/11] data: Add Microsoft Surface Book 2 (13.5")
@@ -29,5 +29,5 @@ index 0000000..b13cb07
 +Touch=true
 +Buttons=0
 -- 
-2.33.0
+2.34.1
 
diff --git a/0009-data-Add-Microsoft-Surface-Book-2-15.patch b/0009-data-Add-Microsoft-Surface-Book-2-15.patch
index 03d1b178f526..6b784429cb51 100644
--- a/0009-data-Add-Microsoft-Surface-Book-2-15.patch
+++ b/0009-data-Add-Microsoft-Surface-Book-2-15.patch
@@ -1,4 +1,4 @@
-From 38b03dcc3dd03c482f31b8473b2e39c4fdc308d3 Mon Sep 17 00:00:00 2001
+From 6317007aec054989b8a992fa7481d00d4ef89c38 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:13 +0200
 Subject: [PATCH 09/11] data: Add Microsoft Surface Book 2 (15")
@@ -29,5 +29,5 @@ index 0000000..ad98cc7
 +Touch=true
 +Buttons=0
 -- 
-2.33.0
+2.34.1
 
diff --git a/0010-data-Add-Microsoft-Surface-Book-3-13.5.patch b/0010-data-Add-Microsoft-Surface-Book-3-13.5.patch
index ae831cc600a6..916c761f1c71 100644
--- a/0010-data-Add-Microsoft-Surface-Book-3-13.5.patch
+++ b/0010-data-Add-Microsoft-Surface-Book-3-13.5.patch
@@ -1,4 +1,4 @@
-From 7200a9ea1054442c6d07bac7ef97918759a125f8 Mon Sep 17 00:00:00 2001
+From 9c5c879ebd7f2f692cdd33d2643300d66b12ec06 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:29 +0200
 Subject: [PATCH 10/11] data: Add Microsoft Surface Book 3 (13.5")
@@ -29,5 +29,5 @@ index 0000000..a33c9cb
 +Touch=true
 +Buttons=0
 -- 
-2.33.0
+2.34.1
 
diff --git a/0011-data-Add-Microsoft-Surface-Book-3-15.patch b/0011-data-Add-Microsoft-Surface-Book-3-15.patch
index db1900c10ce0..f99918980a4e 100644
--- a/0011-data-Add-Microsoft-Surface-Book-3-15.patch
+++ b/0011-data-Add-Microsoft-Surface-Book-3-15.patch
@@ -1,4 +1,4 @@
-From b0c52138ed2f35c3a301888c38bb150323a5e32b Mon Sep 17 00:00:00 2001
+From aeb6452b61ae8b88dff810e9ae11c2923d967a9d Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Tue, 18 Aug 2020 20:20:42 +0200
 Subject: [PATCH 11/11] data: Add Microsoft Surface Book 3 (15")
@@ -29,5 +29,5 @@ index 0000000..291321f
 +Touch=true
 +Buttons=0
 -- 
-2.33.0
+2.34.1
 
diff --git a/PKGBUILD b/PKGBUILD
index a0096e9c799e..15238f152cc5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Based on official Arch Linux PKGBUILD
 
 pkgname=libwacom-surface
-pkgver=1.12
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="Patched libwacom for Microsoft Surface devices"
 arch=('x86_64')
@@ -27,20 +27,20 @@ source=(
     '0009-data-Add-Microsoft-Surface-Book-2-15.patch'
     '0010-data-Add-Microsoft-Surface-Book-3-13.5.patch'
     '0011-data-Add-Microsoft-Surface-Book-3-15.patch'
-    "https://github.com/linuxwacom/libwacom/releases/download/libwacom-${pkgver}/libwacom-${pkgver}.tar.bz2"{,.sig}
+    "https://github.com/linuxwacom/libwacom/releases/download/libwacom-${pkgver}/libwacom-${pkgver}.tar.xz"{,.sig}
 )
-sha256sums=('f5fce00cc3fa80e6bad42c6baa96480014ef7244a3da235b5bb2fc270c6812f5'
-            '73ab975b884bf45269c680fcfd6c4ee96e17f984b98978b3301d5cb492bee733'
-            '12d054857e2bd1bdcbdda55dd326928f386916284aed3e64c87fd8221ab25338'
-            '2405d843de802644eb3bd9cd8f33c5def1d6b985b69b59e0a9b0b83a89b6949e'
-            'c02b0444d411f4485de7b5c34ddc237ffe8800386adf64642f4ab78b64512352'
-            '5e376b3a90ac9d8ff080462d7b2ad5a126696601c184f47ac029d5ee8d92e944'
-            'cc61efcac4b62437a8b03186da837482305e684e055bf6c668328f820cf31896'
-            'b24a49d1ef7f16b6af37196d074e99fc7d059c6de3c40bb72a426c9708daa7eb'
-            '21f0dab7f1727b7ac1f0491c1758c3b839017cba6e97790e8bf11ff82a957e03'
-            'b4263d845e180b6deb94002bd9c6fba1b7243994e37fb7b9ec336a8ad4b58683'
-            'bd5140879a449a3ca5443d7cae7c32426a2ffb78fafe20ad5f1998b0d226d40f'
-            '290450d604f78bbd956eddb69f79f8d56f8ed1a5ccbb5e88e22fa84fa2fceb4f'
+sha256sums=('b2110eced57007d601e4ed18644f0f44ceff357aede0ee321794d214fa038881'
+            '0f43297b2248df9df0d315edb25a1f9e30e86a9a2c13d1260cf66ec7c7c42d3c'
+            '7a2886015574ddaffdbf3462255064831a03e4a6df0152d10516e1639824ab19'
+            '0cc9ae1d12bb2d72f2c465326ae94bb0ce6bd3fb85a8c21ad4d64ee386bdce22'
+            '8026b2bbf840fe8e24897a740b4cc8ee0eb807440c9cd4502750823b022eeaef'
+            '51c09e64e452d41a3a2ed98fa01a1283c51f6e3e517083baaba42af2262894fe'
+            '25d3831c5d090d9053690f6b8d683e155789d05db116b14c23a3f8604e58b2db'
+            'b9633f0c292a0f385fdd8e8a2d1fa0214e0dd5aedf18460a92230b021dcb8b07'
+            '4cd9ac66a493ec2a363154f682066aabb3c3b1f89f459addabcef3a4a00efcdf'
+            '55e2dabee35ad1d6e8df0703afdd75344a08b2e56898255e31c722eb07341b47'
+            '447507d06e842d1e83d90fa454b828e1a7a487619c57b1d62ac73bbdeb2cb4b1'
+            '4923bdf3e7b4940bd81d3e7c1b8ab1843597a1bdf1e6f627840e0c87c381fe0a'
             'SKIP')
 
 prepare() {