aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO28
-rw-r--r--0001-Add-support-for-Intel-Management-Engine-bus.patch6
-rw-r--r--0002-data-Add-Microsoft-Surface-Pro-4.patch (renamed from 0006-data-Add-Microsoft-Surface-Pro-4.patch)21
-rw-r--r--0003-data-Add-Microsoft-Surface-Pro-5.patch21
-rw-r--r--0004-data-Add-Microsoft-Surface-Pro-6.patch (renamed from 0005-data-Add-Microsoft-Surface-Pro-6.patch)21
-rw-r--r--0005-data-Add-Microsoft-Surface-Book.patch (renamed from 0007-data-Add-Microsoft-Surface-Book.patch)21
-rw-r--r--0006-data-Add-Microsoft-Surface-Book-2-13.5.patch (renamed from 0002-data-Add-Microsoft-Surface-Book-2-13.5.patch)21
-rw-r--r--0007-data-Add-Microsoft-Surface-Book-2-15.patch (renamed from 0004-data-Add-Microsoft-Surface-Book-2-15.patch)21
-rw-r--r--0008-data-Add-Microsoft-Surface-Go.patch46
-rw-r--r--PKGBUILD28
10 files changed, 181 insertions, 53 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7adb881fe0df..4f5314cf4d06 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = libwacom-surface
pkgdesc = Patched libwacom for Microsoft Surface devices
pkgver = 1.2
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/linux-surface/libwacom
arch = x86_64
license = MIT
@@ -13,22 +13,24 @@ pkgbase = libwacom-surface
provides = libwacom=1.2
conflicts = libwacom
source = 0001-Add-support-for-Intel-Management-Engine-bus.patch
- source = 0002-data-Add-Microsoft-Surface-Book-2-13.5.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-Book-2-15.patch
- source = 0005-data-Add-Microsoft-Surface-Pro-6.patch
- source = 0006-data-Add-Microsoft-Surface-Pro-4.patch
- source = 0007-data-Add-Microsoft-Surface-Book.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 = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.2/libwacom-1.2.tar.bz2
source = https://github.com/linuxwacom/libwacom/releases/download/libwacom-1.2/libwacom-1.2.tar.bz2.sig
validpgpkeys = 3C2C43D9447D5938EF4551EBE23B7E70B467F0BF
- sha256sums = eb0f32d5e33cb07cfb66c97ac6303383387ccfb97e808865cf056c21c3998ba4
- sha256sums = abf0137ec6ac8aee8e77b2d33423a4a90689660558bbb9bfef41b43f72170d4d
- sha256sums = 55384a33ddb4761729d8915a3709160dfc2c076b103c4072b2a46c0cb24a44b6
- sha256sums = fb16b33addc6c44401c2e36e8f3d5d244d6c76e036a64cf4988c679de8687cb2
- sha256sums = 833227f52f050c368e6ca5908aa7534238b96afb5d8a0df8413b14dd63891a9a
- sha256sums = dde9d2328c6c6112656f1537efb2bc8f0f50d96570b055acef1628a2442b464a
- sha256sums = 6f7f5f849e460110fad9304b275e4f9f2d880165faed124305b1bf2391c6958f
+ sha256sums = 7c4ff319dcf48debca4445d18ef10a50435d41a54f9d2b9ca0b41a238c3d76de
+ sha256sums = 281d6d13129cb04809bf94dc7d8bc631f04d2cb99f5d2e890d4f69086f206048
+ sha256sums = e1813105d44b1ad289853a73795b0b86701a750202f6733100ee0c4bd457e283
+ sha256sums = d166a0f37f39ffa186ee2577940465f1bc70d00b8bb75e15af6dffa82233c401
+ sha256sums = 78cbe7898e896fd594610a58c2dc2972348bbc3b89ff21f880687fb0b9190d74
+ sha256sums = b05ba743fd4315906fbcfa1dd8f13ce3c09ca4b7dbd05d9b17353827880f8d3b
+ sha256sums = 65173fcf181e9346aab610598cf1155aa83ee89af6cd9b767d5e27482e25c928
+ sha256sums = 3d9bbeab1447996089181d5dd7ff1331e87dfbb5b292b280cfa0e51f0250230d
sha256sums = c204cfdee2159d124a4f5ecc8970bbd72f9adf5ad7fd94b66798f93db1f863c3
sha256sums = SKIP
diff --git a/0001-Add-support-for-Intel-Management-Engine-bus.patch b/0001-Add-support-for-Intel-Management-Engine-bus.patch
index 641049c92d78..e72f82e5c08a 100644
--- a/0001-Add-support-for-Intel-Management-Engine-bus.patch
+++ b/0001-Add-support-for-Intel-Management-Engine-bus.patch
@@ -1,7 +1,7 @@
-From fa8fbe3e4d077f4b22d0da65fe9bff4b038f05e8 Mon Sep 17 00:00:00 2001
+From 4b36a9066dbe229fbe81fe2534b4c5af04854961 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/7] Add support for Intel Management Engine bus
+Subject: [PATCH 1/8] 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)
@@ -83,5 +83,5 @@ index 7f36197..2805da5 100644
g_assert_cmpint(libwacom_get_product_id(device), >, 0);
break;
--
-2.23.0
+2.24.1
diff --git a/0006-data-Add-Microsoft-Surface-Pro-4.patch b/0002-data-Add-Microsoft-Surface-Pro-4.patch
index 92c86e42dd41..1ac938fcc2ce 100644
--- a/0006-data-Add-Microsoft-Surface-Pro-4.patch
+++ b/0002-data-Add-Microsoft-Surface-Pro-4.patch
@@ -1,11 +1,12 @@
-From 5830c1e96938f58af8a159191e4c9522d6ab0cd1 Mon Sep 17 00:00:00 2001
+From 007ea6725861dae2fe12af8f1c3905077026bd4a Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Mon, 3 Jun 2019 00:42:30 +0200
-Subject: [PATCH 6/7] data: Add Microsoft Surface Pro 4
+Subject: [PATCH 2/8] data: Add Microsoft Surface Pro 4
---
data/surface-pro4.tablet | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
+ meson.build | 1 +
+ 2 files changed, 15 insertions(+)
create mode 100644 data/surface-pro4.tablet
diff --git a/data/surface-pro4.tablet b/data/surface-pro4.tablet
@@ -28,6 +29,18 @@ index 0000000..bb6f02f
+Stylus=true
+Touch=true
+Buttons=0
+diff --git a/meson.build b/meson.build
+index 41ea756..da920c8 100644
+--- a/meson.build
++++ b/meson.build
+@@ -318,6 +318,7 @@ data_files = [
+ 'data/one-by-wacom-s-p.tablet',
+ 'data/one-by-wacom-s-p2.tablet',
+ 'data/serial-wacf004.tablet',
++ 'data/surface-pro4.tablet',
+ 'data/xp-pen-star03.tablet',
+ ]
+
--
-2.23.0
+2.24.1
diff --git a/0003-data-Add-Microsoft-Surface-Pro-5.patch b/0003-data-Add-Microsoft-Surface-Pro-5.patch
index d8393cc3b650..96b0c66334bf 100644
--- a/0003-data-Add-Microsoft-Surface-Pro-5.patch
+++ b/0003-data-Add-Microsoft-Surface-Pro-5.patch
@@ -1,11 +1,12 @@
-From 582d23d27a6c6c83bdce3702e073f498f68fdeba Mon Sep 17 00:00:00 2001
+From 9dcfb5a3318c46599718b1dad9b4f9181126a1ba 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/7] data: Add Microsoft Surface Pro 5
+Subject: [PATCH 3/8] data: Add Microsoft Surface Pro 5
---
data/surface-pro5.tablet | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
+ meson.build | 1 +
+ 2 files changed, 15 insertions(+)
create mode 100644 data/surface-pro5.tablet
diff --git a/data/surface-pro5.tablet b/data/surface-pro5.tablet
@@ -28,6 +29,18 @@ index 0000000..2ad6539
+Stylus=true
+Touch=true
+Buttons=0
+diff --git a/meson.build b/meson.build
+index da920c8..ba17ef0 100644
+--- a/meson.build
++++ b/meson.build
+@@ -319,6 +319,7 @@ data_files = [
+ 'data/one-by-wacom-s-p2.tablet',
+ 'data/serial-wacf004.tablet',
+ 'data/surface-pro4.tablet',
++ 'data/surface-pro5.tablet',
+ 'data/xp-pen-star03.tablet',
+ ]
+
--
-2.23.0
+2.24.1
diff --git a/0005-data-Add-Microsoft-Surface-Pro-6.patch b/0004-data-Add-Microsoft-Surface-Pro-6.patch
index c8987d1d3fbc..6cdc09d04d11 100644
--- a/0005-data-Add-Microsoft-Surface-Pro-6.patch
+++ b/0004-data-Add-Microsoft-Surface-Pro-6.patch
@@ -1,11 +1,12 @@
-From a0a5b5e5149f62e179df800155d2b10a56738748 Mon Sep 17 00:00:00 2001
+From 233e53ef4460d597a9bcc782e640bd61b7e1868e Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Mon, 3 Jun 2019 00:40:34 +0200
-Subject: [PATCH 5/7] data: Add Microsoft Surface Pro 6
+Subject: [PATCH 4/8] data: Add Microsoft Surface Pro 6
---
data/surface-pro6.tablet | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
+ meson.build | 1 +
+ 2 files changed, 15 insertions(+)
create mode 100644 data/surface-pro6.tablet
diff --git a/data/surface-pro6.tablet b/data/surface-pro6.tablet
@@ -28,6 +29,18 @@ index 0000000..da31e8f
+Stylus=true
+Touch=true
+Buttons=0
+diff --git a/meson.build b/meson.build
+index ba17ef0..735e332 100644
+--- a/meson.build
++++ b/meson.build
+@@ -320,6 +320,7 @@ data_files = [
+ 'data/serial-wacf004.tablet',
+ 'data/surface-pro4.tablet',
+ 'data/surface-pro5.tablet',
++ 'data/surface-pro6.tablet',
+ 'data/xp-pen-star03.tablet',
+ ]
+
--
-2.23.0
+2.24.1
diff --git a/0007-data-Add-Microsoft-Surface-Book.patch b/0005-data-Add-Microsoft-Surface-Book.patch
index 336868f9a2dd..5b1b97a5ef00 100644
--- a/0007-data-Add-Microsoft-Surface-Book.patch
+++ b/0005-data-Add-Microsoft-Surface-Book.patch
@@ -1,11 +1,12 @@
-From e3be71039c05e50d58784b41564c59028f7789fa Mon Sep 17 00:00:00 2001
+From 5555d9221da9378393d14529a62eaed8afbd824f Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Mon, 3 Jun 2019 00:45:41 +0200
-Subject: [PATCH 7/7] data: Add Microsoft Surface Book
+Subject: [PATCH 5/8] data: Add Microsoft Surface Book
---
data/surface-book.tablet | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
+ meson.build | 1 +
+ 2 files changed, 15 insertions(+)
create mode 100644 data/surface-book.tablet
diff --git a/data/surface-book.tablet b/data/surface-book.tablet
@@ -28,6 +29,18 @@ index 0000000..45e17db
+Stylus=true
+Touch=true
+Buttons=0
+diff --git a/meson.build b/meson.build
+index 735e332..3b68396 100644
+--- a/meson.build
++++ b/meson.build
+@@ -318,6 +318,7 @@ data_files = [
+ 'data/one-by-wacom-s-p.tablet',
+ 'data/one-by-wacom-s-p2.tablet',
+ 'data/serial-wacf004.tablet',
++ 'data/surface-book.tablet',
+ 'data/surface-pro4.tablet',
+ 'data/surface-pro5.tablet',
+ 'data/surface-pro6.tablet',
--
-2.23.0
+2.24.1
diff --git a/0002-data-Add-Microsoft-Surface-Book-2-13.5.patch b/0006-data-Add-Microsoft-Surface-Book-2-13.5.patch
index 57f6b9f8903b..602892a717a9 100644
--- a/0002-data-Add-Microsoft-Surface-Book-2-13.5.patch
+++ b/0006-data-Add-Microsoft-Surface-Book-2-13.5.patch
@@ -1,11 +1,12 @@
-From 6179b43efe792cd0d4b6fd9c00674cb37ecde1fc Mon Sep 17 00:00:00 2001
+From b85499b82ce7ce27de75834607e67b7be0a91a0e 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 2/7] data: Add Microsoft Surface Book 2 (13.5")
+Subject: [PATCH 6/8] data: Add Microsoft Surface Book 2 (13.5")
---
data/surface-book2-13.tablet | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
+ meson.build | 1 +
+ 2 files changed, 15 insertions(+)
create mode 100644 data/surface-book2-13.tablet
diff --git a/data/surface-book2-13.tablet b/data/surface-book2-13.tablet
@@ -28,6 +29,18 @@ index 0000000..dc1353e
+Stylus=true
+Touch=true
+Buttons=0
+diff --git a/meson.build b/meson.build
+index 3b68396..d5f3f89 100644
+--- a/meson.build
++++ b/meson.build
+@@ -319,6 +319,7 @@ data_files = [
+ 'data/one-by-wacom-s-p2.tablet',
+ 'data/serial-wacf004.tablet',
+ 'data/surface-book.tablet',
++ 'data/surface-book2-13.tablet',
+ 'data/surface-pro4.tablet',
+ 'data/surface-pro5.tablet',
+ 'data/surface-pro6.tablet',
--
-2.23.0
+2.24.1
diff --git a/0004-data-Add-Microsoft-Surface-Book-2-15.patch b/0007-data-Add-Microsoft-Surface-Book-2-15.patch
index 7b26c39b818e..49caf5189c82 100644
--- a/0004-data-Add-Microsoft-Surface-Book-2-15.patch
+++ b/0007-data-Add-Microsoft-Surface-Book-2-15.patch
@@ -1,11 +1,12 @@
-From 45ac16891f1fe44fd7d79732102d8ada4e245d51 Mon Sep 17 00:00:00 2001
+From 03c38d658e7a7c5ff891260520c957157b02b312 Mon Sep 17 00:00:00 2001
From: Maximilian Luz <luzmaximilian@gmail.com>
Date: Sun, 2 Jun 2019 01:01:15 +0200
-Subject: [PATCH 4/7] data: Add Microsoft Surface Book 2 (15")
+Subject: [PATCH 7/8] data: Add Microsoft Surface Book 2 (15")
---
data/surface-book2-15.tablet | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
+ meson.build | 1 +
+ 2 files changed, 15 insertions(+)
create mode 100644 data/surface-book2-15.tablet
diff --git a/data/surface-book2-15.tablet b/data/surface-book2-15.tablet
@@ -28,6 +29,18 @@ index 0000000..6ec6551
+Stylus=true
+Touch=true
+Buttons=0
+diff --git a/meson.build b/meson.build
+index d5f3f89..e89dab8 100644
+--- a/meson.build
++++ b/meson.build
+@@ -320,6 +320,7 @@ data_files = [
+ 'data/serial-wacf004.tablet',
+ 'data/surface-book.tablet',
+ 'data/surface-book2-13.tablet',
++ 'data/surface-book2-15.tablet',
+ 'data/surface-pro4.tablet',
+ 'data/surface-pro5.tablet',
+ 'data/surface-pro6.tablet',
--
-2.23.0
+2.24.1
diff --git a/0008-data-Add-Microsoft-Surface-Go.patch b/0008-data-Add-Microsoft-Surface-Go.patch
new file mode 100644
index 000000000000..3322426f562f
--- /dev/null
+++ b/0008-data-Add-Microsoft-Surface-Go.patch
@@ -0,0 +1,46 @@
+From 562706f992bb88535a3728a58f4773f0b0e5a4f4 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
+
+---
+ data/surface-go.tablet | 14 ++++++++++++++
+ meson.build | 1 +
+ 2 files 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
+--- /dev/null
++++ b/data/surface-go.tablet
+@@ -0,0 +1,14 @@
++# This is for the Microsoft Surface Go
++
++[Device]
++Name=Microsoft Surface Go
++DeviceMatch=i2c:04F3:261A
++Class=ISDV4
++Width=8
++Height=5
++IntegratedIn=Display;System;
++
++[Features]
++Stylus=true
++Touch=true
++Buttons=0
+diff --git a/meson.build b/meson.build
+index e89dab8..05b71c9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -321,6 +321,7 @@ data_files = [
+ 'data/surface-book.tablet',
+ 'data/surface-book2-13.tablet',
+ 'data/surface-book2-15.tablet',
++ 'data/surface-go.tablet',
+ 'data/surface-pro4.tablet',
+ 'data/surface-pro5.tablet',
+ 'data/surface-pro6.tablet',
+--
+2.24.1
+
diff --git a/PKGBUILD b/PKGBUILD
index f567151d9552..0c458ba00a5d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=libwacom-surface
pkgver=1.2
-pkgrel=1
+pkgrel=2
pkgdesc="Patched libwacom for Microsoft Surface devices"
arch=('x86_64')
url="https://github.com/linux-surface/libwacom"
@@ -15,21 +15,23 @@ provides=("libwacom=${pkgver}")
source=(
'0001-Add-support-for-Intel-Management-Engine-bus.patch'
- '0002-data-Add-Microsoft-Surface-Book-2-13.5.patch'
+ '0002-data-Add-Microsoft-Surface-Pro-4.patch'
'0003-data-Add-Microsoft-Surface-Pro-5.patch'
- '0004-data-Add-Microsoft-Surface-Book-2-15.patch'
- '0005-data-Add-Microsoft-Surface-Pro-6.patch'
- '0006-data-Add-Microsoft-Surface-Pro-4.patch'
- '0007-data-Add-Microsoft-Surface-Book.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'
"https://github.com/linuxwacom/libwacom/releases/download/libwacom-${pkgver}/libwacom-${pkgver}.tar.bz2"{,.sig}
)
-sha256sums=('eb0f32d5e33cb07cfb66c97ac6303383387ccfb97e808865cf056c21c3998ba4'
- 'abf0137ec6ac8aee8e77b2d33423a4a90689660558bbb9bfef41b43f72170d4d'
- '55384a33ddb4761729d8915a3709160dfc2c076b103c4072b2a46c0cb24a44b6'
- 'fb16b33addc6c44401c2e36e8f3d5d244d6c76e036a64cf4988c679de8687cb2'
- '833227f52f050c368e6ca5908aa7534238b96afb5d8a0df8413b14dd63891a9a'
- 'dde9d2328c6c6112656f1537efb2bc8f0f50d96570b055acef1628a2442b464a'
- '6f7f5f849e460110fad9304b275e4f9f2d880165faed124305b1bf2391c6958f'
+sha256sums=('7c4ff319dcf48debca4445d18ef10a50435d41a54f9d2b9ca0b41a238c3d76de'
+ '281d6d13129cb04809bf94dc7d8bc631f04d2cb99f5d2e890d4f69086f206048'
+ 'e1813105d44b1ad289853a73795b0b86701a750202f6733100ee0c4bd457e283'
+ 'd166a0f37f39ffa186ee2577940465f1bc70d00b8bb75e15af6dffa82233c401'
+ '78cbe7898e896fd594610a58c2dc2972348bbc3b89ff21f880687fb0b9190d74'
+ 'b05ba743fd4315906fbcfa1dd8f13ce3c09ca4b7dbd05d9b17353827880f8d3b'
+ '65173fcf181e9346aab610598cf1155aa83ee89af6cd9b767d5e27482e25c928'
+ '3d9bbeab1447996089181d5dd7ff1331e87dfbb5b292b280cfa0e51f0250230d'
'c204cfdee2159d124a4f5ecc8970bbd72f9adf5ad7fd94b66798f93db1f863c3'
'SKIP')