aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO34
-rw-r--r--0001-Add-support-for-BUS_VIRTUAL.patch14
-rw-r--r--0002-Add-support-for-Intel-Management-Engine-bus.patch12
-rw-r--r--0003-data-Add-Microsoft-Surface-pro-4.patch4
-rw-r--r--0004-data-Add-Microsoft-Surface-pro-5.patch4
-rw-r--r--0005-data-Add-Microsoft-Surface-pro-6.patch4
-rw-r--r--0006-data-Add-Microsoft-Surface-pro-7.patch4
-rw-r--r--0007-data-Add-Microsoft-Surface-Book.patch4
-rw-r--r--0008-data-Add-Microsoft-Surface-Book-2-13.5.patch4
-rw-r--r--0009-data-Add-Microsoft-Surface-Book-2-15.patch4
-rw-r--r--0010-data-Add-Microsoft-Surface-Book-3-13.5.patch4
-rw-r--r--0011-data-Add-Microsoft-Surface-Book-3-15.patch4
-rw-r--r--0012-data-Add-Microsoft-Surface-Go.patch4
-rw-r--r--PKGBUILD28
14 files changed, 64 insertions, 64 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c2100aa7ceb0..57062566a886 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = libwacom-surface
pkgdesc = Patched libwacom for Microsoft Surface devices
- pkgver = 1.5
+ pkgver = 1.6
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.5
+ provides = libwacom=1.6
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.5/libwacom-1.5.tar.bz2
- source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.5/libwacom-1.5.tar.bz2.sig
+ 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
validpgpkeys = 3C2C43D9447D5938EF4551EBE23B7E70B467F0BF
- sha256sums = c8809fe2b66f14347b6adfe2375088f678bd4381a186407dc210ee5561fb2e54
- sha256sums = 4954a859dc0ea049aacca09b960de75384fcb93d55b2eac6880ae4467ed2a62e
- sha256sums = 3b8707b6158b6f362326bcf63ec30bd9d78d30115a6ad5861730296b7b8346e0
- sha256sums = c531a7c2f4bb9b77825d10db9f7afc362db180af5cdd14b9c6c6aaee0983e175
- sha256sums = b968c7c44047c4d46e3e813d927987ee95f8f574bfc8b2ad2957355cc4921964
- sha256sums = 37cc1991df66c0d446f83ce40faf489999a1ebf429f7c765391422d808c5428f
- sha256sums = 0c8252fc1ac89d12bb2ff796efa63a7f19191a2b8c4860435dc7bacdd279ccf8
- sha256sums = dd79ead5a21871c02b9ad9cea2c976c77fabc418389a3f07212a7ee46a464f98
- sha256sums = b5ec92ab67ddc06d81a51c731ec331935fef45cba0f8cec589cc9394f1037b34
- sha256sums = ccb0c301697404b1b703468fc9c03327e9e8b646855e9050f82b18e7316ef2f3
- sha256sums = 9cd9f04dd3e194e24a32f699fe2fe07c3c4c943032eb1e9c9fa278f49540fe0b
- sha256sums = cc12eedb8e38d9b05f93da32aa9acf2280b7b560381569cba55ea4f98b9c5ddb
- sha256sums = 6b349fb73c8edcf0288d17c49049648214924846b6a58914c2ed3477ff36d47b
+ 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 = SKIP
pkgname = libwacom-surface
diff --git a/0001-Add-support-for-BUS_VIRTUAL.patch b/0001-Add-support-for-BUS_VIRTUAL.patch
index 2a981f38ecd0..9c2f897218b3 100644
--- a/0001-Add-support-for-BUS_VIRTUAL.patch
+++ b/0001-Add-support-for-BUS_VIRTUAL.patch
@@ -1,4 +1,4 @@
-From 958ee8b63cdcd7347a1999bb94c0226e93025fd6 Mon Sep 17 00:00:00 2001
+From 232486e70e95297ac1e5f9cb32974f69e762c93f 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
@@ -41,7 +41,7 @@ index 9f2657b..7be5247 100644
g_assert_not_reached ();
}
diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index 627354c..aa1d47f 100644
+index 062b313..7b97bb1 100644
--- a/libwacom/libwacom.c
+++ b/libwacom/libwacom.c
@@ -147,6 +147,10 @@ get_bus_vid_pid (GUdevDevice *device,
@@ -64,7 +64,7 @@ index 627354c..aa1d47f 100644
default: g_assert_not_reached(); break;
}
diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
-index a848133..30636b4 100644
+index 1b9bc2c..24e99cd 100644
--- a/libwacom/libwacom.h
+++ b/libwacom/libwacom.h
@@ -117,6 +117,7 @@ typedef enum {
@@ -76,11 +76,11 @@ index a848133..30636b4 100644
/**
diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
-index 65b87c0..0b117eb 100644
+index 9e5b02f..3883341 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)
- /* fall through */
+@@ -179,6 +179,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
+ break;
case WBUSTYPE_BLUETOOTH:
case WBUSTYPE_I2C:
+ case WBUSTYPE_VIRTUAL:
@@ -88,5 +88,5 @@ index 65b87c0..0b117eb 100644
g_assert_cmpint(pid, >, 0);
break;
--
-2.28.0
+2.29.2
diff --git a/0002-Add-support-for-Intel-Management-Engine-bus.patch b/0002-Add-support-for-Intel-Management-Engine-bus.patch
index 9eb17ede147e..d5f2f25b94b8 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 b9a239e8e242d0f07b2023fe1b648e3abc389e06 Mon Sep 17 00:00:00 2001
+From 1b05921d0832770f31544ec252a8fedbd3b8db2c 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
@@ -36,7 +36,7 @@ index 7be5247..37ffd37 100644
g_assert_not_reached ();
}
diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c
-index aa1d47f..c6551ad 100644
+index 7b97bb1..d84e8fa 100644
--- a/libwacom/libwacom.c
+++ b/libwacom/libwacom.c
@@ -151,6 +151,10 @@ get_bus_vid_pid (GUdevDevice *device,
@@ -59,7 +59,7 @@ index aa1d47f..c6551ad 100644
default: g_assert_not_reached(); break;
}
diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h
-index 30636b4..e555be3 100644
+index 24e99cd..0eee2fd 100644
--- a/libwacom/libwacom.h
+++ b/libwacom/libwacom.h
@@ -118,6 +118,7 @@ typedef enum {
@@ -71,10 +71,10 @@ index 30636b4..e555be3 100644
/**
diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c
-index 0b117eb..58b909f 100644
+index 3883341..352bc43 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)
+@@ -180,6 +180,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid)
case WBUSTYPE_BLUETOOTH:
case WBUSTYPE_I2C:
case WBUSTYPE_VIRTUAL:
@@ -83,5 +83,5 @@ index 0b117eb..58b909f 100644
g_assert_cmpint(pid, >, 0);
break;
--
-2.28.0
+2.29.2
diff --git a/0003-data-Add-Microsoft-Surface-pro-4.patch b/0003-data-Add-Microsoft-Surface-pro-4.patch
index 38b3c693ab4c..17f027676a4e 100644
--- a/0003-data-Add-Microsoft-Surface-pro-4.patch
+++ b/0003-data-Add-Microsoft-Surface-pro-4.patch
@@ -1,4 +1,4 @@
-From 113e978f6ba2b6dcead82e475eda40b567357672 Mon Sep 17 00:00:00 2001
+From 75c107b81586f6bcc8c44eb815a7ff62203a6ba5 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
@@ -29,5 +29,5 @@ index 0000000..bfbe809
+Touch=true
+Buttons=0
--
-2.28.0
+2.29.2
diff --git a/0004-data-Add-Microsoft-Surface-pro-5.patch b/0004-data-Add-Microsoft-Surface-pro-5.patch
index 426344681703..ecfb27efd2d7 100644
--- a/0004-data-Add-Microsoft-Surface-pro-5.patch
+++ b/0004-data-Add-Microsoft-Surface-pro-5.patch
@@ -1,4 +1,4 @@
-From ee23ff644a706f8e73d42bf2d0b3f06bd5829137 Mon Sep 17 00:00:00 2001
+From b046b8f1caadcd191e8ab7ac93e6a3190f09779d 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
@@ -29,5 +29,5 @@ index 0000000..4fdbac6
+Touch=true
+Buttons=0
--
-2.28.0
+2.29.2
diff --git a/0005-data-Add-Microsoft-Surface-pro-6.patch b/0005-data-Add-Microsoft-Surface-pro-6.patch
index 34cd2c8d1e71..23be392c5212 100644
--- a/0005-data-Add-Microsoft-Surface-pro-6.patch
+++ b/0005-data-Add-Microsoft-Surface-pro-6.patch
@@ -1,4 +1,4 @@
-From 6d4d980f10ed4e02fff4c0f37ed3761c549b13f0 Mon Sep 17 00:00:00 2001
+From 204eed54bb339d927f2291bc6d8abb47b7ddccc3 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
@@ -29,5 +29,5 @@ index 0000000..787fd7a
+Touch=true
+Buttons=0
--
-2.28.0
+2.29.2
diff --git a/0006-data-Add-Microsoft-Surface-pro-7.patch b/0006-data-Add-Microsoft-Surface-pro-7.patch
index ce9c1ad9c726..c17cd1d01c31 100644
--- a/0006-data-Add-Microsoft-Surface-pro-7.patch
+++ b/0006-data-Add-Microsoft-Surface-pro-7.patch
@@ -1,4 +1,4 @@
-From 3a2548b9bbb9b61c9bc2f3fa7c0c1e3a094e011a Mon Sep 17 00:00:00 2001
+From 2130681ccb33f538e4000ce219b2f6c861dcd024 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
@@ -29,5 +29,5 @@ index 0000000..4659131
+Touch=true
+Buttons=0
--
-2.28.0
+2.29.2
diff --git a/0007-data-Add-Microsoft-Surface-Book.patch b/0007-data-Add-Microsoft-Surface-Book.patch
index bdb84b0bb0de..08313911c377 100644
--- a/0007-data-Add-Microsoft-Surface-Book.patch
+++ b/0007-data-Add-Microsoft-Surface-Book.patch
@@ -1,4 +1,4 @@
-From eb1fde4cbd67dd58e8a5bc262f3e3444516d9bfe Mon Sep 17 00:00:00 2001
+From ce150a5ca89aba8c5985b90a81f8bcbff046780c 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
@@ -29,5 +29,5 @@ index 0000000..a551c9b
+Touch=true
+Buttons=0
--
-2.28.0
+2.29.2
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 985743435510..a7182d5f8b27 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 0b5ea7dc8e9c5546bfb17fe118dfefe2750cd47d Mon Sep 17 00:00:00 2001
+From f3117e7ff8e213672f532b609d98c0e5d8d30d41 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")
@@ -29,5 +29,5 @@ index 0000000..6e770e9
+Touch=true
+Buttons=0
--
-2.28.0
+2.29.2
diff --git a/0009-data-Add-Microsoft-Surface-Book-2-15.patch b/0009-data-Add-Microsoft-Surface-Book-2-15.patch
index 7ec6ea947756..c49bce5b4552 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 08d1aa675432c1e5d0e35a635680d06fe90a9671 Mon Sep 17 00:00:00 2001
+From c5bc7f543e56e2110af2538a6a1385c4323ecc00 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")
@@ -29,5 +29,5 @@ index 0000000..c07e60f
+Touch=true
+Buttons=0
--
-2.28.0
+2.29.2
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 088499fa31c7..a49054525527 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 4823363ed2a44b64b90a81e8ed6f2ed990c21ae1 Mon Sep 17 00:00:00 2001
+From f8b1b9f4edde20df98af37d849661d64bcecf093 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")
@@ -29,5 +29,5 @@ index 0000000..212ef93
+Touch=true
+Buttons=0
--
-2.28.0
+2.29.2
diff --git a/0011-data-Add-Microsoft-Surface-Book-3-15.patch b/0011-data-Add-Microsoft-Surface-Book-3-15.patch
index 3ce6fe4161f6..2b13bec21b99 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 0a9b42de76b0f388c61155a227a35478c55de7b3 Mon Sep 17 00:00:00 2001
+From 5a4e8cc37dd573cb2b88292f454e9c6e4d9078b8 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")
@@ -29,5 +29,5 @@ index 0000000..6bef542
+Touch=true
+Buttons=0
--
-2.28.0
+2.29.2
diff --git a/0012-data-Add-Microsoft-Surface-Go.patch b/0012-data-Add-Microsoft-Surface-Go.patch
index fe2b5da2779b..f00179e873fe 100644
--- a/0012-data-Add-Microsoft-Surface-Go.patch
+++ b/0012-data-Add-Microsoft-Surface-Go.patch
@@ -1,4 +1,4 @@
-From 376c8bde6b881bf1367173d73275be242e2bd27a Mon Sep 17 00:00:00 2001
+From eb8d7dd917a71e5d972cab536ee5a78fd227e21d 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
@@ -30,5 +30,5 @@ index 0000000..b8f39a5
+Touch=true
+Buttons=0
--
-2.28.0
+2.29.2
diff --git a/PKGBUILD b/PKGBUILD
index 470b609ed3b9..febf830400c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Based on official Arch Linux PKGBUILD
pkgname=libwacom-surface
-pkgver=1.5
+pkgver=1.6
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=('c8809fe2b66f14347b6adfe2375088f678bd4381a186407dc210ee5561fb2e54'
- '4954a859dc0ea049aacca09b960de75384fcb93d55b2eac6880ae4467ed2a62e'
- '3b8707b6158b6f362326bcf63ec30bd9d78d30115a6ad5861730296b7b8346e0'
- 'c531a7c2f4bb9b77825d10db9f7afc362db180af5cdd14b9c6c6aaee0983e175'
- 'b968c7c44047c4d46e3e813d927987ee95f8f574bfc8b2ad2957355cc4921964'
- '37cc1991df66c0d446f83ce40faf489999a1ebf429f7c765391422d808c5428f'
- '0c8252fc1ac89d12bb2ff796efa63a7f19191a2b8c4860435dc7bacdd279ccf8'
- 'dd79ead5a21871c02b9ad9cea2c976c77fabc418389a3f07212a7ee46a464f98'
- 'b5ec92ab67ddc06d81a51c731ec331935fef45cba0f8cec589cc9394f1037b34'
- 'ccb0c301697404b1b703468fc9c03327e9e8b646855e9050f82b18e7316ef2f3'
- '9cd9f04dd3e194e24a32f699fe2fe07c3c4c943032eb1e9c9fa278f49540fe0b'
- 'cc12eedb8e38d9b05f93da32aa9acf2280b7b560381569cba55ea4f98b9c5ddb'
- '6b349fb73c8edcf0288d17c49049648214924846b6a58914c2ed3477ff36d47b'
+sha256sums=('21c0495cdbbac8950727e3699a851214ae4b67f24dffbc562eaa7a4dbd9c8947'
+ '9f49d987d534564149caa089cdb6fb99582d7c6ecd3c46a6be6ac910bff47de9'
+ 'fc091b56ab73c56ee0a4a7c387b1881ae6c57d4120e6e41ef209ee31e596b56f'
+ 'd7c4993dff271a181215a01cd29979629aad3becfe41dcacc59d46824e907b1d'
+ '1907a57c2f276a51356becfe50265af60eb17870667e4b3a99046216f1526812'
+ 'c64344b92c60312ea4c9928fe04a1f69174f5c99567f2fd7590d143efb71a234'
+ '5159e9e33c9e54b2321d4ecf94e1e446a2d9be296f2b998c1d809666cb3ebd3e'
+ '636f68a054c6ef286c7926acdb0d8c97ca673668beb96b04a1fdb55875d136eb'
+ '8982215d8c61705f04deb96b00239a6343e361703699e5dedbb20dceae3356f6'
+ 'd5381abd62a44d7886c743316de941b2cb940ccf5eb04ee55326cdc0bb05bd8f'
+ '6086082b23267fa991edd8ad623f43bcc4924a17f0fa5f5ba994cf0ce24f5fd2'
+ '4637cbcd280def21e74c23b1c2b37427a5a8e94ccdad864a49d9f337600fdcae'
+ '701cb23ee3f2ad4eb5183ef1421dfff3e5b7622e5d3bb6fcd599190a7d77aea8'
'SKIP')
prepare() {