Update to libwacom-1.4

11 files changed, 102 insertions, 149 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27c4e107d8c1..fd5c1898c7ef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libwacom-surface
 	pkgdesc = Patched libwacom for Microsoft Surface devices
-	pkgver = 1.3
+	pkgver = 1.4
 	pkgrel = 1
 	url = https://github.com/linux-surface/libwacom
 	arch = x86_64
@@ -10,8 +10,9 @@ pkgbase = libwacom-surface
 	depends = glib2
 	depends = systemd
 	depends = libgudev
-	provides = libwacom=1.3
+	provides = libwacom=1.4
 	conflicts = libwacom
+	source = 0001-meson.build-ignore-Makefile.in-when-installing-data.patch
 	source = 0001-Add-support-for-Intel-Management-Engine-bus.patch
 	source = 0002-data-Add-Microsoft-Surface-Pro-4.patch
 	source = 0003-data-Add-Microsoft-Surface-Pro-5.patch
@@ -20,18 +21,19 @@ 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.3/libwacom-1.3.tar.bz2
-	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.3/libwacom-1.3.tar.bz2.sig
+	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.4/libwacom-1.4.tar.bz2
+	source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.4/libwacom-1.4.tar.bz2.sig
 	validpgpkeys = 3C2C43D9447D5938EF4551EBE23B7E70B467F0BF
-	sha256sums = 3f5cf68310477c21dbe05ca213d95010188b7cf54a2d98d6ef7c0adad776b210
-	sha256sums = f0a4f080be79cd088618c23ab083fdfcea1102af879d0385e658845226f82dc6
-	sha256sums = 9b343d6906d7b39872e6f9d7cd249fdd093b85dc279dfd6e77eb09dd05b61321
-	sha256sums = 4df6930caad3eb93337d1d18b6e622265f3dafa8e51e5e8bbb276aca8f84b561
-	sha256sums = 9967cab88d7ac8ea56f3525cd025103f79bd5bce2a4471c62c526bf64e90259f
-	sha256sums = 48fc778b0c8c9874dbb21b91b1ab81fa6d4fd6c51fb49099e28d6ffe18cc48d6
-	sha256sums = aba10fe7bdcf2c292211cfd49c1041f7b9c1a782a0f3a8e4f701aa70cd5e607f
-	sha256sums = 64f62919b95f0b942aa59670a9c6691e43f50c562120636f1841b9e12f6d2354
-	sha256sums = e19ce00fe1e074cc54ffd198dda6c6f1ec389e5c913134adc8795f2c5e63883c
+	sha256sums = e2a38bbcb5041f0606f3f06d8db00ae6af364382f0f7d072510a73704f4be36a
+	sha256sums = 2bb41c3b1b23670c5f5ccf2fbb851827b6fbcaa8cead8f56de571a740e4e21b2
+	sha256sums = c728251446d677df44635e2329fe9cb31077b500e587fd505c7b2b5fe5d15a60
+	sha256sums = d75087e2bcb05f373609c2f4e8ca114fd681ebed2234624aaca265bb7f1a9c17
+	sha256sums = 6fdae3834af15bcb68917eb2a3fd29bb7fd384025c7226659681b6f030f65f1f
+	sha256sums = 2a0c08be2b3273bd439bac0b373e20335631e29591f2d6cd8b33ad7fce142e3c
+	sha256sums = 2e482b9cf1f5f1308ca4a2f38aea0874cea0cee7fb52897c738d31570c73d07e
+	sha256sums = 15ed034d7e359a59051ec2d8f0d2508bf725ec42f8499209de8f2ecba4eeef82
+	sha256sums = 7b66af8c01423d5c7b93ddb1b77910c6be91e8a332cc16f3c42ff7ac3ab7ddfb
+	sha256sums = 90061797ccde3ccf9960ffdc4d0e7e767dedacd68c039ed35450d5ea593066e6
 	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 21aa6be6f1ed..909e7c0f61b8 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 435a6d9547d5b24a73da93cdba0d7bb5c513b6c1 Mon Sep 17 00:00:00 2001
+From 5bf2b290f25006f5e97c868f4423048074d96dbe 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
@@ -14,10 +14,10 @@ the Microsoft Surface Books, Surface Pro 5 and 6, and Surface Laptops.
  4 files changed, 11 insertions(+)
 
 diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
-index ebc0605..37e797a 100644
+index 9f2657b..6084818 100644
 --- a/libwacom/libwacom-database.c
 +++ b/libwacom/libwacom-database.c
