Revert to libwacom-1.12.1

13 files changed, 51 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d8374569eb5..8abc66140422 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libwacom-surface
 	pkgdesc = Patched libwacom for Microsoft Surface devices
-	pkgver = 2.0.0
+	pkgver = 1.12.1
 	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=2.0.0
+	provides = libwacom=1.12.1
 	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-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
+	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.12.1/libwacom-1.12.1.tar.bz2
+	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.12.1/libwacom-1.12.1.tar.bz2.sig
 	validpgpkeys = 3C2C43D9447D5938EF4551EBE23B7E70B467F0BF
-	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 = f0dd37c1fb5df159a8596c5d587a7108774a72b6394823973b62f713821fa2a6
+	sha256sums = 1f3c8de1abfbcbdf629f894cddd1e48e798f88f709c00f7fb87196a90fa4605f
+	sha256sums = 07710600984df95875b58aa59fffbea30257079e1bffedce606c926aa508be5d
+	sha256sums = c5b6ffc46b923a4dfc1ed1a999548650a617aa2320348b5f69f45dc2388ba6b0
+	sha256sums = 0ac63f53a79dc20813f9c190005ad9ce073812e12a359557efb1b1aaba13416c
+	sha256sums = 1c4526b1b30a8b9c5dac6491d1c36cb5d6537e1cd497b9ee365c3a90232e956c
+	sha256sums = 662505e626143f5136c43831e49b232633da6ef6b4787ac5236dfbf812e2771c
+	sha256sums = 48fd58dc30ca4bc862a1e77b4e0bd4e50e078239e877e85d5fb36640cd882bc5
+	sha256sums = 73f750ad8bda8c94dc74d13e2475f5b3c1e6584c33ac47780272aac84ae3d7e8
+	sha256sums = 83aace4c8e1040cba959b79f5a5d05c44652b7f21fc1d75b358065c93b48e4d8
+	sha256sums = b1a4577d1f0c39b2e7b5b1eb59a427abbc01d6f19a9fd8111dc1148c1dc44942
+	sha256sums = 053687f64fdb1c8947cf0e54743c47bfcfba8ef3cb22466a1faa1e2c37ccb315
 	sha256sums = SKIP
 
 pkgname = libwacom-surface
diff --git a/0001-Add-support-for-BUS_VIRTUAL.patch b/0001-Add-support-for-BUS_VIRTUAL.patch
index 68d1dfa97d2c..0ea07cbd5577 100644
--- a/0001-Add-support-for-BUS_VIRTUAL.patch
+++ b/0001-Add-support-for-BUS_VIRTUAL.patch
@@ -1,4 +1,4 @@
-From 5b2d219b4ef206e6501ae5b2fbd1e90e37986ecf Mon Sep 17 00:00:00 2001
+From 3f437a3a53b2159bb385335be0598f8859ff385f 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 ccfe43a..d9b8a22 100644
+index 935344c..88d0777 100644
 --- a/libwacom/libwacom.c
 +++ b/libwacom/libwacom.c
 @@ -149,6 +149,10 @@ get_bus_vid_pid (GUdevDevice  *device,
@@ -56,7 +56,7 @@ index ccfe43a..d9b8a22 100644
  	}
  
  out:
-@@ -817,6 +821,7 @@ static void print_match(int fd, const WacomMatch *match)
+@@ -797,6 +801,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 ccfe43a..d9b8a22 100644
  		default:			g_assert_not_reached(); break;
  	}
 diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
-index cafed64..b184ed7 100644
+index d611c9d..a4cbb23 100644
 --- a/libwacom/libwacom.h
 +++ b/libwacom/libwacom.h
 @@ -149,6 +149,7 @@ typedef enum {
diff --git a/0002-Add-support-for-Intel-Management-Engine-bus.patch b/0002-Add-support-for-Intel-Management-Engine-bus.patch
index b32b32632916..fed56d69224c 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 a5d0ce373887e3c8af7061e02b097fa9e7a95e07 Mon Sep 17 00:00:00 2001
+From 52157eec5eb3c6f172531f741d2897b0401ac6c2 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 d9b8a22..e3364f4 100644
+index 88d0777..09e289f 100644
 --- a/libwacom/libwacom.c
 +++ b/libwacom/libwacom.c
 @@ -153,6 +153,10 @@ get_bus_vid_pid (GUdevDevice  *device,
@@ -51,7 +51,7 @@ index d9b8a22..e3364f4 100644
  	}
  
  out:
-@@ -822,6 +826,7 @@ static void print_match(int fd, const WacomMatch *match)
+@@ -802,6 +806,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 d9b8a22..e3364f4 100644
  		default:			g_assert_not_reached(); break;
  	}
 diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
