diff options
| -rw-r--r-- | .SRCINFO | 42 | ||||
| -rw-r--r-- | 0001-Add-support-for-BUS_VIRTUAL.patch | 92 | ||||
| -rw-r--r-- | 0001-meson.build-ignore-Makefile.in-when-installing-data.patch | 39 | ||||
| -rw-r--r-- | 0002-Add-support-for-Intel-Management-Engine-bus.patch (renamed from 0001-Add-support-for-Intel-Management-Engine-bus.patch) | 42 | ||||
| -rw-r--r-- | 0003-data-Add-Microsoft-Surface-pro-4.patch (renamed from 0002-data-Add-Microsoft-Surface-Pro-4.patch) | 14 | ||||
| -rw-r--r-- | 0004-data-Add-Microsoft-Surface-pro-5.patch (renamed from 0003-data-Add-Microsoft-Surface-Pro-5.patch) | 14 | ||||
| -rw-r--r-- | 0005-data-Add-Microsoft-Surface-pro-6.patch (renamed from 0004-data-Add-Microsoft-Surface-Pro-6.patch) | 14 | ||||
| -rw-r--r-- | 0006-data-Add-Microsoft-Surface-pro-7.patch | 33 | ||||
| -rw-r--r-- | 0007-data-Add-Microsoft-Surface-Book.patch (renamed from 0005-data-Add-Microsoft-Surface-Book.patch) | 14 | ||||
| -rw-r--r-- | 0008-data-Add-Microsoft-Surface-Book-2-13.5.patch (renamed from 0006-data-Add-Microsoft-Surface-Book-2-13.5.patch) | 16 | ||||
| -rw-r--r-- | 0009-data-Add-Microsoft-Surface-Book-2-15.patch (renamed from 0007-data-Add-Microsoft-Surface-Book-2-15.patch) | 14 | ||||
| -rw-r--r-- | 0010-data-Add-Microsoft-Surface-Book-3-13.5.patch | 33 | ||||
| -rw-r--r-- | 0011-data-Add-Microsoft-Surface-Book-3-15.patch | 33 | ||||
| -rw-r--r-- | 0012-data-Add-Microsoft-Surface-Go.patch (renamed from 0008-data-Add-Microsoft-Surface-Go.patch) | 19 | ||||
| -rw-r--r-- | PKGBUILD | 42 |
15 files changed, 315 insertions, 146 deletions
@@ -1,7 +1,7 @@ pkgbase = libwacom-surface pkgdesc = Patched libwacom for Microsoft Surface devices pkgver = 1.4.1 - pkgrel = 1 + pkgrel = 2 url = https://github.com/linux-surface/libwacom arch = x86_64 license = MIT @@ -12,25 +12,33 @@ pkgbase = libwacom-surface depends = libgudev provides = libwacom=1.4.1 conflicts = libwacom - 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 - source = 0004-data-Add-Microsoft-Surface-Pro-6.patch - source = 0005-data-Add-Microsoft-Surface-Book.patch - 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 = 0001-Add-support-for-BUS_VIRTUAL.patch + source = 0002-Add-support-for-Intel-Management-Engine-bus.patch + source = 0003-data-Add-Microsoft-Surface-pro-4.patch + source = 0004-data-Add-Microsoft-Surface-pro-5.patch + source = 0005-data-Add-Microsoft-Surface-pro-6.patch + source = 0006-data-Add-Microsoft-Surface-pro-7.patch + source = 0007-data-Add-Microsoft-Surface-Book.patch + source = 0008-data-Add-Microsoft-Surface-Book-2-13.5.patch + source = 0009-data-Add-Microsoft-Surface-Book-2-15.patch + 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.4.1/libwacom-1.4.1.tar.bz2 source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.4.1/libwacom-1.4.1.tar.bz2.sig validpgpkeys = 3C2C43D9447D5938EF4551EBE23B7E70B467F0BF - sha256sums = 2bb41c3b1b23670c5f5ccf2fbb851827b6fbcaa8cead8f56de571a740e4e21b2 - sha256sums = c728251446d677df44635e2329fe9cb31077b500e587fd505c7b2b5fe5d15a60 - sha256sums = d75087e2bcb05f373609c2f4e8ca114fd681ebed2234624aaca265bb7f1a9c17 - sha256sums = 6fdae3834af15bcb68917eb2a3fd29bb7fd384025c7226659681b6f030f65f1f - sha256sums = 2a0c08be2b3273bd439bac0b373e20335631e29591f2d6cd8b33ad7fce142e3c - sha256sums = 2e482b9cf1f5f1308ca4a2f38aea0874cea0cee7fb52897c738d31570c73d07e - sha256sums = 15ed034d7e359a59051ec2d8f0d2508bf725ec42f8499209de8f2ecba4eeef82 - sha256sums = 7b66af8c01423d5c7b93ddb1b77910c6be91e8a332cc16f3c42ff7ac3ab7ddfb + sha256sums = 140de2c9ed7350248f20137942f46c48c84468b1e82169cea3c56c211199c461 + sha256sums = a41bab123588c5c67c8a05e01338b13f13c59f29695084cd9b6ce8e585e82a3a + sha256sums = 73d4cfd588a568775fe2a6d859a7223c48b6c17e8ccde7e3691b7ab30f9fefe6 + sha256sums = ca2f7a787ac80abcf9cb022ee87c2923ab6636e9fad181b9d6c28d153c046ea3 + sha256sums = b49f60e700d1cce47d59145ad86df4a50a57b1ea577d4958c18252a40fd3c2d9 + sha256sums = 1b58b993a57669bba910794df7949c77af281813c56edb7eee9205744003fd26 + sha256sums = 5041c7c8b216d223f5e33773fcd430d36ca4ca67b9ee9c7ace6bfb077c20e9b9 + sha256sums = 4478ba5fdfb032e5841f29d16ad01711a6ad3d426bccf22f2c0901621987f999 + sha256sums = 5a039a3633523297f1aa34f01bbe43272999201659a3f11f14d343e0d634f438 + sha256sums = 8a7470b8a4bf4d8fbd29fa6f191bafc3bb34f76aee4c696b9308bb8b63f91ea8 + sha256sums = 937ecf67fa4e47dafd5a5ca7bb84de8db185c990ff50988966af51e7f9274ffe + sha256sums = cc670a133023308d62f24d9e853673db9644337ebad4e8ed5be55785e2c0f6e2 sha256sums = 07839c542940776c402168c7b73c04b346ba7557eb3f25a23a49893aff86ab08 sha256sums = SKIP diff --git a/0001-Add-support-for-BUS_VIRTUAL.patch b/0001-Add-support-for-BUS_VIRTUAL.patch new file mode 100644 index 000000000000..b46137e95019 --- /dev/null +++ b/0001-Add-support-for-BUS_VIRTUAL.patch @@ -0,0 +1,92 @@ +From 174ac028e838a4e564aac4d791aa64209e5cbfa1 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 + +This is needed to support IPTS devices through the iptsd userspace +daemon. It exposes the touchscreen / stylus as uinput, since the parsing +of raw IPTS data needs to happen in userspace. + +Because these devices are not backed by an actual bus, they are created +as BUS_VIRTUAL. + +Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io> +--- + libwacom/libwacom-database.c | 4 ++++ + libwacom/libwacom.c | 5 +++++ + libwacom/libwacom.h | 1 + + test/test-tablet-validity.c | 1 + + 4 files changed, 11 insertions(+) + +diff --git a/libwacom/libwacom-database.c b/libwacom/libwacom-database.c +index 9f2657b..7be5247 100644 +--- a/libwacom/libwacom-database.c ++++ b/libwacom/libwacom-database.c +@@ -130,6 +130,8 @@ bus_from_str (const char *str) + return WBUSTYPE_BLUETOOTH; + if (streq(str, "i2c")) + return WBUSTYPE_I2C; ++ if (streq(str, "virt")) ++ return WBUSTYPE_VIRTUAL; + return WBUSTYPE_UNKNOWN; + } + +@@ -148,6 +150,8 @@ bus_to_str (WacomBusType bus) + return "bluetooth"; + case WBUSTYPE_I2C: + return "i2c"; ++ case WBUSTYPE_VIRTUAL: ++ return "virt"; + } + g_assert_not_reached (); + } +diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c +index 627354c..aa1d47f 100644 +--- a/libwacom/libwacom.c ++++ b/libwacom/libwacom.c +@@ -147,6 +147,10 @@ get_bus_vid_pid (GUdevDevice *device, + *bus = WBUSTYPE_I2C; + retval = TRUE; + break; ++ case 6: ++ *bus = WBUSTYPE_VIRTUAL; ++ retval = TRUE; ++ break; + } + + out: +@@ -765,6 +769,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; ++ case WBUSTYPE_VIRTUAL: bus_name = "virt"; break; + case WBUSTYPE_UNKNOWN: bus_name = "unknown"; break; + default: g_assert_not_reached(); break; + } +diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h +index a848133..30636b4 100644 +--- a/libwacom/libwacom.h ++++ b/libwacom/libwacom.h +@@ -117,6 +117,7 @@ typedef enum { + WBUSTYPE_SERIAL, /**< Serial tablet */ + WBUSTYPE_BLUETOOTH, /**< Bluetooth tablet */ + WBUSTYPE_I2C, /**< I2C tablet */ ++ WBUSTYPE_VIRTUAL, /**< Virtual (uinput) tablet */ + } WacomBusType; + + /** +diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c +index 65b87c0..0b117eb 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 */ + case WBUSTYPE_BLUETOOTH: + case WBUSTYPE_I2C: ++ case WBUSTYPE_VIRTUAL: + g_assert_cmpint(vid, >, 0); + g_assert_cmpint(pid, >, 0); + break; +-- +2.28.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 deleted file mode 100644 index caba45478680..000000000000 --- a/0001-meson.build-ignore-Makefile.in-when-installing-data.patch +++ /dev/null @@ -1,39 +0,0 @@ -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/0001-Add-support-for-Intel-Management-Engine-bus.patch b/0002-Add-support-for-Intel-Management-Engine-bus.patch index 909e7c0f61b8..5cde71504bdb 100644 --- a/0001-Add-support-for-Intel-Management-Engine-bus.patch +++ b/0002-Add-support-for-Intel-Management-Engine-bus.patch @@ -1,7 +1,7 @@ -From 5bf2b290f25006f5e97c868f4423048074d96dbe Mon Sep 17 00:00:00 2001 +From fb31b52509797b47119e95dc15d46a5d0ed23352 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 +Subject: [PATCH 02/12] Add support for Intel Management Engine bus Add support for devices connected via the Intel Management Engine (MEI). This is required to support IPTS based devices, such as (among others) @@ -14,33 +14,33 @@ 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 9f2657b..6084818 100644 +index 7be5247..37ffd37 100644 --- a/libwacom/libwacom-database.c +++ b/libwacom/libwacom-database.c -@@ -130,6 +130,8 @@ bus_from_str (const char *str) - return WBUSTYPE_BLUETOOTH; - if (streq(str, "i2c")) +@@ -132,6 +132,8 @@ bus_from_str (const char *str) return WBUSTYPE_I2C; + if (streq(str, "virt")) + return WBUSTYPE_VIRTUAL; + if (strcmp (str, "mei") == 0) + return WBUSTYPE_MEI; return WBUSTYPE_UNKNOWN; } -@@ -148,6 +150,8 @@ bus_to_str (WacomBusType bus) - return "bluetooth"; - case WBUSTYPE_I2C: +@@ -152,6 +154,8 @@ bus_to_str (WacomBusType bus) return "i2c"; + case WBUSTYPE_VIRTUAL: + return "virt"; + case WBUSTYPE_MEI: + return "mei"; } g_assert_not_reached (); } diff --git a/libwacom/libwacom.c b/libwacom/libwacom.c -index 627354c..c52daed 100644 +index aa1d47f..c6551ad 100644 --- a/libwacom/libwacom.c +++ b/libwacom/libwacom.c -@@ -147,6 +147,10 @@ get_bus_vid_pid (GUdevDevice *device, - *bus = WBUSTYPE_I2C; +@@ -151,6 +151,10 @@ get_bus_vid_pid (GUdevDevice *device, + *bus = WBUSTYPE_VIRTUAL; retval = TRUE; break; + case 68: @@ -50,38 +50,38 @@ index 627354c..c52daed 100644 } out: -@@ -765,6 +769,7 @@ static void print_match(int fd, const WacomMatch *match) - case WBUSTYPE_USB: bus_name = "usb"; break; +@@ -770,6 +774,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; + case WBUSTYPE_MEI: bus_name = "mei"; break; case WBUSTYPE_UNKNOWN: bus_name = "unknown"; break; default: g_assert_not_reached(); break; } diff --git a/libwacom/libwacom.h b/libwacom/libwacom.h -index a848133..af0f134 100644 +index 30636b4..e555be3 100644 --- a/libwacom/libwacom.h +++ b/libwacom/libwacom.h -@@ -117,6 +117,7 @@ typedef enum { - WBUSTYPE_SERIAL, /**< Serial tablet */ +@@ -118,6 +118,7 @@ typedef enum { WBUSTYPE_BLUETOOTH, /**< Bluetooth tablet */ WBUSTYPE_I2C, /**< I2C tablet */ + WBUSTYPE_VIRTUAL, /**< Virtual (uinput) tablet */ + WBUSTYPE_MEI, /**< MEI */ } WacomBusType; /** diff --git a/test/test-tablet-validity.c b/test/test-tablet-validity.c -index 65b87c0..745c46d 100644 +index 0b117eb..58b909f 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 */ +@@ -178,6 +178,7 @@ assert_vidpid(WacomBusType bus, int vid, int pid) case WBUSTYPE_BLUETOOTH: case WBUSTYPE_I2C: + case WBUSTYPE_VIRTUAL: + case WBUSTYPE_MEI: g_assert_cmpint(vid, >, 0); g_assert_cmpint(pid, >, 0); break; -- -2.27.0 +2.28.0 diff --git a/0002-data-Add-Microsoft-Surface-Pro-4.patch b/0003-data-Add-Microsoft-Surface-pro-4.patch index 517d3a511d64..148bc2b1b228 100644 --- a/0002-data-Add-Microsoft-Surface-Pro-4.patch +++ b/0003-data-Add-Microsoft-Surface-pro-4.patch @@ -1,7 +1,7 @@ -From 50e1eff057aab7b2b92ea65de3097ab37692fb75 Mon Sep 17 00:00:00 2001 +From 40978156216b4158d0b3fcbcbc712382c193fcbd 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 +Date: Tue, 18 Aug 2020 20:18:55 +0200 +Subject: [PATCH 03/12] data: Add Microsoft Surface pro 4 --- data/surface-pro4.tablet | 14 ++++++++++++++ @@ -10,7 +10,7 @@ Subject: [PATCH 2/8] data: Add Microsoft Surface Pro 4 diff --git a/data/surface-pro4.tablet b/data/surface-pro4.tablet new file mode 100644 -index 0000000..bb6f02f +index 0000000..bfbe809 --- /dev/null +++ b/data/surface-pro4.tablet @@ -0,0 +1,14 @@ @@ -18,8 +18,8 @@ index 0000000..bb6f02f + +[Device] +Name=Microsoft Surface Pro 4 -+DeviceMatch=mei:1B96:006A -+Class=ISDV4 ++Class=PenDisplay ++DeviceMatch=virt:1B96:006A;virt:1B96:0021;mei:1B96:006A;mei:1B96:0021 +Width=10 +Height=6 +IntegratedIn=Display;System; @@ -29,5 +29,5 @@ index 0000000..bb6f02f +Touch=true +Buttons=0 -- -2.27.0 +2.28.0 diff --git a/0003-data-Add-Microsoft-Surface-Pro-5.patch b/0004-data-Add-Microsoft-Surface-pro-5.patch index f2e8c8d6b544..47fb95bb5618 100644 --- a/0003-data-Add-Microsoft-Surface-Pro-5.patch +++ b/0004-data-Add-Microsoft-Surface-pro-5.patch @@ -1,7 +1,7 @@ -From a66716aa122b99f2c3c12b9d487640c120be7426 Mon Sep 17 00:00:00 2001 +From 9437dac1f05a295afc2fb6fd9a7a89018757b5dd 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 +Date: Tue, 18 Aug 2020 20:19:02 +0200 +Subject: [PATCH 04/12] data: Add Microsoft Surface pro 5 --- data/surface-pro5.tablet | 14 ++++++++++++++ @@ -10,7 +10,7 @@ Subject: [PATCH 3/8] data: Add Microsoft Surface Pro 5 diff --git a/data/surface-pro5.tablet b/data/surface-pro5.tablet new file mode 100644 -index 0000000..2ad6539 +index 0000000..4fdbac6 --- /dev/null +++ b/data/surface-pro5.tablet @@ -0,0 +1,14 @@ @@ -18,8 +18,8 @@ index 0000000..2ad6539 + +[Device] +Name=Microsoft Surface Pro 5 -+DeviceMatch=mei:1B96:001F -+Class=ISDV4 ++Class=PenDisplay ++DeviceMatch=virt:1B96:001F;mei:1B96:001F +Width=10 +Height=6 +IntegratedIn=Display;System; @@ -29,5 +29,5 @@ index 0000000..2ad6539 +Touch=true +Buttons=0 -- -2.27.0 +2.28.0 diff --git a/0004-data-Add-Microsoft-Surface-Pro-6.patch b/0005-data-Add-Microsoft-Surface-pro-6.patch index f4c9c45cf01d..bbd2d0ef8bd5 100644 --- a/0004-data-Add-Microsoft-Surface-Pro-6.patch +++ b/0005-data-Add-Microsoft-Surface-pro-6.patch @@ -1,7 +1,7 @@ -From cfdb0ebe6303ec2eada62b9f61e4e1c1b0fc0233 Mon Sep 17 00:00:00 2001 +From 31f366ad82ac7ee32526bb3c429a9c98a0391463 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 +Date: Tue, 18 Aug 2020 20:19:07 +0200 +Subject: [PATCH 05/12] data: Add Microsoft Surface pro 6 --- data/surface-pro6.tablet | 14 ++++++++++++++ @@ -10,7 +10,7 @@ Subject: [PATCH 4/8] data: Add Microsoft Surface Pro 6 diff --git a/data/surface-pro6.tablet b/data/surface-pro6.tablet new file mode 100644 -index 0000000..da31e8f +index 0000000..787fd7a --- /dev/null +++ b/data/surface-pro6.tablet @@ -0,0 +1,14 @@ @@ -18,8 +18,8 @@ index 0000000..da31e8f + +[Device] +Name=Microsoft Surface Pro 6 -+DeviceMatch=mei:045E:001F -+Class=ISDV4 ++Class=PenDisplay ++DeviceMatch=virt:045E:001F;mei:045E:001F +Width=10 +Height=6 +IntegratedIn=Display;System; @@ -29,5 +29,5 @@ index 0000000..da31e8f +Touch=true +Buttons=0 -- -2.27.0 +2.28.0 diff --git a/0006-data-Add-Microsoft-Surface-pro-7.patch b/0006-data-Add-Microsoft-Surface-pro-7.patch new file mode 100644 index 000000000000..165260a98f1b --- /dev/null +++ b/0006-data-Add-Microsoft-Surface-pro-7.patch @@ -0,0 +1,33 @@ +From 65e14e2a29dffae46526c7e1b7f0efba1477dbfa 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 + +--- + data/surface-pro7.tablet | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + create mode 100644 data/surface-pro7.tablet + +diff --git a/data/surface-pro7.tablet b/data/surface-pro7.tablet +new file mode 100644 +index 0000000..4659131 +--- /dev/null ++++ b/data/surface-pro7.tablet +@@ -0,0 +1,14 @@ ++# This is for the Microsoft Surface Pro 7 ++ ++[Device] ++Name=Microsoft Surface Pro 7 ++Class=PenDisplay ++DeviceMatch=virt:045E:099F;mei:045E:099F ++Width=10 ++Height=6 ++IntegratedIn=Display;System; ++ ++[Features] ++Stylus=false ++Touch=true ++Buttons=0 +-- +2.28.0 + diff --git a/0005-data-Add-Microsoft-Surface-Book.patch b/0007-data-Add-Microsoft-Surface-Book.patch index e65db773eed9..70a06812c47e 100644 --- a/0005-data-Add-Microsoft-Surface-Book.patch +++ b/0007-data-Add-Microsoft-Surface-Book.patch @@ -1,7 +1,7 @@ -From 122fcb323532c576fb3913b6c2230dc57cf35b12 Mon Sep 17 00:00:00 2001 +From 910d868d837aa1989695cdbcbf07f47fae3086d3 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 +Date: Tue, 18 Aug 2020 20:19:38 +0200 +Subject: [PATCH 07/12] data: Add Microsoft Surface Book --- data/surface-book.tablet | 14 ++++++++++++++ @@ -10,7 +10,7 @@ Subject: [PATCH 5/8] data: Add Microsoft Surface Book diff --git a/data/surface-book.tablet b/data/surface-book.tablet new file mode 100644 -index 0000000..45e17db +index 0000000..a551c9b --- /dev/null +++ b/data/surface-book.tablet @@ -0,0 +1,14 @@ @@ -18,8 +18,8 @@ index 0000000..45e17db + +[Device] +Name=Microsoft Surface Book -+DeviceMatch=mei:1B96:005e -+Class=ISDV4 ++Class=PenDisplay ++DeviceMatch=virt:1B96:005e;mei:1B96:005e +Width=11 +Height=7 +IntegratedIn=Display;System; @@ -29,5 +29,5 @@ index 0000000..45e17db +Touch=true +Buttons=0 -- -2.27.0 +2.28.0 diff --git a/0006-data-Add-Microsoft-Surface-Book-2-13.5.patch b/0008-data-Add-Microsoft-Surface-Book-2-13.5.patch index ddcb55187d00..67943d00568a 100644 --- a/0006-data-Add-Microsoft-Surface-Book-2-13.5.patch +++ b/0008-data-Add-Microsoft-Surface-Book-2-13.5.patch @@ -1,7 +1,7 @@ -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") +From 8deba9f6ee84f20a6d1544d59d6d184bc580da42 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") --- data/surface-book2-13.tablet | 14 ++++++++++++++ @@ -10,7 +10,7 @@ Subject: [PATCH 6/8] 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..dc1353e +index 0000000..6e770e9 --- /dev/null +++ b/data/surface-book2-13.tablet @@ -0,0 +1,14 @@ @@ -18,8 +18,8 @@ index 0000000..dc1353e + +[Device] +Name=Microsoft Surface Book 2 (13.5") -+DeviceMatch=mei:045E:0021 -+Class=ISDV4 ++Class=PenDisplay ++DeviceMatch=virt:045E:0021;mei:045E:0021 +Width=11 +Height=7 +IntegratedIn=Display;System; @@ -29,5 +29,5 @@ index 0000000..dc1353e +Touch=true +Buttons=0 -- -2.27.0 +2.28.0 diff --git a/0007-data-Add-Microsoft-Surface-Book-2-15.patch b/0009-data-Add-Microsoft-Surface-Book-2-15.patch index 612a3c874176..70810702a54b 100644 --- a/0007-data-Add-Microsoft-Surface-Book-2-15.patch +++ b/0009-data-Add-Microsoft-Surface-Book-2-15.patch @@ -1,7 +1,7 @@ -From f9fda882fb7ec2d379977a968bd914e938fcdafb Mon Sep 17 00:00:00 2001 +From dd1f305bbac0bb8336915085f99199d84cbc1f6a 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") +Date: Tue, 18 Aug 2020 20:20:13 +0200 +Subject: [PATCH 09/12] data: Add Microsoft Surface Book 2 (15") --- data/surface-book2-15.tablet | 14 ++++++++++++++ @@ -10,7 +10,7 @@ Subject: [PATCH 7/8] 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..6ec6551 +index 0000000..c07e60f --- /dev/null +++ b/data/surface-book2-15.tablet @@ -0,0 +1,14 @@ @@ -18,8 +18,8 @@ index 0000000..6ec6551 + +[Device] +Name=Microsoft Surface Book 2 (15") -+DeviceMatch=mei:045E:0020 -+Class=ISDV4 ++Class=PenDisplay ++DeviceMatch=virt:045E:0020;mei:045E:0020 +Width=12 +Height=8 +IntegratedIn=Display;System; @@ -29,5 +29,5 @@ index 0000000..6ec6551 +Touch=true +Buttons=0 -- -2.27.0 +2.28.0 diff --git a/0010-data-Add-Microsoft-Surface-Book-3-13.5.patch b/0010-data-Add-Microsoft-Surface-Book-3-13.5.patch new file mode 100644 index 000000000000..82e7fd6e6243 --- /dev/null +++ b/0010-data-Add-Microsoft-Surface-Book-3-13.5.patch @@ -0,0 +1,33 @@ +From d090f4f101c9a5ac16d8c04a82402ce1bb2ce157 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") + +--- + data/surface-book3-13.tablet | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + create mode 100644 data/surface-book3-13.tablet + +diff --git a/data/surface-book3-13.tablet b/data/surface-book3-13.tablet +new file mode 100644 +index 0000000..212ef93 +--- /dev/null ++++ b/data/surface-book3-13.tablet +@@ -0,0 +1,14 @@ ++# This is for the Microsoft Surface Book 3 13.5-inch model ++ ++[Device] ++Name=Microsoft Surface Book 3 (13.5") ++Class=PenDisplay ++DeviceMatch=virt:045E:09B2;mei:045E:09B2 ++Width=11 ++Height=7 ++IntegratedIn=Display;System; ++ ++[Features] ++Stylus=false ++Touch=true ++Buttons=0 +-- +2.28.0 + diff --git a/0011-data-Add-Microsoft-Surface-Book-3-15.patch b/0011-data-Add-Microsoft-Surface-Book-3-15.patch new file mode 100644 index 000000000000..829c3ebde5a3 --- /dev/null +++ b/0011-data-Add-Microsoft-Surface-Book-3-15.patch @@ -0,0 +1,33 @@ +From edcd303985bbe63762c4158465d63fcbd0dfb45e 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") + +--- + data/surface-book3-15.tablet | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + create mode 100644 data/surface-book3-15.tablet + +diff --git a/data/surface-book3-15.tablet b/data/surface-book3-15.tablet +new file mode 100644 +index 0000000..6bef542 +--- /dev/null ++++ b/data/surface-book3-15.tablet +@@ -0,0 +1,14 @@ ++# This is for the Microsoft Surface Book 3 15-inch model ++ ++[Device] ++Name=Microsoft Surface Book 3 (15") ++Class=PenDisplay ++DeviceMatch=virt:045E:09B1;mei:045E:09B1 ++Width=12 ++Height=8 ++IntegratedIn=Display;System; ++ ++[Features] ++Stylus=false ++Touch=true ++Buttons=0 +-- +2.28.0 + diff --git a/0008-data-Add-Microsoft-Surface-Go.patch b/0012-data-Add-Microsoft-Surface-Go.patch index 6dafc6be90ad..1793efd71130 100644 --- a/0008-data-Add-Microsoft-Surface-Go.patch +++ b/0012-data-Add-Microsoft-Surface-Go.patch @@ -1,23 +1,24 @@ -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 +From fec850bc0d60a85fea17d59b3c11fdaa831bcd5b 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 | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) + data/surface-go.tablet | 15 +++++++++++++++ + 1 file changed, 15 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..0db7a78 +index 0000000..b8f39a5 --- /dev/null +++ b/data/surface-go.tablet -@@ -0,0 +1,14 @@ +@@ -0,0 +1,15 @@ +# This is for the Microsoft Surface Go + +[Device] +Name=Microsoft Surface Go ++Class=PenDisplay +DeviceMatch=i2c:04F3:261A +Class=ISDV4 +Width=8 @@ -29,5 +30,5 @@ index 0000000..0db7a78 +Touch=true +Buttons=0 -- -2.27.0 +2.28.0 @@ -3,7 +3,7 @@ pkgname=libwacom-surface pkgver=1.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="Patched libwacom for Microsoft Surface devices" arch=('x86_64') url="https://github.com/linux-surface/libwacom" @@ -15,24 +15,32 @@ conflicts=('libwacom') provides=("libwacom=${pkgver}") source=( - '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' - '0004-data-Add-Microsoft-Surface-Pro-6.patch' - '0005-data-Add-Microsoft-Surface-Book.patch' - '0006-data-Add-Microsoft-Surface-Book-2-13.5.patch' - '0007-data-Add-Microsoft-Surface-Book-2-15.patch' - '0008-data-Add-Microsoft-Surface-Go.patch' + '0001-Add-support-for-BUS_VIRTUAL.patch' + '0002-Add-support-for-Intel-Management-Engine-bus.patch' + '0003-data-Add-Microsoft-Surface-pro-4.patch' + '0004-data-Add-Microsoft-Surface-pro-5.patch' + '0005-data-Add-Microsoft-Surface-pro-6.patch' + '0006-data-Add-Microsoft-Surface-pro-7.patch' + '0007-data-Add-Microsoft-Surface-Book.patch' + '0008-data-Add-Microsoft-Surface-Book-2-13.5.patch' + '0009-data-Add-Microsoft-Surface-Book-2-15.patch' + '0010-data-Add-Microsoft-Surface-Book-3-13.5.patch' + '0011-data-Add-Microsoft-Surface-Book-3-15.patch' + '0012-data-Add-Microsoft-Surface-Go.patch' "https://github.com/linuxwacom/libwacom/releases/download/libwacom-${pkgver}/libwacom-${pkgver}.tar.bz2"{,.sig} ) -sha256sums=('2bb41c3b1b23670c5f5ccf2fbb851827b6fbcaa8cead8f56de571a740e4e21b2' - 'c728251446d677df44635e2329fe9cb31077b500e587fd505c7b2b5fe5d15a60' - 'd75087e2bcb05f373609c2f4e8ca114fd681ebed2234624aaca265bb7f1a9c17' - '6fdae3834af15bcb68917eb2a3fd29bb7fd384025c7226659681b6f030f65f1f' - '2a0c08be2b3273bd439bac0b373e20335631e29591f2d6cd8b33ad7fce142e3c' - '2e482b9cf1f5f1308ca4a2f38aea0874cea0cee7fb52897c738d31570c73d07e' - '15ed034d7e359a59051ec2d8f0d2508bf725ec42f8499209de8f2ecba4eeef82' - '7b66af8c01423d5c7b93ddb1b77910c6be91e8a332cc16f3c42ff7ac3ab7ddfb' +sha256sums=('140de2c9ed7350248f20137942f46c48c84468b1e82169cea3c56c211199c461' + 'a41bab123588c5c67c8a05e01338b13f13c59f29695084cd9b6ce8e585e82a3a' + '73d4cfd588a568775fe2a6d859a7223c48b6c17e8ccde7e3691b7ab30f9fefe6' + 'ca2f7a787ac80abcf9cb022ee87c2923ab6636e9fad181b9d6c28d153c046ea3' + 'b49f60e700d1cce47d59145ad86df4a50a57b1ea577d4958c18252a40fd3c2d9' + '1b58b993a57669bba910794df7949c77af281813c56edb7eee9205744003fd26' + '5041c7c8b216d223f5e33773fcd430d36ca4ca67b9ee9c7ace6bfb077c20e9b9' + '4478ba5fdfb032e5841f29d16ad01711a6ad3d426bccf22f2c0901621987f999' + '5a039a3633523297f1aa34f01bbe43272999201659a3f11f14d343e0d634f438' + '8a7470b8a4bf4d8fbd29fa6f191bafc3bb34f76aee4c696b9308bb8b63f91ea8' + '937ecf67fa4e47dafd5a5ca7bb84de8db185c990ff50988966af51e7f9274ffe' + 'cc670a133023308d62f24d9e853673db9644337ebad4e8ed5be55785e2c0f6e2' '07839c542940776c402168c7b73c04b346ba7557eb3f25a23a49893aff86ab08' 'SKIP') |