Update to libwacom-1.3

10 files changed, 63 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f5314cf4d06..27c4e107d8c1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libwacom-surface
 	pkgdesc = Patched libwacom for Microsoft Surface devices
-	pkgver = 1.2
-	pkgrel = 2
+	pkgver = 1.3
+	pkgrel = 1
 	url = https://github.com/linux-surface/libwacom
 	arch = x86_64
 	license = MIT
@@ -10,7 +10,7 @@ pkgbase = libwacom-surface
 	depends = glib2
 	depends = systemd
 	depends = libgudev
-	provides = libwacom=1.2
+	provides = libwacom=1.3
 	conflicts = libwacom
 	source = 0001-Add-support-for-Intel-Management-Engine-bus.patch
 	source = 0002-data-Add-Microsoft-Surface-Pro-4.patch
@@ -20,18 +20,18 @@ pkgbase = libwacom-surface
 	source = 0006-data-Add-Microsoft-Surface-Book-2-13.5.patch
 	source = 0007-data-Add-Microsoft-Surface-Book-2-15.patch
 	source = 0008-data-Add-Microsoft-Surface-Go.patch
-	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.2/libwacom-1.2.tar.bz2
-	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.2/libwacom-1.2.tar.bz2.sig
+	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.3/libwacom-1.3.tar.bz2
+	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.3/libwacom-1.3.tar.bz2.sig
 	validpgpkeys = 3C2C43D9447D5938EF4551EBE23B7E70B467F0BF
-	sha256sums = 7c4ff319dcf48debca4445d18ef10a50435d41a54f9d2b9ca0b41a238c3d76de
-	sha256sums = 281d6d13129cb04809bf94dc7d8bc631f04d2cb99f5d2e890d4f69086f206048
-	sha256sums = e1813105d44b1ad289853a73795b0b86701a750202f6733100ee0c4bd457e283
-	sha256sums = d166a0f37f39ffa186ee2577940465f1bc70d00b8bb75e15af6dffa82233c401
-	sha256sums = 78cbe7898e896fd594610a58c2dc2972348bbc3b89ff21f880687fb0b9190d74
-	sha256sums = b05ba743fd4315906fbcfa1dd8f13ce3c09ca4b7dbd05d9b17353827880f8d3b
-	sha256sums = 65173fcf181e9346aab610598cf1155aa83ee89af6cd9b767d5e27482e25c928
-	sha256sums = 3d9bbeab1447996089181d5dd7ff1331e87dfbb5b292b280cfa0e51f0250230d
-	sha256sums = c204cfdee2159d124a4f5ecc8970bbd72f9adf5ad7fd94b66798f93db1f863c3
+	sha256sums = 3f5cf68310477c21dbe05ca213d95010188b7cf54a2d98d6ef7c0adad776b210
+	sha256sums = f0a4f080be79cd088618c23ab083fdfcea1102af879d0385e658845226f82dc6
+	sha256sums = 9b343d6906d7b39872e6f9d7cd249fdd093b85dc279dfd6e77eb09dd05b61321
+	sha256sums = 4df6930caad3eb93337d1d18b6e622265f3dafa8e51e5e8bbb276aca8f84b561
+	sha256sums = 9967cab88d7ac8ea56f3525cd025103f79bd5bce2a4471c62c526bf64e90259f
+	sha256sums = 48fc778b0c8c9874dbb21b91b1ab81fa6d4fd6c51fb49099e28d6ffe18cc48d6
+	sha256sums = aba10fe7bdcf2c292211cfd49c1041f7b9c1a782a0f3a8e4f701aa70cd5e607f
+	sha256sums = 64f62919b95f0b942aa59670a9c6691e43f50c562120636f1841b9e12f6d2354
+	sha256sums = e19ce00fe1e074cc54ffd198dda6c6f1ec389e5c913134adc8795f2c5e63883c
 	sha256sums = SKIP
 
 pkgname = libwacom-surface
diff --git a/0001-Add-support-for-Intel-Management-Engine-bus.patch b/0001-Add-support-for-Intel-Management-Engine-bus.patch
index e72f82e5c08a..21aa6be6f1ed 100644
--- a/0001-Add-support-for-Intel-Management-Engine-bus.patch
+++ b/0001-Add-support-for-Intel-Management-Engine-bus.patch
@@ -1,4 +1,4 @@
-From 4b36a9066dbe229fbe81fe2534b4c5af04854961 Mon Sep 17 00:00:00 2001
+From 435a6d9547d5b24a73da93cdba0d7bb5c513b6c1 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 1 Jun 2019 21:17:15 +0200
 Subject: [PATCH 1/8] Add support for Intel Management Engine bus
