From 781f18d9eebecb7d847232f757052c2b0eb5b9cc Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Thu, 5 Sep 2024 03:38:45 +0300 Subject: [PATCH] import libwacom-1.12.1-3.el9_4 --- ...unknown-BuiltIn-key-from-the-DTU1931.patch | 23 + ...02-Add-description-for-elan-2a70-466.patch | 37 ++ ...t-for-a-new-Wacom-One-Pen-Display-13.patch | 31 ++ ...4-data-add-Wacom-One-12-Wacom-One-13.patch | 77 +++ .../0005-data-Add-Wacom-One-pen-tablet.patch | 91 ++++ ...0006-data-add-Wacom-Cintiq-Pro-22-17.patch | 505 ++++++++++++++++++ ...007-Add-support-for-Wacom-Movink-673.patch | 262 +++++++++ ...d-support-for-a-new-Intuos-Pro-Small.patch | 29 + ...-wacom-movink.tablet-add-more-groups.patch | 31 ++ ...-memcmp-the-led-data-if-we-have-leds.patch | 31 ++ ...k-13.tablet-correct-the-product-name.patch | 51 ++ ....svg-correct-the-name-of-the-product.patch | 57 ++ SPECS/libwacom.spec | 18 +- 13 files changed, 1242 insertions(+), 1 deletion(-) create mode 100644 SOURCES/0001-data-remove-unknown-BuiltIn-key-from-the-DTU1931.patch create mode 100644 SOURCES/0002-Add-description-for-elan-2a70-466.patch create mode 100644 SOURCES/0003-Add-support-for-a-new-Wacom-One-Pen-Display-13.patch create mode 100644 SOURCES/0004-data-add-Wacom-One-12-Wacom-One-13.patch create mode 100644 SOURCES/0005-data-Add-Wacom-One-pen-tablet.patch create mode 100644 SOURCES/0006-data-add-Wacom-Cintiq-Pro-22-17.patch create mode 100644 SOURCES/0007-Add-support-for-Wacom-Movink-673.patch create mode 100644 SOURCES/0008-Add-support-for-a-new-Intuos-Pro-Small.patch create mode 100644 SOURCES/0009-wacom-movink.tablet-add-more-groups.patch create mode 100644 SOURCES/0010-libwacom-only-memcmp-the-led-data-if-we-have-leds.patch create mode 100644 SOURCES/0011-wacom-movink-13.tablet-correct-the-product-name.patch create mode 100644 SOURCES/0012-wacom-movink-13.svg-correct-the-name-of-the-product.patch 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/SPECS/libwacom.spec b/SPECS/libwacom.spec index 1390d68..b9f0db4 100644 --- a/SPECS/libwacom.spec +++ b/SPECS/libwacom.spec @@ -1,6 +1,6 @@ Name: libwacom Version: 1.12.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tablet Information Client Library Requires: %{name}-data @@ -9,6 +9,19 @@ 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 + BuildRequires: meson gcc BuildRequires: glib2-devel libgudev1-devel BuildRequires: systemd systemd-devel @@ -88,6 +101,9 @@ rm ${RPM_BUILD_ROOT}/%{_bindir}/libwacom-show-stylus %{_datadir}/libwacom/layouts/*.svg %changelog +* Mon Aug 05 2024 Peter Hutterer - 1.12.1-3 +- Add a set of newer Wacom tablets description files + * Wed Mar 15 2023 MSVSphere Packaging Team - 1.12.1-2 - Rebuilt for MSVSphere 9.1.