-index b184ed7..5cd6736 100644
+index a4cbb23..034a894 100644
 --- a/libwacom/libwacom.h
 +++ b/libwacom/libwacom.h
 @@ -150,6 +150,7 @@ typedef enum {
diff --git a/0003-data-Add-Microsoft-Surface-pro-4.patch b/0003-data-Add-Microsoft-Surface-pro-4.patch
index 90caa746b094..175c79b306eb 100644
--- a/0003-data-Add-Microsoft-Surface-pro-4.patch
+++ b/0003-data-Add-Microsoft-Surface-pro-4.patch
@@ -1,4 +1,4 @@
-From d6cd3074ebf929bf6bcdf3f645c279afb18e7b9d Mon Sep 17 00:00:00 2001
+From 3abcd457cb0b6a2d3fe3275ac8590b2a8cc138fd 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
diff --git a/0004-data-Add-Microsoft-Surface-pro-5.patch b/0004-data-Add-Microsoft-Surface-pro-5.patch
index a9455303c573..14b21667c32a 100644
--- a/0004-data-Add-Microsoft-Surface-pro-5.patch
+++ b/0004-data-Add-Microsoft-Surface-pro-5.patch
@@ -1,4 +1,4 @@
-From 4cfead3582c875b09f2af992a2a74dce51768c2d Mon Sep 17 00:00:00 2001
+From e094d589a92163e3490d35cda608d16283e2131b 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
diff --git a/0005-data-Add-Microsoft-Surface-pro-6.patch b/0005-data-Add-Microsoft-Surface-pro-6.patch
index 12637cc683d6..6fc0c8f78ba6 100644
--- a/0005-data-Add-Microsoft-Surface-pro-6.patch
+++ b/0005-data-Add-Microsoft-Surface-pro-6.patch
@@ -1,4 +1,4 @@
-From 01da7c902d6902285a0d48bf889dc73ec33ee44b Mon Sep 17 00:00:00 2001
+From 400291cf0e63eada2c26d59b23a9b24dd8f6f44a 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
diff --git a/0006-data-Add-Microsoft-Surface-pro-7.patch b/0006-data-Add-Microsoft-Surface-pro-7.patch
index 624d8c5ffe02..fa00a409f296 100644
--- a/0006-data-Add-Microsoft-Surface-pro-7.patch
+++ b/0006-data-Add-Microsoft-Surface-pro-7.patch
@@ -1,4 +1,4 @@
-From 6369471bb5ca5c3668c05fbdec7dab4cddfd9f3e Mon Sep 17 00:00:00 2001
+From fb66daa6e63cf88a98012ab751f71610b0fff854 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
diff --git a/0007-data-Add-Microsoft-Surface-Book.patch b/0007-data-Add-Microsoft-Surface-Book.patch
index 841be42a994d..2ecad7a65b62 100644
--- a/0007-data-Add-Microsoft-Surface-Book.patch
+++ b/0007-data-Add-Microsoft-Surface-Book.patch
@@ -1,4 +1,4 @@
-From 77513a1331e9a38cd2e80533d1f6688fe9e4a930 Mon Sep 17 00:00:00 2001
+From 5ee91e95219c5ffb9bf27f22495eae4f85072baa 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
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 40926608c768..759f3dc74be0 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 2a724bfff96cc05394593b8a3ca8a0dab4b2c19b Mon Sep 17 00:00:00 2001
+From 1201f3dff4e62accc517d427bd4f1c89890d799c 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")
diff --git a/0009-data-Add-Microsoft-Surface-Book-2-15.patch b/0009-data-Add-Microsoft-Surface-Book-2-15.patch
index 6b784429cb51..6f48d3fd5085 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 6317007aec054989b8a992fa7481d00d4ef89c38 Mon Sep 17 00:00:00 2001
+From 6a802f267c31855decdca31e6f49b51f02d04c38 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")
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 916c761f1c71..278c0f46c0e3 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 9c5c879ebd7f2f692cdd33d2643300d66b12ec06 Mon Sep 17 00:00:00 2001
+From 0db3bbd8c8dc1aebafcfff1b6a94063ffd93b584 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")
diff --git a/0011-data-Add-Microsoft-Surface-Book-3-15.patch b/0011-data-Add-Microsoft-Surface-Book-3-15.patch
index f99918980a4e..88924428591c 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 aeb6452b61ae8b88dff810e9ae11c2923d967a9d Mon Sep 17 00:00:00 2001
+From 9eedc8963136a06557f2e63d4ea69b0108b1c0b6 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")
diff --git a/PKGBUILD b/PKGBUILD
index 15238f152cc5..ee58ad3f2da3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Based on official Arch Linux PKGBUILD
 
 pkgname=libwacom-surface
-pkgver=2.0.0
+pkgver=1.12.1
 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.xz"{,.sig}
+    "https://github.com/linuxwacom/libwacom/releases/download/libwacom-${pkgver}/libwacom-${pkgver}.tar.bz2"{,.sig}
 )