@@ -71,17 +71,17 @@ index 8035e17..799e9b2 100644
  
  /**
 diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
-index 7f36197..2805da5 100644
+index 8ee41e2..42e5f54 100644
 --- a/test/test-tablet-validity.c
 +++ b/test/test-tablet-validity.c
-@@ -171,6 +171,7 @@ test_vidpid(gconstpointer data)
- 		case WBUSTYPE_USB:
+@@ -172,6 +172,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
+ 			/* fall through */
  		case WBUSTYPE_BLUETOOTH:
  		case WBUSTYPE_I2C:
 +		case WBUSTYPE_MEI:
- 			g_assert_cmpint(libwacom_get_vendor_id(device), >, 0);
- 			g_assert_cmpint(libwacom_get_product_id(device), >, 0);
+ 			g_assert_cmpint(vid, >, 0);
+ 			g_assert_cmpint(pid, >, 0);
  			break;
 -- 
-2.24.1
+2.26.0
 
diff --git a/0002-data-Add-Microsoft-Surface-Pro-4.patch b/0002-data-Add-Microsoft-Surface-Pro-4.patch
index 1ac938fcc2ce..769e34de0c18 100644
--- a/0002-data-Add-Microsoft-Surface-Pro-4.patch
+++ b/0002-data-Add-Microsoft-Surface-Pro-4.patch
@@ -1,4 +1,4 @@
-From 007ea6725861dae2fe12af8f1c3905077026bd4a Mon Sep 17 00:00:00 2001
+From 16df70f77e5636dd0d14d999ad3f535c6fae0c8e Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 3 Jun 2019 00:42:30 +0200
 Subject: [PATCH 2/8] data: Add Microsoft Surface Pro 4
@@ -30,17 +30,17 @@ index 0000000..bb6f02f
 +Touch=true
 +Buttons=0
 diff --git a/meson.build b/meson.build
