aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO34
-rw-r--r--0001-Add-support-for-BUS_VIRTUAL.patch17
-rw-r--r--0002-Add-support-for-Intel-Management-Engine-bus.patch17
-rw-r--r--0003-data-Add-Microsoft-Surface-pro-4.patch6
-rw-r--r--0004-data-Add-Microsoft-Surface-pro-5.patch6
-rw-r--r--0005-data-Add-Microsoft-Surface-pro-6.patch6
-rw-r--r--0006-data-Add-Microsoft-Surface-pro-7.patch6
-rw-r--r--0007-data-Add-Microsoft-Surface-Book.patch6
-rw-r--r--0008-data-Add-Microsoft-Surface-Book-2-13.5.patch6
-rw-r--r--0009-data-Add-Microsoft-Surface-Book-2-15.patch6
-rw-r--r--0010-data-Add-Microsoft-Surface-Book-3-13.5.patch6
-rw-r--r--0011-data-Add-Microsoft-Surface-Book-3-15.patch6
-rw-r--r--0012-data-Add-Microsoft-Surface-Go.patch13
-rw-r--r--PKGBUILD28
14 files changed, 94 insertions, 69 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 57062566a886..2bac3594f512 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = libwacom-surface
pkgdesc = Patched libwacom for Microsoft Surface devices
- pkgver = 1.6
+ pkgver = 1.7
pkgrel = 1
url = https://github.com/linux-surface/libwacom
arch = x86_64
@@ -10,7 +10,7 @@ pkgbase = libwacom-surface
depends = glib2
depends = systemd
depends = libgudev
- provides = libwacom=1.6
+ provides = libwacom=1.7
conflicts = libwacom
source = 0001-Add-support-for-BUS_VIRTUAL.patch
source = 0002-Add-support-for-Intel-Management-Engine-bus.patch
@@ -24,22 +24,22 @@ pkgbase = libwacom-surface
source = 0010-data-Add-Microsoft-Surface-Book-3-13.5.patch
source = 0011-data-Add-Microsoft-Surface-Book-3-15.patch
source = 0012-data-Add-Microsoft-Surface-Go.patch
- source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.6/libwacom-1.6.tar.bz2
- source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.6/libwacom-1.6.tar.bz2.sig
+ source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.7/libwacom-1.7.tar.bz2
+ source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.7/libwacom-1.7.tar.bz2.sig
validpgpkeys = 3C2C43D9447D5938EF4551EBE23B7E70B467F0BF
- sha256sums = 21c0495cdbbac8950727e3699a851214ae4b67f24dffbc562eaa7a4dbd9c8947
- sha256sums = 9f49d987d534564149caa089cdb6fb99582d7c6ecd3c46a6be6ac910bff47de9
- sha256sums = fc091b56ab73c56ee0a4a7c387b1881ae6c57d4120e6e41ef209ee31e596b56f
- sha256sums = d7c4993dff271a181215a01cd29979629aad3becfe41dcacc59d46824e907b1d
- sha256sums = 1907a57c2f276a51356becfe50265af60eb17870667e4b3a99046216f1526812
- sha256sums = c64344b92c60312ea4c9928fe04a1f69174f5c99567f2fd7590d143efb71a234
- sha256sums = 5159e9e33c9e54b2321d4ecf94e1e446a2d9be296f2b998c1d809666cb3ebd3e
- sha256sums = 636f68a054c6ef286c7926acdb0d8c97ca673668beb96b04a1fdb55875d136eb
- sha256sums = 8982215d8c61705f04deb96b00239a6343e361703699e5dedbb20dceae3356f6
- sha256sums = d5381abd62a44d7886c743316de941b2cb940ccf5eb04ee55326cdc0bb05bd8f
- sha256sums = 6086082b23267fa991edd8ad623f43bcc4924a17f0fa5f5ba994cf0ce24f5fd2
- sha256sums = 4637cbcd280def21e74c23b1c2b37427a5a8e94ccdad864a49d9f337600fdcae
- sha256sums = 701cb23ee3f2ad4eb5183ef1421dfff3e5b7622e5d3bb6fcd599190a7d77aea8
+ sha256sums = 717886cb815bfb7393fb3163615c72d2bfda76f924e1e48c0852d4a667af0323
+ sha256sums = c337255d52f42107b05be6e7ebf38c1797ba8eac209ae94aec08a5a876659a4c
+ sha256sums = dcc39c283c461c600868a6e82445577811e1c5b0a967b51c054c99571421d170
+ sha256sums = c103ed241afe5618c0b6b67664eb7b0ab28f976edc7f921383f4a89ffd5005eb
+ sha256sums = d041d860b7f1baca20d3d79908e690931671f62f2207b9ed9ddebf36fbce97ed
+ sha256sums = 60bfcc69740e3363ebf3b8934737765b584557cf02cc0a5ba135a91abe92146d
+ sha256sums = 4f1319251911a57559f8b0d0eb073f07e79e71e1e30ec9aff26639eb044ee9cb
+ sha256sums = 7d317b1a73522083956900d606f7414301c596542a2c420526c5b106f71642bc
+ sha256sums = 5c390a438360affdea4b0a2cb866734a0ccc3725bbac54b617a0118a76a1a9ed
+ sha256sums = b81f1ca39996e4c49cdec80c2c395e158d60ac46ed7a223665976180c8c934ee
+ sha256sums = 7e6ae8b0a3d5382258ecb42a482ac0dfed1fd148edb4b2f5c0980f391442ab9a
+ sha256sums = 53ed7707cc9a31ac1ee9e326fe499126a5b61c787adf1f1dc28d709159539666
+ sha256sums = 3c875f3bc88c6291528be98bc549e672a0b68640c9cb889d14efb552007b271d
sha256sums = SKIP
pkgname = libwacom-surface
diff --git a/0001-Add-support-for-BUS_VIRTUAL.patch b/0001-Add-support-for-BUS_VIRTUAL.patch
index 9c2f897218b3..2f3ffa8dc8ef 100644
--- a/0001-Add-support-for-BUS_VIRTUAL.patch
+++ b/0001-Add-support-for-BUS_VIRTUAL.patch
@@ -1,4 +1,4 @@
-From 232486e70e95297ac1e5f9cb32974f69e762c93f Mon Sep 17 00:00:00 2001
+From e5810a27408a5578c892ef77c889d964b8e2a867 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
@@ -12,12 +12,25 @@ as BUS_VIRTUAL.
Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
---
+ data/test_data_files.py | 2 +-
libwacom/libwacom-database.c | 4 ++++
libwacom/libwacom.c | 5 +++++
libwacom/libwacom.h | 1 +
test/test-tablet-validity.c | 1 +
- 4 files changed, 11 insertions(+)
+ 5 files changed, 12 insertions(+), 1 deletion(-)
+diff --git a/data/test_data_files.py b/data/test_data_files.py
+index 5acdbac..cb5ca6d 100755
+--- a/data/test_data_files.py
++++ b/data/test_data_files.py
+@@ -29,6 +29,6 @@ def test_device_match(tabletfile):
+ continue
+
+ bus, vid, pid = match.split(':')[:3] # skip the name part of the match
+- assert bus in ['usb', 'bluetooth', 'i2c', 'serial'], f'{tabletfile}: unknown bus type'
++ assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt'], f'{tabletfile}: unknown bus type'
+ assert re.match('[0-9a-f]{4}', vid), f'{tabletfile}: {vid} must be lowercase hex'
+ assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
index 9f2657b..7be5247 100644
--- a/libwacom/libwacom-database.c
diff --git a/0002-Add-support-for-Intel-Management-Engine-bus.patch b/0002-Add-support-for-Intel-Management-Engine-bus.patch
index d5f2f25b94b8..db0b3e874bfc 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 1b05921d0832770f31544ec252a8fedbd3b8db2c Mon Sep 17 00:00:00 2001
+From dc3f22ed257f40bb2eb086f5379208e4400e8530 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
@@ -7,12 +7,25 @@ Add support for devices connected via the Intel Management Engine (MEI).
This is required to support IPTS based devices, such as (among others)
the Microsoft Surface Books, Surface Pro 5 and 6, and Surface Laptops.
---
+ data/test_data_files.py | 2 +-
libwacom/libwacom-database.c | 4 ++++
libwacom/libwacom.c | 5 +++++
libwacom/libwacom.h | 1 +
test/test-tablet-validity.c | 1 +
- 4 files changed, 11 insertions(+)
+ 5 files changed, 12 insertions(+), 1 deletion(-)
+diff --git a/data/test_data_files.py b/data/test_data_files.py
+index cb5ca6d..466b18a 100755
+--- a/data/test_data_files.py
++++ b/data/test_data_files.py
+@@ -29,6 +29,6 @@ def test_device_match(tabletfile):
+ continue
+
+ bus, vid, pid = match.split(':')[:3] # skip the name part of the match
+- assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt'], f'{tabletfile}: unknown bus type'
++ assert bus in ['usb', 'bluetooth', 'i2c', 'serial', 'virt', 'mei'], f'{tabletfile}: unknown bus type'
+ assert re.match('[0-9a-f]{4}', vid), f'{tabletfile}: {vid} must be lowercase hex'
+ assert re.match('[0-9a-f]{4}', pid), f'{tabletfile}: {pid} must be lowercase hex'
diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c
index 7be5247..37ffd37 100644
--- a/libwacom/libwacom-database.c
diff --git a/0003-data-Add-Microsoft-Surface-pro-4.patch b/0003-data-Add-Microsoft-Surface-pro-4.patch
index 17f027676a4e..800806210435 100644
--- a/0003-data-Add-Microsoft-Surface-pro-4.patch
+++ b/0003-data-Add-Microsoft-Surface-pro-4.patch
@@ -1,4 +1,4 @@
-From 75c107b81586f6bcc8c44eb815a7ff62203a6ba5 Mon Sep 17 00:00:00 2001
+From 146233c4818ab6bb41b19eb91aa7f5b228ac26e8 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/12] data: Add Microsoft Surface pro 4
@@ -10,7 +10,7 @@ Subject: [PATCH 03/12] data: Add Microsoft Surface pro 4
diff --git a/data/surface-pro4.tablet b/data/surface-pro4.tablet
new file mode 100644
-index 0000000..bfbe809
+index 0000000..1e0c67c
--- /dev/null
+++ b/data/surface-pro4.tablet
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..bfbe809
+[Device]
+Name=Microsoft Surface Pro 4
+Class=PenDisplay
-+DeviceMatch=virt:1B96:006A;virt:1B96:0021;mei:1B96:006A;mei:1B96:0021
++DeviceMatch=virt:1b96:006a;virt:1b96:0021;mei:1b96:006a;mei:1b96:0021
+Width=10
+Height=6
+IntegratedIn=Display;System;
diff --git a/0004-data-Add-Microsoft-Surface-pro-5.patch b/0004-data-Add-Microsoft-Surface-pro-5.patch
index ecfb27efd2d7..29bca358dae1 100644
--- a/0004-data-Add-Microsoft-Surface-pro-5.patch
+++ b/0004-data-Add-Microsoft-Surface-pro-5.patch
@@ -1,4 +1,4 @@
-From b046b8f1caadcd191e8ab7ac93e6a3190f09779d Mon Sep 17 00:00:00 2001
+From 39fa36b6378be6090321f304477e5e2112c830a1 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/12] data: Add Microsoft Surface pro 5
@@ -10,7 +10,7 @@ Subject: [PATCH 04/12] data: Add Microsoft Surface pro 5
diff --git a/data/surface-pro5.tablet b/data/surface-pro5.tablet
new file mode 100644
-index 0000000..4fdbac6
+index 0000000..b26af3a
--- /dev/null
+++ b/data/surface-pro5.tablet
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..4fdbac6
+[Device]
+Name=Microsoft Surface Pro 5
+Class=PenDisplay
-+DeviceMatch=virt:1B96:001F;mei:1B96:001F
++DeviceMatch=virt:1b96:001f;mei:1b96:001f
+Width=10
+Height=6
+IntegratedIn=Display;System;
diff --git a/0005-data-Add-Microsoft-Surface-pro-6.patch b/0005-data-Add-Microsoft-Surface-pro-6.patch
index 23be392c5212..0885add6feaa 100644
--- a/0005-data-Add-Microsoft-Surface-pro-6.patch
+++ b/0005-data-Add-Microsoft-Surface-pro-6.patch
@@ -1,4 +1,4 @@
-From 204eed54bb339d927f2291bc6d8abb47b7ddccc3 Mon Sep 17 00:00:00 2001
+From b9027ca78c80b82434a4c22f38b706c55bc9c03b 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/12] data: Add Microsoft Surface pro 6
@@ -10,7 +10,7 @@ Subject: [PATCH 05/12] data: Add Microsoft Surface pro 6
diff --git a/data/surface-pro6.tablet b/data/surface-pro6.tablet
new file mode 100644
-index 0000000..787fd7a
+index 0000000..e97fad8
--- /dev/null
+++ b/data/surface-pro6.tablet
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..787fd7a
+[Device]
+Name=Microsoft Surface Pro 6
+Class=PenDisplay
-+DeviceMatch=virt:045E:001F;mei:045E:001F
++DeviceMatch=virt:045e:001f;mei:045e:001f
+Width=10
+Height=6
+IntegratedIn=Display;System;
diff --git a/0006-data-Add-Microsoft-Surface-pro-7.patch b/0006-data-Add-Microsoft-Surface-pro-7.patch
index c17cd1d01c31..8fe772f7ccca 100644
--- a/0006-data-Add-Microsoft-Surface-pro-7.patch
+++ b/0006-data-Add-Microsoft-Surface-pro-7.patch
@@ -1,4 +1,4 @@
-From 2130681ccb33f538e4000ce219b2f6c861dcd024 Mon Sep 17 00:00:00 2001
+From 94d3588f4375f0121c5b602db33d02c87a0f6190 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/12] data: Add Microsoft Surface pro 7
@@ -10,7 +10,7 @@ Subject: [PATCH 06/12] data: Add Microsoft Surface pro 7
diff --git a/data/surface-pro7.tablet b/data/surface-pro7.tablet
new file mode 100644
-index 0000000..4659131
+index 0000000..7961379
--- /dev/null
+++ b/data/surface-pro7.tablet
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..4659131
+[Device]
+Name=Microsoft Surface Pro 7
+Class=PenDisplay
-+DeviceMatch=virt:045E:099F;mei:045E:099F
++DeviceMatch=virt:045e:099f;mei:045e:099f
+Width=10
+Height=6
+IntegratedIn=Display;System;
diff --git a/0007-data-Add-Microsoft-Surface-Book.patch b/0007-data-Add-Microsoft-Surface-Book.patch
index 08313911c377..6ca48522ef00 100644
--- a/0007-data-Add-Microsoft-Surface-Book.patch
+++ b/0007-data-Add-Microsoft-Surface-Book.patch
@@ -1,4 +1,4 @@
-From ce150a5ca89aba8c5985b90a81f8bcbff046780c Mon Sep 17 00:00:00 2001
+From c4910de17af81cb510d84a0c783a0f5ed484a63c 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/12] data: Add Microsoft Surface Book
@@ -10,7 +10,7 @@ Subject: [PATCH 07/12] data: Add Microsoft Surface Book
diff --git a/data/surface-book.tablet b/data/surface-book.tablet
new file mode 100644
-index 0000000..a551c9b
+index 0000000..e2a5401
--- /dev/null
+++ b/data/surface-book.tablet
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..a551c9b
+[Device]
+Name=Microsoft Surface Book
+Class=PenDisplay
-+DeviceMatch=virt:1B96:005e;mei:1B96:005e
++DeviceMatch=virt:1b96:005e;mei:1b96:005e
+Width=11
+Height=7
+IntegratedIn=Display;System;
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 a7182d5f8b27..076a2953d589 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 f3117e7ff8e213672f532b609d98c0e5d8d30d41 Mon Sep 17 00:00:00 2001
+From 91ac17c9ff9d0930a164fa674b159890f74b2bf8 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/12] data: Add Microsoft Surface Book 2 (13.5")
@@ -10,7 +10,7 @@ Subject: [PATCH 08/12] data: Add Microsoft Surface Book 2 (13.5")
diff --git a/data/surface-book2-13.tablet b/data/surface-book2-13.tablet
new file mode 100644
-index 0000000..6e770e9
+index 0000000..b13cb07
--- /dev/null
+++ b/data/surface-book2-13.tablet
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..6e770e9
+[Device]
+Name=Microsoft Surface Book 2 (13.5")
+Class=PenDisplay
-+DeviceMatch=virt:045E:0021;mei:045E:0021
++DeviceMatch=virt:045e:0021;mei:045e:0021
+Width=11
+Height=7
+IntegratedIn=Display;System;
diff --git a/0009-data-Add-Microsoft-Surface-Book-2-15.patch b/0009-data-Add-Microsoft-Surface-Book-2-15.patch
index c49bce5b4552..3dd8506455dc 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 c5bc7f543e56e2110af2538a6a1385c4323ecc00 Mon Sep 17 00:00:00 2001
+From daa169c373e1a541bf9d752371581b32de5c5fad 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/12] data: Add Microsoft Surface Book 2 (15")
@@ -10,7 +10,7 @@ Subject: [PATCH 09/12] data: Add Microsoft Surface Book 2 (15")
diff --git a/data/surface-book2-15.tablet b/data/surface-book2-15.tablet
new file mode 100644
-index 0000000..c07e60f
+index 0000000..ad98cc7
--- /dev/null
+++ b/data/surface-book2-15.tablet
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..c07e60f
+[Device]
+Name=Microsoft Surface Book 2 (15")
+Class=PenDisplay
-+DeviceMatch=virt:045E:0020;mei:045E:0020
++DeviceMatch=virt:045e:0020;mei:045e:0020
+Width=12
+Height=8
+IntegratedIn=Display;System;
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 a49054525527..501c9825bf8e 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 f8b1b9f4edde20df98af37d849661d64bcecf093 Mon Sep 17 00:00:00 2001
+From 5362189bdb53ec688c633fef60b246b58a9734cd 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/12] data: Add Microsoft Surface Book 3 (13.5")
@@ -10,7 +10,7 @@ Subject: [PATCH 10/12] data: Add Microsoft Surface Book 3 (13.5")
diff --git a/data/surface-book3-13.tablet b/data/surface-book3-13.tablet
new file mode 100644
-index 0000000..212ef93
+index 0000000..a33c9cb
--- /dev/null
+++ b/data/surface-book3-13.tablet
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..212ef93
+[Device]
+Name=Microsoft Surface Book 3 (13.5")
+Class=PenDisplay
-+DeviceMatch=virt:045E:09B2;mei:045E:09B2
++DeviceMatch=virt:045e:09b2;mei:045e:09b2
+Width=11
+Height=7
+IntegratedIn=Display;System;
diff --git a/0011-data-Add-Microsoft-Surface-Book-3-15.patch b/0011-data-Add-Microsoft-Surface-Book-3-15.patch
index 2b13bec21b99..1284915f4d57 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 5a4e8cc37dd573cb2b88292f454e9c6e4d9078b8 Mon Sep 17 00:00:00 2001
+From 28c63f47f1b2cbc913994d10d3115722ea0492e9 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/12] data: Add Microsoft Surface Book 3 (15")
@@ -10,7 +10,7 @@ Subject: [PATCH 11/12] data: Add Microsoft Surface Book 3 (15")
diff --git a/data/surface-book3-15.tablet b/data/surface-book3-15.tablet
new file mode 100644
-index 0000000..6bef542
+index 0000000..291321f
--- /dev/null
+++ b/data/surface-book3-15.tablet
@@ -0,0 +1,14 @@
@@ -19,7 +19,7 @@ index 0000000..6bef542
+[Device]
+Name=Microsoft Surface Book 3 (15")
+Class=PenDisplay
-+DeviceMatch=virt:045E:09B1;mei:045E:09B1
++DeviceMatch=virt:045e:09b1;mei:045e:09b1
+Width=12
+Height=8
+IntegratedIn=Display;System;
diff --git a/0012-data-Add-Microsoft-Surface-Go.patch b/0012-data-Add-Microsoft-Surface-Go.patch
index f00179e873fe..bc7d9a50814d 100644
--- a/0012-data-Add-Microsoft-Surface-Go.patch
+++ b/0012-data-Add-Microsoft-Surface-Go.patch
@@ -1,26 +1,25 @@
-From eb8d7dd917a71e5d972cab536ee5a78fd227e21d Mon Sep 17 00:00:00 2001
+From 9a6ad48ee884b28e077450eba4121d712938c8f0 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Tue, 18 Aug 2020 20:20:56 +0200
Subject: [PATCH 12/12] data: Add Microsoft Surface Go
---
- data/surface-go.tablet | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
+ data/surface-go.tablet | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
create mode 100644 data/surface-go.tablet
diff --git a/data/surface-go.tablet b/data/surface-go.tablet
new file mode 100644
-index 0000000..b8f39a5
+index 0000000..60a1e3d
--- /dev/null
+++ b/data/surface-go.tablet
-@@ -0,0 +1,15 @@
+@@ -0,0 +1,14 @@
+# This is for the Microsoft Surface Go
+
+[Device]
+Name=Microsoft Surface Go
+Class=PenDisplay
-+DeviceMatch=i2c:04F3:261A
-+Class=ISDV4
++DeviceMatch=i2c:04f3:261a
+Width=8
+Height=5
+IntegratedIn=Display;System;
diff --git a/PKGBUILD b/PKGBUILD
index febf830400c9..a2947fce3a58 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Based on official Arch Linux PKGBUILD
pkgname=libwacom-surface
-pkgver=1.6
+pkgver=1.7
pkgrel=1
pkgdesc="Patched libwacom for Microsoft Surface devices"
arch=('x86_64')
@@ -29,19 +29,19 @@ source=(
'0012-data-Add-Microsoft-Surface-Go.patch'
"https://github.com/linuxwacom/libwacom/releases/download/libwacom-${pkgver}/libwacom-${pkgver}.tar.bz2"{,.sig}
)
-sha256sums=('21c0495cdbbac8950727e3699a851214ae4b67f24dffbc562eaa7a4dbd9c8947'
- '9f49d987d534564149caa089cdb6fb99582d7c6ecd3c46a6be6ac910bff47de9'
- 'fc091b56ab73c56ee0a4a7c387b1881ae6c57d4120e6e41ef209ee31e596b56f'
- 'd7c4993dff271a181215a01cd29979629aad3becfe41dcacc59d46824e907b1d'
- '1907a57c2f276a51356becfe50265af60eb17870667e4b3a99046216f1526812'
- 'c64344b92c60312ea4c9928fe04a1f69174f5c99567f2fd7590d143efb71a234'
- '5159e9e33c9e54b2321d4ecf94e1e446a2d9be296f2b998c1d809666cb3ebd3e'
- '636f68a054c6ef286c7926acdb0d8c97ca673668beb96b04a1fdb55875d136eb'
- '8982215d8c61705f04deb96b00239a6343e361703699e5dedbb20dceae3356f6'
- 'd5381abd62a44d7886c743316de941b2cb940ccf5eb04ee55326cdc0bb05bd8f'
- '6086082b23267fa991edd8ad623f43bcc4924a17f0fa5f5ba994cf0ce24f5fd2'
- '4637cbcd280def21e74c23b1c2b37427a5a8e94ccdad864a49d9f337600fdcae'
- '701cb23ee3f2ad4eb5183ef1421dfff3e5b7622e5d3bb6fcd599190a7d77aea8'
+sha256sums=('717886cb815bfb7393fb3163615c72d2bfda76f924e1e48c0852d4a667af0323'
+ 'c337255d52f42107b05be6e7ebf38c1797ba8eac209ae94aec08a5a876659a4c'
+ 'dcc39c283c461c600868a6e82445577811e1c5b0a967b51c054c99571421d170'
+ 'c103ed241afe5618c0b6b67664eb7b0ab28f976edc7f921383f4a89ffd5005eb'
+ 'd041d860b7f1baca20d3d79908e690931671f62f2207b9ed9ddebf36fbce97ed'
+ '60bfcc69740e3363ebf3b8934737765b584557cf02cc0a5ba135a91abe92146d'
+ '4f1319251911a57559f8b0d0eb073f07e79e71e1e30ec9aff26639eb044ee9cb'
+ '7d317b1a73522083956900d606f7414301c596542a2c420526c5b106f71642bc'
+ '5c390a438360affdea4b0a2cb866734a0ccc3725bbac54b617a0118a76a1a9ed'
+ 'b81f1ca39996e4c49cdec80c2c395e158d60ac46ed7a223665976180c8c934ee'
+ '7e6ae8b0a3d5382258ecb42a482ac0dfed1fd148edb4b2f5c0980f391442ab9a'
+ '53ed7707cc9a31ac1ee9e326fe499126a5b61c787adf1f1dc28d709159539666'
+ '3c875f3bc88c6291528be98bc549e672a0b68640c9cb889d14efb552007b271d'
'SKIP')
prepare() {