diff options
-rw-r--r-- | .SRCINFO | 34 | ||||
-rw-r--r-- | 0001-Add-support-for-BUS_VIRTUAL.patch | 27 | ||||
-rw-r--r-- | 0002-Add-support-for-Intel-Management-Engine-bus.patch | 27 | ||||
-rw-r--r-- | 0003-data-Add-Microsoft-Surface-Pro-3.patch | 4 | ||||
-rw-r--r-- | 0004-data-Add-Microsoft-Surface-Pro-4.patch | 4 | ||||
-rw-r--r-- | 0005-data-Add-Microsoft-Surface-Pro-5.patch | 4 | ||||
-rw-r--r-- | 0006-data-Add-Microsoft-Surface-Pro-6.patch | 4 | ||||
-rw-r--r-- | 0007-data-Add-Microsoft-Surface-Pro-7.patch | 4 | ||||
-rw-r--r-- | 0008-data-Add-Microsoft-Surface-Book.patch | 4 | ||||
-rw-r--r-- | 0009-data-Add-Microsoft-Surface-Book-2-13.5.patch | 4 | ||||
-rw-r--r-- | 0010-data-Add-Microsoft-Surface-Book-2-15.patch | 4 | ||||
-rw-r--r-- | 0011-data-Add-Microsoft-Surface-Book-3-13.5.patch | 4 | ||||
-rw-r--r-- | 0012-data-Add-Microsoft-Surface-Book-3-15.patch | 4 | ||||
-rw-r--r-- | PKGBUILD | 28 |
14 files changed, 77 insertions, 79 deletions
@@ -1,6 +1,6 @@ pkgbase = libwacom-surface pkgdesc = Patched libwacom for Microsoft Surface devices - pkgver = 2.6.0 + pkgver = 2.7.0 pkgrel = 1 url = https://github.com/linux-surface/libwacom arch = x86_64 @@ -14,10 +14,10 @@ pkgbase = libwacom-surface depends = systemd depends = libgudev optdepends = python-libevdev: for libwacom-show-stylus - provides = libwacom=2.6.0 + provides = libwacom=2.7.0 conflicts = libwacom - source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.6.0/libwacom-2.6.0.tar.xz - source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.6.0/libwacom-2.6.0.tar.xz.sig + source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.7.0/libwacom-2.7.0.tar.xz + source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.7.0/libwacom-2.7.0.tar.xz.sig source = 0001-Add-support-for-BUS_VIRTUAL.patch source = 0002-Add-support-for-Intel-Management-Engine-bus.patch source = 0003-data-Add-Microsoft-Surface-Pro-3.patch @@ -32,19 +32,19 @@ pkgbase = libwacom-surface source = 0012-data-Add-Microsoft-Surface-Book-3-15.patch validpgpkeys = 594ABBA066118C7A02D10A80A8AF906D9307FBAD validpgpkeys = 3C2C43D9447D5938EF4551EBE23B7E70B467F0BF - sha256sums = 2376cca99475235b75053a2cfbc7ed40fd8763d5a516941a664870ff1f3aa98f + sha256sums = 853929bd73fba2064b12142dbbee4b3bf84509197ff46a4da559eddf62d32cdf sha256sums = SKIP - sha256sums = 30f8ea4c4f6e5d0e93e746edc6c45f9f51ce5de51919bacd6dcd9d6ad45c2485 - sha256sums = 37021ba70f4c721bdca081364ff966e665b44841b9ec8165fa81469dc4f3ac4b - sha256sums = d2d63a9f88e4e902a84af6ec66658a5b9befcc66b8e62472c087ff5f724328c5 - sha256sums = 0a276d6242bcc2f3baf5cca8574f24b79f0d6933ad15071c967cab6e85a0287c - sha256sums = b2cf2ba543a90fd909f0c982edf1f2283f773d997921fdfee4e436e5ac16352e - sha256sums = 5804607b73770d9b26c2c8a8ac49d695c565c7472e4cb87e6ce6f89b6cf07b74 - sha256sums = eec88ac7eb7b618f9c2cd61df599a524155e852cb0b99fa248c8bf4efe4ed278 - sha256sums = 5f9314d3d676591d9fcb3f8a37def8ce77ff4e2d55907b82143051e6d6f2b960 - sha256sums = 5bae7be9cafca3f98e9dd59c3d103bc983280585044610208152cd43e6b3d78d - sha256sums = a4226a479ff74deddf38cffda99447c18e0175fa2cfdc8b50dbd3473e1d94e2e - sha256sums = ca7161b4991b1915e82a55e3e5f44c7ed34b52daff34062a950697755b99e97e - sha256sums = 05b88326d0ad49936412052707a9e65d31c624da299119db8d1f9bd600b4d830 + sha256sums = 0041920d4d29b02d0e2b05fc63ad9e4b3c4cc28579f3a9a4638a4505d1fb9f6b + sha256sums = 1be62a8e1b901cb6f89da71a76f073a03a3c14d56edc936fac7f5eaa71baf420 + sha256sums = 7b15be0134391de1df67ba6f23bb8f5ae2c820d924b73216b0d45b179f0fbf69 + sha256sums = 570e905787ebd1b26610ea47faaf245eb1af1d61891ab433a5c6684ffb507ed2 + sha256sums = c6558d5f996a360633259b01e036870439eaf1d20f8d1baab18a26f9698bf8a7 + sha256sums = 4527ef6685744f012ca791b7b118344250b3bec67e1973eba80119876e28ff20 + sha256sums = 2f0286c0c6cb76bc9c1cd3db44f281754f43ea4a839b0cc604dce12400aafe90 + sha256sums = bd4fc2ccabff9830985c8c36f42d3913d7eacf3406731f71a08114f016542601 + sha256sums = f93e3769f881c2834f442da0b67fd94ab369d0cc6bdb9b09e15c86b1caa67482 + sha256sums = e33b4edb33413d9e97c57bee71b6cdbffb5efb6a83c8452b62307255c1c9b6ce + sha256sums = 93a45c1f4755a7fb41572dbe70f3b9f2dcbbcdaf8eb0cf8baf55d897d4309526 + sha256sums = 5ab4afb7208b91eb93b5dafde1ace9b8139cfd2e7aa47c0e8c977b5d40ae8286 pkgname = libwacom-surface diff --git a/0001-Add-support-for-BUS_VIRTUAL.patch b/0001-Add-support-for-BUS_VIRTUAL.patch index 1ec830d6aac4..945b8faa3f09 100644 --- a/0001-Add-support-for-BUS_VIRTUAL.patch +++ b/0001-Add-support-for-BUS_VIRTUAL.patch @@ -1,4 +1,4 @@ -From a7475cd68d1e76d74bdb192652bdd5b7a879f1d7 Mon Sep 17 00:00:00 2001 +From 6fe89a80a28042bc57fd625ad82181e4092b95f2 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 @@ -16,8 +16,8 @@ Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io> libwacom/libwacom.c | 5 +++++ libwacom/libwacom.h | 1 + test/test-tablet-validity.c | 1 + - test/test_data_files.py | 2 +- - 5 files changed, 12 insertions(+), 1 deletion(-) + test/test_data_files.py | 1 + + 5 files changed, 12 insertions(+) diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c index 804ac3d..96aaa5e 100644 @@ -89,18 +89,17 @@ index 2095089..da5fe07 100644 g_assert_cmpint(pid, >, 0); break; diff --git a/test/test_data_files.py b/test/test_data_files.py -index d732bd1..4b21b6a 100755 +index c2db899..476aeca 100755 --- a/test/test_data_files.py +++ b/test/test_data_files.py -@@ -41,7 +41,7 @@ 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' - +@@ -46,6 +46,7 @@ def test_device_match(tabletfile): + "bluetooth", + "i2c", + "serial", ++ "virt", + ], f"{tabletfile}: unknown bus type" + assert re.match( + "[0-9a-f]{4}", vid -- -2.39.1 +2.40.1 diff --git a/0002-Add-support-for-Intel-Management-Engine-bus.patch b/0002-Add-support-for-Intel-Management-Engine-bus.patch index 0b22d4acfe7f..59c7bf562849 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 df9f3dc3b76fac2dae92e53250cc5ed8ed8f4c8a Mon Sep 17 00:00:00 2001 +From 10ef0701cdde200063a73b3db5bfb305a12909c2 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 @@ -11,8 +11,8 @@ the Microsoft Surface Books, Surface Pro 5 and 6, and Surface Laptops. libwacom/libwacom.c | 5 +++++ libwacom/libwacom.h | 1 + test/test-tablet-validity.c | 1 + - test/test_data_files.py | 2 +- - 5 files changed, 12 insertions(+), 1 deletion(-) + test/test_data_files.py | 1 + + 5 files changed, 12 insertions(+) diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c index 96aaa5e..cc3ecfd 100644 @@ -84,18 +84,17 @@ index da5fe07..6b45597 100644 g_assert_cmpint(pid, >, 0); break; diff --git a/test/test_data_files.py b/test/test_data_files.py -index 4b21b6a..04a1310 100755 +index 476aeca..cc739dd 100755 --- a/test/test_data_files.py +++ b/test/test_data_files.py -@@ -41,7 +41,7 @@ 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' - +@@ -47,6 +47,7 @@ def test_device_match(tabletfile): + "i2c", + "serial", + "virt", ++ "mei", + ], f"{tabletfile}: unknown bus type" + assert re.match( + "[0-9a-f]{4}", vid -- -2.39.1 +2.40.1 diff --git a/0003-data-Add-Microsoft-Surface-Pro-3.patch b/0003-data-Add-Microsoft-Surface-Pro-3.patch index 91f1d0db6591..101c8750b31a 100644 --- a/0003-data-Add-Microsoft-Surface-Pro-3.patch +++ b/0003-data-Add-Microsoft-Surface-Pro-3.patch @@ -1,4 +1,4 @@ -From f0bef3c18c6050f7fd3151a8dc504f777966bef3 Mon Sep 17 00:00:00 2001 +From 77664bc3c0be343b8e6acddb5bcb18bfb591da24 Mon Sep 17 00:00:00 2001 From: "Antony Jordan (Tablet)" <wiccan.two@gmail.com> Date: Wed, 8 Jun 2022 22:03:33 +0200 Subject: [PATCH 03/12] data: Add Microsoft Surface Pro 3 @@ -29,5 +29,5 @@ index 0000000..3238d43 +Touch=true +Buttons=0 -- -2.39.1 +2.40.1 diff --git a/0004-data-Add-Microsoft-Surface-Pro-4.patch b/0004-data-Add-Microsoft-Surface-Pro-4.patch index 8ef528f94a99..582b68e055d7 100644 --- a/0004-data-Add-Microsoft-Surface-Pro-4.patch +++ b/0004-data-Add-Microsoft-Surface-Pro-4.patch @@ -1,4 +1,4 @@ -From 30c13b66db3ab0d7037bfed649eb018dce6d64d4 Mon Sep 17 00:00:00 2001 +From fa3a6c733c16529098f5a5066eb8fd3051177d8f Mon Sep 17 00:00:00 2001 From: Maximilian Luz <luzmaximilian@gmail.com> Date: Tue, 18 Aug 2020 20:18:55 +0200 Subject: [PATCH 04/12] data: Add Microsoft Surface Pro 4 @@ -29,5 +29,5 @@ index 0000000..1e0c67c +Touch=true +Buttons=0 -- -2.39.1 +2.40.1 diff --git a/0005-data-Add-Microsoft-Surface-Pro-5.patch b/0005-data-Add-Microsoft-Surface-Pro-5.patch index 4a3648e011ea..a7cc58ba52fa 100644 --- a/0005-data-Add-Microsoft-Surface-Pro-5.patch +++ b/0005-data-Add-Microsoft-Surface-Pro-5.patch @@ -1,4 +1,4 @@ -From 435890e807f4af7bedd4977627b305b8e448b1b2 Mon Sep 17 00:00:00 2001 +From c1e48260b343e6616f1106ff4769ad11e9a0948b Mon Sep 17 00:00:00 2001 From: Maximilian Luz <luzmaximilian@gmail.com> Date: Tue, 18 Aug 2020 20:19:02 +0200 Subject: [PATCH 05/12] data: Add Microsoft Surface Pro 5 @@ -29,5 +29,5 @@ index 0000000..b26af3a +Touch=true +Buttons=0 -- -2.39.1 +2.40.1 diff --git a/0006-data-Add-Microsoft-Surface-Pro-6.patch b/0006-data-Add-Microsoft-Surface-Pro-6.patch index cf8a8649730d..9f1b58dccdd3 100644 --- a/0006-data-Add-Microsoft-Surface-Pro-6.patch +++ b/0006-data-Add-Microsoft-Surface-Pro-6.patch @@ -1,4 +1,4 @@ -From 73304fe135721875de0bef2dbbde32285a81c4c3 Mon Sep 17 00:00:00 2001 +From ccacedf0af12ab54bfaacb7f286cf7611d52f2c4 Mon Sep 17 00:00:00 2001 From: Maximilian Luz <luzmaximilian@gmail.com> Date: Tue, 18 Aug 2020 20:19:07 +0200 Subject: [PATCH 06/12] data: Add Microsoft Surface Pro 6 @@ -29,5 +29,5 @@ index 0000000..e97fad8 +Touch=true +Buttons=0 -- -2.39.1 +2.40.1 diff --git a/0007-data-Add-Microsoft-Surface-Pro-7.patch b/0007-data-Add-Microsoft-Surface-Pro-7.patch index bdbb1f23623e..f923a7c34983 100644 --- a/0007-data-Add-Microsoft-Surface-Pro-7.patch +++ b/0007-data-Add-Microsoft-Surface-Pro-7.patch @@ -1,4 +1,4 @@ -From 3dc12d92bd13fd38501e9bb2f6b3e1cc3b94ce5a Mon Sep 17 00:00:00 2001 +From 21fa2ae7428ae749938aef68a8498f23017bf4d0 Mon Sep 17 00:00:00 2001 From: Maximilian Luz <luzmaximilian@gmail.com> Date: Tue, 18 Aug 2020 20:19:13 +0200 Subject: [PATCH 07/12] data: Add Microsoft Surface Pro 7 @@ -29,5 +29,5 @@ index 0000000..7961379 +Touch=true +Buttons=0 -- -2.39.1 +2.40.1 diff --git a/0008-data-Add-Microsoft-Surface-Book.patch b/0008-data-Add-Microsoft-Surface-Book.patch index 50f178f3b845..3b521411ab1f 100644 --- a/0008-data-Add-Microsoft-Surface-Book.patch +++ b/0008-data-Add-Microsoft-Surface-Book.patch @@ -1,4 +1,4 @@ -From 1f047efd4bd7ab1d77b99d079bde082463ee47f0 Mon Sep 17 00:00:00 2001 +From 45d559ed17e818fd4bd26966c3b4c3fb833ad23b Mon Sep 17 00:00:00 2001 From: Maximilian Luz <luzmaximilian@gmail.com> Date: Tue, 18 Aug 2020 20:19:38 +0200 Subject: [PATCH 08/12] data: Add Microsoft Surface Book @@ -29,5 +29,5 @@ index 0000000..e2a5401 +Touch=true +Buttons=0 -- -2.39.1 +2.40.1 diff --git a/0009-data-Add-Microsoft-Surface-Book-2-13.5.patch b/0009-data-Add-Microsoft-Surface-Book-2-13.5.patch index 3caf3a640afd..77f278839a52 100644 --- a/0009-data-Add-Microsoft-Surface-Book-2-13.5.patch +++ b/0009-data-Add-Microsoft-Surface-Book-2-13.5.patch @@ -1,4 +1,4 @@ -From 65e4bca15a972b86e1fdb8efb00ba6f0f3c89367 Mon Sep 17 00:00:00 2001 +From cad8b471eb747cdc53da8a8a16976352921e6fe2 Mon Sep 17 00:00:00 2001 From: Maximilian Luz <luzmaximilian@gmail.com> Date: Tue, 18 Aug 2020 20:20:04 +0200 Subject: [PATCH 09/12] data: Add Microsoft Surface Book 2 (13.5") @@ -29,5 +29,5 @@ index 0000000..b13cb07 +Touch=true +Buttons=0 -- -2.39.1 +2.40.1 diff --git a/0010-data-Add-Microsoft-Surface-Book-2-15.patch b/0010-data-Add-Microsoft-Surface-Book-2-15.patch index 3af41f83b38a..384706bfcc53 100644 --- a/0010-data-Add-Microsoft-Surface-Book-2-15.patch +++ b/0010-data-Add-Microsoft-Surface-Book-2-15.patch @@ -1,4 +1,4 @@ -From e0969b521e5ec1ee8563fe9ba1e1b61386ace57a Mon Sep 17 00:00:00 2001 +From ff81b9f652459ccef960516c2381bfc3cbe1d519 Mon Sep 17 00:00:00 2001 From: Maximilian Luz <luzmaximilian@gmail.com> Date: Tue, 18 Aug 2020 20:20:13 +0200 Subject: [PATCH 10/12] data: Add Microsoft Surface Book 2 (15") @@ -29,5 +29,5 @@ index 0000000..ad98cc7 +Touch=true +Buttons=0 -- -2.39.1 +2.40.1 diff --git a/0011-data-Add-Microsoft-Surface-Book-3-13.5.patch b/0011-data-Add-Microsoft-Surface-Book-3-13.5.patch index e071c5202fbb..03b173d4e921 100644 --- a/0011-data-Add-Microsoft-Surface-Book-3-13.5.patch +++ b/0011-data-Add-Microsoft-Surface-Book-3-13.5.patch @@ -1,4 +1,4 @@ -From 2ba86d198e221d6e74eb4cf47f80c12654cda37e Mon Sep 17 00:00:00 2001 +From 315ed87e3e8ed8b288c43655c237887cea668562 Mon Sep 17 00:00:00 2001 From: Maximilian Luz <luzmaximilian@gmail.com> Date: Tue, 18 Aug 2020 20:20:29 +0200 Subject: [PATCH 11/12] data: Add Microsoft Surface Book 3 (13.5") @@ -29,5 +29,5 @@ index 0000000..a33c9cb +Touch=true +Buttons=0 -- -2.39.1 +2.40.1 diff --git a/0012-data-Add-Microsoft-Surface-Book-3-15.patch b/0012-data-Add-Microsoft-Surface-Book-3-15.patch index 3dc01574d833..0a86c9c19c36 100644 --- a/0012-data-Add-Microsoft-Surface-Book-3-15.patch +++ b/0012-data-Add-Microsoft-Surface-Book-3-15.patch @@ -1,4 +1,4 @@ -From b0380862020fc69f77023b2f240be330030a2a49 Mon Sep 17 00:00:00 2001 +From 9f0d51ad149595a1c9189222e556efb57412842b Mon Sep 17 00:00:00 2001 From: Maximilian Luz <luzmaximilian@gmail.com> Date: Tue, 18 Aug 2020 20:20:42 +0200 Subject: [PATCH 12/12] data: Add Microsoft Surface Book 3 (15") @@ -29,5 +29,5 @@ index 0000000..291321f +Touch=true +Buttons=0 -- -2.39.1 +2.40.1 @@ -2,7 +2,7 @@ # Based on official Arch Linux PKGBUILD pkgname=libwacom-surface -pkgver=2.6.0 +pkgver=2.7.0 pkgrel=1 pkgdesc="Patched libwacom for Microsoft Surface devices" arch=('x86_64') @@ -34,20 +34,20 @@ source=( "0011-data-Add-Microsoft-Surface-Book-3-13.5.patch" "0012-data-Add-Microsoft-Surface-Book-3-15.patch" ) -sha256sums=('2376cca99475235b75053a2cfbc7ed40fd8763d5a516941a664870ff1f3aa98f' +sha256sums=('853929bd73fba2064b12142dbbee4b3bf84509197ff46a4da559eddf62d32cdf' 'SKIP' - '30f8ea4c4f6e5d0e93e746edc6c45f9f51ce5de51919bacd6dcd9d6ad45c2485' - '37021ba70f4c721bdca081364ff966e665b44841b9ec8165fa81469dc4f3ac4b' - 'd2d63a9f88e4e902a84af6ec66658a5b9befcc66b8e62472c087ff5f724328c5' - '0a276d6242bcc2f3baf5cca8574f24b79f0d6933ad15071c967cab6e85a0287c' - 'b2cf2ba543a90fd909f0c982edf1f2283f773d997921fdfee4e436e5ac16352e' - '5804607b73770d9b26c2c8a8ac49d695c565c7472e4cb87e6ce6f89b6cf07b74' - 'eec88ac7eb7b618f9c2cd61df599a524155e852cb0b99fa248c8bf4efe4ed278' - '5f9314d3d676591d9fcb3f8a37def8ce77ff4e2d55907b82143051e6d6f2b960' - '5bae7be9cafca3f98e9dd59c3d103bc983280585044610208152cd43e6b3d78d' - 'a4226a479ff74deddf38cffda99447c18e0175fa2cfdc8b50dbd3473e1d94e2e' - 'ca7161b4991b1915e82a55e3e5f44c7ed34b52daff34062a950697755b99e97e' - '05b88326d0ad49936412052707a9e65d31c624da299119db8d1f9bd600b4d830') + '0041920d4d29b02d0e2b05fc63ad9e4b3c4cc28579f3a9a4638a4505d1fb9f6b' + '1be62a8e1b901cb6f89da71a76f073a03a3c14d56edc936fac7f5eaa71baf420' + '7b15be0134391de1df67ba6f23bb8f5ae2c820d924b73216b0d45b179f0fbf69' + '570e905787ebd1b26610ea47faaf245eb1af1d61891ab433a5c6684ffb507ed2' + 'c6558d5f996a360633259b01e036870439eaf1d20f8d1baab18a26f9698bf8a7' + '4527ef6685744f012ca791b7b118344250b3bec67e1973eba80119876e28ff20' + '2f0286c0c6cb76bc9c1cd3db44f281754f43ea4a839b0cc604dce12400aafe90' + 'bd4fc2ccabff9830985c8c36f42d3913d7eacf3406731f71a08114f016542601' + 'f93e3769f881c2834f442da0b67fd94ab369d0cc6bdb9b09e15c86b1caa67482' + 'e33b4edb33413d9e97c57bee71b6cdbffb5efb6a83c8452b62307255c1c9b6ce' + '93a45c1f4755a7fb41572dbe70f3b9f2dcbbcdaf8eb0cf8baf55d897d4309526' + '5ab4afb7208b91eb93b5dafde1ace9b8139cfd2e7aa47c0e8c977b5d40ae8286') prepare() { cd "libwacom-${pkgver}" |