-index 41ea756..da920c8 100644
+index 20eb0fc..b1de7ed 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -318,6 +318,7 @@ data_files = [
+@@ -348,6 +348,7 @@ data_files = [
  	'data/one-by-wacom-s-p.tablet',
  	'data/one-by-wacom-s-p2.tablet',
  	'data/serial-wacf004.tablet',
 +	'data/surface-pro4.tablet',
+ 	'data/wacom-one.tablet',
  	'data/xp-pen-star03.tablet',
  ]
- 
 -- 
-2.24.1
+2.26.0
 
diff --git a/0003-data-Add-Microsoft-Surface-Pro-5.patch b/0003-data-Add-Microsoft-Surface-Pro-5.patch
index 96b0c66334bf..4c7530f136cf 100644
--- a/0003-data-Add-Microsoft-Surface-Pro-5.patch
+++ b/0003-data-Add-Microsoft-Surface-Pro-5.patch
@@ -1,4 +1,4 @@
-From 9dcfb5a3318c46599718b1dad9b4f9181126a1ba Mon Sep 17 00:00:00 2001
+From d89c414a70db49e6ca7672d05d5647159b8b29a2 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sat, 1 Jun 2019 22:09:47 +0200
 Subject: [PATCH 3/8] data: Add Microsoft Surface Pro 5
@@ -30,17 +30,17 @@ index 0000000..2ad6539
 +Touch=true
 +Buttons=0
 diff --git a/meson.build b/meson.build
-index da920c8..ba17ef0 100644
+index b1de7ed..41f29c3 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -319,6 +319,7 @@ data_files = [
+@@ -349,6 +349,7 @@ data_files = [
  	'data/one-by-wacom-s-p2.tablet',
  	'data/serial-wacf004.tablet',
  	'data/surface-pro4.tablet',
 +	'data/surface-pro5.tablet',
+ 	'data/wacom-one.tablet',
  	'data/xp-pen-star03.tablet',
  ]
- 
 -- 
-2.24.1
+2.26.0
 
diff --git a/0004-data-Add-Microsoft-Surface-Pro-6.patch b/0004-data-Add-Microsoft-Surface-Pro-6.patch
index 6cdc09d04d11..518e0d7dc99d 100644
--- a/0004-data-Add-Microsoft-Surface-Pro-6.patch
+++ b/0004-data-Add-Microsoft-Surface-Pro-6.patch
@@ -1,4 +1,4 @@
-From 233e53ef4460d597a9bcc782e640bd61b7e1868e Mon Sep 17 00:00:00 2001
+From 4614cfcf4f437ef1e042100e7750e36c032e2146 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 3 Jun 2019 00:40:34 +0200
 Subject: [PATCH 4/8] data: Add Microsoft Surface Pro 6
@@ -30,17 +30,17 @@ index 0000000..da31e8f
 +Touch=true
 +Buttons=0
 diff --git a/meson.build b/meson.build
-index ba17ef0..735e332 100644
+index 41f29c3..49bb185 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -320,6 +320,7 @@ data_files = [
+@@ -350,6 +350,7 @@ data_files = [
  	'data/serial-wacf004.tablet',
  	'data/surface-pro4.tablet',
  	'data/surface-pro5.tablet',
 +	'data/surface-pro6.tablet',
+ 	'data/wacom-one.tablet',
  	'data/xp-pen-star03.tablet',
  ]
- 
 -- 
-2.24.1
+2.26.0
 
diff --git a/0005-data-Add-Microsoft-Surface-Book.patch b/0005-data-Add-Microsoft-Surface-Book.patch
index 5b1b97a5ef00..5fd560161604 100644
--- a/0005-data-Add-Microsoft-Surface-Book.patch
+++ b/0005-data-Add-Microsoft-Surface-Book.patch
@@ -1,4 +1,4 @@
-From 5555d9221da9378393d14529a62eaed8afbd824f Mon Sep 17 00:00:00 2001
+From 9535ce6363534d7bf7c964a9bcc305515b0df5eb Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Mon, 3 Jun 2019 00:45:41 +0200
 Subject: [PATCH 5/8] data: Add Microsoft Surface Book
@@ -30,10 +30,10 @@ index 0000000..45e17db
 +Touch=true
 +Buttons=0
 diff --git a/meson.build b/meson.build
-index 735e332..3b68396 100644
+index 49bb185..04f58e0 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -318,6 +318,7 @@ data_files = [
+@@ -348,6 +348,7 @@ data_files = [
  	'data/one-by-wacom-s-p.tablet',
  	'data/one-by-wacom-s-p2.tablet',
  	'data/serial-wacf004.tablet',
@@ -42,5 +42,5 @@ index 735e332..3b68396 100644
  	'data/surface-pro5.tablet',
  	'data/surface-pro6.tablet',
 -- 
-2.24.1
+2.26.0
 
diff --git a/0006-data-Add-Microsoft-Surface-Book-2-13.5.patch b/0006-data-Add-Microsoft-Surface-Book-2-13.5.patch
index 602892a717a9..0b8b1d2548f9 100644
--- a/0006-data-Add-Microsoft-Surface-Book-2-13.5.patch
+++ b/0006-data-Add-Microsoft-Surface-Book-2-13.5.patch
@@ -1,4 +1,4 @@
-From b85499b82ce7ce27de75834607e67b7be0a91a0e Mon Sep 17 00:00:00 2001
+From ac4dc86a56e6a046a282fd84fefed5d7c03a01e2 Mon Sep 17 00:00:00 2001
 From: qzed <qzed@users.noreply.github.com>
 Date: Sat, 1 Jun 2019 21:48:02 +0200
 Subject: [PATCH 6/8] data: Add Microsoft Surface Book 2 (13.5")
@@ -30,10 +30,10 @@ index 0000000..dc1353e
 +Touch=true
 +Buttons=0
 diff --git a/meson.build b/meson.build
-index 3b68396..d5f3f89 100644
+index 04f58e0..84f4316 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -319,6 +319,7 @@ data_files = [
+@@ -349,6 +349,7 @@ data_files = [
  	'data/one-by-wacom-s-p2.tablet',
  	'data/serial-wacf004.tablet',
  	'data/surface-book.tablet',
@@ -42,5 +42,5 @@ index 3b68396..d5f3f89 100644
  	'data/surface-pro5.tablet',
  	'data/surface-pro6.tablet',
 -- 
-2.24.1
+2.26.0
 
diff --git a/0007-data-Add-Microsoft-Surface-Book-2-15.patch b/0007-data-Add-Microsoft-Surface-Book-2-15.patch
index 49caf5189c82..b145b94fe070 100644
--- a/0007-data-Add-Microsoft-Surface-Book-2-15.patch
+++ b/0007-data-Add-Microsoft-Surface-Book-2-15.patch
@@ -1,4 +1,4 @@
-From 03c38d658e7a7c5ff891260520c957157b02b312 Mon Sep 17 00:00:00 2001
+From 66f02a33892d866bc50e0840b03145bf590c1322 Mon Sep 17 00:00:00 2001
 From: Maximilian Luz <luzmaximilian@gmail.com>
 Date: Sun, 2 Jun 2019 01:01:15 +0200
 Subject: [PATCH 7/8] data: Add Microsoft Surface Book 2 (15")
@@ -30,10 +30,10 @@ index 0000000..6ec6551
 +Touch=true
 +Buttons=0
 diff --git a/meson.build b/meson.build
-index d5f3f89..e89dab8 100644
+index 84f4316..55f40af 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -320,6 +320,7 @@ data_files = [
+@@ -350,6 +350,7 @@ data_files = [
  	'data/serial-wacf004.tablet',
  	'data/surface-book.tablet',
  	'data/surface-book2-13.tablet',
@@ -42,5 +42,5 @@ index d5f3f89..e89dab8 100644
  	'data/surface-pro5.tablet',
  	'data/surface-pro6.tablet',
 -- 
-2.24.1
+2.26.0
 
diff --git a/0008-data-Add-Microsoft-Surface-Go.patch b/0008-data-Add-Microsoft-Surface-Go.patch
index 3322426f562f..32cdc240e227 100644
--- a/0008-data-Add-Microsoft-Surface-Go.patch
+++ b/0008-data-Add-Microsoft-Surface-Go.patch
@@ -1,4 +1,4 @@
-From 562706f992bb88535a3728a58f4773f0b0e5a4f4 Mon Sep 17 00:00:00 2001
+From a2086130d8ee8655c8dc5ad77e14b4ab2dbc5ddb Mon Sep 17 00:00:00 2001
 From: Ivo Damjanovic <ivo@damjanovic.it>
 Date: Fri, 10 Jan 2020 00:36:33 +0100
 Subject: [PATCH 8/8] data: Add Microsoft Surface Go
@@ -30,10 +30,10 @@ index 0000000..0db7a78
 +Touch=true
 +Buttons=0
 diff --git a/meson.build b/meson.build
-index e89dab8..05b71c9 100644
+index 55f40af..3a1c548 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -321,6 +321,7 @@ data_files = [
+@@ -351,6 +351,7 @@ data_files = [
  	'data/surface-book.tablet',
  	'data/surface-book2-13.tablet',
  	'data/surface-book2-15.tablet',
@@ -42,5 +42,5 @@ index e89dab8..05b71c9 100644
  	'data/surface-pro5.tablet',
  	'data/surface-pro6.tablet',
 -- 
-2.24.1
+2.26.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 0c458ba00a5d..9793ab899592 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Maximilian Luz <luzmaximilian@gmail.com>
 
 pkgname=libwacom-surface
-pkgver=1.2
-pkgrel=2
+pkgver=1.3
+pkgrel=1
 pkgdesc="Patched libwacom for Microsoft Surface devices"
 arch=('x86_64')
 url="https://github.com/linux-surface/libwacom"
@@ -24,15 +24,15 @@ source=(
     '0008-data-Add-Microsoft-Surface-Go.patch'
     "https://github.com/linuxwacom/libwacom/releases/download/libwacom-${pkgver}/libwacom-${pkgver}.tar.bz2"{,.sig}
 )
-sha256sums=('7c4ff319dcf48debca4445d18ef10a50435d41a54f9d2b9ca0b41a238c3d76de'
-            '281d6d13129cb04809bf94dc7d8bc631f04d2cb99f5d2e890d4f69086f206048'
-            'e1813105d44b1ad289853a73795b0b86701a750202f6733100ee0c4bd457e283'
-            'd166a0f37f39ffa186ee2577940465f1bc70d00b8bb75e15af6dffa82233c401'
-            '78cbe7898e896fd594610a58c2dc2972348bbc3b89ff21f880687fb0b9190d74'
-            'b05ba743fd4315906fbcfa1dd8f13ce3c09ca4b7dbd05d9b17353827880f8d3b'
-            '65173fcf181e9346aab610598cf1155aa83ee89af6cd9b767d5e27482e25c928'
-            '3d9bbeab1447996089181d5dd7ff1331e87dfbb5b292b280cfa0e51f0250230d'
-            'c204cfdee2159d124a4f5ecc8970bbd72f9adf5ad7fd94b66798f93db1f863c3'
+sha256sums=('3f5cf68310477c21dbe05ca213d95010188b7cf54a2d98d6ef7c0adad776b210'
+            'f0a4f080be79cd088618c23ab083fdfcea1102af879d0385e658845226f82dc6'
+            '9b343d6906d7b39872e6f9d7cd249fdd093b85dc279dfd6e77eb09dd05b61321'
+            '4df6930caad3eb93337d1d18b6e622265f3dafa8e51e5e8bbb276aca8f84b561'
+            '9967cab88d7ac8ea56f3525cd025103f79bd5bce2a4471c62c526bf64e90259f'
+            '48fc778b0c8c9874dbb21b91b1ab81fa6d4fd6c51fb49099e28d6ffe18cc48d6'
+            'aba10fe7bdcf2c292211cfd49c1041f7b9c1a782a0f3a8e4f701aa70cd5e607f'
+            '64f62919b95f0b942aa59670a9c6691e43f50c562120636f1841b9e12f6d2354'
+            'e19ce00fe1e074cc54ffd198dda6c6f1ec389e5c913134adc8795f2c5e63883c'
             'SKIP')
 
 prepare() {