-@@ -112,6 +112,8 @@ bus_from_str (const char *str)
+@@ -130,6 +130,8 @@ bus_from_str (const char *str)
  		return WBUSTYPE_BLUETOOTH;
  	if (streq(str, "i2c"))
  		return WBUSTYPE_I2C;
@@ -26,7 +26,7 @@ index ebc0605..37e797a 100644
  	return WBUSTYPE_UNKNOWN;
  }
  
-@@ -130,6 +132,8 @@ bus_to_str (WacomBusType bus)
+@@ -148,6 +150,8 @@ bus_to_str (WacomBusType bus)
  		return "bluetooth";
  	case WBUSTYPE_I2C:
  		return "i2c";
@@ -36,7 +36,7 @@ index ebc0605..37e797a 100644
  	g_assert_not_reached ();
  }
 diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index c4a50a8..bd6b63f 100644
+index 627354c..c52daed 100644
 --- a/libwacom/libwacom.c
 +++ b/libwacom/libwacom.c
 @@ -147,6 +147,10 @@ get_bus_vid_pid (GUdevDevice  *device,
@@ -59,7 +59,7 @@ index c4a50a8..bd6b63f 100644
  		default:			g_assert_not_reached(); break;
  	}
 diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
-index 8035e17..799e9b2 100644
+index a848133..af0f134 100644
 --- a/libwacom/libwacom.h
 +++ b/libwacom/libwacom.h
 @@ -117,6 +117,7 @@ typedef enum {
@@ -71,10 +71,10 @@ index 8035e17..799e9b2 100644
  
  /**
 diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
-index 8ee41e2..42e5f54 100644
+index 65b87c0..745c46d 100644
 --- a/test/test-tablet-validity.c
 +++ b/test/test-tablet-validity.c
-@@ -172,6 +172,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
+@@ -177,6 +177,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
  			/* fall through */
  		case WBUSTYPE_BLUETOOTH:
  		case WBUSTYPE_I2C:
@@ -83,5 +83,5 @@ index 8ee41e2..42e5f54 100644
  			g_assert_cmpint(pid, >, 0);
  			break;
 -- 
-2.26.0
+2.27.0
 
diff --git a/0001-meson.build-ignore-Makefile.in-when-installing-data.patch b/0001-meson.build-ignore-Makefile.in-when-installing-data.patch
new file mode 100644
index 000000000000..caba45478680
--- /dev/null
+++ b/0001-meson.build-ignore-Makefile.in-when-installing-data.patch
@@ -0,0 +1,39 @@
+From b0acb98c410b46372b835726130498585e03ff81 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed, 24 Jun 2020 10:51:05 +1000
+Subject: [PATCH libwacom] meson.build: ignore Makefile.in when installing data
+
+A tarball generated with autotools has a generated Makefile.in in every
+directory we have a Makefile.am. Using install_subdir() we end up installing
+that file unless we explicitly exclude it. This doesn't happen when building
+from git (unless the git tree is dirty from a previous autotools setup).
+
+And sneak a "space before tab" whitespace change in while we're in that
+vincinity.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+---
+ meson.build | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 7453256..9254bcf 100644
+--- a/meson.build
++++ b/meson.build
+@@ -94,10 +94,12 @@ install_subdir('data',
+ 	       install_dir: dir_data,
+ 	       strip_directory: true,
+ 	       exclude_files: ['wacom.example',
+-		       	       'check-files-in-git.sh',
++			       'check-files-in-git.sh',
+ 			       'check-svg-exists.sh',
+ 			       'Makefile.am',
++			       'Makefile.in',
+ 			       'layouts/Makefile.am',
++			       'layouts/Makefile.in',
+ 			       'layouts/README'])
+ 
+ test('files-in-git',
+-- 
+2.26.2
+
diff --git a/0002-data-Add-Microsoft-Surface-Pro-4.patch b/0002-data-Add-Microsoft-Surface-Pro-4.patch
index 769e34de0c18..517d3a511d64 100644
--- a/0002-data-Add-Microsoft-Surface-Pro-4.patch
+++ b/0002-data-Add-Microsoft-Surface-Pro-4.patch
@@ -1,12 +1,11 @@
-From 16df70f77e5636dd0d14d999ad3f535c6fae0c8e Mon Sep 17 00:00:00 2001
+From 50e1eff057aab7b2b92ea65de3097ab37692fb75 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
 
 ---
  data/surface-pro4.tablet | 14 ++++++++++++++
- meson.build              |  1 +
- 2 files changed, 15 insertions(+)
+ 1 file changed, 14 insertions(+)
  create mode 100644 data/surface-pro4.tablet
 
 diff --git a/data/surface-pro4.tablet b/data/surface-pro4.tablet
@@ -29,18 +28,6 @@ index 0000000..bb6f02f
 +Stylus=true
 +Touch=true
 +Buttons=0
-diff --git a/meson.build b/meson.build
-index 20eb0fc..b1de7ed 100644
---- a/meson.build
-+++ b/meson.build
-@@ -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.26.0
+2.27.0
 
diff --git a/0003-data-Add-Microsoft-Surface-Pro-5.patch b/0003-data-Add-Microsoft-Surface-Pro-5.patch
index 4c7530f136cf..f2e8c8d6b544 100644
--- a/0003-data-Add-Microsoft-Surface-Pro-5.patch
+++ b/0003-data-Add-Microsoft-Surface-Pro-5.patch
@@ -1,12 +1,11 @@
-From d89c414a70db49e6ca7672d05d5647159b8b29a2 Mon Sep 17 00:00:00 2001
+From a66716aa122b99f2c3c12b9d487640c120be7426 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
 
 ---
  data/surface-pro5.tablet | 14 ++++++++++++++
- meson.build              |  1 +
- 2 files changed, 15 insertions(+)
+ 1 file changed, 14 insertions(+)
  create mode 100644 data/surface-pro5.tablet
 
 diff --git a/data/surface-pro5.tablet b/data/surface-pro5.tablet
@@ -29,18 +28,6 @@ index 0000000..2ad6539
 +Stylus=true
 +Touch=true
 +Buttons=0
-diff --git a/meson.build b/meson.build
-index b1de7ed..41f29c3 100644
---- a/meson.build
-+++ b/meson.build
-@@ -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.26.0
+2.27.0
 
diff --git a/0004-data-Add-Microsoft-Surface-Pro-6.patch b/0004-data-Add-Microsoft-Surface-Pro-6.patch
index 518e0d7dc99d..f4c9c45cf01d 100644
--- a/0004-data-Add-Microsoft-Surface-Pro-6.patch
+++ b/0004-data-Add-Microsoft-Surface-Pro-6.patch
@@ -1,12 +1,11 @@
-From 4614cfcf4f437ef1e042100e7750e36c032e2146 Mon Sep 17 00:00:00 2001
+From cfdb0ebe6303ec2eada62b9f61e4e1c1b0fc0233 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
 
 ---
  data/surface-pro6.tablet | 14 ++++++++++++++
- meson.build              |  1 +
- 2 files changed, 15 insertions(+)
+ 1 file changed, 14 insertions(+)
  create mode 100644 data/surface-pro6.tablet
 
 diff --git a/data/surface-pro6.tablet b/data/surface-pro6.tablet
@@ -29,18 +28,6 @@ index 0000000..da31e8f
 +Stylus=true
 +Touch=true
 +Buttons=0
-diff --git a/meson.build b/meson.build
-index 41f29c3..49bb185 100644
---- a/meson.build
-+++ b/meson.build
-@@ -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.26.0
+2.27.0
 
diff --git a/0005-data-Add-Microsoft-Surface-Book.patch b/0005-data-Add-Microsoft-Surface-Book.patch
index 5fd560161604..e65db773eed9 100644
--- a/0005-data-Add-Microsoft-Surface-Book.patch
+++ b/0005-data-Add-Microsoft-Surface-Book.patch
@@ -1,12 +1,11 @@
-From 9535ce6363534d7bf7c964a9bcc305515b0df5eb Mon Sep 17 00:00:00 2001
+From 122fcb323532c576fb3913b6c2230dc57cf35b12 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
 
 ---
  data/surface-book.tablet | 14 ++++++++++++++
- meson.build              |  1 +
- 2 files changed, 15 insertions(+)
+ 1 file changed, 14 insertions(+)
  create mode 100644 data/surface-book.tablet
 
 diff --git a/data/surface-book.tablet b/data/surface-book.tablet
@@ -29,18 +28,6 @@ index 0000000..45e17db
 +Stylus=true
 +Touch=true
 +Buttons=0
-diff --git a/meson.build b/meson.build
-index 49bb185..04f58e0 100644
---- a/meson.build
-+++ b/meson.build
-@@ -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-book.tablet',
- 	'data/surface-pro4.tablet',
- 	'data/surface-pro5.tablet',
- 	'data/surface-pro6.tablet',
 -- 
-2.26.0
+2.27.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 0b8b1d2548f9..ddcb55187d00 100644
--- a/0006-data-Add-Microsoft-Surface-Book-2-13.5.patch
+++ b/0006-data-Add-Microsoft-Surface-Book-2-13.5.patch
@@ -1,12 +1,11 @@
-From ac4dc86a56e6a046a282fd84fefed5d7c03a01e2 Mon Sep 17 00:00:00 2001
+From 02712dc4d0aa1b5a153133c7e3d2549c8d1b5b32 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")
 
 ---
  data/surface-book2-13.tablet | 14 ++++++++++++++
- meson.build                  |  1 +
- 2 files changed, 15 insertions(+)
+ 1 file changed, 14 insertions(+)
  create mode 100644 data/surface-book2-13.tablet
 
 diff --git a/data/surface-book2-13.tablet b/data/surface-book2-13.tablet
@@ -29,18 +28,6 @@ index 0000000..dc1353e
 +Stylus=true
 +Touch=true
 +Buttons=0
-diff --git a/meson.build b/meson.build
-index 04f58e0..84f4316 100644
---- a/meson.build
-+++ b/meson.build
-@@ -349,6 +349,7 @@ data_files = [
- 	'data/one-by-wacom-s-p2.tablet',
- 	'data/serial-wacf004.tablet',
- 	'data/surface-book.tablet',
-+	'data/surface-book2-13.tablet',
- 	'data/surface-pro4.tablet',
- 	'data/surface-pro5.tablet',
- 	'data/surface-pro6.tablet',
 -- 
-2.26.0
+2.27.0
 
diff --git a/0007-data-Add-Microsoft-Surface-Book-2-15.patch b/0007-data-Add-Microsoft-Surface-Book-2-15.patch
index b145b94fe070..612a3c874176 100644
--- a/0007-data-Add-Microsoft-Surface-Book-2-15.patch
+++ b/0007-data-Add-Microsoft-Surface-Book-2-15.patch
@@ -1,12 +1,11 @@
-From 66f02a33892d866bc50e0840b03145bf590c1322 Mon Sep 17 00:00:00 2001
+From f9fda882fb7ec2d379977a968bd914e938fcdafb 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")
 
 ---
  data/surface-book2-15.tablet | 14 ++++++++++++++
- meson.build                  |  1 +
- 2 files changed, 15 insertions(+)
+ 1 file changed, 14 insertions(+)
  create mode 100644 data/surface-book2-15.tablet
 
 diff --git a/data/surface-book2-15.tablet b/data/surface-book2-15.tablet
@@ -29,18 +28,6 @@ index 0000000..6ec6551
 +Stylus=true
 +Touch=true
 +Buttons=0
-diff --git a/meson.build b/meson.build
-index 84f4316..55f40af 100644
---- a/meson.build
-+++ b/meson.build
-@@ -350,6 +350,7 @@ data_files = [
- 	'data/serial-wacf004.tablet',
- 	'data/surface-book.tablet',
- 	'data/surface-book2-13.tablet',
-+	'data/surface-book2-15.tablet',
- 	'data/surface-pro4.tablet',
- 	'data/surface-pro5.tablet',
- 	'data/surface-pro6.tablet',
 -- 
-2.26.0
+2.27.0
 
diff --git a/0008-data-Add-Microsoft-Surface-Go.patch b/0008-data-Add-Microsoft-Surface-Go.patch
index 32cdc240e227..6dafc6be90ad 100644
--- a/0008-data-Add-Microsoft-Surface-Go.patch
+++ b/0008-data-Add-Microsoft-Surface-Go.patch
@@ -1,12 +1,11 @@
-From a2086130d8ee8655c8dc5ad77e14b4ab2dbc5ddb Mon Sep 17 00:00:00 2001
+From 7c2a08fe22b287add99d0c16c22e0538077f865e 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
 
 ---
  data/surface-go.tablet | 14 ++++++++++++++
- meson.build            |  1 +
- 2 files changed, 15 insertions(+)
+ 1 file changed, 14 insertions(+)
  create mode 100644 data/surface-go.tablet
 
 diff --git a/data/surface-go.tablet b/data/surface-go.tablet
@@ -29,18 +28,6 @@ index 0000000..0db7a78
 +Stylus=true
 +Touch=true
 +Buttons=0
-diff --git a/meson.build b/meson.build
-index 55f40af..3a1c548 100644
---- a/meson.build
-+++ b/meson.build
-@@ -351,6 +351,7 @@ data_files = [
- 	'data/surface-book.tablet',
- 	'data/surface-book2-13.tablet',
- 	'data/surface-book2-15.tablet',
-+	'data/surface-go.tablet',
- 	'data/surface-pro4.tablet',
- 	'data/surface-pro5.tablet',
- 	'data/surface-pro6.tablet',
 -- 
-2.26.0
+2.27.0
 
diff --git a/PKGBUILD b/PKGBUILD
index 9793ab899592..34bf39d0d18e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Maximilian Luz <luzmaximilian@gmail.com>
+# Based on official Arch Linux PKGBUILD
 
 pkgname=libwacom-surface
-pkgver=1.3
+pkgver=1.4
 pkgrel=1
 pkgdesc="Patched libwacom for Microsoft Surface devices"
 arch=('x86_64')
@@ -14,6 +15,7 @@ conflicts=('libwacom')
 provides=("libwacom=${pkgver}")
 
 source=(
+    '0001-meson.build-ignore-Makefile.in-when-installing-data.patch'
     '0001-Add-support-for-Intel-Management-Engine-bus.patch'
     '0002-data-Add-Microsoft-Surface-Pro-4.patch'
     '0003-data-Add-Microsoft-Surface-Pro-5.patch'
@@ -24,15 +26,16 @@ source=(
     '0008-data-Add-Microsoft-Surface-Go.patch'
     "https://github.com/linuxwacom/libwacom/releases/download/libwacom-${pkgver}/libwacom-${pkgver}.tar.bz2"{,.sig}
 )
-sha256sums=('3f5cf68310477c21dbe05ca213d95010188b7cf54a2d98d6ef7c0adad776b210'
-            'f0a4f080be79cd088618c23ab083fdfcea1102af879d0385e658845226f82dc6'
-            '9b343d6906d7b39872e6f9d7cd249fdd093b85dc279dfd6e77eb09dd05b61321'
-            '4df6930caad3eb93337d1d18b6e622265f3dafa8e51e5e8bbb276aca8f84b561'
-            '9967cab88d7ac8ea56f3525cd025103f79bd5bce2a4471c62c526bf64e90259f'
-            '48fc778b0c8c9874dbb21b91b1ab81fa6d4fd6c51fb49099e28d6ffe18cc48d6'
-            'aba10fe7bdcf2c292211cfd49c1041f7b9c1a782a0f3a8e4f701aa70cd5e607f'
-            '64f62919b95f0b942aa59670a9c6691e43f50c562120636f1841b9e12f6d2354'
-            'e19ce00fe1e074cc54ffd198dda6c6f1ec389e5c913134adc8795f2c5e63883c'
+sha256sums=('e2a38bbcb5041f0606f3f06d8db00ae6af364382f0f7d072510a73704f4be36a'
+            '2bb41c3b1b23670c5f5ccf2fbb851827b6fbcaa8cead8f56de571a740e4e21b2'
+            'c728251446d677df44635e2329fe9cb31077b500e587fd505c7b2b5fe5d15a60'
+            'd75087e2bcb05f373609c2f4e8ca114fd681ebed2234624aaca265bb7f1a9c17'
+            '6fdae3834af15bcb68917eb2a3fd29bb7fd384025c7226659681b6f030f65f1f'
+            '2a0c08be2b3273bd439bac0b373e20335631e29591f2d6cd8b33ad7fce142e3c'
+            '2e482b9cf1f5f1308ca4a2f38aea0874cea0cee7fb52897c738d31570c73d07e'
+            '15ed034d7e359a59051ec2d8f0d2508bf725ec42f8499209de8f2ecba4eeef82'
+            '7b66af8c01423d5c7b93ddb1b77910c6be91e8a332cc16f3c42ff7ac3ab7ddfb'
+            '90061797ccde3ccf9960ffdc4d0e7e767dedacd68c039ed35450d5ea593066e6'
             'SKIP')
 
 prepare() {
@@ -56,9 +59,9 @@ check() {
 
 package() {
     cd "libwacom-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-    install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    install -m755 -d "${pkgdir}/usr/lib/udev/rules.d"
-    cd "tools"
-    ./generate-udev-rules > "${pkgdir}/usr/lib/udev/rules.d/65-libwacom.rules"
+    make DESTDIR="$pkgdir" install
+    install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -m755 -d "${pkgdir}"/usr/lib/udev/rules.d
+    cd tools
+    ./generate-hwdb > "${pkgdir}"/usr/lib/udev/hwdb.d/65-libwacom.hwdb
 }