diff options
-rw-r--r-- | .SRCINFO | 48 | ||||
-rw-r--r-- | 0001-Add-support-for-BUS_VIRTUAL.patch | 22 | ||||
-rw-r--r-- | 0002-Add-support-for-Intel-Management-Engine-bus.patch | 22 | ||||
-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-Pro-7.patch | 4 | ||||
-rw-r--r-- | 0009-data-Add-Microsoft-Surface-Pro-8.patch | 4 | ||||
-rw-r--r-- | 0010-data-Add-Microsoft-Surface-Pro-9.patch | 4 | ||||
-rw-r--r-- | 0011-data-Add-Microsoft-Surface-Book.patch | 4 | ||||
-rw-r--r-- | 0012-data-Add-Microsoft-Surface-Book-2-13.5.patch | 4 | ||||
-rw-r--r-- | 0013-data-Add-Microsoft-Surface-Book-2-15.patch | 4 | ||||
-rw-r--r-- | 0014-data-Add-Microsoft-Surface-Book-3-13.5.patch | 4 | ||||
-rw-r--r-- | 0015-data-Add-Microsoft-Surface-Book-3-15.patch | 4 | ||||
-rw-r--r-- | 0016-data-Add-Microsoft-Surface-Laptop-Studio.patch | 4 | ||||
-rw-r--r-- | PKGBUILD | 56 |
18 files changed, 104 insertions, 100 deletions
@@ -1,6 +1,6 @@ pkgbase = libwacom-surface - pkgdesc = Patched libwacom for Microsoft Surface devices - pkgver = 2.8.0 + pkgdesc = Library to identify Wacom tablets and their features - Patched for Microsoft Surface devices + pkgver = 2.9.0 pkgrel = 1 url = https://github.com/linux-surface/libwacom arch = x86_64 @@ -11,13 +11,15 @@ pkgbase = libwacom-surface makedepends = libxml2 makedepends = meson depends = glib2 - depends = systemd + depends = libevdev depends = libgudev + depends = glibc optdepends = python-libevdev: for libwacom-show-stylus - provides = libwacom=2.8.0 + optdepends = python-pyudev: for libwacom-show-stylus + provides = libwacom=2.9.0 conflicts = libwacom - source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.8.0/libwacom-2.8.0.tar.xz - source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.8.0/libwacom-2.8.0.tar.xz.sig + source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.9.0/libwacom-2.9.0.tar.xz + source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-2.9.0/libwacom-2.9.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 @@ -36,23 +38,23 @@ pkgbase = libwacom-surface source = 0016-data-Add-Microsoft-Surface-Laptop-Studio.patch validpgpkeys = 594ABBA066118C7A02D10A80A8AF906D9307FBAD validpgpkeys = 3C2C43D9447D5938EF4551EBE23B7E70B467F0BF - sha256sums = bb04b12c8688d0ff6a108d47a38d2057d572c4d7227d78138abd5fd0ba59f215 + sha256sums = 6f678156797becc4f1537a19aadcc48ed7a54e1ff3cbf591d1233f8a2d82e242 sha256sums = SKIP - sha256sums = 0e00ada152317d16355cbfed8195397f3903f3d3448d19731d839367182d4cb6 - sha256sums = a092cc857a665204fc0284865186fddc7e746f0e4217f1c55a128265929e101f - sha256sums = 7380090427e166e2216742479925c44045cf914e3543615692850168d952f0c8 - sha256sums = 33e4867394903376f110b674cc0a0b777313dfb4c7ff3a487e11e3735b95c604 - sha256sums = 94903d479d0667870decdd57c51bee29d16feb199dc720844144e13745d77877 - sha256sums = f70a3faf5797b3db86c51fd2bf75a3f7fb95087231e8c998b3ce5b8a009f08da - sha256sums = 93931117dccec37684b8890e5ae28ac6c23e65517581e0269382252c81eeab2b - sha256sums = 57abca80d9be9e4d93d5ba83be92a576d0fef5186efcbb213c92cb5fa85e8b5f - sha256sums = 6886bd9f9a445830972d608f3edcd8381527c6ac553fcb4511559a2274ab4904 - sha256sums = 7096f0e8d5b57c5e20e0616be98b77f6f5d300d7913d2e224f8a2b968872765d - sha256sums = a61577739761a0730ed137cbd4c1151275ecabece7b9c35069e8de7fcf2786bc - sha256sums = 16e4c0124cf126735c321f5b2fd51d303f079a8892727981b2221a36a7d93c8f - sha256sums = fe511c7ff2b39760aaee0617cedd7277cca4c49627fc476006bfb30bdd4bb35f - sha256sums = 5c4acfc9565d7743686792e6637e28a54f28abd9ab5a05bda072e34fab7f5af7 - sha256sums = 227c278f19be81d8cd67556855b0e4e7bc0fd3059f9697b525506be2b076cfa9 - sha256sums = 79a11214181e0e912e77e9013c7f35f7a44fc2f839d331371a227e1563985151 + sha256sums = 7db8188ca1afd8655fd79b606428e403baefdec13484d4807ace4b992bed6807 + sha256sums = 5ec7cf7f5e0a4e0278563cb05e6a446c3a26ca82cd2e2a6c129d5d8cc35828e5 + sha256sums = f14740304f43c336bdf7e1d78991717b504331f48c577d2c512ae276981c8f1e + sha256sums = 649bfef25ae14d9cc44818ad466f1bcfab56b890acfbdbddd5f8a546cbfecebb + sha256sums = d54044d69ee002d891e554149d350462618329477d0e1900528c34973bcb315e + sha256sums = 634e552757df946f997f0f682802828f6540b5eff9eb60965714e4c9a8c3a3f5 + sha256sums = b3d7197f92d7e02e73b2f06a0b7770164f5052d38afa36843099468dd5eafafa + sha256sums = bd8ae40ec5e3214fab8a92861a1e07ba92c89aebd2ecfbe59f2649a92150d1fb + sha256sums = 9dee7840ac3231adbd5c23c57a09a289e3cc3fe4a24fcb2c56e78ab2c86f86cd + sha256sums = 101e8ba35a6493359667a3c119e6f792bde16e77c04642127e7dd81bc2d56d41 + sha256sums = 0b38005851833200cf31a4bc99a4bac40a560db14bf32f4c4ebcfe77f635e06b + sha256sums = f1236857310a8362abb8fc55e67a7013b61f03d593a89acf6ceae86cefc4ec37 + sha256sums = 5da915726aba84add16f5c509dc1be343db66f70a294b411759353b0ffaef0c2 + sha256sums = 8bb8c1aab143185a05b91cacaf600e147fcee55fc1abe67af0e1d6fed0b6e99f + sha256sums = bd6c8a319845ec161106b85859ab42b22ded1f6515676449a00bb3cc776acb43 + sha256sums = bc4398d29b3a49e617cb7d9acd7a045c2a8c248c2065c96fd38ecc59e1a6d86f pkgname = libwacom-surface diff --git a/0001-Add-support-for-BUS_VIRTUAL.patch b/0001-Add-support-for-BUS_VIRTUAL.patch index ed0e1d35e519..52b296bcdaf8 100644 --- a/0001-Add-support-for-BUS_VIRTUAL.patch +++ b/0001-Add-support-for-BUS_VIRTUAL.patch @@ -1,4 +1,4 @@ -From ca5c3616a3c77b234e35ef953569b0da71084347 Mon Sep 17 00:00:00 2001 +From 808f74da665bb932664b4950fe86e05910c77537 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/16] Add support for BUS_VIRTUAL @@ -20,10 +20,10 @@ Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io> 5 files changed, 12 insertions(+) diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c -index 804ac3d..96aaa5e 100644 +index 2c17e0d..090d5aa 100644 --- a/libwacom/libwacom-database.c +++ b/libwacom/libwacom-database.c -@@ -128,6 +128,8 @@ bus_from_str (const char *str) +@@ -130,6 +130,8 @@ bus_from_str (const char *str) return WBUSTYPE_BLUETOOTH; if (g_str_equal(str, "i2c")) return WBUSTYPE_I2C; @@ -32,7 +32,7 @@ index 804ac3d..96aaa5e 100644 return WBUSTYPE_UNKNOWN; } -@@ -146,6 +148,8 @@ bus_to_str (WacomBusType bus) +@@ -148,6 +150,8 @@ bus_to_str (WacomBusType bus) return "bluetooth"; case WBUSTYPE_I2C: return "i2c"; @@ -42,10 +42,10 @@ index 804ac3d..96aaa5e 100644 g_assert_not_reached (); } diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c -index ccfe43a..d9b8a22 100644 +index d220d14..1ba0740 100644 --- a/libwacom/libwacom.c +++ b/libwacom/libwacom.c -@@ -149,6 +149,10 @@ get_bus_vid_pid (GUdevDevice *device, +@@ -148,6 +148,10 @@ get_bus_vid_pid (GUdevDevice *device, *bus = WBUSTYPE_I2C; retval = TRUE; break; @@ -56,7 +56,7 @@ index ccfe43a..d9b8a22 100644 } out: -@@ -817,6 +821,7 @@ static void print_match(int fd, const WacomMatch *match) +@@ -826,6 +830,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 389681d..040c51e 100644 --- a/libwacom/libwacom.h +++ b/libwacom/libwacom.h @@ -149,6 +149,7 @@ typedef enum { @@ -77,7 +77,7 @@ index cafed64..b184ed7 100644 /** diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c -index 2095089..da5fe07 100644 +index 4b7983d..91e83de 100644 --- a/test/test-tablet-validity.c +++ b/test/test-tablet-validity.c @@ -177,6 +177,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid) @@ -89,7 +89,7 @@ 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 c2db899..476aeca 100755 +index 4cca787..8ab1fea 100755 --- a/test/test_data_files.py +++ b/test/test_data_files.py @@ -46,6 +46,7 @@ def test_device_match(tabletfile): @@ -101,5 +101,5 @@ index c2db899..476aeca 100755 assert re.match( "[0-9a-f]{4}", vid -- -2.42.0 +2.43.0 diff --git a/0002-Add-support-for-Intel-Management-Engine-bus.patch b/0002-Add-support-for-Intel-Management-Engine-bus.patch index 12ba889e23bb..cd5a87bf9ab8 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 e2514eca67211f37574b1ef9c227c8f90b66e565 Mon Sep 17 00:00:00 2001 +From ff253e558ddc2cafed7ba1cf2bd93e3544debb30 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/16] Add support for Intel Management Engine bus @@ -15,10 +15,10 @@ the Microsoft Surface Books, Surface Pro 5 and 6, and Surface Laptops. 5 files changed, 12 insertions(+) diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c -index 96aaa5e..cc3ecfd 100644 +index 090d5aa..5a749c9 100644 --- a/libwacom/libwacom-database.c +++ b/libwacom/libwacom-database.c -@@ -130,6 +130,8 @@ bus_from_str (const char *str) +@@ -132,6 +132,8 @@ bus_from_str (const char *str) return WBUSTYPE_I2C; if (g_str_equal(str, "virt")) return WBUSTYPE_VIRTUAL; @@ -27,7 +27,7 @@ index 96aaa5e..cc3ecfd 100644 return WBUSTYPE_UNKNOWN; } -@@ -150,6 +152,8 @@ bus_to_str (WacomBusType bus) +@@ -152,6 +154,8 @@ bus_to_str (WacomBusType bus) return "i2c"; case WBUSTYPE_VIRTUAL: return "virt"; @@ -37,10 +37,10 @@ index 96aaa5e..cc3ecfd 100644 g_assert_not_reached (); } diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c -index d9b8a22..e3364f4 100644 +index 1ba0740..1de4dc3 100644 --- a/libwacom/libwacom.c +++ b/libwacom/libwacom.c -@@ -153,6 +153,10 @@ get_bus_vid_pid (GUdevDevice *device, +@@ -152,6 +152,10 @@ get_bus_vid_pid (GUdevDevice *device, *bus = WBUSTYPE_VIRTUAL; retval = TRUE; break; @@ -51,7 +51,7 @@ index d9b8a22..e3364f4 100644 } out: -@@ -822,6 +826,7 @@ static void print_match(int fd, const WacomMatch *match) +@@ -831,6 +835,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 040c51e..a937c08 100644 --- a/libwacom/libwacom.h +++ b/libwacom/libwacom.h @@ -150,6 +150,7 @@ typedef enum { @@ -72,7 +72,7 @@ index b184ed7..5cd6736 100644 /** diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c -index da5fe07..6b45597 100644 +index 91e83de..9c8af44 100644 --- a/test/test-tablet-validity.c +++ b/test/test-tablet-validity.c @@ -178,6 +178,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid) @@ -84,7 +84,7 @@ 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 476aeca..cc739dd 100755 +index 8ab1fea..a3f1d9d 100755 --- a/test/test_data_files.py +++ b/test/test_data_files.py @@ -47,6 +47,7 @@ def test_device_match(tabletfile): @@ -96,5 +96,5 @@ index 476aeca..cc739dd 100755 assert re.match( "[0-9a-f]{4}", vid -- -2.42.0 +2.43.0 diff --git a/0003-data-Add-Microsoft-Surface-Pro-3.patch b/0003-data-Add-Microsoft-Surface-Pro-3.patch index 474dd4ee6680..6f34cb37c3db 100644 --- a/0003-data-Add-Microsoft-Surface-Pro-3.patch +++ b/0003-data-Add-Microsoft-Surface-Pro-3.patch @@ -1,4 +1,4 @@ -From ea2503e14cbec0ce0402768ac1ad831625fda2a6 Mon Sep 17 00:00:00 2001 +From b2cd1fd0ecd63b4cb78de9111333e5ebd7ce8be6 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/16] data: Add Microsoft Surface Pro 3 @@ -29,5 +29,5 @@ index 0000000..3238d43 +Touch=true +Buttons=0 -- -2.42.0 +2.43.0 diff --git a/0004-data-Add-Microsoft-Surface-Pro-4.patch b/0004-data-Add-Microsoft-Surface-Pro-4.patch index f62fa2a5ca0e..f794c65a114e 100644 --- a/0004-data-Add-Microsoft-Surface-Pro-4.patch +++ b/0004-data-Add-Microsoft-Surface-Pro-4.patch @@ -1,4 +1,4 @@ -From 82bedd51116db60bd2f033ce6962e78ad85cdbc6 Mon Sep 17 00:00:00 2001 +From 22d88608f2d8275c7903e99bbf6adb25917444b7 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/16] data: Add Microsoft Surface Pro 4 @@ -29,5 +29,5 @@ index 0000000..1e0c67c +Touch=true +Buttons=0 -- -2.42.0 +2.43.0 diff --git a/0005-data-Add-Microsoft-Surface-Pro-5.patch b/0005-data-Add-Microsoft-Surface-Pro-5.patch index 27af1943b4d1..6da96e465d56 100644 --- a/0005-data-Add-Microsoft-Surface-Pro-5.patch +++ b/0005-data-Add-Microsoft-Surface-Pro-5.patch @@ -1,4 +1,4 @@ -From 0bb846deb7e80cdf58d24b36818d0f53d9230350 Mon Sep 17 00:00:00 2001 +From 817645f017e59fd6c52b055f6a84964bc2eb7ece 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/16] data: Add Microsoft Surface Pro 5 @@ -29,5 +29,5 @@ index 0000000..b26af3a +Touch=true +Buttons=0 -- -2.42.0 +2.43.0 diff --git a/0006-data-Add-Microsoft-Surface-Pro-6.patch b/0006-data-Add-Microsoft-Surface-Pro-6.patch index fde6973ed089..4523b983d05e 100644 --- a/0006-data-Add-Microsoft-Surface-Pro-6.patch +++ b/0006-data-Add-Microsoft-Surface-Pro-6.patch @@ -1,4 +1,4 @@ -From 3d86a63e2b2f8a83cdab5780590eb028dbd062d6 Mon Sep 17 00:00:00 2001 +From e220b3f08175713b573ae6442d1a78bd9d736523 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/16] data: Add Microsoft Surface Pro 6 @@ -29,5 +29,5 @@ index 0000000..e97fad8 +Touch=true +Buttons=0 -- -2.42.0 +2.43.0 diff --git a/0007-data-Add-Microsoft-Surface-Pro-7.patch b/0007-data-Add-Microsoft-Surface-Pro-7.patch index 766554e1e61f..7c1d6fbc124e 100644 --- a/0007-data-Add-Microsoft-Surface-Pro-7.patch +++ b/0007-data-Add-Microsoft-Surface-Pro-7.patch @@ -1,4 +1,4 @@ -From 863d8d86d360c84e0fdd4d4b7deab5dd491e35aa Mon Sep 17 00:00:00 2001 +From 4ca473d97213ba21b44d802a97c08e6d1d5fa313 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/16] data: Add Microsoft Surface Pro 7 @@ -29,5 +29,5 @@ index 0000000..7961379 +Touch=true +Buttons=0 -- -2.42.0 +2.43.0 diff --git a/0008-data-Add-Microsoft-Surface-Pro-7.patch b/0008-data-Add-Microsoft-Surface-Pro-7.patch index f82235e50739..1c493a568c47 100644 --- a/0008-data-Add-Microsoft-Surface-Pro-7.patch +++ b/0008-data-Add-Microsoft-Surface-Pro-7.patch @@ -1,4 +1,4 @@ -From 3e7603439f3c43b43a5ffb205240c4aee288925f Mon Sep 17 00:00:00 2001 +From 9b63f2d4a734c5939d79d3647b6f7b786aeb6be1 Mon Sep 17 00:00:00 2001 From: Maximilian Luz <luzmaximilian@gmail.com> Date: Fri, 26 May 2023 12:32:21 +0200 Subject: [PATCH 08/16] data: Add Microsoft Surface Pro 7+ @@ -30,5 +30,5 @@ index 0000000..36e1e3f +Touch=true +Buttons=0 -- -2.42.0 +2.43.0 diff --git a/0009-data-Add-Microsoft-Surface-Pro-8.patch b/0009-data-Add-Microsoft-Surface-Pro-8.patch index 2dbf3e490c3d..a04a22c10fe8 100644 --- a/0009-data-Add-Microsoft-Surface-Pro-8.patch +++ b/0009-data-Add-Microsoft-Surface-Pro-8.patch @@ -1,4 +1,4 @@ -From bbb911a4dd661920b19fe7ac93a34a1251039092 Mon Sep 17 00:00:00 2001 +From ed65256b6fe211840687af577c2e79961ba9827b Mon Sep 17 00:00:00 2001 From: Maximilian Luz <luzmaximilian@gmail.com> Date: Sun, 11 Jun 2023 21:29:52 +0200 Subject: [PATCH 09/16] data: Add Microsoft Surface Pro 8 @@ -30,5 +30,5 @@ index 0000000..fe779af +Touch=true +Buttons=0 -- -2.42.0 +2.43.0 diff --git a/0010-data-Add-Microsoft-Surface-Pro-9.patch b/0010-data-Add-Microsoft-Surface-Pro-9.patch index 63848859ddc8..671556e2fc4a 100644 --- a/0010-data-Add-Microsoft-Surface-Pro-9.patch +++ b/0010-data-Add-Microsoft-Surface-Pro-9.patch @@ -1,4 +1,4 @@ -From bf6c55ab5bcd46c418a4a2ad0a0312e28b70e5e3 Mon Sep 17 00:00:00 2001 +From 9c11b480b22f200ace8fb3d67c48932a85938277 Mon Sep 17 00:00:00 2001 From: Maximilian Luz <luzmaximilian@gmail.com> Date: Wed, 14 Jun 2023 21:11:36 +0200 Subject: [PATCH 10/16] data: Add Microsoft Surface Pro 9 @@ -30,5 +30,5 @@ index 0000000..e5ccf68 +Touch=true +Buttons=0 -- -2.42.0 +2.43.0 diff --git a/0011-data-Add-Microsoft-Surface-Book.patch b/0011-data-Add-Microsoft-Surface-Book.patch index 65904a43d5d4..e149d7a933fd 100644 --- a/0011-data-Add-Microsoft-Surface-Book.patch +++ b/0011-data-Add-Microsoft-Surface-Book.patch @@ -1,4 +1,4 @@ -From 9c4344dffb1e06d81113eba3603f4c38457ceb44 Mon Sep 17 00:00:00 2001 +From be3ea124cbd482f4b4f7082f05cd96bbcf031acf Mon Sep 17 00:00:00 2001 From: Maximilian Luz <luzmaximilian@gmail.com> Date: Tue, 18 Aug 2020 20:19:38 +0200 Subject: [PATCH 11/16] data: Add Microsoft Surface Book @@ -29,5 +29,5 @@ index 0000000..e2a5401 +Touch=true +Buttons=0 -- -2.42.0 +2.43.0 diff --git a/0012-data-Add-Microsoft-Surface-Book-2-13.5.patch b/0012-data-Add-Microsoft-Surface-Book-2-13.5.patch index 97b607aa526d..7e8b1c110014 100644 --- a/0012-data-Add-Microsoft-Surface-Book-2-13.5.patch +++ b/0012-data-Add-Microsoft-Surface-Book-2-13.5.patch @@ -1,4 +1,4 @@ -From a5fd9e35dd06a300a2f50e4cb8724793331b5a47 Mon Sep 17 00:00:00 2001 +From 13159050c79d2fa615a5558457fe716c71628278 Mon Sep 17 00:00:00 2001 From: Maximilian Luz <luzmaximilian@gmail.com> Date: Tue, 18 Aug 2020 20:20:04 +0200 Subject: [PATCH 12/16] data: Add Microsoft Surface Book 2 (13.5") @@ -29,5 +29,5 @@ index 0000000..b13cb07 +Touch=true +Buttons=0 -- -2.42.0 +2.43.0 diff --git a/0013-data-Add-Microsoft-Surface-Book-2-15.patch b/0013-data-Add-Microsoft-Surface-Book-2-15.patch index ada802188a1b..99491ace306c 100644 --- a/0013-data-Add-Microsoft-Surface-Book-2-15.patch +++ b/0013-data-Add-Microsoft-Surface-Book-2-15.patch @@ -1,4 +1,4 @@ -From 6cd78337204a31c3479d077a78d2bd4c469c58bd Mon Sep 17 00:00:00 2001 +From 55cefd38d6b74fe822ef2e18fc0cc8d97f21679a Mon Sep 17 00:00:00 2001 From: Maximilian Luz <luzmaximilian@gmail.com> Date: Tue, 18 Aug 2020 20:20:13 +0200 Subject: [PATCH 13/16] data: Add Microsoft Surface Book 2 (15") @@ -29,5 +29,5 @@ index 0000000..ad98cc7 +Touch=true +Buttons=0 -- -2.42.0 +2.43.0 diff --git a/0014-data-Add-Microsoft-Surface-Book-3-13.5.patch b/0014-data-Add-Microsoft-Surface-Book-3-13.5.patch index 5ab36ed261a1..6fd7af1519ef 100644 --- a/0014-data-Add-Microsoft-Surface-Book-3-13.5.patch +++ b/0014-data-Add-Microsoft-Surface-Book-3-13.5.patch @@ -1,4 +1,4 @@ -From ae98349af0b3a0a7ca2a7676f29d81a8d960bfe1 Mon Sep 17 00:00:00 2001 +From 4dbf2e50785b775ce18473b990810d162d27ab80 Mon Sep 17 00:00:00 2001 From: Maximilian Luz <luzmaximilian@gmail.com> Date: Tue, 18 Aug 2020 20:20:29 +0200 Subject: [PATCH 14/16] data: Add Microsoft Surface Book 3 (13.5") @@ -29,5 +29,5 @@ index 0000000..a33c9cb +Touch=true +Buttons=0 -- -2.42.0 +2.43.0 diff --git a/0015-data-Add-Microsoft-Surface-Book-3-15.patch b/0015-data-Add-Microsoft-Surface-Book-3-15.patch index e0c099df7ad4..3ba855f31b1a 100644 --- a/0015-data-Add-Microsoft-Surface-Book-3-15.patch +++ b/0015-data-Add-Microsoft-Surface-Book-3-15.patch @@ -1,4 +1,4 @@ -From f776cf5680942e0a03b1c6023851086fa0229a6c Mon Sep 17 00:00:00 2001 +From 4a47f0eef0e3d7bb44b3b34f85e25d5b7e4ccc07 Mon Sep 17 00:00:00 2001 From: Maximilian Luz <luzmaximilian@gmail.com> Date: Tue, 18 Aug 2020 20:20:42 +0200 Subject: [PATCH 15/16] data: Add Microsoft Surface Book 3 (15") @@ -29,5 +29,5 @@ index 0000000..291321f +Touch=true +Buttons=0 -- -2.42.0 +2.43.0 diff --git a/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch b/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch index 6ac0813dee7a..a1731154be1e 100644 --- a/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch +++ b/0016-data-Add-Microsoft-Surface-Laptop-Studio.patch @@ -1,4 +1,4 @@ -From 33da22c5f8639c13d152c749cf71339d9caac622 Mon Sep 17 00:00:00 2001 +From 8603173ac0a99578e1e7ed18f0864d002f6a2500 Mon Sep 17 00:00:00 2001 From: Maximilian Luz <luzmaximilian@gmail.com> Date: Wed, 14 Jun 2023 21:12:41 +0200 Subject: [PATCH 16/16] data: Add Microsoft Surface Laptop Studio @@ -30,5 +30,5 @@ index 0000000..6739b2c +Touch=true +Buttons=0 -- -2.42.0 +2.43.0 @@ -2,19 +2,20 @@ # Based on official Arch Linux PKGBUILD pkgname=libwacom-surface -pkgver=2.8.0 +pkgver=2.9.0 pkgrel=1 -pkgdesc="Patched libwacom for Microsoft Surface devices" +pkgdesc="Library to identify Wacom tablets and their features - Patched for Microsoft Surface devices" arch=('x86_64') url="https://github.com/linux-surface/libwacom" license=('MIT') -depends=('glib2' 'systemd' 'libgudev') +depends=('glib2' 'libevdev' 'libgudev' 'glibc') makedepends=('libxml2' 'meson') checkdepends=('python-pytest' 'python-libevdev' 'python-pyudev') -optdepends=('python-libevdev: for libwacom-show-stylus') +optdepends=('python-libevdev: for libwacom-show-stylus' + 'python-pyudev: for libwacom-show-stylus') validpgpkeys=( - '594ABBA066118C7A02D10A80A8AF906D9307FBAD' - '3C2C43D9447D5938EF4551EBE23B7E70B467F0BF' + '594ABBA066118C7A02D10A80A8AF906D9307FBAD' # "Joshua Dickens <Joshua@Joshua-Dickens.com>" + '3C2C43D9447D5938EF4551EBE23B7E70B467F0BF' # "Peter Hutterer (Who-T) <office@who-t.net>" ) conflicts=('libwacom') provides=("libwacom=${pkgver}") @@ -38,24 +39,24 @@ source=( "0015-data-Add-Microsoft-Surface-Book-3-15.patch" "0016-data-Add-Microsoft-Surface-Laptop-Studio.patch" ) -sha256sums=('bb04b12c8688d0ff6a108d47a38d2057d572c4d7227d78138abd5fd0ba59f215' +sha256sums=('6f678156797becc4f1537a19aadcc48ed7a54e1ff3cbf591d1233f8a2d82e242' 'SKIP' - '0e00ada152317d16355cbfed8195397f3903f3d3448d19731d839367182d4cb6' - 'a092cc857a665204fc0284865186fddc7e746f0e4217f1c55a128265929e101f' - '7380090427e166e2216742479925c44045cf914e3543615692850168d952f0c8' - '33e4867394903376f110b674cc0a0b777313dfb4c7ff3a487e11e3735b95c604' - '94903d479d0667870decdd57c51bee29d16feb199dc720844144e13745d77877' - 'f70a3faf5797b3db86c51fd2bf75a3f7fb95087231e8c998b3ce5b8a009f08da' - '93931117dccec37684b8890e5ae28ac6c23e65517581e0269382252c81eeab2b' - '57abca80d9be9e4d93d5ba83be92a576d0fef5186efcbb213c92cb5fa85e8b5f' - '6886bd9f9a445830972d608f3edcd8381527c6ac553fcb4511559a2274ab4904' - '7096f0e8d5b57c5e20e0616be98b77f6f5d300d7913d2e224f8a2b968872765d' - 'a61577739761a0730ed137cbd4c1151275ecabece7b9c35069e8de7fcf2786bc' - '16e4c0124cf126735c321f5b2fd51d303f079a8892727981b2221a36a7d93c8f' - 'fe511c7ff2b39760aaee0617cedd7277cca4c49627fc476006bfb30bdd4bb35f' - '5c4acfc9565d7743686792e6637e28a54f28abd9ab5a05bda072e34fab7f5af7' - '227c278f19be81d8cd67556855b0e4e7bc0fd3059f9697b525506be2b076cfa9' - '79a11214181e0e912e77e9013c7f35f7a44fc2f839d331371a227e1563985151') + '7db8188ca1afd8655fd79b606428e403baefdec13484d4807ace4b992bed6807' + '5ec7cf7f5e0a4e0278563cb05e6a446c3a26ca82cd2e2a6c129d5d8cc35828e5' + 'f14740304f43c336bdf7e1d78991717b504331f48c577d2c512ae276981c8f1e' + '649bfef25ae14d9cc44818ad466f1bcfab56b890acfbdbddd5f8a546cbfecebb' + 'd54044d69ee002d891e554149d350462618329477d0e1900528c34973bcb315e' + '634e552757df946f997f0f682802828f6540b5eff9eb60965714e4c9a8c3a3f5' + 'b3d7197f92d7e02e73b2f06a0b7770164f5052d38afa36843099468dd5eafafa' + 'bd8ae40ec5e3214fab8a92861a1e07ba92c89aebd2ecfbe59f2649a92150d1fb' + '9dee7840ac3231adbd5c23c57a09a289e3cc3fe4a24fcb2c56e78ab2c86f86cd' + '101e8ba35a6493359667a3c119e6f792bde16e77c04642127e7dd81bc2d56d41' + '0b38005851833200cf31a4bc99a4bac40a560db14bf32f4c4ebcfe77f635e06b' + 'f1236857310a8362abb8fc55e67a7013b61f03d593a89acf6ceae86cefc4ec37' + '5da915726aba84add16f5c509dc1be343db66f70a294b411759353b0ffaef0c2' + '8bb8c1aab143185a05b91cacaf600e147fcee55fc1abe67af0e1d6fed0b6e99f' + 'bd6c8a319845ec161106b85859ab42b22ded1f6515676449a00bb3cc776acb43' + 'bc4398d29b3a49e617cb7d9acd7a045c2a8c248c2065c96fd38ecc59e1a6d86f') prepare() { cd "libwacom-${pkgver}" @@ -67,17 +68,18 @@ prepare() { build() { rm -rf build - meson setup build "libwacom-${pkgver}" --prefix="/usr" + + arch-meson libwacom-$pkgver build meson compile -C build } check() { # disabled for now... - # ninja test -C build + # meson test -C build --print-errorlogs true } package() { - DESTDIR="${pkgdir}" meson install -C build - install -D -m644 "libwacom-${pkgver}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + meson install -C build --destdir "$pkgdir" + install -D -m644 libwacom-$pkgver/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } |