diff --git a/SOURCES/0001-data-remove-unknown-BuiltIn-key-from-the-DTU1931.patch b/SOURCES/0001-data-remove-unknown-BuiltIn-key-from-the-DTU1931.patch new file mode 100644 index 0000000..4dcc897 --- /dev/null +++ b/SOURCES/0001-data-remove-unknown-BuiltIn-key-from-the-DTU1931.patch @@ -0,0 +1,23 @@ +From dc5810f869180dc47888b9a170d68c946c48d794 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +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 + diff --git a/SOURCES/0002-Add-description-for-elan-2a70-466.patch b/SOURCES/0002-Add-description-for-elan-2a70-466.patch new file mode 100644 index 0000000..45ed051 --- /dev/null +++ b/SOURCES/0002-Add-description-for-elan-2a70-466.patch @@ -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 + diff --git a/SOURCES/0003-Add-support-for-a-new-Wacom-One-Pen-Display-13.patch b/SOURCES/0003-Add-support-for-a-new-Wacom-One-Pen-Display-13.patch new file mode 100644 index 0000000..e546d16 --- /dev/null +++ b/SOURCES/0003-Add-support-for-a-new-Wacom-One-Pen-Display-13.patch @@ -0,0 +1,31 @@ +From a0a0f786c845313d9eb3cb2ee08a5d058cac80c1 Mon Sep 17 00:00:00 2001 +From: Ping Cheng +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 +(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 + diff --git a/SOURCES/0004-data-add-Wacom-One-12-Wacom-One-13.patch b/SOURCES/0004-data-add-Wacom-One-12-Wacom-One-13.patch new file mode 100644 index 0000000..f3f2829 --- /dev/null +++ b/SOURCES/0004-data-add-Wacom-One-12-Wacom-One-13.patch @@ -0,0 +1,77 @@ +From a43858e4de82bde845a95833d69f643c122c70fb Mon Sep 17 00:00:00 2001 +From: Joshua Dickens +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 + diff --git a/SOURCES/0005-data-Add-Wacom-One-pen-tablet.patch b/SOURCES/0005-data-Add-Wacom-One-pen-tablet.patch new file mode 100644 index 0000000..1e66216 --- /dev/null +++ b/SOURCES/0005-data-Add-Wacom-One-pen-tablet.patch @@ -0,0 +1,91 @@ +From ba79ec1602bd0dbcdc799fe1893fe2e2b439c3d2 Mon Sep 17 00:00:00 2001 +From: Jason Gerecke +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 +(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 + diff --git a/SOURCES/0006-data-add-Wacom-Cintiq-Pro-22-17.patch b/SOURCES/0006-data-add-Wacom-Cintiq-Pro-22-17.patch new file mode 100644 index 0000000..54db144 --- /dev/null +++ b/SOURCES/0006-data-add-Wacom-Cintiq-Pro-22-17.patch @@ -0,0 +1,505 @@ +From 6dd004896f6014f3f7516d2b84efd1bcc5a285e2 Mon Sep 17 00:00:00 2001 +From: Aaron Armstrong Skomra +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 + +(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 @@ ++ ++ ++ ++ Wacom Cintiq Pro 17 ++ ++ ++ ++ A ++ ++ ++ ++ ++ B ++ ++ ++ ++ ++ C ++ ++ ++ ++ ++ D ++ ++ ++ ++ ++ E ++ ++ ++ ++ ++ F ++ ++ ++ ++ ++ G ++ ++ ++ ++ ++ H ++ ++ +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 @@ ++ ++ ++ ++ Wacom Cintiq Pro 22 ++ ++ ++ ++ A ++ ++ ++ ++ ++ B ++ ++ ++ ++ ++ C ++ ++ ++ ++ ++ D ++ ++ ++ ++ ++ E ++ ++ ++ ++ ++ F ++ ++ ++ ++ ++ G ++ ++ ++ ++ ++ H ++ ++ +-- +2.45.2 + diff --git a/SOURCES/0007-Add-support-for-Wacom-Movink-673.patch b/SOURCES/0007-Add-support-for-Wacom-Movink-673.patch new file mode 100644 index 0000000..39e6288 --- /dev/null +++ b/SOURCES/0007-Add-support-for-Wacom-Movink-673.patch @@ -0,0 +1,262 @@ +From 090a3552e22023cfa6d3e2ff8d8c7dd5c5f568ae Mon Sep 17 00:00:00 2001 +From: Tatsunosuke Tobita +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 +(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 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ Wacom Movink ++ ++ ++ ++ A ++ ++ ++ ++ ++ B ++ ++ ++ ++ ++ Wacom Movink ++ ++ ++ ++ ++ ++ ++ ++ C ++ ++ +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 + diff --git a/SOURCES/0008-Add-support-for-a-new-Intuos-Pro-Small.patch b/SOURCES/0008-Add-support-for-a-new-Intuos-Pro-Small.patch new file mode 100644 index 0000000..339d10b --- /dev/null +++ b/SOURCES/0008-Add-support-for-a-new-Intuos-Pro-Small.patch @@ -0,0 +1,29 @@ +From 16a15ba8aee72867fa87db61681be8dd8850a3bf Mon Sep 17 00:00:00 2001 +From: Ping Cheng +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 +(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 + diff --git a/SOURCES/0009-wacom-movink.tablet-add-more-groups.patch b/SOURCES/0009-wacom-movink.tablet-add-more-groups.patch new file mode 100644 index 0000000..dcb6f28 --- /dev/null +++ b/SOURCES/0009-wacom-movink.tablet-add-more-groups.patch @@ -0,0 +1,31 @@ +From 8d5c4bd7dd47f3aa2a71f414fc6b13c9c7de395a Mon Sep 17 00:00:00 2001 +From: Tatsunosuke Tobita +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 +Signed-off-by: Tatsunosuke Tobita +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 + diff --git a/SOURCES/0011-wacom-movink-13.tablet-correct-the-product-name.patch b/SOURCES/0011-wacom-movink-13.tablet-correct-the-product-name.patch new file mode 100644 index 0000000..1cd635a --- /dev/null +++ b/SOURCES/0011-wacom-movink-13.tablet-correct-the-product-name.patch @@ -0,0 +1,51 @@ +From 297311bf9e3ecad1790a9f867ff587e330807ca6 Mon Sep 17 00:00:00 2001 +From: Tatsunosuke Tobita +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 +(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 + diff --git a/SOURCES/0012-wacom-movink-13.svg-correct-the-name-of-the-product.patch b/SOURCES/0012-wacom-movink-13.svg-correct-the-name-of-the-product.patch new file mode 100644 index 0000000..ca5bea6 --- /dev/null +++ b/SOURCES/0012-wacom-movink-13.svg-correct-the-name-of-the-product.patch @@ -0,0 +1,57 @@ +From 14cd4d9ea27c29c33686bf3774db140afd697249 Mon Sep 17 00:00:00 2001 +From: Tatsunosuke Tobita +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 +(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 @@ + + + Wacom Movink ++ id="title">Wacom Movink 13 + + + +- Wacom Movink ++ Wacom Movink 13 + + + +-- +2.45.2 + diff --git a/SOURCES/0013-data-Added-support-for-Cintiq-Pro-27-525.patch b/SOURCES/0013-data-Added-support-for-Cintiq-Pro-27-525.patch new file mode 100644 index 0000000..5fca361 --- /dev/null +++ b/SOURCES/0013-data-Added-support-for-Cintiq-Pro-27-525.patch @@ -0,0 +1,977 @@ +From 52fc7eec49ba1d33bfa36977f33e18d82187ac34 Mon Sep 17 00:00:00 2001 +From: Joshua +Date: Thu, 29 Sep 2022 13:44:24 -0700 +Subject: [PATCH libwacom] data: Added support for "Cintiq Pro 27" (#525) + +* data: Added support for a "Cintiq Pro 27" +To fix issues with pen compatability on the new tablet with current libwacom.stylus groups the intuos5 group had certain pens split off into a new group called propengen2. All .tablet files affected by this change were updated to include this new group. + +Signed-off-by: Joshua Dickens +(cherry picked from commit 594205738d977757073e29e3224e06b1868cc9a9) +--- + data/cintiq-13hd.tablet | 2 +- + data/cintiq-13hdt.tablet | 2 +- + data/cintiq-16-2.tablet | 2 +- + data/cintiq-16.tablet | 2 +- + data/cintiq-21ux2.tablet | 2 +- + data/cintiq-22.tablet | 2 +- + data/cintiq-22hd.tablet | 2 +- + data/cintiq-22hdt.tablet | 2 +- + data/cintiq-24hd-touch.tablet | 2 +- + data/cintiq-24hd.tablet | 2 +- + data/cintiq-27hd.tablet | 2 +- + data/cintiq-27hdt.tablet | 2 +- + data/cintiq-companion-2.tablet | 2 +- + data/cintiq-companion-hybrid.tablet | 2 +- + data/cintiq-companion.tablet | 2 +- + data/cintiq-pro-13.tablet | 2 +- + data/cintiq-pro-16-2.tablet | 2 +- + data/cintiq-pro-16.tablet | 2 +- + data/cintiq-pro-24-p.tablet | 2 +- + data/cintiq-pro-24-pt.tablet | 2 +- + data/cintiq-pro-27.tablet | 48 ++++++++ + data/cintiq-pro-32.tablet | 2 +- + data/dtk-1660e-2.tablet | 2 +- + data/dtk-1660e.tablet | 2 +- + data/intuos-pro-2-l.tablet | 2 +- + data/intuos-pro-2-m.tablet | 2 +- + data/intuos-pro-2-s.tablet | 2 +- + data/intuos-pro-l.tablet | 2 +- + data/intuos-pro-m.tablet | 2 +- + data/intuos-pro-s.tablet | 2 +- + data/intuos4-12x19.tablet | 2 +- + data/intuos4-4x6.tablet | 2 +- + data/intuos4-6x9-wl.tablet | 2 +- + data/intuos4-6x9.tablet | 2 +- + data/intuos4-8x13.tablet | 2 +- + data/intuos5-m.tablet | 2 +- + data/intuos5-s.tablet | 2 +- + data/intuos5-touch-l.tablet | 2 +- + data/intuos5-touch-m.tablet | 2 +- + data/intuos5-touch-s.tablet | 2 +- + data/layouts/cintiq-pro-27.svg | 181 ++++++++++++++++++++++++++++ + data/libwacom.stylus | 32 +++-- + data/mobilestudio-pro-13-2.tablet | 2 +- + data/mobilestudio-pro-13.tablet | 2 +- + data/mobilestudio-pro-16-2.tablet | 2 +- + data/mobilestudio-pro-16-3.tablet | 2 +- + data/mobilestudio-pro-16.tablet | 2 +- + 47 files changed, 297 insertions(+), 52 deletions(-) + create mode 100644 data/cintiq-pro-27.tablet + create mode 100644 data/layouts/cintiq-pro-27.svg + +diff --git a/data/cintiq-13hd.tablet b/data/cintiq-13hd.tablet +index 7083aa87337a..c86ca2ec349e 100644 +--- a/data/cintiq-13hd.tablet ++++ b/data/cintiq-13hd.tablet +@@ -29,7 +29,7 @@ DeviceMatch=usb:056a:0304 + Width=12 + Height=7 + Layout=cintiq-13hd.svg +-Styli=@intuos5;@intuos4; ++Styli=@intuos5;@intuos4;@propengen2; + IntegratedIn=Display + + [Features] +diff --git a/data/cintiq-13hdt.tablet b/data/cintiq-13hdt.tablet +index 0301f08c6c77..0d6b2ecfac20 100644 +--- a/data/cintiq-13hdt.tablet ++++ b/data/cintiq-13hdt.tablet +@@ -31,7 +31,7 @@ PairedID=usb:056a:0335 + Width=12 + Height=7 + Layout=cintiq-13hd.svg +-Styli=@intuos5;@intuos4; ++Styli=@intuos5;@intuos4;@propengen2; + IntegratedIn=Display + + [Features] +diff --git a/data/cintiq-16-2.tablet b/data/cintiq-16-2.tablet +index e35aa60ae47a..10e1ba1c426e 100644 +--- a/data/cintiq-16-2.tablet ++++ b/data/cintiq-16-2.tablet +@@ -10,7 +10,7 @@ DeviceMatch=usb:056a:03ae + Width=14 + Height=8 + # No pad buttons, so no layout +-Styli=@intuos5;@mobilestudio; ++Styli=@intuos5;@mobilestudio;@propengen2; + IntegratedIn=Display + + [Features] +diff --git a/data/cintiq-16.tablet b/data/cintiq-16.tablet +index 8d72fa1af32c..c620898f8c19 100644 +--- a/data/cintiq-16.tablet ++++ b/data/cintiq-16.tablet +@@ -10,7 +10,7 @@ DeviceMatch=usb:056a:0390 + Width=14 + Height=8 + # No pad buttons, so no layout +-Styli=@intuos5;@mobilestudio; ++Styli=@intuos5;@mobilestudio;@propengen2; + IntegratedIn=Display + + [Features] +diff --git a/data/cintiq-21ux2.tablet b/data/cintiq-21ux2.tablet +index a81fae5565d1..b586ce2231f1 100644 +--- a/data/cintiq-21ux2.tablet ++++ b/data/cintiq-21ux2.tablet +@@ -50,7 +50,7 @@ Class=Cintiq + Width=17 + Height=13 + Layout=cintiq-21ux2.svg +-Styli=@intuos5;@intuos4; ++Styli=@intuos5;@intuos4;@propengen2; + IntegratedIn=Display + + [Features] +diff --git a/data/cintiq-22.tablet b/data/cintiq-22.tablet +index 322f8135cf36..2d3979ce0de5 100644 +--- a/data/cintiq-22.tablet ++++ b/data/cintiq-22.tablet +@@ -10,7 +10,7 @@ DeviceMatch=usb:056a:0391 + Width=19 + Height=10 + # No pad buttons, so no layout +-Styli=@intuos5;@mobilestudio; ++Styli=@intuos5;@mobilestudio;@propengen2; + IntegratedIn=Display + + [Features] +diff --git a/data/cintiq-22hd.tablet b/data/cintiq-22hd.tablet +index 86c3e2d738e0..f06b08ea1eb7 100644 +--- a/data/cintiq-22hd.tablet ++++ b/data/cintiq-22hd.tablet +@@ -38,7 +38,7 @@ Class=Cintiq + Width=19 + Height=11 + Layout=cintiq-22hd.svg +-Styli=@intuos5;@intuos4; ++Styli=@intuos5;@intuos4;@propengen2; + IntegratedIn=Display + + [Features] +diff --git a/data/cintiq-22hdt.tablet b/data/cintiq-22hdt.tablet +index af51a6130a53..2a0f5451d2cb 100644 +--- a/data/cintiq-22hdt.tablet ++++ b/data/cintiq-22hdt.tablet +@@ -40,7 +40,7 @@ Class=Cintiq + Width=19 + Height=11 + Layout=cintiq-22hd.svg +-Styli=@intuos5;@intuos4; ++Styli=@intuos5;@intuos4;@propengen2; + IntegratedIn=Display + + [Features] +diff --git a/data/cintiq-24hd-touch.tablet b/data/cintiq-24hd-touch.tablet +index 425d6c5a81ef..45e5e5ff4682 100644 +--- a/data/cintiq-24hd-touch.tablet ++++ b/data/cintiq-24hd-touch.tablet +@@ -48,7 +48,7 @@ Class=Cintiq + Width=21 + Height=13 + Layout=cintiq-24hd.svg +-Styli=@intuos5;@intuos4; ++Styli=@intuos5;@intuos4;@propengen2; + IntegratedIn=Display + + [Features] +diff --git a/data/cintiq-24hd.tablet b/data/cintiq-24hd.tablet +index b6a1e6ad4066..92b67c923f69 100644 +--- a/data/cintiq-24hd.tablet ++++ b/data/cintiq-24hd.tablet +@@ -46,7 +46,7 @@ Class=Cintiq + Width=21 + Height=13 + Layout=cintiq-24hd.svg +-Styli=@intuos5;@intuos4; ++Styli=@intuos5;@intuos4;@propengen2; + IntegratedIn=Display + + [Features] +diff --git a/data/cintiq-27hd.tablet b/data/cintiq-27hd.tablet +index b8c9377605f0..4003e769af6c 100644 +--- a/data/cintiq-27hd.tablet ++++ b/data/cintiq-27hd.tablet +@@ -10,7 +10,7 @@ DeviceMatch=usb:056a:032a + Class=Cintiq + Width=24 + Height=12 +-Styli=@intuos5; ++Styli=@intuos5;@propengen2; + IntegratedIn=Display + + [Features] +diff --git a/data/cintiq-27hdt.tablet b/data/cintiq-27hdt.tablet +index e24a41111314..63504490f2e8 100644 +--- a/data/cintiq-27hdt.tablet ++++ b/data/cintiq-27hdt.tablet +@@ -12,7 +12,7 @@ PairedID=usb:056a:032c + Class=Cintiq + Width=24 + Height=12 +-Styli=@intuos5; ++Styli=@intuos5;@propengen2; + IntegratedIn=Display + + [Features] +diff --git a/data/cintiq-companion-2.tablet b/data/cintiq-companion-2.tablet +index 0b8a031148bf..e5f47dd50128 100644 +--- a/data/cintiq-companion-2.tablet ++++ b/data/cintiq-companion-2.tablet +@@ -35,7 +35,7 @@ PairedID=usb:056a:0326 + Width=12 + Height=7 + Layout=cintiq-companion-2.svg +-Styli=@intuos5;@intuos4; ++Styli=@intuos5;@intuos4;@propengen2; + IntegratedIn=Display;System + + [Features] +diff --git a/data/cintiq-companion-hybrid.tablet b/data/cintiq-companion-hybrid.tablet +index 93a0dbd55df9..23450f32f81a 100644 +--- a/data/cintiq-companion-hybrid.tablet ++++ b/data/cintiq-companion-hybrid.tablet +@@ -33,7 +33,7 @@ PairedID=usb:056a:0309 + Width=12 + Height=7 + Layout=cintiq-companion-hybrid.svg +-Styli=@intuos5;@intuos4; ++Styli=@intuos5;@intuos4;@propengen2; + IntegratedIn=Display + + [Features] +diff --git a/data/cintiq-companion.tablet b/data/cintiq-companion.tablet +index 9ee8d4c1ff46..44415a7972aa 100644 +--- a/data/cintiq-companion.tablet ++++ b/data/cintiq-companion.tablet +@@ -33,7 +33,7 @@ PairedID=usb:056a:030c + Width=12 + Height=7 + Layout=cintiq-companion.svg +-Styli=@intuos5;@intuos4; ++Styli=@intuos5;@intuos4;@propengen2; + IntegratedIn=Display;System + + [Features] +diff --git a/data/cintiq-pro-13.tablet b/data/cintiq-pro-13.tablet +index ca5e2284040f..9dfbf88dcd29 100644 +--- a/data/cintiq-pro-13.tablet ++++ b/data/cintiq-pro-13.tablet +@@ -35,7 +35,7 @@ PairedID=usb:056a:0353 + Width=12 + Height=7 + # No pad buttons, so no layout +-Styli=@intuos5;@mobilestudio; ++Styli=@intuos5;@mobilestudio;@propengen2; + IntegratedIn=Display + + [Features] +diff --git a/data/cintiq-pro-16-2.tablet b/data/cintiq-pro-16-2.tablet +index 8133a2c4bc90..30d841e530bb 100644 +--- a/data/cintiq-pro-16-2.tablet ++++ b/data/cintiq-pro-16-2.tablet +@@ -32,7 +32,7 @@ PairedID=usb:056a:03b3 + Width=14 + Height=8 + Layout=cintiq-pro-16-2.svg +-Styli=@intuos5;@mobilestudio; ++Styli=@intuos5;@mobilestudio;@propengen2; + IntegratedIn=Display + + [Features] +diff --git a/data/cintiq-pro-16.tablet b/data/cintiq-pro-16.tablet +index f2f8869f8130..09ad8122c6eb 100644 +--- a/data/cintiq-pro-16.tablet ++++ b/data/cintiq-pro-16.tablet +@@ -35,7 +35,7 @@ PairedID=usb:056a:0354 + Width=14 + Height=8 + # No pad buttons, so no layout +-Styli=@intuos5;@mobilestudio; ++Styli=@intuos5;@mobilestudio;@propengen2; + IntegratedIn=Display + + [Features] +diff --git a/data/cintiq-pro-24-p.tablet b/data/cintiq-pro-24-p.tablet +index 1cf9be726024..a584781813ca 100644 +--- a/data/cintiq-pro-24-p.tablet ++++ b/data/cintiq-pro-24-p.tablet +@@ -34,7 +34,7 @@ DeviceMatch=usb:056a:037c + Width=20 + Height=12 + # No pad buttons, so no layout +-Styli=@intuos5;@mobilestudio; ++Styli=@intuos5;@mobilestudio;@propengen2; + IntegratedIn=Display + + [Features] +diff --git a/data/cintiq-pro-24-pt.tablet b/data/cintiq-pro-24-pt.tablet +index 806f4edea5ae..4776c89015f9 100644 +--- a/data/cintiq-pro-24-pt.tablet ++++ b/data/cintiq-pro-24-pt.tablet +@@ -35,7 +35,7 @@ PairedID=usb:056a:0355 + Width=20 + Height=12 + # No pad buttons, so no layout +-Styli=@intuos5;@mobilestudio; ++Styli=@intuos5;@mobilestudio;@propengen2; + IntegratedIn=Display + + [Features] +diff --git a/data/cintiq-pro-27.tablet b/data/cintiq-pro-27.tablet +new file mode 100644 +index 000000000000..a616c1fa88bf +--- /dev/null ++++ b/data/cintiq-pro-27.tablet +@@ -0,0 +1,48 @@ ++# Wacom ++# Cintiq Pro 27 ++# DTH-271 ++# ++# 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.rLRz2hqrEy ++# https://github.com/linuxwacom/wacom-hid-descriptors/issues/260#issue-1391416660 ++ ++[Device] ++Name=Wacom Cintiq Pro 27 ++ModelName=DTH-271 ++Class=Cintiq ++DeviceMatch=usb:056a:03c0 ++Width=24 ++Height=13 ++Layout=cintiq-pro-27.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 a/data/cintiq-pro-32.tablet b/data/cintiq-pro-32.tablet +index 772efdb2b4e9..dada3f322129 100644 +--- a/data/cintiq-pro-32.tablet ++++ b/data/cintiq-pro-32.tablet +@@ -35,7 +35,7 @@ PairedID=usb:056a:0356 + Width=27 + Height=15 + # No pad buttons, so no layout +-Styli=@intuos5;@mobilestudio; ++Styli=@intuos5;@mobilestudio;@propengen2; + IntegratedIn=Display + + [Features] +diff --git a/data/dtk-1660e-2.tablet b/data/dtk-1660e-2.tablet +index dd29e481208b..3223ad9be61c 100644 +--- a/data/dtk-1660e-2.tablet ++++ b/data/dtk-1660e-2.tablet +@@ -9,7 +9,7 @@ DeviceMatch=usb:056a:03b0 + Width=14 + Height=8 + # No pad buttons, so no layout +-Styli=@intuos5;@mobilestudio; ++Styli=@intuos5;@mobilestudio;@propengen2; + IntegratedIn=Display + + [Features] +diff --git a/data/dtk-1660e.tablet b/data/dtk-1660e.tablet +index 4a89838acfa8..321879519b7c 100644 +--- a/data/dtk-1660e.tablet ++++ b/data/dtk-1660e.tablet +@@ -9,7 +9,7 @@ DeviceMatch=usb:056a:0396 + Width=14 + Height=8 + # No pad buttons, so no layout +-Styli=@intuos5;@mobilestudio; ++Styli=@intuos5;@mobilestudio;@propengen2; + IntegratedIn=Display + + [Features] +diff --git a/data/intuos-pro-2-l.tablet b/data/intuos-pro-2-l.tablet +index c544909bb997..75e1f695e905 100644 +--- a/data/intuos-pro-2-l.tablet ++++ b/data/intuos-pro-2-l.tablet +@@ -51,7 +51,7 @@ Width=12 + Height=8 + Layout=intuos-pro-2-l.svg + IntegratedIn= +-Styli=@intuos5;@mobilestudio; ++Styli=@intuos5;@mobilestudio;@propengen2; + + [Features] + Stylus=true +diff --git a/data/intuos-pro-2-m.tablet b/data/intuos-pro-2-m.tablet +index bfa775ed3b46..581082f5a57f 100644 +--- a/data/intuos-pro-2-m.tablet ++++ b/data/intuos-pro-2-m.tablet +@@ -51,7 +51,7 @@ Width=9 + Height=6 + Layout=intuos-pro-2-m.svg + IntegratedIn= +-Styli=@intuos5;@mobilestudio; ++Styli=@intuos5;@mobilestudio;@propengen2; + + [Features] + Stylus=true +diff --git a/data/intuos-pro-2-s.tablet b/data/intuos-pro-2-s.tablet +index 12c39bfae6f6..9613f5a46556 100644 +--- a/data/intuos-pro-2-s.tablet ++++ b/data/intuos-pro-2-s.tablet +@@ -38,7 +38,7 @@ Width=6 + Height=4 + Layout=intuos-pro-2-s.svg + IntegratedIn= +-Styli=@intuos5;@mobilestudio; ++Styli=@intuos5;@mobilestudio;@propengen2; + + [Features] + Stylus=true +diff --git a/data/intuos-pro-l.tablet b/data/intuos-pro-l.tablet +index 44d426a66ac3..9c4fee2f4209 100644 +--- a/data/intuos-pro-l.tablet ++++ b/data/intuos-pro-l.tablet +@@ -51,7 +51,7 @@ Width=13 + Height=8 + Layout=intuos-pro-l.svg + IntegratedIn= +-Styli=@intuos4-lens;@intuos4-puck;@intuos5;@intuos4; ++Styli=@intuos4-lens;@intuos4-puck;@intuos5;@intuos4;@propengen2; + + [Features] + Stylus=true +diff --git a/data/intuos-pro-m.tablet b/data/intuos-pro-m.tablet +index de880cd24b4c..e507e2c13180 100644 +--- a/data/intuos-pro-m.tablet ++++ b/data/intuos-pro-m.tablet +@@ -51,7 +51,7 @@ Width=9 + Height=6 + Layout=intuos-pro-m.svg + IntegratedIn= +-Styli=@intuos4-puck;@intuos5;@intuos4; ++Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2; + + [Features] + Stylus=true +diff --git a/data/intuos-pro-s.tablet b/data/intuos-pro-s.tablet +index 5bfc733e47e4..4e35fa589388 100644 +--- a/data/intuos-pro-s.tablet ++++ b/data/intuos-pro-s.tablet +@@ -49,7 +49,7 @@ Width=6 + Height=4 + Layout=intuos-pro-s.svg + IntegratedIn= +-Styli=@intuos4-puck;@intuos5;@intuos4; ++Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2; + + [Features] + Stylus=true +diff --git a/data/intuos4-12x19.tablet b/data/intuos4-12x19.tablet +index 1b76c819c96c..2dc9ea9d233e 100644 +--- a/data/intuos4-12x19.tablet ++++ b/data/intuos4-12x19.tablet +@@ -41,7 +41,7 @@ Width=19 + Height=12 + Layout=intuos4-12x19.svg + IntegratedIn= +-Styli=@intuos4-lens;@intuos4-puck;@intuos5;@intuos4; ++Styli=@intuos4-lens;@intuos4-puck;@intuos5;@intuos4;@propengen2; + + [Features] + Reversible=true +diff --git a/data/intuos4-4x6.tablet b/data/intuos4-4x6.tablet +index e6cc9a3b87be..1147716048e2 100644 +--- a/data/intuos4-4x6.tablet ++++ b/data/intuos4-4x6.tablet +@@ -42,7 +42,7 @@ Width=6 + Height=4 + Layout=intuos4-4x6.svg + IntegratedIn= +-Styli=@intuos4-puck;@intuos5;@intuos4; ++Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2; + + [Features] + Reversible=true +diff --git a/data/intuos4-6x9-wl.tablet b/data/intuos4-6x9-wl.tablet +index d2f4ef04a6fb..bd60600d319e 100644 +--- a/data/intuos4-6x9-wl.tablet ++++ b/data/intuos4-6x9-wl.tablet +@@ -41,7 +41,7 @@ Width=8 + Height=5 + IntegratedIn= + Layout=intuos4-6x9-wl.svg +-Styli=@intuos4-puck;@intuos5;@intuos4; ++Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2; + + [Features] + Reversible=true +diff --git a/data/intuos4-6x9.tablet b/data/intuos4-6x9.tablet +index d1ae6532163d..875fd078febc 100644 +--- a/data/intuos4-6x9.tablet ++++ b/data/intuos4-6x9.tablet +@@ -41,7 +41,7 @@ Width=9 + Height=6 + Layout=intuos4-6x9.svg + IntegratedIn= +-Styli=@intuos4-puck;@intuos5;@intuos4; ++Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2; + + [Features] + Reversible=true +diff --git a/data/intuos4-8x13.tablet b/data/intuos4-8x13.tablet +index dec15d33f100..cfe3afdc4635 100644 +--- a/data/intuos4-8x13.tablet ++++ b/data/intuos4-8x13.tablet +@@ -41,7 +41,7 @@ Width=13 + Height=8 + Layout=intuos4-8x13.svg + IntegratedIn= +-Styli=@intuos4-puck;@intuos5;@intuos4; ++Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2; + + [Features] + Reversible=true +diff --git a/data/intuos5-m.tablet b/data/intuos5-m.tablet +index c0815501bfb8..8370397ccc9e 100644 +--- a/data/intuos5-m.tablet ++++ b/data/intuos5-m.tablet +@@ -51,7 +51,7 @@ Width=9 + Height=6 + Layout=intuos5-m.svg + IntegratedIn= +-Styli=@intuos4-puck;@intuos5;@intuos4; ++Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2; + + [Features] + Stylus=true +diff --git a/data/intuos5-s.tablet b/data/intuos5-s.tablet +index a8159eb6ffeb..e67585cdf57e 100644 +--- a/data/intuos5-s.tablet ++++ b/data/intuos5-s.tablet +@@ -49,7 +49,7 @@ Width=6 + Height=4 + Layout=intuos5-s.svg + IntegratedIn= +-Styli=@intuos4-puck;@intuos5;@intuos4; ++Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2; + + [Features] + Stylus=true +diff --git a/data/intuos5-touch-l.tablet b/data/intuos5-touch-l.tablet +index 75ed69b48f0c..85c4fa8003b9 100644 +--- a/data/intuos5-touch-l.tablet ++++ b/data/intuos5-touch-l.tablet +@@ -51,7 +51,7 @@ Width=13 + Height=8 + Layout=intuos5-l.svg + IntegratedIn= +-Styli=@intuos4-lens;@intuos4-puck;@intuos5;@intuos4; ++Styli=@intuos4-lens;@intuos4-puck;@intuos5;@intuos4;@propengen2; + + [Features] + Stylus=true +diff --git a/data/intuos5-touch-m.tablet b/data/intuos5-touch-m.tablet +index 138d19f6d71f..46421d0fd3da 100644 +--- a/data/intuos5-touch-m.tablet ++++ b/data/intuos5-touch-m.tablet +@@ -51,7 +51,7 @@ Width=9 + Height=6 + Layout=intuos5-m.svg + IntegratedIn= +-Styli=@intuos4-puck;@intuos5;@intuos4; ++Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2; + + [Features] + Stylus=true +diff --git a/data/intuos5-touch-s.tablet b/data/intuos5-touch-s.tablet +index 21af4005769e..7c0af1e578af 100644 +--- a/data/intuos5-touch-s.tablet ++++ b/data/intuos5-touch-s.tablet +@@ -49,7 +49,7 @@ Width=6 + Height=4 + Layout=intuos5-s.svg + IntegratedIn= +-Styli=@intuos4-puck;@intuos5;@intuos4; ++Styli=@intuos4-puck;@intuos5;@intuos4;@propengen2; + + [Features] + Stylus=true +diff --git a/data/layouts/cintiq-pro-27.svg b/data/layouts/cintiq-pro-27.svg +new file mode 100644 +index 000000000000..da20fb552e7d +--- /dev/null ++++ b/data/layouts/cintiq-pro-27.svg +@@ -0,0 +1,181 @@ ++ ++ ++ ++ Wacom Cintiq Pro 27 ++ ++ ++ ++ A ++ ++ ++ ++ ++ B ++ ++ ++ ++ ++ C ++ ++ ++ ++ ++ D ++ ++ ++ ++ ++ E ++ ++ ++ ++ ++ F ++ ++ ++ ++ ++ G ++ ++ ++ ++ ++ H ++ ++ +diff --git a/data/libwacom.stylus b/data/libwacom.stylus +index 17fea9090990..60f2ffb7eda0 100644 +--- a/data/libwacom.stylus ++++ b/data/libwacom.stylus +@@ -291,6 +291,22 @@ Buttons=2 + Axes=Tilt;Pressure;Distance; + Type=General + ++[0x200] ++# Cintiq Pro 2022 ++Name=Pro Pen 3 ++Group=cintiqpro2022 ++Buttons=3 ++Axes=Tilt;Pressure;Distance; ++Type=General ++ ++[0x40200] ++# Cintiq Pro 2022 ++Name=Pro Pen 3 ++Group=cintiqpro2022 ++Buttons=3 ++Axes=Tilt;Pressure;Distance; ++Type=General ++ + [0x80842] + # MobileStudio Pro + Name=Pro Pen 3D +@@ -355,7 +371,7 @@ Type=Marker + [0x100804] + # Intuos4, 5 and Cintiq 21UX2, 22HD, 24HD + Name=Art Pen +-Group=intuos5 ++Group=propengen2 + PairedStylusIds=0x10080c; + Buttons=2 + Axes=Tilt;Pressure;Distance;RotationZ; +@@ -364,7 +380,7 @@ Type=Marker + [0x100802] + # Intuos4, 5 and Cintiq 21UX2, 24HD + Name=Grip Pen +-Group=intuos5 ++Group=propengen2 + PairedStylusIds=0x10080a; + Buttons=2 + Axes=Tilt;Pressure;Distance; +@@ -390,7 +406,7 @@ Type=Classic + [0x140802] + # Intuos4, 5 and Cintiq 21UX2, 24HD + Name=Classic Pen +-Group=intuos5 ++Group=propengen2 + PairedStylusIds=0x14080a; + Buttons=2 + Axes=Tilt;Pressure;Distance; +@@ -399,7 +415,7 @@ Type=Classic + [0x160802] + # Cintiq 13HD Pro Pen + Name=Pro Pen +-Group=intuos5 ++Group=propengen2 + PairedStylusIds=0x16080a; + Buttons=2 + Axes=Tilt;Pressure;Distance; +@@ -536,7 +552,7 @@ Type=Classic + [0x14080a] + # Intuos4, 5 and Cintiq 21UX2, 24HD + Name=Classic Pen Eraser +-Group=intuos5 ++Group=propengen2 + PairedStylusIds=0x140802; + EraserType=Invert + Buttons=2 +@@ -546,7 +562,7 @@ Type=Classic + [0x10080c] + # Intuos4, 5 and 13HD, 24HD Art Pen + Name=Art Pen Eraser +-Group=intuos5 ++Group=propengen2 + PairedStylusIds=0x100804; + EraserType=Invert + Buttons=2 +@@ -556,7 +572,7 @@ Type=Marker + [0x10080a] + # Intuos4, 5 and Cintiq 21UX2, 24HD + Name=Grip Pen Eraser +-Group=intuos5 ++Group=propengen2 + PairedStylusIds=0x100802; + EraserType=Invert + Buttons=2 +@@ -576,7 +592,7 @@ Type=General + [0x16080a] + # Cintiq 13HD + Name=Pro Pen Eraser +-Group=intuos5 ++Group=propengen2 + PairedStylusIds=0x160802; + EraserType=Invert + Buttons=2 +diff --git a/data/mobilestudio-pro-13-2.tablet b/data/mobilestudio-pro-13-2.tablet +index f2cce71ce06f..6be21cb244ce 100644 +--- a/data/mobilestudio-pro-13-2.tablet ++++ b/data/mobilestudio-pro-13-2.tablet +@@ -42,7 +42,7 @@ PairedID=usb:056a:039a + Width=12 + Height=7 + Layout=mobilestudio-pro-13.svg +-Styli=@intuos5;@mobilestudio; ++Styli=@intuos5;@mobilestudio;@propengen2; + IntegratedIn=Display;System + + [Features] +diff --git a/data/mobilestudio-pro-13.tablet b/data/mobilestudio-pro-13.tablet +index da1eed4cb991..61963bd074bf 100644 +--- a/data/mobilestudio-pro-13.tablet ++++ b/data/mobilestudio-pro-13.tablet +@@ -42,7 +42,7 @@ PairedID=usb:056a:034a + Width=12 + Height=7 + Layout=mobilestudio-pro-13.svg +-Styli=@intuos5;@mobilestudio; ++Styli=@intuos5;@mobilestudio;@propengen2; + IntegratedIn=Display;System + + [Features] +diff --git a/data/mobilestudio-pro-16-2.tablet b/data/mobilestudio-pro-16-2.tablet +index f9c62a541410..f11c90957712 100644 +--- a/data/mobilestudio-pro-16-2.tablet ++++ b/data/mobilestudio-pro-16-2.tablet +@@ -44,7 +44,7 @@ PairedID=usb:056a:039b + Width=14 + Height=8 + Layout=mobilestudio-pro-16.svg +-Styli=@intuos5;@mobilestudio; ++Styli=@intuos5;@mobilestudio;@propengen2; + IntegratedIn=Display;System + + [Features] +diff --git a/data/mobilestudio-pro-16-3.tablet b/data/mobilestudio-pro-16-3.tablet +index 1a8efeaf761f..b6a932c513fc 100644 +--- a/data/mobilestudio-pro-16-3.tablet ++++ b/data/mobilestudio-pro-16-3.tablet +@@ -44,7 +44,7 @@ PairedID=usb:056a:03ac + Width=14 + Height=8 + Layout=mobilestudio-pro-16.svg +-Styli=@intuos5;@mobilestudio; ++Styli=@intuos5;@mobilestudio;@propengen2; + IntegratedIn=Display;System + + [Features] +diff --git a/data/mobilestudio-pro-16.tablet b/data/mobilestudio-pro-16.tablet +index 379b4e708ca4..a99e171fa086 100644 +--- a/data/mobilestudio-pro-16.tablet ++++ b/data/mobilestudio-pro-16.tablet +@@ -44,7 +44,7 @@ PairedID=usb:056a:034b + Width=14 + Height=8 + Layout=mobilestudio-pro-16.svg +-Styli=@intuos5;@mobilestudio; ++Styli=@intuos5;@mobilestudio;@propengen2; + IntegratedIn=Display;System + + [Features] +-- +2.50.1 + diff --git a/SOURCES/0014-data-Add-3rd-gen-Intuos-Pro-devices.patch b/SOURCES/0014-data-Add-3rd-gen-Intuos-Pro-devices.patch new file mode 100644 index 0000000..b311b30 --- /dev/null +++ b/SOURCES/0014-data-Add-3rd-gen-Intuos-Pro-devices.patch @@ -0,0 +1,882 @@ +From dfd35cefc1d60603dc63e9ab4a8574037287758f Mon Sep 17 00:00:00 2001 +From: Jason Gerecke +Date: Thu, 20 Jun 2024 10:32:57 -0700 +Subject: [PATCH libwacom] data: Add 3rd gen Intuos Pro devices + +Signed-off-by: Jason Gerecke +(cherry picked from commit 0dc703f7a727a869bf5c6a370a2a49a124716254) + +RHEL: +- Fix the DeviceMatch line +- Add Buttons= line to the tablet +- comment out the Dial features, not supported in this version +--- + data/layouts/wacom-intuos-pro-3-l.svg | 255 ++++++++++++++++++++++++++ + data/layouts/wacom-intuos-pro-3-m.svg | 255 ++++++++++++++++++++++++++ + data/layouts/wacom-intuos-pro-3-s.svg | 135 ++++++++++++++ + data/wacom-intuos-pro-3-l.tablet | 58 ++++++ + data/wacom-intuos-pro-3-m.tablet | 58 ++++++ + data/wacom-intuos-pro-3-s.tablet | 55 ++++++ + 6 files changed, 816 insertions(+) + create mode 100644 data/layouts/wacom-intuos-pro-3-l.svg + create mode 100644 data/layouts/wacom-intuos-pro-3-m.svg + create mode 100644 data/layouts/wacom-intuos-pro-3-s.svg + create mode 100644 data/wacom-intuos-pro-3-l.tablet + create mode 100644 data/wacom-intuos-pro-3-m.tablet + create mode 100644 data/wacom-intuos-pro-3-s.tablet + +diff --git a/data/layouts/wacom-intuos-pro-3-l.svg b/data/layouts/wacom-intuos-pro-3-l.svg +new file mode 100644 +index 000000000000..466fd9e8aa76 +--- /dev/null ++++ b/data/layouts/wacom-intuos-pro-3-l.svg +@@ -0,0 +1,255 @@ ++ ++ ++ ++ ++ Wacom Intuos Pro L (PTK870) ++ ++ ++ ++ A ++ ++ ++ ++ ++ B ++ ++ ++ ++ ++ C ++ ++ ++ ++ ++ D ++ ++ ++ ++ ++ I ++ ++ ++ ++ ++ CCW ++ ++ ++ CW ++ ++ ++ ++ ++ ++ E ++ ++ ++ ++ ++ F ++ ++ ++ ++ ++ G ++ ++ ++ ++ ++ H ++ ++ ++ ++ ++ J ++ ++ ++ ++ ++ CCW ++ ++ ++ CW ++ ++ ++ +diff --git a/data/layouts/wacom-intuos-pro-3-m.svg b/data/layouts/wacom-intuos-pro-3-m.svg +new file mode 100644 +index 000000000000..ac3af53affd8 +--- /dev/null ++++ b/data/layouts/wacom-intuos-pro-3-m.svg +@@ -0,0 +1,255 @@ ++ ++ ++ ++ ++ Wacom Intuos Pro M (PTK670) ++ ++ ++ ++ A ++ ++ ++ ++ ++ B ++ ++ ++ ++ ++ C ++ ++ ++ ++ ++ D ++ ++ ++ ++ ++ I ++ ++ ++ ++ ++ CCW ++ ++ ++ CW ++ ++ ++ ++ ++ ++ E ++ ++ ++ ++ ++ F ++ ++ ++ ++ ++ G ++ ++ ++ ++ ++ H ++ ++ ++ ++ ++ J ++ ++ ++ ++ ++ CCW ++ ++ ++ CW ++ ++ ++ +diff --git a/data/layouts/wacom-intuos-pro-3-s.svg b/data/layouts/wacom-intuos-pro-3-s.svg +new file mode 100644 +index 000000000000..ac0e3004d257 +--- /dev/null ++++ b/data/layouts/wacom-intuos-pro-3-s.svg +@@ -0,0 +1,135 @@ ++ ++ ++ ++ ++ Wacom Intuos Pro S (PTK470) ++ ++ ++ ++ A ++ ++ ++ ++ ++ B ++ ++ ++ ++ ++ C ++ ++ ++ ++ ++ D ++ ++ ++ ++ ++ E ++ ++ ++ ++ ++ CCW ++ ++ ++ CW ++ ++ ++ +diff --git a/data/wacom-intuos-pro-3-l.tablet b/data/wacom-intuos-pro-3-l.tablet +new file mode 100644 +index 000000000000..2a41a4812b91 +--- /dev/null ++++ b/data/wacom-intuos-pro-3-l.tablet +@@ -0,0 +1,58 @@ ++# Wacom ++# Intuos Pro L ++# PTK870 ++# (Third Generation) ++# ++# sysinfo.oLBtuiyfKd ++# https://github.com/linuxwacom/wacom-hid-descriptors/issues/457#issue-2867134599 ++# ++# Button Map: ++# (A=1, B=2, C=3, ...) ++# ++# A E ++# D I B H J F ++# C G ++# *-----------------------* ++# | | ++# | | ++# | TABLET | ++# | | ++# | | ++# *-----------------------* ++# ++# Relative Dial Map: ++# (A=1st dial, B=2nd dial, ...) ++# ++# A B ++# *-----------------------* ++# | | ++# | TABLET | ++# | | ++# *-----------------------* ++# ++ ++[Device] ++Name=Wacom Intuos Pro L ++ModelName=PTK870 ++DeviceMatch=usb:056a:03f9;bluetooth:056a:03fa;usb:056a:0401; ++Class=Intuos5 ++Width=14 ++Height=8 ++Layout=wacom-intuos-pro-3-l.svg ++IntegratedIn= ++Styli=@mobilestudio;@propengen2;@propen3;@udpen; ++ ++[Features] ++Stylus=true ++Reversible=false ++Touch=false ++Buttons=10 ++# NumDials=2 ++ ++[Buttons] ++Left=A;B;C;D;I ++Right=E;F;G;H;J ++# Dial=I ++# Dial2=J ++# DialNumModes=3 ++# Dial2NumModes=3 +diff --git a/data/wacom-intuos-pro-3-m.tablet b/data/wacom-intuos-pro-3-m.tablet +new file mode 100644 +index 000000000000..39717531b79e +--- /dev/null ++++ b/data/wacom-intuos-pro-3-m.tablet +@@ -0,0 +1,58 @@ ++# Wacom ++# Intuos Pro M ++# PTK670 ++# (Third Generation) ++# ++# sysinfo.BSaGepftZP ++# https://github.com/linuxwacom/wacom-hid-descriptors/issues/456#issue-2861784604 ++# ++# Button Map: ++# (A=1, B=2, C=3, ...) ++# ++# A E ++# D I B H J F ++# C G ++# *-----------------------* ++# | | ++# | | ++# | TABLET | ++# | | ++# | | ++# *-----------------------* ++# ++# Relative Dial Map: ++# (A=1st dial, B=2nd dial, ...) ++# ++# A B ++# *-----------------------* ++# | | ++# | TABLET | ++# | | ++# *-----------------------* ++# ++ ++[Device] ++Name=Wacom Intuos Pro M ++ModelName=PTK670 ++DeviceMatch=usb:056a:03f7;bluetooth:056a:03f8; ++Class=Intuos5 ++Width=10 ++Height=6 ++Layout=wacom-intuos-pro-3-m.svg ++IntegratedIn= ++Styli=@mobilestudio;@propengen2;@propen3;@udpen; ++ ++[Features] ++Stylus=true ++Reversible=false ++Touch=false ++Buttons=10 ++# NumDials=2 ++ ++[Buttons] ++Left=A;B;C;D;I ++Right=E;F;G;H;J ++# Dial=I ++# Dial2=J ++# DialNumModes=3 ++# Dial2NumModes=3 +diff --git a/data/wacom-intuos-pro-3-s.tablet b/data/wacom-intuos-pro-3-s.tablet +new file mode 100644 +index 000000000000..f8e71397d023 +--- /dev/null ++++ b/data/wacom-intuos-pro-3-s.tablet +@@ -0,0 +1,55 @@ ++# Wacom ++# Intuos Pro S ++# PTK470 ++# (Third Generation) ++# ++# sysinfo.vS9sFVLdTW ++# https://github.com/linuxwacom/wacom-hid-descriptors/issues/455#issue-2861784074 ++# ++# Button Map: ++# (A=1, B=2, C=3, ...) ++# ++# A ++# D E B ++# C ++# *-----------------------* ++# | | ++# | | ++# | TABLET | ++# | | ++# | | ++# *-----------------------* ++# ++# Relative Dial Map: ++# (A=1st dial, B=2nd dial, ...) ++# ++# A ++# *-----------------------* ++# | | ++# | TABLET | ++# | | ++# *-----------------------* ++# ++ ++[Device] ++Name=Wacom Intuos Pro S ++ModelName=PTK470 ++DeviceMatch=usb:056a:03f5;bluetooth:056a:03f6; ++Class=Intuos5 ++Width=7 ++Height=4 ++Layout=wacom-intuos-pro-3-s.svg ++IntegratedIn= ++Styli=@mobilestudio;@propengen2;@propen3;@udpen; ++ ++[Features] ++Stylus=true ++Reversible=false ++Touch=false ++Buttons=5 ++# NumDials=1 ++ ++[Buttons] ++Left=A;B;C;D;E ++# Dial=E ++# DialNumModes=3 +-- +2.50.1 + diff --git a/SOURCES/0015-data-remove-erroneous-dash-from-latest-Cintiq-Pro-mo.patch b/SOURCES/0015-data-remove-erroneous-dash-from-latest-Cintiq-Pro-mo.patch new file mode 100644 index 0000000..27d249b --- /dev/null +++ b/SOURCES/0015-data-remove-erroneous-dash-from-latest-Cintiq-Pro-mo.patch @@ -0,0 +1,80 @@ +From 818c47bef2789b79781448b89c616be3d65949ac Mon Sep 17 00:00:00 2001 +From: Aaron Armstrong Skomra +Date: Fri, 27 Oct 2023 16:37:48 -0700 +Subject: [PATCH libwacom] data: remove erroneous dash from latest Cintiq Pro + model names + +Signed-off-by: Aaron Armstrong Skomra +(cherry picked from commit 8ffa4ecfe4c9029d1abdda64428bf8122d92dee5) +--- + data/cintiq-pro-17.tablet | 4 ++-- + data/cintiq-pro-22.tablet | 4 ++-- + data/cintiq-pro-27.tablet | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/data/cintiq-pro-17.tablet b/data/cintiq-pro-17.tablet +index 267a491d87c7..d8f55dcd8078 100644 +--- a/data/cintiq-pro-17.tablet ++++ b/data/cintiq-pro-17.tablet +@@ -1,6 +1,6 @@ + # Wacom + # Cintiq Pro 17 +-# DTH-172 ++# DTH172 + # + # Button Map: + # (A=1, B=2, C=3, ...) +@@ -27,7 +27,7 @@ + + [Device] + Name=Wacom Cintiq Pro 17 +-ModelName=DTH-172 ++ModelName=DTH172 + Class=Cintiq + DeviceMatch=usb:056a:03c4 + Width=15 +diff --git a/data/cintiq-pro-22.tablet b/data/cintiq-pro-22.tablet +index caef2a58e07a..befdb0a7a532 100644 +--- a/data/cintiq-pro-22.tablet ++++ b/data/cintiq-pro-22.tablet +@@ -1,6 +1,6 @@ + # Wacom + # Cintiq Pro 22 +-# DTH-227 ++# DTH227 + # + # Button Map: + # (A=1, B=2, C=3, ...) +@@ -27,7 +27,7 @@ + + [Device] + Name=Wacom Cintiq Pro 22 +-ModelName=DTH-227 ++ModelName=DTH227 + Class=Cintiq + DeviceMatch=usb:056a:03d0 + Width=18 +diff --git a/data/cintiq-pro-27.tablet b/data/cintiq-pro-27.tablet +index a616c1fa88bf..db0c5dbc20b7 100644 +--- a/data/cintiq-pro-27.tablet ++++ b/data/cintiq-pro-27.tablet +@@ -1,6 +1,6 @@ + # Wacom + # Cintiq Pro 27 +-# DTH-271 ++# DTH271 + # + # Button Map: + # (A=1, B=2, C=3, ...) +@@ -27,7 +27,7 @@ + + [Device] + Name=Wacom Cintiq Pro 27 +-ModelName=DTH-271 ++ModelName=DTH271 + Class=Cintiq + DeviceMatch=usb:056a:03c0 + Width=24 +-- +2.50.1 + diff --git a/SOURCES/0016-layouts-rearrange-the-Intuos-Pro-3rd-L-M-buttons.patch b/SOURCES/0016-layouts-rearrange-the-Intuos-Pro-3rd-L-M-buttons.patch new file mode 100644 index 0000000..2872f7e --- /dev/null +++ b/SOURCES/0016-layouts-rearrange-the-Intuos-Pro-3rd-L-M-buttons.patch @@ -0,0 +1,908 @@ +From 76a5a4da6281e496cb47b2850136cecca6a10eab Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Wed, 20 Aug 2025 13:39:01 +1000 +Subject: [PATCH libwacom] layouts: rearrange the Intuos Pro 3rd L/M buttons + +The current layout is too far on the left/right edge, causing the right +set of buttons to be nonconfigurable in GNOME's OSD, see e.g. +https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/3500 + +Re-do the layouts so the button configuration is below the dials. +Ideally the GNOME OSD is smart enough so this isn't an issue to start +with but since we have loads of empty space here anyway, let's +make this a simple fix here until the rest can catch up. +--- + data/layouts/wacom-intuos-pro-3-l.svg | 393 ++++++++++++++----------- + data/layouts/wacom-intuos-pro-3-m.svg | 405 ++++++++++++++------------ + 2 files changed, 442 insertions(+), 356 deletions(-) + +diff --git a/data/layouts/wacom-intuos-pro-3-l.svg b/data/layouts/wacom-intuos-pro-3-l.svg +index 466fd9e8aa76..925149cea6a1 100644 +--- a/data/layouts/wacom-intuos-pro-3-l.svg ++++ b/data/layouts/wacom-intuos-pro-3-l.svg +@@ -8,95 +8,158 @@ + version="1.1" + id="intuos-pro-l-ptk870" + style="fill:none;stroke:#7f7f7f;stroke-width:0.25;font-size:6;font-family:monospace" ++ sodipodi:docname="wacom-intuos-pro-3-l.svg" ++ inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)" ++ 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"> ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + Wacom Intuos Pro L (PTK870) +- +- +- +- A +- +- +- +- +- B +- +- +- +- +- C +- +- +- +- +- D +- +- +- +- +- I +- ++ ++ ++ A ++ ++ ++ B ++ ++ ++ C ++ ++ ++ D ++ ++ ++ I + + + +- +- +- +- E +- +- +- +- +- F +- +- +- +- +- G +- +- +- +- +- H +- +- +- +- +- J +- ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ E ++ F ++ G ++ H ++ J + + ++ ++ + Wacom Intuos Pro M (PTK670) ++ ++ ++ A ++ ++ ++ B ++ ++ ++ C ++ ++ ++ D ++ ++ ++ I + +- +- +- A +- +- +- +- +- B +- +- +- +- +- C +- +- +- +- +- D +- +- +- +- +- I +- +- ++ id="g7" ++ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" ++ transform="translate(-43.414111,-7.5157166e-5)"> + ++ d="m 143.885,5.88344 2.247,-1.10048 v 0.73366 c 1.343,-0.08427 2.672,0.30622 3.745,1.10046 C 148.73,6.00801 147.38,5.87584 146.132,6.25026 V 6.9839 Z" /> + ++ d="m 151.853,6.89279 h 14.246" /> + CCW ++ style="text-anchor:start">CCW + ++ d="m 143.883,26.4255 2.247,-1.1004 v 0.7336 c 1.298,0.1914 2.623,-0.0682 3.745,-0.7336 -0.973,0.9964 -2.338,1.5315 -3.745,1.4672 v 0.7337 z" /> + ++ d="m 151.853,25.0477 h 14.246" /> + CW ++ style="text-anchor:start">CW + ++ d="m 146.854,3.00752 c -5.247,0 -9.976,3.16004 -11.984,8.00658 -2.007,4.8466 -0.898,10.4252 2.812,14.1346 3.709,3.7094 9.288,4.819 14.135,2.8115 4.847,-2.0075 8.007,-6.7368 8.007,-11.9827 0,-7.16311 -5.807,-12.96998 -12.97,-12.96998 z" /> + ++ + +- ++ id="g10" ++ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" ++ transform="translate(-43.414111,-7.5157166e-5)"> + +- E ++ d="m 247.87623,74.037396 h 30.67943 L 278.67096,6.8514934 266.952,6.93851" ++ sodipodi:nodetypes="cccc" /> + ++ ++ ++ ++ ++ ++ ++ ++ ++ E ++ F ++ G ++ H ++ J + +- +- +- F +- +- +- +- +- G +- +- +- +- +- H +- +- +- +- +- J +- +- ++ id="g17" ++ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" ++ transform="translate(-43.414111,-7.5157166e-5)"> + ++ class="Dial2CCW Dial2 Button" ++ d="m 227.31,5.92916 2.247,-1.10048 v 0.73366 c 1.343,-0.08427 2.672,0.30622 3.745,1.10046 -1.147,-0.60907 -2.497,-0.74124 -3.745,-0.36682 v 0.73364 z" /> + ++ d="M 225.28,6.93851 H 211.034" /> + CCW ++ style="text-anchor:end">CCW + ++ d="m 227.308,26.4712 2.247,-1.1004 v 0.7336 c 1.298,0.1914 2.623,-0.0682 3.745,-0.7336 -0.973,0.9964 -2.338,1.5315 -3.745,1.4672 v 0.7337 z" /> + ++ d="M 225.28,25.0934 H 211.034" /> + CW ++ style="text-anchor:end">CW + ++ d="m 230.279,3.05324 c -5.246,0 -9.975,3.16004 -11.983,8.00656 -2.007,4.8466 -0.898,10.4252 2.812,14.1346 3.709,3.7094 9.288,4.819 14.134,2.8115 4.847,-2.0075 8.007,-6.7368 8.007,-11.9827 0,-7.16309 -5.807,-12.96996 -12.97,-12.96996 z" /> + + +-- +2.50.1 + diff --git a/SOURCES/0017-layouts-move-the-rings-of-the-Intuos-Pro-3rd-down-in.patch b/SOURCES/0017-layouts-move-the-rings-of-the-Intuos-Pro-3rd-down-in.patch new file mode 100644 index 0000000..14a34f3 --- /dev/null +++ b/SOURCES/0017-layouts-move-the-rings-of-the-Intuos-Pro-3rd-down-in.patch @@ -0,0 +1,136 @@ +From 9242857af8cec3d1e72401dfe2465c964b80cb80 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Thu, 21 Aug 2025 16:00:29 +1000 +Subject: [PATCH libwacom] layouts: move the rings of the Intuos Pro 3rd down + in their group + +This way a caller that fills the ring with color doesn't obscure +anything else in this group (notably: the arrows). +--- + data/layouts/wacom-intuos-pro-3-l.svg | 16 ++++++++-------- + data/layouts/wacom-intuos-pro-3-m.svg | 16 ++++++++-------- + data/layouts/wacom-intuos-pro-3-s.svg | 8 ++++---- + 3 files changed, 20 insertions(+), 20 deletions(-) + +diff --git a/data/layouts/wacom-intuos-pro-3-l.svg b/data/layouts/wacom-intuos-pro-3-l.svg +index 925149cea6a1..2bd1a1abfab7 100644 +--- a/data/layouts/wacom-intuos-pro-3-l.svg ++++ b/data/layouts/wacom-intuos-pro-3-l.svg +@@ -162,6 +162,10 @@ + style="text-anchor:end">I + ++ + CW +- + + J + ++ + CW +- + + +diff --git a/data/layouts/wacom-intuos-pro-3-m.svg b/data/layouts/wacom-intuos-pro-3-m.svg +index ab3ba59e5abc..ac1e4804d475 100644 +--- a/data/layouts/wacom-intuos-pro-3-m.svg ++++ b/data/layouts/wacom-intuos-pro-3-m.svg +@@ -126,6 +126,10 @@ + id="g7" + style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" + transform="translate(-43.414111,-7.5157166e-5)"> ++ + CW +- + + ++ + CW +- + + +diff --git a/data/layouts/wacom-intuos-pro-3-s.svg b/data/layouts/wacom-intuos-pro-3-s.svg +index ac0e3004d257..4de7c63bf199 100644 +--- a/data/layouts/wacom-intuos-pro-3-s.svg ++++ b/data/layouts/wacom-intuos-pro-3-s.svg +@@ -99,6 +99,10 @@ + + ++ + CW +- + + +-- +2.50.1 + diff --git a/SOURCES/0018-RHEL-pretend-the-Intuos-Pro-3rd-Gen-has-Rings-not-Di.patch b/SOURCES/0018-RHEL-pretend-the-Intuos-Pro-3rd-Gen-has-Rings-not-Di.patch new file mode 100644 index 0000000..4b9bfd2 --- /dev/null +++ b/SOURCES/0018-RHEL-pretend-the-Intuos-Pro-3rd-Gen-has-Rings-not-Di.patch @@ -0,0 +1,366 @@ +From 3b1b46f2f1fd462df258893cc3a114f786f16d73 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer +Date: Tue, 22 Jul 2025 10:45:59 +1000 +Subject: [PATCH libwacom] RHEL: pretend the Intuos Pro 3rd Gen has Rings, not + Dials + +Nothing in our userspace is hooked up to correctly deal with Dial events +(except libinput). This means any device with dials cannot receive +events (X or Wayland) and it cannot be configured in the UI either. + +Instead we pretend this device has absolute Rings which we've supported +for a long time now. This relies on libinput and xorg-x11-drv-wacom (or +the kernel) to map the relative dial events to absolute events. +--- + data/layouts/wacom-intuos-pro-3-l.svg | 56 +++++++++++++-------------- + data/layouts/wacom-intuos-pro-3-m.svg | 56 +++++++++++++-------------- + data/layouts/wacom-intuos-pro-3-s.svg | 28 +++++++------- + data/wacom-intuos-pro-3-l.tablet | 13 +++++++ + data/wacom-intuos-pro-3-m.tablet | 13 +++++++ + data/wacom-intuos-pro-3-s.tablet | 10 +++++ + 6 files changed, 106 insertions(+), 70 deletions(-) + +diff --git a/data/layouts/wacom-intuos-pro-3-l.svg b/data/layouts/wacom-intuos-pro-3-l.svg +index 2bd1a1abfab7..d000ef02acc8 100644 +--- a/data/layouts/wacom-intuos-pro-3-l.svg ++++ b/data/layouts/wacom-intuos-pro-3-l.svg +@@ -163,34 +163,34 @@ + + + + + CCW + + + CW +@@ -273,34 +273,34 @@ + + + + + CCW + + + CW +diff --git a/data/layouts/wacom-intuos-pro-3-m.svg b/data/layouts/wacom-intuos-pro-3-m.svg +index ac1e4804d475..5fa321b71b16 100644 +--- a/data/layouts/wacom-intuos-pro-3-m.svg ++++ b/data/layouts/wacom-intuos-pro-3-m.svg +@@ -127,34 +127,34 @@ + style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" + transform="translate(-43.414111,-7.5157166e-5)"> + + + + CCW + + + CW +@@ -253,34 +253,34 @@ + style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" + transform="translate(-43.414111,-7.5157166e-5)"> + + + + CCW + + + CW +diff --git a/data/layouts/wacom-intuos-pro-3-s.svg b/data/layouts/wacom-intuos-pro-3-s.svg +index 4de7c63bf199..bdd0273a271a 100644 +--- a/data/layouts/wacom-intuos-pro-3-s.svg ++++ b/data/layouts/wacom-intuos-pro-3-s.svg +@@ -100,34 +100,34 @@ + + + + + CCW + + + CW +diff --git a/data/wacom-intuos-pro-3-l.tablet b/data/wacom-intuos-pro-3-l.tablet +index 2a41a4812b91..cb0f687b4762 100644 +--- a/data/wacom-intuos-pro-3-l.tablet ++++ b/data/wacom-intuos-pro-3-l.tablet +@@ -47,12 +47,25 @@ Stylus=true + Reversible=false + Touch=false + Buttons=10 ++# RHEL-specific change: our userspace doesn't support ++# relative dials on tablets so we pretend these are absolute ++# rings and rely on libinput/xf86-input-wacom to emulate ++# ring values for these devices. ++# Note the SVG was changed to that effect too + # NumDials=2 ++Ring=true ++Ring2=true ++StatusLEDs=Ring2;Ring + + [Buttons] + Left=A;B;C;D;I + Right=E;F;G;H;J ++# RHEL-specific change, see above + # Dial=I + # Dial2=J + # DialNumModes=3 + # Dial2NumModes=3 ++Ring=I ++Ring2=J ++RingNumModes=3 ++Ring2NumModes=3 +diff --git a/data/wacom-intuos-pro-3-m.tablet b/data/wacom-intuos-pro-3-m.tablet +index 39717531b79e..4b548422e043 100644 +--- a/data/wacom-intuos-pro-3-m.tablet ++++ b/data/wacom-intuos-pro-3-m.tablet +@@ -47,12 +47,25 @@ Stylus=true + Reversible=false + Touch=false + Buttons=10 ++# RHEL-specific change: our userspace doesn't support ++# relative dials on tablets so we pretend these are absolute ++# rings and rely on libinput/xf86-input-wacom to emulate ++# ring values for these devices. ++# Note the SVG was changed to that effect too + # NumDials=2 ++Ring=true ++Ring2=true ++StatusLEDs=Ring2;Ring + + [Buttons] + Left=A;B;C;D;I + Right=E;F;G;H;J ++# RHEL-specific change, see above + # Dial=I + # Dial2=J + # DialNumModes=3 + # Dial2NumModes=3 ++Ring=I ++Ring2=J ++RingNumModes=3 ++Ring2NumModes=3 +diff --git a/data/wacom-intuos-pro-3-s.tablet b/data/wacom-intuos-pro-3-s.tablet +index f8e71397d023..ac5b52563672 100644 +--- a/data/wacom-intuos-pro-3-s.tablet ++++ b/data/wacom-intuos-pro-3-s.tablet +@@ -47,9 +47,19 @@ Stylus=true + Reversible=false + Touch=false + Buttons=5 ++# RHEL-specific change: our userspace doesn't support ++# relative dials on tablets so we pretend these are absolute ++# rings and rely on libinput/xf86-input-wacom to emulate ++# ring values for these devices. ++# Note the SVG was changed to that effect too + # NumDials=1 ++Ring=true + + [Buttons] + Left=A;B;C;D;E ++# RHEL-specific change, see above + # Dial=E + # DialNumModes=3 ++Ring=E ++RingNumModes=3 ++Ring2NumModes=3 +-- +2.50.1 + diff --git a/SPECS/libwacom.spec b/SPECS/libwacom.spec index eb3141b..9d47d19 100644 --- a/SPECS/libwacom.spec +++ b/SPECS/libwacom.spec @@ -1,6 +1,6 @@ Name: libwacom Version: 1.12.1 -Release: 2%{?dist} +Release: 5%{?dist} Summary: Tablet Information Client Library Requires: %{name}-data @@ -9,6 +9,25 @@ URL: https://github.com/linuxwacom/libwacom Source0: https://github.com/linuxwacom/libwacom/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2 +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 +Patch13: 0013-data-Added-support-for-Cintiq-Pro-27-525.patch +Patch14: 0014-data-Add-3rd-gen-Intuos-Pro-devices.patch +Patch15: 0015-data-remove-erroneous-dash-from-latest-Cintiq-Pro-mo.patch +Patch16: 0016-layouts-rearrange-the-Intuos-Pro-3rd-L-M-buttons.patch +Patch17: 0017-layouts-move-the-rings-of-the-Intuos-Pro-3rd-down-in.patch +Patch18: 0018-RHEL-pretend-the-Intuos-Pro-3rd-Gen-has-Rings-not-Di.patch + BuildRequires: meson gcc BuildRequires: glib2-devel libgudev1-devel BuildRequires: systemd systemd-devel @@ -88,6 +107,17 @@ rm ${RPM_BUILD_ROOT}/%{_bindir}/libwacom-show-stylus %{_datadir}/libwacom/layouts/*.svg %changelog +* Thu Aug 21 2025 Peter Hutterer - 1.12.1-5 +- Rearrange the OSD buttons for the Intuos Pro 3rd Gen (RHEL-101881) +- Use separate Ring/Ring2 assignments + +* Thu Jul 24 2025 Peter Hutterer - 1.12.1-4 +- Add support for the Cintiq Pro 27 (RHEL-101886) +- Add support for the Intuos Pro 3rd Gen series (RHEL-101881) + +* Mon Aug 05 2024 Peter Hutterer - 1.12.1-3 +- Add a set of newer Wacom tablets description files + * Mon Jan 31 2022 Peter Hutterer - 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)