Compare commits

...

No commits in common. 'c8' and 'c9' have entirely different histories.
c8 ... c9

2
.gitignore vendored

@ -1 +1 @@
SOURCES/libwacom-1.6.tar.bz2
SOURCES/libwacom-1.12.1.tar.bz2

@ -1 +1 @@
26814fff5ec4df35f4ecdc0345741569bf898322 SOURCES/libwacom-1.6.tar.bz2
9783ccc5d64a40dfcb2b17bf48b8d01b45422c64 SOURCES/libwacom-1.12.1.tar.bz2

@ -1,45 +0,0 @@
From 4d812e1f7031a1021d09cbcf2e58d7456759c6a1 Mon Sep 17 00:00:00 2001
From: Jason Gerecke <jason.gerecke@wacom.com>
Date: Sun, 22 Nov 2020 13:47:52 -0800
Subject: [PATCH libwacom 1/5] data: Add ISDv4 51c7 (Lenovo IdeaPad FLEX-14API)
(#304)
Link: https://github.com/linuxwacom/wacom-hid-descriptors/issues/109
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
(cherry picked from commit 1354d473e5dc7652ca2927f7b218f798c6301ad0)
---
data/isdv4-51c7.tablet | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 data/isdv4-51c7.tablet
diff --git a/data/isdv4-51c7.tablet b/data/isdv4-51c7.tablet
new file mode 100644
index 0000000..f8d887d
--- /dev/null
+++ b/data/isdv4-51c7.tablet
@@ -0,0 +1,22 @@
+# Lenovo IdeaPad FLEX-14API
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 30931 x 17399 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.MuVcg9kgJJ
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/109#issue-746220933
+
+[Device]
+Name=ISDv4 51C7
+ModelName=
+DeviceMatch=i2c:056A:51C7
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
--
2.29.2

@ -1,233 +0,0 @@
From 7175da4b10d3384748737632d91fbda44138350a Mon Sep 17 00:00:00 2001
From: Jason Gerecke <killertofu@gmail.com>
Date: Tue, 16 Mar 2021 15:26:54 -0700
Subject: [PATCH libwacom 01/10] data: Add multiple Lenovo ThinkPad X1 Yoga Gen
6 PIDs
Adds the following devices:
* ISDv4 5276
* ISDv4 5277
* ISDv4 5278
* ISDv4 5279
* ISDv4 527a
* ISDv4 527e
* ISDv4 527f
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
(cherry picked from commit 6ec085291021fe9126ffec507e87c8d6673b9035)
---
data/isdv4-5276.tablet | 22 ++++++++++++++++++++++
data/isdv4-5277.tablet | 22 ++++++++++++++++++++++
data/isdv4-5278.tablet | 22 ++++++++++++++++++++++
data/isdv4-5279.tablet | 22 ++++++++++++++++++++++
data/isdv4-527a.tablet | 22 ++++++++++++++++++++++
data/isdv4-527e.tablet | 22 ++++++++++++++++++++++
data/isdv4-527f.tablet | 22 ++++++++++++++++++++++
7 files changed, 154 insertions(+)
create mode 100644 data/isdv4-5276.tablet
create mode 100644 data/isdv4-5277.tablet
create mode 100644 data/isdv4-5278.tablet
create mode 100644 data/isdv4-5279.tablet
create mode 100644 data/isdv4-527a.tablet
create mode 100644 data/isdv4-527e.tablet
create mode 100644 data/isdv4-527f.tablet
diff --git a/data/isdv4-5276.tablet b/data/isdv4-5276.tablet
new file mode 100644
index 0000000..52549db
--- /dev/null
+++ b/data/isdv4-5276.tablet
@@ -0,0 +1,22 @@
+# Lenovo ThinkPad X1 Yoga Gen 6
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 30159 x 18850 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.gO13VjL2Ut
+# From private bug report
+
+[Device]
+Name=ISDv4 5276
+ModelName=
+DeviceMatch=i2c:056a:5276
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
diff --git a/data/isdv4-5277.tablet b/data/isdv4-5277.tablet
new file mode 100644
index 0000000..453e376
--- /dev/null
+++ b/data/isdv4-5277.tablet
@@ -0,0 +1,22 @@
+# Lenovo ThinkPad X1 Yoga Gen 6
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 30165 x 18853 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.rhiB11PAfy
+# From private bug report
+
+[Device]
+Name=ISDv4 5277
+ModelName=
+DeviceMatch=i2c:056a:5277
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
diff --git a/data/isdv4-5278.tablet b/data/isdv4-5278.tablet
new file mode 100644
index 0000000..dd86c26
--- /dev/null
+++ b/data/isdv4-5278.tablet
@@ -0,0 +1,22 @@
+# Lenovo ThinkPad X1 Yoga Gen 6
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 30159 x 18850 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.jlmKxHDD9N
+# From private bug report
+
+[Device]
+Name=ISDv4 5278
+ModelName=
+DeviceMatch=i2c:056a:5278
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
diff --git a/data/isdv4-5279.tablet b/data/isdv4-5279.tablet
new file mode 100644
index 0000000..12a1d6c
--- /dev/null
+++ b/data/isdv4-5279.tablet
@@ -0,0 +1,22 @@
+# Lenovo ThinkPad X1 Yoga Gen 6
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 30159 x 18850 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.8euIJDBa1t
+# From private bug report
+
+[Device]
+Name=ISDv4 5279
+ModelName=
+DeviceMatch=i2c:056a:5279
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
diff --git a/data/isdv4-527a.tablet b/data/isdv4-527a.tablet
new file mode 100644
index 0000000..f46da56
--- /dev/null
+++ b/data/isdv4-527a.tablet
@@ -0,0 +1,22 @@
+# Lenovo ThinkPad X1 Yoga Gen 6
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 30160 x 18850 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.lhwHw4oxV0
+# From private bug report
+
+[Device]
+Name=ISDv4 527a
+ModelName=
+DeviceMatch=i2c:056a:527a
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
diff --git a/data/isdv4-527e.tablet b/data/isdv4-527e.tablet
new file mode 100644
index 0000000..2466b9b
--- /dev/null
+++ b/data/isdv4-527e.tablet
@@ -0,0 +1,22 @@
+# Lenovo ThinkPad X1 Yoga Gen 6
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 30159 x 18850 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.azexD4AUXu
+# From private bug report
+
+[Device]
+Name=ISDv4 527e
+ModelName=
+DeviceMatch=i2c:056a:527e
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
diff --git a/data/isdv4-527f.tablet b/data/isdv4-527f.tablet
new file mode 100644
index 0000000..25335be
--- /dev/null
+++ b/data/isdv4-527f.tablet
@@ -0,0 +1,22 @@
+# Lenovo ThinkPad X1 Yoga Gen 6
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 30159 x 18850 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.KNSxghuR5y
+# From private bug report
+
+[Device]
+Name=ISDv4 527f
+ModelName=
+DeviceMatch=i2c:056a:527f
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
--
2.31.1

@ -0,0 +1,23 @@
From dc5810f869180dc47888b9a170d68c946c48d794 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 24 Jan 2022 12:12:37 +1000
Subject: [PATCH libwacom 01/13] data: remove unknown BuiltIn key from the
DTU1931
(cherry picked from commit 8bec663051077573a795e2f2c87ddbafed00936d)
---
data/dtu-1931.tablet | 1 -
1 file changed, 1 deletion(-)
diff --git ./data/dtu-1931.tablet ../data/dtu-1931.tablet
index 5e1aad7f1aea..6548a8271470 100644
--- ./data/dtu-1931.tablet
+++ ../data/dtu-1931.tablet
@@ -14,4 +14,3 @@ IntegratedIn=Display
[Features]
Stylus=true
Buttons=0
-BuiltIn=true
--
2.45.2

@ -0,0 +1,37 @@
From 78853212124e24651e7eb888cbd7bb40c3a94441 Mon Sep 17 00:00:00 2001
From: MSmolarz <49169537+MSmolarz@users.noreply.github.com>
Date: Mon, 24 Jan 2022 03:27:41 +0100
Subject: [PATCH libwacom 02/13] Add description for elan-2a70 (#466)
(cherry picked from commit 28396058d1a83e82f66b4c92d7c01cd0d0f6e354)
---
data/elan-2a70.tablet | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
create mode 100644 data/elan-2a70.tablet
diff --git ./data/elan-2a70.tablet ../data/elan-2a70.tablet
new file mode 100644
index 000000000000..88044e0edfad
--- /dev/null
+++ ../data/elan-2a70.tablet
@@ -0,0 +1,17 @@
+# ELAN touchscreen/pen sensor present in the HP ProBook X360 11 G5 EE
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/185
+# sysinfo.B2HOmo20Hc
+
+[Device]
+Name=ELAN1001
+DeviceMatch=i2c:04f3:2a70
+Class=ISDV4
+Width=10
+Height=6
+IntegratedIn=Display;System
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
+
--
2.45.2

@ -1,45 +0,0 @@
From 4aaa8f1ff954b5fefecc20456c2d3df63f5507e5 Mon Sep 17 00:00:00 2001
From: Jason Gerecke <jason.gerecke@wacom.com>
Date: Tue, 23 Feb 2021 14:51:32 -0800
Subject: [PATCH libwacom 02/10] data: Add ISDv4 51f9 (Lenovo ThinkPad L13
Yoga) (#358)
Link: https://github.com/linuxwacom/wacom-hid-descriptors/issues/143
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
(cherry picked from commit 4934448a865467523c2f53c21a488a9a7240a4d3)
---
data/isdv4-51f9.tablet | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 data/isdv4-51f9.tablet
diff --git a/data/isdv4-51f9.tablet b/data/isdv4-51f9.tablet
new file mode 100644
index 0000000..6eecb63
--- /dev/null
+++ b/data/isdv4-51f9.tablet
@@ -0,0 +1,22 @@
+# Lenovo ThinkPad L13 Yoga
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 29376 x 16524 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.ylAeu0fEDt
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/143#issue-810475452
+
+[Device]
+Name=ISDv4 51f9
+ModelName=
+DeviceMatch=usb:056a:51f9
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
--
2.31.1

@ -1,44 +0,0 @@
From 9c8b75f072369cfce39fcde6b758eba1b3948852 Mon Sep 17 00:00:00 2001
From: Jason Gerecke <killertofu@gmail.com>
Date: Mon, 30 Nov 2020 10:31:58 -0800
Subject: [PATCH libwacom 2/5] data: Add enovo IdeaPad Flex 5 14ARE05 (ISDv4
5215)
Link: https://github.com/linuxwacom/wacom-hid-descriptors/issues/112
(cherry picked from commit c3c8b8357a3a63b5c45fd167c750a4fdef2d30cb)
---
data/isdv4-5215.tablet | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 data/isdv4-5215.tablet
diff --git a/data/isdv4-5215.tablet b/data/isdv4-5215.tablet
new file mode 100644
index 0000000..db23c9f
--- /dev/null
+++ b/data/isdv4-5215.tablet
@@ -0,0 +1,22 @@
+# Lenovo IdeaPad Flex 5 14ARE05
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 30931 x 17399 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.fGWhYaLpPe
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/112#issue-751103246
+
+[Device]
+Name=ISDv4 5215
+ModelName=
+DeviceMatch=i2c:056a:5215
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
--
2.29.2

@ -0,0 +1,31 @@
From a0a0f786c845313d9eb3cb2ee08a5d058cac80c1 Mon Sep 17 00:00:00 2001
From: Ping Cheng <ping.cheng@wacom.com>
Date: Sun, 13 Feb 2022 20:09:34 -0800
Subject: [PATCH libwacom 03/13] Add support for a new "Wacom One Pen Display
13"
Except the PID change, there was only a minor update in the tablet's
cordinate for this model.
Signed-off-by: Ping Cheng <ping.cheng@wacom.com>
(cherry picked from commit f057ded6b820d18fc29b90b7909ae9a2b988916b)
---
data/wacom-one.tablet | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git ./data/wacom-one.tablet ../data/wacom-one.tablet
index be55fecb7097..3bd2b18c7e94 100644
--- ./data/wacom-one.tablet
+++ ../data/wacom-one.tablet
@@ -6,7 +6,7 @@
Name=Wacom One Pen Display 13
ModelName=DTC133
Class=PenDisplay
-DeviceMatch=usb:056a:03a6
+DeviceMatch=usb:056a:03a6;usb:056a:03bd
Width=11
Height=6
# No pad buttons, so no layout
--
2.45.2

@ -1,46 +0,0 @@
From cc965fbbf2659ea6a6c7b484d2e2ec910a314833 Mon Sep 17 00:00:00 2001
From: Jason Gerecke <jason.gerecke@wacom.com>
Date: Wed, 6 Jan 2021 13:01:29 -0800
Subject: [PATCH libwacom 3/5] data: Add ISDv4 51e9 (Lenovo ThinkPad P15 Gen 1)
(#325)
Tablet definition was tested and verified to work by the bug reporter.
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
(cherry picked from commit ba02abf58f8d0405140e658d8238b69e89120576)
---
data/isdv4-51e9.tablet | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 data/isdv4-51e9.tablet
diff --git a/data/isdv4-51e9.tablet b/data/isdv4-51e9.tablet
new file mode 100644
index 0000000..8684b26
--- /dev/null
+++ b/data/isdv4-51e9.tablet
@@ -0,0 +1,22 @@
+# Lenovo ThinkPad P15 Gen 1
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 34422 x 19362 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.VSiBXWPx2J
+# From private bug report
+
+[Device]
+Name=ISDv4 51e9
+ModelName=
+DeviceMatch=usb:056a:51e9
+Class=ISDV4
+Width=14
+Height=8
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
--
2.29.2

@ -1,45 +0,0 @@
From 3db830963fbf494ffa8a876049f73b25b7318930 Mon Sep 17 00:00:00 2001
From: Jason Gerecke <jason.gerecke@wacom.com>
Date: Tue, 16 Feb 2021 17:27:27 -0800
Subject: [PATCH libwacom 03/10] data: Add ISDv4 523a (Lenovo Yoga 9 14ITL5)
(#357)
Link: https://github.com/linuxwacom/libwacom/issues/355
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
(cherry picked from commit d06425e0e2ea6c52e47aa8d9b0e5313730aac2f1)
---
data/isdv4-523a.tablet | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 data/isdv4-523a.tablet
diff --git a/data/isdv4-523a.tablet b/data/isdv4-523a.tablet
new file mode 100644
index 0000000..10ab109
--- /dev/null
+++ b/data/isdv4-523a.tablet
@@ -0,0 +1,22 @@
+# Lenovo Yoga 9 14ITL5
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 30931 x 17399 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.XEiGpAPiOa
+# https://github.com/linuxwacom/libwacom/issues/355#issuecomment-780039943
+
+[Device]
+Name=ISDv4 523a
+ModelName=
+DeviceMatch=i2c:056a:523a
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
--
2.31.1

@ -1,45 +0,0 @@
From eff4978104a3a2bd2838638df52cb2238c316b65 Mon Sep 17 00:00:00 2001
From: Jason Gerecke <jason.gerecke@wacom.com>
Date: Wed, 6 Jan 2021 13:07:48 -0800
Subject: [PATCH libwacom 4/5] data: Add ISDv4 5202 (Lenovo YOGA C640-13IML)
(#322)
Link: https://github.com/linuxwacom/wacom-hid-descriptors/issues/118
Link: https://github.com/linuxwacom/wacom-hid-descriptors/issues/121
(cherry picked from commit 9b02a1fac5dc3df986151f82bf91daf387d34e75)
---
data/isdv4-5202.tablet | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 data/isdv4-5202.tablet
diff --git a/data/isdv4-5202.tablet b/data/isdv4-5202.tablet
new file mode 100644
index 0000000..8014b5d
--- /dev/null
+++ b/data/isdv4-5202.tablet
@@ -0,0 +1,22 @@
+# Lenovo YOGA C640-13IML
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 29376 x 16524 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.M5WQPQfqXg
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/118#issue-772431716
+
+[Device]
+Name=ISDv4 5202
+ModelName=
+DeviceMatch=i2c:056a:5202
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
--
2.29.2

@ -1,45 +0,0 @@
From 10c8bad082a20e0c237670b5ff936144527fd746 Mon Sep 17 00:00:00 2001
From: Jason Gerecke <jason.gerecke@wacom.com>
Date: Tue, 16 Feb 2021 17:27:10 -0800
Subject: [PATCH libwacom 04/10] data: Add ISDv4 5204 (Lenovo YOGA C640-13IML)
(#356)
Link: https://github.com/linuxwacom/wacom-hid-descriptors/issues/101#issuecomment-778785170
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
(cherry picked from commit 6d067dde7c312a16765861da7939bb405e278485)
---
data/isdv4-5204.tablet | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 data/isdv4-5204.tablet
diff --git a/data/isdv4-5204.tablet b/data/isdv4-5204.tablet
new file mode 100644
index 0000000..df7089b
--- /dev/null
+++ b/data/isdv4-5204.tablet
@@ -0,0 +1,22 @@
+# Lenovo YOGA C640-13IML
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 29376 x 16524 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.72igrHtWeC
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/101#issuecomment-778785170
+
+[Device]
+Name=ISDv4 5204
+ModelName=
+DeviceMatch=i2c:056a:5204
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
--
2.31.1

@ -0,0 +1,77 @@
From a43858e4de82bde845a95833d69f643c122c70fb Mon Sep 17 00:00:00 2001
From: Joshua Dickens <Joshua@Joshua-Dickens.com>
Date: Thu, 10 Aug 2023 10:20:29 -0700
Subject: [PATCH libwacom 04/13] data: add Wacom One 12 & Wacom One 13
Adding tablet files for two new Wacom products.
(cherry picked from commit 3563898cd2e87f577e306ba6fc5d22923e1a6fd0)
---
data/wacom-one-12.tablet | 23 +++++++++++++++++++++++
data/wacom-one-13.tablet | 23 +++++++++++++++++++++++
2 files changed, 46 insertions(+)
create mode 100644 data/wacom-one-12.tablet
create mode 100644 data/wacom-one-13.tablet
diff --git ./data/wacom-one-12.tablet ../data/wacom-one-12.tablet
new file mode 100644
index 000000000000..5662fd69716c
--- /dev/null
+++ ../data/wacom-one-12.tablet
@@ -0,0 +1,23 @@
+# Wacom
+# Wacom One Pen Display 12
+# DTC121
+#
+# sysinfo.2gKHOkzsUw
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/315
+
+[Device]
+Name=Wacom One Pen Display 12
+ModelName=DTC121
+Class=PenDisplay
+DeviceMatch=usb:056a:03ce
+Width=11
+Height=6
+# No pad buttons, so no layout
+IntegratedIn=Display
+
+[Features]
+Stylus=true
+Reversible=false
+Touch=false
+Ring=false
+Buttons=0
\ No newline at end of file
diff --git ./data/wacom-one-13.tablet ../data/wacom-one-13.tablet
new file mode 100644
index 000000000000..8cb4b6297600
--- /dev/null
+++ ../data/wacom-one-13.tablet
@@ -0,0 +1,23 @@
+# Wacom
+# Wacom One Pen Display 13
+# DTH134
+#
+# sysinfo.b0YFbQqufS
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/316
+
+[Device]
+Name=Wacom One Pen Display 13
+ModelName=DTH134
+Class=PenDisplay
+DeviceMatch=usb:056a:03cb
+Width=13
+Height=7
+# No pad buttons, so no layout
+IntegratedIn=Display
+
+[Features]
+Stylus=true
+Reversible=false
+Touch=true
+Ring=false
+Buttons=0
--
2.45.2

@ -1,45 +0,0 @@
From 6aa08f536af7ec259b27618a363e0c0194e04856 Mon Sep 17 00:00:00 2001
From: Jason Gerecke <jason.gerecke@wacom.com>
Date: Wed, 10 Feb 2021 12:52:56 -0800
Subject: [PATCH libwacom 05/10] data: Add ISDv4 5256 (Lenovo Yoga 7 15ITL5)
(#351)
Link: https://github.com/linuxwacom/wacom-hid-descriptors/issues/139
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
(cherry picked from commit 1465d3b6623041c2c7cac3505a81f2e363d08472)
---
data/isdv4-5256.tablet | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 data/isdv4-5256.tablet
diff --git a/data/isdv4-5256.tablet b/data/isdv4-5256.tablet
new file mode 100644
index 0000000..24855af
--- /dev/null
+++ b/data/isdv4-5256.tablet
@@ -0,0 +1,22 @@
+# Lenovo Yoga 7 15ITL5
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 34416 x 19359 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.sX9QiNn0RF
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/139#issuecomment-776946036
+
+[Device]
+Name=ISDv4 5256
+ModelName=
+DeviceMatch=i2c:056a:5256
+Class=ISDV4
+Width=14
+Height=8
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
--
2.31.1

@ -1,40 +0,0 @@
From 1fa7c62f266e1c7ff15470422561490169987493 Mon Sep 17 00:00:00 2001
From: Leon Fattakhov <coolcom200@users.noreply.github.com>
Date: Wed, 6 Jan 2021 21:53:59 -0500
Subject: [PATCH libwacom 5/5] data: Add Lenovo X1 Yoga 3 Generation (ISDv4
5148) (#320)
(cherry picked from commit 0234d3793264f551b52ae636be5b599fcfca3309)
---
data/isdv4-5148.tablet | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 data/isdv4-5148.tablet
diff --git a/data/isdv4-5148.tablet b/data/isdv4-5148.tablet
new file mode 100644
index 0000000..8639a30
--- /dev/null
+++ b/data/isdv4-5148.tablet
@@ -0,0 +1,19 @@
+# this is for the Wacom pen + touchscreen as found in the Lenovo ThinkPad X1 Yoga (3rd-gen)
+#
+# sysinfo.4xQ82uOLCD
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/117
+
+[Device]
+Name=Wacom ISDv4 5148
+ModelName=
+DeviceMatch=usb:056a:5148
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
--
2.29.2

@ -0,0 +1,91 @@
From ba79ec1602bd0dbcdc799fe1893fe2e2b439c3d2 Mon Sep 17 00:00:00 2001
From: Jason Gerecke <killertofu@gmail.com>
Date: Fri, 20 Jan 2023 10:36:13 -0800
Subject: [PATCH libwacom 05/13] data: Add "Wacom One pen tablet"
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
(cherry picked from commit bab4b09d61bef980ddfe6ec782342c28ec77ae1c)
---
data/wacom-one-pen-m.tablet | 31 +++++++++++++++++++++++++++++++
data/wacom-one-pen-s.tablet | 31 +++++++++++++++++++++++++++++++
2 files changed, 62 insertions(+)
create mode 100644 data/wacom-one-pen-m.tablet
create mode 100644 data/wacom-one-pen-s.tablet
diff --git ./data/wacom-one-pen-m.tablet ../data/wacom-one-pen-m.tablet
new file mode 100644
index 000000000000..db507539b614
--- /dev/null
+++ ../data/wacom-one-pen-m.tablet
@@ -0,0 +1,31 @@
+# Wacom
+# Wacom One Pen tablet medium
+# CTC6110WL
+#
+# sysinfo.u4eUPF71FH.tar.gz
+# sysinfo.IjTSbRB2uI.tar.gz
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/317
+#
+# Stylus with two buttons and no physical eraser. Upper button switches the
+# pen to become an eraser, similar to AES devices.
+#
+# Pen active area: 8.50 x 5.31in
+#
+# Has an "Android mode" with a slightly different HID descriptor which
+# uses the alternate VID:PID of 0531:0105.
+
+[Device]
+Name=Wacom One Pen tablet medium
+ModelName=CTC6110WL
+DeviceMatch=usb:0531:0102;bluetooth:0531:0103;usb:0531:0105
+Class=Bamboo
+Width=9
+Height=5
+# No pad buttons, so no layout
+IntegratedIn=
+
+[Features]
+Stylus=true
+Reversible=false
+Touch=false
+Buttons=0
diff --git ./data/wacom-one-pen-s.tablet ../data/wacom-one-pen-s.tablet
new file mode 100644
index 000000000000..30cf99024dcb
--- /dev/null
+++ ../data/wacom-one-pen-s.tablet
@@ -0,0 +1,31 @@
+# Wacom
+# Wacom One Pen tablet small
+# CTC4110WL
+#
+# sysinfo.2l5xhSogc9.tar.gz
+# sysinfo.jIO6fyyckl.tar.gz
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/317
+#
+# Stylus with two buttons and no physical eraser. Upper button switches the
+# pen to become an eraser, similar to AES devices.
+#
+# Pen active area: 5.98 x 3.74in
+#
+# Has an "Android mode" with a slightly different HID descriptor which
+# uses the alternate VID:PID of 0531:0104.
+
+[Device]
+Name=Wacom One Pen tablet small
+ModelName=CTC4110WL
+DeviceMatch=usb:0531:0100;bluetooth:0531:0101;usb:0531:0104
+Class=Bamboo
+Width=6
+Height=4
+# No pad buttons, so no layout
+IntegratedIn=
+
+[Features]
+Stylus=true
+Reversible=false
+Touch=false
+Buttons=0
--
2.45.2

@ -1,45 +0,0 @@
From b2aac6115763bdfddb5adf45e6e3d4e193da8589 Mon Sep 17 00:00:00 2001
From: Jason Gerecke <jason.gerecke@wacom.com>
Date: Wed, 10 Feb 2021 12:44:24 -0800
Subject: [PATCH libwacom 06/10] data: Add ISDv4 5216 (Lenovo IdeaPad Flex 5
14IIL05) (#350)
Link: https://github.com/linuxwacom/wacom-hid-descriptors/issues/103
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
(cherry picked from commit 5e2c94f9ba409db83acb5fe4e7d757c9ea4cf888)
---
data/isdv4-5216.tablet | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 data/isdv4-5216.tablet
diff --git a/data/isdv4-5216.tablet b/data/isdv4-5216.tablet
new file mode 100644
index 0000000..5863d98
--- /dev/null
+++ b/data/isdv4-5216.tablet
@@ -0,0 +1,22 @@
+# Lenovo IdeaPad Flex 5 14IIL05
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 30937 x 17402 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.n0ilTsFMOk
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/103#issuecomment-768913777
+
+[Device]
+Name=ISDv4 5216
+ModelName=
+DeviceMatch=i2c:056a:5216
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
--
2.31.1

@ -0,0 +1,505 @@
From 6dd004896f6014f3f7516d2b84efd1bcc5a285e2 Mon Sep 17 00:00:00 2001
From: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
Date: Thu, 19 Oct 2023 12:10:12 -0700
Subject: [PATCH libwacom 06/13] data: add Wacom Cintiq Pro 22 & 17
Add tablet and layout files for a new Wacom products.
Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
(cherry picked from commit 127b99a0580d50423409d9b086765c704e948e68)
---
data/cintiq-pro-17.tablet | 48 +++++++++
data/cintiq-pro-22.tablet | 48 +++++++++
data/layouts/cintiq-pro-17.svg | 181 +++++++++++++++++++++++++++++++++
data/layouts/cintiq-pro-22.svg | 181 +++++++++++++++++++++++++++++++++
4 files changed, 458 insertions(+)
create mode 100644 data/cintiq-pro-17.tablet
create mode 100644 data/cintiq-pro-22.tablet
create mode 100644 data/layouts/cintiq-pro-17.svg
create mode 100644 data/layouts/cintiq-pro-22.svg
diff --git ./data/cintiq-pro-17.tablet ../data/cintiq-pro-17.tablet
new file mode 100644
index 000000000000..267a491d87c7
--- /dev/null
+++ ../data/cintiq-pro-17.tablet
@@ -0,0 +1,48 @@
+# Wacom
+# Cintiq Pro 17
+# DTH-172
+#
+# Button Map:
+# (A=1, B=2, C=3, ...)
+#
+# *-----------------------*
+# A | | E
+# B | | F
+# C | | G
+# D | | H
+# | |
+# | DISPLAY |
+# | |
+# | |
+# | |
+# | |
+# | |
+# *-----------------------*
+#
+# NOTE: Buttons are on the back side of the device rather
+# than on the top bezel.
+#
+# sysinfo.wvOAcmWSUM.tar.gz
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/332
+
+[Device]
+Name=Wacom Cintiq Pro 17
+ModelName=DTH-172
+Class=Cintiq
+DeviceMatch=usb:056a:03c4
+Width=15
+Height=8
+Layout=cintiq-pro-17.svg
+Styli=@cintiqpro2022;@mobilestudio;@propengen2;
+IntegratedIn=Display
+
+[Features]
+Stylus=true
+Reversible=false
+Touch=true
+Ring=false
+Buttons=8
+
+[Buttons]
+Left=A;B;C;D
+Right=E;F;G;H
diff --git ./data/cintiq-pro-22.tablet ../data/cintiq-pro-22.tablet
new file mode 100644
index 000000000000..caef2a58e07a
--- /dev/null
+++ ../data/cintiq-pro-22.tablet
@@ -0,0 +1,48 @@
+# Wacom
+# Cintiq Pro 22
+# DTH-227
+#
+# Button Map:
+# (A=1, B=2, C=3, ...)
+#
+# *-----------------------*
+# A | | E
+# B | | F
+# C | | G
+# D | | H
+# | |
+# | DISPLAY |
+# | |
+# | |
+# | |
+# | |
+# | |
+# *-----------------------*
+#
+# NOTE: Buttons are on the back side of the device rather
+# than on the top bezel.
+#
+# sysinfo.zUn2dGOyeh.tar.gz
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/331
+
+[Device]
+Name=Wacom Cintiq Pro 22
+ModelName=DTH-227
+Class=Cintiq
+DeviceMatch=usb:056a:03d0
+Width=18
+Height=10
+Layout=cintiq-pro-22.svg
+Styli=@cintiqpro2022;@mobilestudio;@propengen2;
+IntegratedIn=Display
+
+[Features]
+Stylus=true
+Reversible=false
+Touch=true
+Ring=false
+Buttons=8
+
+[Buttons]
+Left=A;B;C;D
+Right=E;F;G;H
diff --git ./data/layouts/cintiq-pro-17.svg ../data/layouts/cintiq-pro-17.svg
new file mode 100644
index 000000000000..447982235383
--- /dev/null
+++ ../data/layouts/cintiq-pro-17.svg
@@ -0,0 +1,181 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg
+ xmlns="http://www.w3.org/2000/svg"
+ version="1.1"
+ style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8"
+ id="cintiq-pro-17"
+ width="410"
+ height="264">
+ <title
+ id="title">Wacom Cintiq Pro 17</title>
+ <g>
+ <rect
+ id="ButtonA"
+ class="A Button"
+ rx=".5"
+ ry=".5"
+ x="1"
+ y="40"
+ width="15"
+ height="5" />
+ <path
+ id="LeaderA"
+ class="A Leader"
+ d="M 20 42 L 40 42" />
+ <text
+ id="LabelA"
+ class="A Label"
+ x="45"
+ y="42"
+ style="text-anchor:start;">A</text>
+ </g>
+ <g>
+ <rect
+ id="ButtonB"
+ class="B Button"
+ rx=".5"
+ ry=".5"
+ x="1"
+ y="55"
+ width="15"
+ height="5" />
+ <path
+ id="LeaderB"
+ class="B Leader"
+ d="M 20 57 L 40 57" />
+ <text
+ id="LabelB"
+ class="B Label"
+ x="45"
+ y="57"
+ style="text-anchor:start;">B</text>
+ </g>
+ <g>
+ <rect
+ id="ButtonC"
+ class="C Button"
+ rx=".5"
+ ry=".5"
+ x="1"
+ y="70"
+ width="15"
+ height="5" />
+ <path
+ id="LeaderC"
+ class="C Leader"
+ d="M 20 72 L 40 72" />
+ <text
+ id="LabelC"
+ class="C Label"
+ x="45"
+ y="72"
+ style="text-anchor:start;">C</text>
+ </g>
+ <g>
+ <rect
+ id="ButtonD"
+ class="D Button"
+ rx=".5"
+ ry=".5"
+ x="1"
+ y="85"
+ width="15"
+ height="5" />
+ <path
+ id="LeaderD"
+ class="D Leader"
+ d="M 20 87 L 40 87" />
+ <text
+ id="LabelD"
+ class="D Label"
+ x="45"
+ y="87"
+ style="text-anchor:start;">D</text>
+ </g>
+ <g>
+ <rect
+ id="ButtonE"
+ class="E Button"
+ rx=".5"
+ ry=".5"
+ x="394"
+ y="40"
+ width="15"
+ height="5" />
+ <path
+ id="LeaderE"
+ class="E Leader"
+ d="M 380 42 L 360 42" />
+ <text
+ id="LabelE"
+ class="E Label"
+ x="355"
+ y="42"
+ style="text-anchor:end;">E</text>
+ </g>
+ <g>
+ <rect
+ id="ButtonF"
+ class="F Button"
+ rx=".5"
+ ry=".5"
+ x="394"
+ y="55"
+ width="15"
+ height="5" />
+ <path
+ id="LeaderF"
+ class="F Leader"
+ d="M 380 57 L 360 57" />
+ <text
+ id="LabelF"
+ class="F Label"
+ x="355"
+ y="57"
+ style="text-anchor:end;">F</text>
+ </g>
+ <g>
+ <rect
+ id="ButtonG"
+ class="G Button"
+ rx=".5"
+ ry=".5"
+ x="394"
+ y="70"
+ width="15"
+ height="5" />
+ <path
+ id="LeaderG"
+ class="G Leader"
+ d="M 380 72 L 360 72" />
+ <text
+ id="LabelG"
+ class="G Label"
+ x="355"
+ y="72"
+ style="text-anchor:end;">G</text>
+ </g>
+ <g>
+ <rect
+ id="ButtonH"
+ class="H Button"
+ rx=".5"
+ ry=".5"
+ x="394"
+ y="85"
+ width="15"
+ height="5" />
+ <path
+ id="LeaderH"
+ class="H Leader"
+ d="M 380 87 L 360 87" />
+ <text
+ id="LabelH"
+ class="H Label"
+ x="355"
+ y="87"
+ style="text-anchor:end;">H</text>
+ </g>
+</svg>
diff --git ./data/layouts/cintiq-pro-22.svg ../data/layouts/cintiq-pro-22.svg
new file mode 100644
index 000000000000..d8e5fee14201
--- /dev/null
+++ ../data/layouts/cintiq-pro-22.svg
@@ -0,0 +1,181 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+ "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg
+ xmlns="http://www.w3.org/2000/svg"
+ version="1.1"
+ style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8"
+ id="cintiq-pro-22"
+ width="410"
+ height="264">
+ <title
+ id="title">Wacom Cintiq Pro 22</title>
+ <g>
+ <rect
+ id="ButtonA"
+ class="A Button"
+ rx=".5"
+ ry=".5"
+ x="1"
+ y="40"
+ width="15"
+ height="5" />
+ <path
+ id="LeaderA"
+ class="A Leader"
+ d="M 20 42 L 40 42" />
+ <text
+ id="LabelA"
+ class="A Label"
+ x="45"
+ y="42"
+ style="text-anchor:start;">A</text>
+ </g>
+ <g>
+ <rect
+ id="ButtonB"
+ class="B Button"
+ rx=".5"
+ ry=".5"
+ x="1"
+ y="55"
+ width="15"
+ height="5" />
+ <path
+ id="LeaderB"
+ class="B Leader"
+ d="M 20 57 L 40 57" />
+ <text
+ id="LabelB"
+ class="B Label"
+ x="45"
+ y="57"
+ style="text-anchor:start;">B</text>
+ </g>
+ <g>
+ <rect
+ id="ButtonC"
+ class="C Button"
+ rx=".5"
+ ry=".5"
+ x="1"
+ y="70"
+ width="15"
+ height="5" />
+ <path
+ id="LeaderC"
+ class="C Leader"
+ d="M 20 72 L 40 72" />
+ <text
+ id="LabelC"
+ class="C Label"
+ x="45"
+ y="72"
+ style="text-anchor:start;">C</text>
+ </g>
+ <g>
+ <rect
+ id="ButtonD"
+ class="D Button"
+ rx=".5"
+ ry=".5"
+ x="1"
+ y="85"
+ width="15"
+ height="5" />
+ <path
+ id="LeaderD"
+ class="D Leader"
+ d="M 20 87 L 40 87" />
+ <text
+ id="LabelD"
+ class="D Label"
+ x="45"
+ y="87"
+ style="text-anchor:start;">D</text>
+ </g>
+ <g>
+ <rect
+ id="ButtonE"
+ class="E Button"
+ rx=".5"
+ ry=".5"
+ x="394"
+ y="40"
+ width="15"
+ height="5" />
+ <path
+ id="LeaderE"
+ class="E Leader"
+ d="M 380 42 L 360 42" />
+ <text
+ id="LabelE"
+ class="E Label"
+ x="355"
+ y="42"
+ style="text-anchor:end;">E</text>
+ </g>
+ <g>
+ <rect
+ id="ButtonF"
+ class="F Button"
+ rx=".5"
+ ry=".5"
+ x="394"
+ y="55"
+ width="15"
+ height="5" />
+ <path
+ id="LeaderF"
+ class="F Leader"
+ d="M 380 57 L 360 57" />
+ <text
+ id="LabelF"
+ class="F Label"
+ x="355"
+ y="57"
+ style="text-anchor:end;">F</text>
+ </g>
+ <g>
+ <rect
+ id="ButtonG"
+ class="G Button"
+ rx=".5"
+ ry=".5"
+ x="394"
+ y="70"
+ width="15"
+ height="5" />
+ <path
+ id="LeaderG"
+ class="G Leader"
+ d="M 380 72 L 360 72" />
+ <text
+ id="LabelG"
+ class="G Label"
+ x="355"
+ y="72"
+ style="text-anchor:end;">G</text>
+ </g>
+ <g>
+ <rect
+ id="ButtonH"
+ class="H Button"
+ rx=".5"
+ ry=".5"
+ x="394"
+ y="85"
+ width="15"
+ height="5" />
+ <path
+ id="LeaderH"
+ class="H Leader"
+ d="M 380 87 L 360 87" />
+ <text
+ id="LabelH"
+ class="H Label"
+ x="355"
+ y="87"
+ style="text-anchor:end;">H</text>
+ </g>
+</svg>
--
2.45.2

@ -0,0 +1,262 @@
From 090a3552e22023cfa6d3e2ff8d8c7dd5c5f568ae Mon Sep 17 00:00:00 2001
From: Tatsunosuke Tobita <tatsunosuke.tobita@wacom.com>
Date: Thu, 2 May 2024 12:30:11 +0900
Subject: [PATCH libwacom 07/13] Add support for Wacom Movink (#673)
Signed-off-by: Tatsunosuke Tobita <tatsunosuke.tobita@wacom.com>
(cherry picked from commit 03a9a244c8cf042716fc7453aec92b6ea8274c7f)
---
data/layouts/movink.svg | 153 ++++++++++++++++++++++++++++++++++++++++
data/libwacom.stylus | 19 +++++
data/movink.tablet | 52 ++++++++++++++
3 files changed, 224 insertions(+)
create mode 100644 data/layouts/movink.svg
create mode 100644 data/movink.tablet
diff --git ./data/layouts/movink.svg ../data/layouts/movink.svg
new file mode 100644
index 000000000000..a71fb1a880aa
--- /dev/null
+++ ../data/layouts/movink.svg
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ version="1.1"
+ style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8"
+ id="movink"
+ width="410"
+ height="264"
+ sodipodi:docname="movink.svg"
+ inkscape:version="1.3.2 (1:1.3.2+202311252150+091e20ef0f)"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:dc="http://purl.org/dc/elements/1.1/">
+ <defs
+ id="defs8">
+ <rect
+ x="174.34434"
+ y="32.630142"
+ width="17.491545"
+ height="15.641169"
+ id="rect1" />
+ <rect
+ x="64.742484"
+ y="49.620748"
+ width="71.798062"
+ height="22.304045"
+ id="rect8" />
+ </defs>
+ <sodipodi:namedview
+ id="namedview8"
+ pagecolor="#ffffff"
+ bordercolor="#000000"
+ borderopacity="0.25"
+ showguides="true"
+ showgrid="false"
+ inkscape:showpageshadow="2"
+ inkscape:pageopacity="0.0"
+ inkscape:pagecheckerboard="0"
+ inkscape:deskcolor="#d1d1d1"
+ inkscape:zoom="5.0783123"
+ inkscape:cx="188.54689"
+ inkscape:cy="70.889692"
+ inkscape:window-width="3794"
+ inkscape:window-height="2096"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="g10">
+ <sodipodi:guide
+ position="-0.19691581,270.30131"
+ orientation="1,0"
+ id="guide1"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="409.97872,260.65243"
+ orientation="1,0"
+ id="guide2"
+ inkscape:locked="false" />
+ </sodipodi:namedview>
+ <title
+ id="title">Wacom Movink</title>
+ <g
+ id="g8">
+ <rect
+ id="ButtonA"
+ class="A Button"
+ rx="0.49358961"
+ ry="1.5854464"
+ x="1.096156"
+ y="40.096157"
+ width="14.807688"
+ height="15.854464"
+ style="stroke-width:0.442312;fill:none" />
+ <path
+ id="LeaderA"
+ class="A Leader"
+ d="M 20,42 H 40" />
+ <text
+ id="LabelA"
+ class="A Label"
+ x="45"
+ y="42"
+ style="text-anchor:start">A</text>
+ </g>
+ <g
+ id="g9">
+ <rect
+ id="ButtonB"
+ class="B Button"
+ rx="0.49358961"
+ ry="1.5854464"
+ x="394.04855"
+ y="40.171661"
+ width="14.807688"
+ height="15.854464"
+ style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.442312" />
+ <path
+ id="LeaderB"
+ class="B Leader"
+ d="M 390,42 H 370" />
+ <text
+ id="LabelB"
+ class="B Label"
+ x="367"
+ y="42"
+ style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:0.25;font-size:8;text-anchor:start"
+ inkscape:label="LabelB">B</text>
+ </g>
+ <metadata
+ id="metadata9">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:title>Wacom Movink</dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="g10"
+ style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.25"
+ transform="translate(-163.66016,-12.042969)">
+ <rect
+ id="ButtonC"
+ class="C Button"
+ rx="0.49358961"
+ ry="1.5854464"
+ x="360.75516"
+ y="13.385727"
+ width="14.807688"
+ height="15.854464"
+ style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.442312" />
+ <path
+ id="LeaderC"
+ class="C Leader"
+ d="M 571.61407,20.15304 H 376.41438"
+ style="stroke-width:0.781024" />
+ <path
+ id="LeaderC-2"
+ class="C Leader"
+ d="M 360.12797,20.633226 H 164.92828"
+ style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.781024" />
+ <text
+ id="LabelC"
+ class="C Label"
+ x="364.94287"
+ y="37.266518"
+ style="color:#000000;font-size:8px;text-anchor:start;fill:none;stroke:#7f7f7f;stroke-width:0.25"
+ inkscape:label="LabelC">C</text>
+ </g>
+</svg>
diff --git ./data/libwacom.stylus ../data/libwacom.stylus
index e012e09182b7..17fea9090990 100644
--- ./data/libwacom.stylus
+++ ../data/libwacom.stylus
@@ -729,3 +729,22 @@ Type=Puck
HasLens=false
HasWheel=true
Buttons=5
+
+[0x10002]
+# Movink
+Name=UD Pen
+Group=udpen
+PairedStylusIds=0x1000a;
+Buttons=2
+Axes=Tilt;Pressure;Distance;
+Type=General
+
+[0x1000a]
+# Movink
+Name=UD Pen Eraser
+Group=udpen
+PairedStylusIds=0x10002;
+Buttons=1
+EraserType=Invert
+Axes=Tilt;Pressure;Distance;
+Type=General
diff --git ./data/movink.tablet ../data/movink.tablet
new file mode 100644
index 000000000000..6cc4155d341b
--- /dev/null
+++ ../data/movink.tablet
@@ -0,0 +1,52 @@
+# Wacom Movink DTH135K0C
+# Sensor Type: EMR
+# Features: Touch (Integrated), Tilt
+#
+# Button Map:
+# (A=1, B=2, C=3)
+#
+# *------------------------------------------*
+# | C |
+# A | | B
+# | |
+# | |
+# | |
+# | TABLET |
+# | |
+# | |
+# | |
+# | |
+# | |
+# *------------------------------------------*
+#
+# Note: This tablet has 2 physical buttons (one left, one right)
+# configured via a firmware OSD but only one button can send
+# events at any time. This is button C, shown centered here.
+# We cannot tell which physical button triggered the event.
+#
+# Note: touch data comes through the usb:056a:03f0 interface
+#
+# sysinfo.4XIn8KkXzp
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/376#issue-2270545906
+[Device]
+Name=Wacom Movink
+ModelName=DTH-135K0C
+DeviceMatch=usb:056a:03f0
+Class=Cintiq
+Width=11
+Height=8
+Styli=@udpen;
+IntegratedIn=Display
+Layout=movink.svg
+
+[Features]
+Stylus=true
+Reversible=false
+Touch=true
+Buttons=3
+
+[Buttons]
+# Button C can be physically left or right depending on the firmware
+# but let's assign it to Left here, that's good enough.
+Left=A;C
+Right=B
--
2.45.2

@ -1,45 +0,0 @@
From c97281874ca1ae68e966d0f972afbf82506ce35b Mon Sep 17 00:00:00 2001
From: Jason Gerecke <jason.gerecke@wacom.com>
Date: Thu, 4 Feb 2021 16:45:44 -0800
Subject: [PATCH libwacom 07/10] data: Add ISDv4 528e (Lenovo Yoga 6 13ARE05)
(#346)
Link: https://github.com/linuxwacom/wacom-hid-descriptors/issues/136
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
(cherry picked from commit d7b8e1bd501156ef2f4237b9e29a946496070490)
---
data/isdv4-528e.tablet | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 data/isdv4-528e.tablet
diff --git a/data/isdv4-528e.tablet b/data/isdv4-528e.tablet
new file mode 100644
index 0000000..d697f27
--- /dev/null
+++ b/data/isdv4-528e.tablet
@@ -0,0 +1,22 @@
+# Lenovo Yoga 6 13ARE05
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 29376 x 16524 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.RGxfCFKW69
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/136#issue-801322153
+
+[Device]
+Name=ISDv4 528e
+ModelName=
+DeviceMatch=i2c:056a:528e
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
--
2.31.1

@ -0,0 +1,29 @@
From 16a15ba8aee72867fa87db61681be8dd8850a3bf Mon Sep 17 00:00:00 2001
From: Ping Cheng <ping.cheng@wacom.com>
Date: Fri, 19 Aug 2022 15:11:30 -0700
Subject: [PATCH libwacom 08/13] Add support for a new "Intuos Pro Small"
Except PID, everything is the same.
Signed-off-by: Ping Cheng <ping.cheng@wacom.com>
(cherry picked from commit a058fba02939e15b543fd0c9f9a3e66021e3162f)
---
data/intuos-pro-2-s.tablet | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git ./data/intuos-pro-2-s.tablet ../data/intuos-pro-2-s.tablet
index 48c4143bd2da..12c39bfae6f6 100644
--- ./data/intuos-pro-2-s.tablet
+++ ../data/intuos-pro-2-s.tablet
@@ -32,7 +32,7 @@
[Device]
Name=Wacom Intuos Pro S
ModelName=PTH-460
-DeviceMatch=usb:056a:0392;bluetooth:056a:0393;
+DeviceMatch=usb:056a:0392;bluetooth:056a:0393;usb:056a:03dc;bluetooth:056a:03dd;
Class=Intuos5
Width=6
Height=4
--
2.45.2

@ -1,45 +0,0 @@
From 7e3c0f35d7b4f88133d0f83fa747741fd1f8aa18 Mon Sep 17 00:00:00 2001
From: Jason Gerecke <jason.gerecke@wacom.com>
Date: Wed, 3 Feb 2021 21:50:43 -0800
Subject: [PATCH libwacom 08/10] data: Add ISDv4 5229 (Lenovo ThinkPad X1 Yoga
Gen 5) (#345)
Link: https://github.com/linuxwacom/wacom-hid-descriptors/issues/135
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
(cherry picked from commit cb1bf9037d7976ce6efae78f9877c8c5974406e0)
---
data/isdv4-5229.tablet | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 data/isdv4-5229.tablet
diff --git a/data/isdv4-5229.tablet b/data/isdv4-5229.tablet
new file mode 100644
index 0000000..646e2e8
--- /dev/null
+++ b/data/isdv4-5229.tablet
@@ -0,0 +1,22 @@
+# Lenovo ThinkPad X1 Yoga Gen 5
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 30931 x 17399 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.FAhKZ7iIrn
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/135#issue-800191575
+
+[Device]
+Name=ISDv4 5229
+ModelName=
+DeviceMatch=usb:056a:5229
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
--
2.31.1

@ -1,43 +0,0 @@
From 3cf507ddec0e4ae3e0f310d0a822414a83e9df35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Bl=C3=BCmel?= <blaimi@blaimi.de>
Date: Thu, 21 Jan 2021 22:52:05 +0100
Subject: [PATCH libwacom 09/10] data: Add Lenovo ThinkPad X13 Yoga Gen 1
(ISDv4 5220) (#336)
(cherry picked from commit cd48da82f01e9e60501adc3cc96a668349079cd2)
---
data/isdv4-5220.tablet | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 data/isdv4-5220.tablet
diff --git a/data/isdv4-5220.tablet b/data/isdv4-5220.tablet
new file mode 100644
index 0000000..c1bba66
--- /dev/null
+++ b/data/isdv4-5220.tablet
@@ -0,0 +1,22 @@
+# Lenovo ThinkPad X13 Yoga Gen 1
+# Sensor Type: AES
+# Features: Touch (Integrated), Tilt
+# HW Resolution: 29376 x 16524 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.KNB1IfMgnC
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/129
+
+[Device]
+Name=ISDv4 5220
+ModelName=
+DeviceMatch=usb:056a:5220
+Class=ISDV4
+Width=12
+Height=7
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
--
2.31.1

@ -0,0 +1,31 @@
From 8d5c4bd7dd47f3aa2a71f414fc6b13c9c7de395a Mon Sep 17 00:00:00 2001
From: Tatsunosuke Tobita <tatsunosuke.tobita@wacom.com>
Date: Wed, 17 Jul 2024 14:11:57 +0900
Subject: [PATCH libwacom 09/13] wacom-movink.tablet: add more groups
Since Movink supports mobilestudio and propengen2 groups, they
are added by this change.
Signed-off-by: Tatsunosuke Tobita <tatsunosuke.tobita@wacom.com>
Signed-off-by: Tatsunosuke Tobita <tatsunosuke.wacom@gmail.com
(cherry picked from commit d2e4b2b6c40d661b7c2f3dc241e17bc76df0db0f)
---
data/movink.tablet | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git ./data/movink.tablet ../data/movink.tablet
index 6cc4155d341b..10c10711745e 100644
--- ./data/movink.tablet
+++ ../data/movink.tablet
@@ -35,7 +35,7 @@ DeviceMatch=usb:056a:03f0
Class=Cintiq
Width=11
Height=8
-Styli=@udpen;
+Styli=@udpen;@mobilestudio;@propengen2;
IntegratedIn=Display
Layout=movink.svg
--
2.45.2

@ -1,45 +0,0 @@
From 694f2e10202fb6ae44aaa3d09d71228b852ed815 Mon Sep 17 00:00:00 2001
From: Jason Gerecke <jason.gerecke@wacom.com>
Date: Wed, 20 Jan 2021 02:40:58 -0800
Subject: [PATCH libwacom 10/10] data: Add ISDv4 5072 (Lenovo ThinkPad Yoga 11e
3rd Gen) (#333)
Link: https://github.com/linuxwacom/wacom-hid-descriptors/issues/126
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
(cherry picked from commit f8e50998dd7398071e546a7a42b8323fffed7b27)
---
data/isdv4-5072.tablet | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 data/isdv4-5072.tablet
diff --git a/data/isdv4-5072.tablet b/data/isdv4-5072.tablet
new file mode 100644
index 0000000..d1ef618
--- /dev/null
+++ b/data/isdv4-5072.tablet
@@ -0,0 +1,22 @@
+# Lenovo ThinkPad Yoga 11e 3rd Gen
+# Sensor Type: AES
+# Features: Touch (Integrated)
+# HW Resolution: 25613 x 14400 (2540 x 2540 lpi)
+#
+# Autogenerated from sysinfo.XoiNSn7Aiz
+# https://github.com/linuxwacom/wacom-hid-descriptors/issues/126#issue-787478489
+
+[Device]
+Name=ISDv4 5072
+ModelName=
+DeviceMatch=i2c:056a:5072
+Class=ISDV4
+Width=10
+Height=6
+IntegratedIn=Display;System
+Styli=@isdv4-aes;
+
+[Features]
+Stylus=true
+Touch=true
+Buttons=0
--
2.31.1

@ -0,0 +1,31 @@
From 845d1c1e447a80977217d7a289a64c83fcca0889 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 22 Nov 2023 09:08:30 +1000
Subject: [PATCH libwacom 10/13] libwacom: only memcmp the led data if we have
leds
../libwacom/libwacom.c:498:13: runtime error: null pointer passed as argument 1, which is declared to never be null
/usr/include/string.h:65:33: note: nonnull attribute specified here
(cherry picked from commit 8468b88c7c55af65585ce7d7b21ab82544af7bfd)
---
libwacom/libwacom.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git ./libwacom/libwacom.c ../libwacom/libwacom.c
index 935344c49752..37d03bd2642f 100644
--- ./libwacom/libwacom.c
+++ ../libwacom/libwacom.c
@@ -472,7 +472,8 @@ libwacom_compare(const WacomDevice *a, const WacomDevice *b, WacomCompareFlags f
if (a->status_leds->len != b->status_leds->len)
return 1;
- if (memcmp(a->status_leds->data, b->status_leds->data,
+ if (a->status_leds->len > 0 &&
+ memcmp(a->status_leds->data, b->status_leds->data,
sizeof(WacomStatusLEDs) * a->status_leds->len) != 0)
return 1;
--
2.45.2

@ -0,0 +1,51 @@
From 297311bf9e3ecad1790a9f867ff587e330807ca6 Mon Sep 17 00:00:00 2001
From: Tatsunosuke Tobita <tatsunosuke.tobita@wacom.com>
Date: Wed, 31 Jul 2024 17:21:22 +0900
Subject: [PATCH libwacom 11/13] wacom-movink-13.tablet: correct the product
name
"Wacom Movink" used in the previous tablet file was corrected
to "Wacom Movink 13" which is more appropriate for the product
Signed-off-by: Tatsunosuke Tobita <tatsunosuke.tobita@wacom.com>
(cherry picked from commit ac9e57d399c38c1e34a077ad01ed63b28491811a)
---
data/{movink.tablet => movink-13.tablet} | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
rename data/{movink.tablet => movink-13.tablet} (94%)
diff --git ./data/movink.tablet ../data/movink-13.tablet
similarity index 94%
rename from data/movink.tablet
rename to data/movink-13.tablet
index 10c10711745e..99153cab87a3 100644
--- ./data/movink.tablet
+++ ../data/movink-13.tablet
@@ -1,4 +1,5 @@
-# Wacom Movink DTH135K0C
+# Wacom Movink 13
+# Model Name: DTH135K0C
# Sensor Type: EMR
# Features: Touch (Integrated), Tilt
#
@@ -29,7 +30,7 @@
# sysinfo.4XIn8KkXzp
# https://github.com/linuxwacom/wacom-hid-descriptors/issues/376#issue-2270545906
[Device]
-Name=Wacom Movink
+Name=Wacom Movink 13
ModelName=DTH-135K0C
DeviceMatch=usb:056a:03f0
Class=Cintiq
@@ -37,7 +38,7 @@ Width=11
Height=8
Styli=@udpen;@mobilestudio;@propengen2;
IntegratedIn=Display
-Layout=movink.svg
+Layout=movink-13.svg
[Features]
Stylus=true
--
2.45.2

@ -0,0 +1,57 @@
From 14cd4d9ea27c29c33686bf3774db140afd697249 Mon Sep 17 00:00:00 2001
From: Tatsunosuke Tobita <tatsunosuke.tobita@wacom.com>
Date: Wed, 31 Jul 2024 17:22:11 +0900
Subject: [PATCH libwacom 12/13] wacom-movink-13.svg: correct the name of the
product
"Wacom Movink" or "movink" used in the previous file was corrected
to "Wacom Movink 13"
Signed-off-by: Tatsunosuke Tobita <tatsunosuke.tobita@wacom.com>
(cherry picked from commit 93d4dceb38573953abdbd99ae7b8c5e55d49a9a9)
---
data/layouts/{movink.svg => movink-13.svg} | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
rename data/layouts/{movink.svg => movink-13.svg} (96%)
diff --git ./data/layouts/movink.svg ../data/layouts/movink-13.svg
similarity index 96%
rename from data/layouts/movink.svg
rename to data/layouts/movink-13.svg
index a71fb1a880aa..92e89a62bc48 100644
--- ./data/layouts/movink.svg
+++ ../data/layouts/movink-13.svg
@@ -2,10 +2,10 @@
<svg
version="1.1"
style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8"
- id="movink"
+ id="movink-13"
width="410"
height="264"
- sodipodi:docname="movink.svg"
+ sodipodi:docname="movink-13.svg"
inkscape:version="1.3.2 (1:1.3.2+202311252150+091e20ef0f)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@@ -61,7 +61,7 @@
inkscape:locked="false" />
</sodipodi:namedview>
<title
- id="title">Wacom Movink</title>
+ id="title">Wacom Movink 13</title>
<g
id="g8">
<rect
@@ -114,7 +114,7 @@
<rdf:RDF>
<cc:Work
rdf:about="">
- <dc:title>Wacom Movink</dc:title>
+ <dc:title>Wacom Movink 13</dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
--
2.45.2

@ -1,37 +1,31 @@
Name: libwacom
Version: 1.6
Version: 1.12.1
Release: 3%{?dist}
Summary: Tablet Information Client Library
Requires: %{name}-data
Group: System Environment/Libraries
License: MIT
URL: https://github.com/linuxwacom/libwacom
Source0: https://github.com/linuxwacom/libwacom/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
Patch001: 0001-data-Add-ISDv4-51c7-Lenovo-IdeaPad-FLEX-14API-304.patch
Patch002: 0002-data-Add-enovo-IdeaPad-Flex-5-14ARE05-ISDv4-5215.patch
Patch003: 0003-data-Add-ISDv4-51e9-Lenovo-ThinkPad-P15-Gen-1-325.patch
Patch004: 0004-data-Add-ISDv4-5202-Lenovo-YOGA-C640-13IML-322.patch
Patch005: 0005-data-Add-Lenovo-X1-Yoga-3-Generation-ISDv4-5148-320.patch
Patch006: 0001-data-Add-multiple-Lenovo-ThinkPad-X1-Yoga-Gen-6-PIDs.patch
Patch007: 0002-data-Add-ISDv4-51f9-Lenovo-ThinkPad-L13-Yoga-358.patch
Patch008: 0003-data-Add-ISDv4-523a-Lenovo-Yoga-9-14ITL5-357.patch
Patch009: 0004-data-Add-ISDv4-5204-Lenovo-YOGA-C640-13IML-356.patch
Patch010: 0005-data-Add-ISDv4-5256-Lenovo-Yoga-7-15ITL5-351.patch
Patch011: 0006-data-Add-ISDv4-5216-Lenovo-IdeaPad-Flex-5-14IIL05-35.patch
Patch012: 0007-data-Add-ISDv4-528e-Lenovo-Yoga-6-13ARE05-346.patch
Patch013: 0008-data-Add-ISDv4-5229-Lenovo-ThinkPad-X1-Yoga-Gen-5-34.patch
Patch014: 0009-data-Add-Lenovo-ThinkPad-X13-Yoga-Gen-1-ISDv4-5220-3.patch
Patch015: 0010-data-Add-ISDv4-5072-Lenovo-ThinkPad-Yoga-11e-3rd-Gen.patch
Patch01: 0001-data-remove-unknown-BuiltIn-key-from-the-DTU1931.patch
Patch02: 0002-Add-description-for-elan-2a70-466.patch
Patch03: 0003-Add-support-for-a-new-Wacom-One-Pen-Display-13.patch
Patch04: 0004-data-add-Wacom-One-12-Wacom-One-13.patch
Patch05: 0005-data-Add-Wacom-One-pen-tablet.patch
Patch06: 0006-data-add-Wacom-Cintiq-Pro-22-17.patch
Patch07: 0007-Add-support-for-Wacom-Movink-673.patch
Patch08: 0008-Add-support-for-a-new-Intuos-Pro-Small.patch
Patch09: 0009-wacom-movink.tablet-add-more-groups.patch
Patch10: 0010-libwacom-only-memcmp-the-led-data-if-we-have-leds.patch
Patch11: 0011-wacom-movink-13.tablet-correct-the-product-name.patch
Patch12: 0012-wacom-movink-13.svg-correct-the-name-of-the-product.patch
BuildRequires: meson gcc
BuildRequires: glib2-devel libgudev1-devel
BuildRequires: systemd systemd-devel
BuildRequires: git
BuildRequires: git-core
BuildRequires: libxml2-devel
Requires: %{name}-data = %{version}-%{release}
@ -42,38 +36,37 @@ tools. This information can then be used by drivers or applications to tweak
the UI or general settings to match the physical tablet.
%package devel
Summary: Tablet Information Client Library Library Development Package
Summary: Tablet Information Client Library Development Package
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
%description devel
Tablet information client library library development package.
Tablet information client library development package.
%package data
Summary: Tablet Information Client Library Library Data Files
Summary: Tablet Information Client Library Data Files
BuildArch: noarch
# 65-libwacom.rules moved from libwacom to libwacom-data. Conflict here
# because there's no real use-case for having old libwacom and new
# libwacom-data installed. libwacom-data doesn't require libwacom but it
# does require the same version, so let's conflict with any older version
# here.
Conflicts: %{name} < %{version}
%description data
Tablet information client library library data files.
Tablet information client library data files.
%prep
%autosetup -S git
%build
%meson -Dtests=enabled -Ddocumentation=disabled
%meson -Dtests=disabled -Ddocumentation=disabled
%meson_build
%install
%meson_install
install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir}
# libwacom-show-stylus is an interactive debugging tool to find the stylus ID.
# It's has extra dependencies we don't want to force onto every machine
# libwacom is on and it's only used where we need to write new tablet files
# for unknown stylus. Let's skip it.
rm ${RPM_BUILD_ROOT}/%{_bindir}/libwacom-show-stylus
%check
%meson_test
@ -83,7 +76,11 @@ install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir}
%license COPYING
%doc README.md
%{_libdir}/libwacom.so.*
%{_bindir}/libwacom-list-devices
%{_bindir}/libwacom-list-local-devices
%{_bindir}/libwacom-update-db
%{_mandir}/man1/libwacom-list-devices.1*
%{_mandir}/man1/libwacom-list-local-devices.1*
%files devel
@ -104,26 +101,111 @@ install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir}
%{_datadir}/libwacom/layouts/*.svg
%changelog
* Wed May 26 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.6-3
- Add Lenovo tablet files from upstream (#1940874)
* Mon Aug 05 2024 Peter Hutterer <peter.hutterer@redhat.com> - 1.12.1-3
- Add a set of newer Wacom tablets description files
* Mon Jan 31 2022 Peter Hutterer <peter.hutterer@redhat.com> - 1.12.1-2
- Drop libwacom-show-stylus, it's a debugging tool that requires extra
dependencies that we shouldn't pull in everywhere (#2044710)
* Thu Jan 27 2022 Peter Hutterer <peter.hutterer@redhat.com> - 1.12.1-1
- libwacom 1.12.1 (#2044710)
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.11-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Jul 29 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.11-1
- libwacom 1.11 (#1983561)
* Wed Apr 28 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.10-1
- libwacom 1.10 (#1954399)
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.9-3
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Thu Mar 25 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.9-2
- Add X1 Yoga6 data files (#1940872)
* Wed Feb 24 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.9-1
- libwacom 1.9
* Tue Feb 09 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.8-2
- Add tablet file for Lenovo Yoga 6
* Fri Jan 29 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.8-1
- libwacom 1.8
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jan 13 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.6-2
- Add Lenovo tablet files from upstream (#1914411)
* Thu Jan 14 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.7-2
- Add tablet file for Lenovo ThinkPad P15 (#1914409)
* Thu Dec 17 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.7-1
- libwacom 1.7
* Wed Nov 04 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.6-2
- Change BuildRequires to git-core, we don't need full git
* Tue Nov 03 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.6-1
- libwacom 1.6 (#1878160)
- libwacom 1.6
* Mon Aug 31 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.5-1
- libwacom 1.5
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jun 30 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.4.1-1
- libwacom 1.4.1
* Wed Jun 24 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.4-1
- libwacom 1.4
* Wed Mar 25 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.3-1
- libwacom 1.3
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jun 25 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.1-3
- Add a set of Lenovo tablets and styli (#1850319)
* Mon Dec 23 2019 Peter Hutterer <peter.hutterer@redhat.com> 1.2-2
- Disable documentation explicitly. Fedora uses --auto-features=enabled
during the build.
* Mon Dec 23 2019 Peter Hutterer <peter.hutterer@redhat.com> 1.2-1
- libwacom 1.2
* Thu Nov 07 2019 Peter Hutterer <peter.hutterer@redhat.com> 1.1-2
- Conflict with older libwacom
- Require a libwacom-data package of the same version
* Mon Sep 16 2019 Peter Hutterer <peter.hutterer@redhat.com> 1.1-1
- libwacom 1.1
* Mon Aug 26 2019 Peter Hutterer <peter.hutterer@redhat.com> 1.0-1
- libwacom 1.0
* Thu Aug 08 2019 Peter Hutterer <peter.hutterer@redhat.com> 0.99.901-1
- libwacom 1.0rc1
- switch to meson
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.33-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Apr 12 2019 Peter Hutterer <peter.hutterer@redhat.com> 0.33-1
- libwacom 0.33
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.32-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Nov 12 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.32-2
- Move the udev rule to the noarch libwacom-data package (#1648743)
* Thu Nov 07 2019 Peter Hutterer <peter.hutterer@redhat.com> 1.1-1
- libwacom 1.1 (#1741423)
* Mon Nov 05 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.32-1
- libwacom 0.32
* Thu Aug 09 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.31-1
- libwacom 0.31 (#1612758)
- libwacom 0.31
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Loading…
Cancel
Save