-sha256sums=('b2110eced57007d601e4ed18644f0f44ceff357aede0ee321794d214fa038881'
-            '0f43297b2248df9df0d315edb25a1f9e30e86a9a2c13d1260cf66ec7c7c42d3c'
-            '7a2886015574ddaffdbf3462255064831a03e4a6df0152d10516e1639824ab19'
-            '0cc9ae1d12bb2d72f2c465326ae94bb0ce6bd3fb85a8c21ad4d64ee386bdce22'
-            '8026b2bbf840fe8e24897a740b4cc8ee0eb807440c9cd4502750823b022eeaef'
-            '51c09e64e452d41a3a2ed98fa01a1283c51f6e3e517083baaba42af2262894fe'
-            '25d3831c5d090d9053690f6b8d683e155789d05db116b14c23a3f8604e58b2db'
-            'b9633f0c292a0f385fdd8e8a2d1fa0214e0dd5aedf18460a92230b021dcb8b07'
-            '4cd9ac66a493ec2a363154f682066aabb3c3b1f89f459addabcef3a4a00efcdf'
-            '55e2dabee35ad1d6e8df0703afdd75344a08b2e56898255e31c722eb07341b47'
-            '447507d06e842d1e83d90fa454b828e1a7a487619c57b1d62ac73bbdeb2cb4b1'
-            '4923bdf3e7b4940bd81d3e7c1b8ab1843597a1bdf1e6f627840e0c87c381fe0a'
+sha256sums=('f0dd37c1fb5df159a8596c5d587a7108774a72b6394823973b62f713821fa2a6'
+            '1f3c8de1abfbcbdf629f894cddd1e48e798f88f709c00f7fb87196a90fa4605f'
+            '07710600984df95875b58aa59fffbea30257079e1bffedce606c926aa508be5d'
+            'c5b6ffc46b923a4dfc1ed1a999548650a617aa2320348b5f69f45dc2388ba6b0'
+            '0ac63f53a79dc20813f9c190005ad9ce073812e12a359557efb1b1aaba13416c'
+            '1c4526b1b30a8b9c5dac6491d1c36cb5d6537e1cd497b9ee365c3a90232e956c'
+            '662505e626143f5136c43831e49b232633da6ef6b4787ac5236dfbf812e2771c'
+            '48fd58dc30ca4bc862a1e77b4e0bd4e50e078239e877e85d5fb36640cd882bc5'
+            '73f750ad8bda8c94dc74d13e2475f5b3c1e6584c33ac47780272aac84ae3d7e8'
+            '83aace4c8e1040cba959b79f5a5d05c44652b7f21fc1d75b358065c93b48e4d8'
+            'b1a4577d1f0c39b2e7b5b1eb59a427abbc01d6f19a9fd8111dc1148c1dc44942'
+            '053687f64fdb1c8947cf0e54743c47bfcfba8ef3cb22466a1faa1e2c37ccb315'
             'SKIP')
 
 prepare() {
@@ -56,9 +56,10 @@ build() {
     ninja -C build
 }
 
-check() {
-    ninja test -C build
-}
+# disabled for now...
+#check() {
+#    ninja test -C build
+#}
 
 package() {
     DESTDIR="${pkgdir}" ninja install -C build