From ff101c9c9b2a9c3b6d166b05dcedff17d7acfe0e Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 24 Sep 2025 08:11:17 +0000 Subject: [PATCH] import CS libwacom-2.14.0-3.el10 --- .gitignore | 2 +- .libwacom.metadata | 1 - ...-data-Add-3rd-gen-Intuos-Pro-devices.patch | 874 +++++++++++++++++ ...-data-Add-six-new-tablet-definitions.patch | 196 ++++ ...range-the-Intuos-Pro-3rd-L-M-buttons.patch | 908 ++++++++++++++++++ ...-rings-of-the-Intuos-Pro-3rd-down-in.patch | 136 +++ ...-Intuos-Pro-3rd-Gen-has-Rings-not-Di.patch | 379 ++++++++ ...4-51c7-Lenovo-IdeaPad-FLEX-14API-304.patch | 45 - ...e-Lenovo-ThinkPad-X1-Yoga-Gen-6-PIDs.patch | 233 ----- ...v4-51f9-Lenovo-ThinkPad-L13-Yoga-358.patch | 45 - ...vo-IdeaPad-Flex-5-14ARE05-ISDv4-5215.patch | 44 - ...4-51e9-Lenovo-ThinkPad-P15-Gen-1-325.patch | 46 - ...-ISDv4-523a-Lenovo-Yoga-9-14ITL5-357.patch | 45 - ...SDv4-5202-Lenovo-YOGA-C640-13IML-322.patch | 45 - ...SDv4-5204-Lenovo-YOGA-C640-13IML-356.patch | 45 - ...-ISDv4-5256-Lenovo-Yoga-7-15ITL5-351.patch | 45 - ...-X1-Yoga-3-Generation-ISDv4-5148-320.patch | 40 - ...216-Lenovo-IdeaPad-Flex-5-14IIL05-35.patch | 45 - ...ISDv4-528e-Lenovo-Yoga-6-13ARE05-346.patch | 45 - ...229-Lenovo-ThinkPad-X1-Yoga-Gen-5-34.patch | 45 - ...ThinkPad-X13-Yoga-Gen-1-ISDv4-5220-3.patch | 43 - ...072-Lenovo-ThinkPad-Yoga-11e-3rd-Gen.patch | 45 - SPECS/libwacom.spec => libwacom.spec | 250 ++++- sources | 1 + 24 files changed, 2698 insertions(+), 905 deletions(-) delete mode 100644 .libwacom.metadata create mode 100644 0001-data-Add-3rd-gen-Intuos-Pro-devices.patch create mode 100644 0002-data-Add-six-new-tablet-definitions.patch create mode 100644 0003-layouts-rearrange-the-Intuos-Pro-3rd-L-M-buttons.patch create mode 100644 0004-layouts-move-the-rings-of-the-Intuos-Pro-3rd-down-in.patch create mode 100644 0005-RHEL-pretend-the-Intuos-Pro-3rd-Gen-has-Rings-not-Di.patch delete mode 100644 SOURCES/0001-data-Add-ISDv4-51c7-Lenovo-IdeaPad-FLEX-14API-304.patch delete mode 100644 SOURCES/0001-data-Add-multiple-Lenovo-ThinkPad-X1-Yoga-Gen-6-PIDs.patch delete mode 100644 SOURCES/0002-data-Add-ISDv4-51f9-Lenovo-ThinkPad-L13-Yoga-358.patch delete mode 100644 SOURCES/0002-data-Add-enovo-IdeaPad-Flex-5-14ARE05-ISDv4-5215.patch delete mode 100644 SOURCES/0003-data-Add-ISDv4-51e9-Lenovo-ThinkPad-P15-Gen-1-325.patch delete mode 100644 SOURCES/0003-data-Add-ISDv4-523a-Lenovo-Yoga-9-14ITL5-357.patch delete mode 100644 SOURCES/0004-data-Add-ISDv4-5202-Lenovo-YOGA-C640-13IML-322.patch delete mode 100644 SOURCES/0004-data-Add-ISDv4-5204-Lenovo-YOGA-C640-13IML-356.patch delete mode 100644 SOURCES/0005-data-Add-ISDv4-5256-Lenovo-Yoga-7-15ITL5-351.patch delete mode 100644 SOURCES/0005-data-Add-Lenovo-X1-Yoga-3-Generation-ISDv4-5148-320.patch delete mode 100644 SOURCES/0006-data-Add-ISDv4-5216-Lenovo-IdeaPad-Flex-5-14IIL05-35.patch delete mode 100644 SOURCES/0007-data-Add-ISDv4-528e-Lenovo-Yoga-6-13ARE05-346.patch delete mode 100644 SOURCES/0008-data-Add-ISDv4-5229-Lenovo-ThinkPad-X1-Yoga-Gen-5-34.patch delete mode 100644 SOURCES/0009-data-Add-Lenovo-ThinkPad-X13-Yoga-Gen-1-ISDv4-5220-3.patch delete mode 100644 SOURCES/0010-data-Add-ISDv4-5072-Lenovo-ThinkPad-Yoga-11e-3rd-Gen.patch rename SPECS/libwacom.spec => libwacom.spec (56%) create mode 100644 sources diff --git a/.gitignore b/.gitignore index 2bf08bf..5607c43 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libwacom-1.6.tar.bz2 +libwacom-2.14.0.tar.xz diff --git a/.libwacom.metadata b/.libwacom.metadata deleted file mode 100644 index a89a61a..0000000 --- a/.libwacom.metadata +++ /dev/null @@ -1 +0,0 @@ -26814fff5ec4df35f4ecdc0345741569bf898322 SOURCES/libwacom-1.6.tar.bz2 diff --git a/0001-data-Add-3rd-gen-Intuos-Pro-devices.patch b/0001-data-Add-3rd-gen-Intuos-Pro-devices.patch new file mode 100644 index 0000000..bb5b921 --- /dev/null +++ b/0001-data-Add-3rd-gen-Intuos-Pro-devices.patch @@ -0,0 +1,874 @@ +From 7e27962b48ccf934ad78a4a11e5185be5d7f716d Mon Sep 17 00:00:00 2001 +From: Jason Gerecke +Date: Thu, 20 Jun 2024 10:32:57 -0700 +Subject: [PATCH libwacom 1/3] data: Add 3rd gen Intuos Pro devices + +Signed-off-by: Jason Gerecke +(cherry picked from commit 0dc703f7a727a869bf5c6a370a2a49a124716254) +--- + 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 | 57 ++++++ + data/wacom-intuos-pro-3-m.tablet | 57 ++++++ + data/wacom-intuos-pro-3-s.tablet | 54 ++++++ + 6 files changed, 813 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 ./data/layouts/wacom-intuos-pro-3-l.svg ../data/layouts/wacom-intuos-pro-3-l.svg +new file mode 100644 +index 000000000000..466fd9e8aa76 +--- /dev/null ++++ ../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 ./data/layouts/wacom-intuos-pro-3-m.svg ../data/layouts/wacom-intuos-pro-3-m.svg +new file mode 100644 +index 000000000000..ac3af53affd8 +--- /dev/null ++++ ../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 ./data/layouts/wacom-intuos-pro-3-s.svg ../data/layouts/wacom-intuos-pro-3-s.svg +new file mode 100644 +index 000000000000..ac0e3004d257 +--- /dev/null ++++ ../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 ./data/wacom-intuos-pro-3-l.tablet ../data/wacom-intuos-pro-3-l.tablet +new file mode 100644 +index 000000000000..0f3c27c502b2 +--- /dev/null ++++ ../data/wacom-intuos-pro-3-l.tablet +@@ -0,0 +1,57 @@ ++# 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 ++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 ./data/wacom-intuos-pro-3-m.tablet ../data/wacom-intuos-pro-3-m.tablet +new file mode 100644 +index 000000000000..850532273109 +--- /dev/null ++++ ../data/wacom-intuos-pro-3-m.tablet +@@ -0,0 +1,57 @@ ++# 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 ++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 ./data/wacom-intuos-pro-3-s.tablet ../data/wacom-intuos-pro-3-s.tablet +new file mode 100644 +index 000000000000..cb1210aacf31 +--- /dev/null ++++ ../data/wacom-intuos-pro-3-s.tablet +@@ -0,0 +1,54 @@ ++# 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 ++NumDials=1 ++ ++[Buttons] ++Left=A;B;C;D;E ++Dial=E ++DialNumModes=3 +-- +2.50.1 + diff --git a/0002-data-Add-six-new-tablet-definitions.patch b/0002-data-Add-six-new-tablet-definitions.patch new file mode 100644 index 0000000..cf82da7 --- /dev/null +++ b/0002-data-Add-six-new-tablet-definitions.patch @@ -0,0 +1,196 @@ +From 9c01425c38f8328fbde820cb8450ff84798b6434 Mon Sep 17 00:00:00 2001 +From: Erin Skomra +Date: Tue, 3 Jun 2025 16:29:15 -0700 +Subject: [PATCH libwacom 2/3] data: Add six new tablet definitions + +(cherry picked from commit 5f50c5a6a87fc3c9f3ff657c0b9261ed9ba60792) +--- + data/wacom-cintiq-16-3.tablet | 24 ++++++++++++++++++++++++ + data/wacom-cintiq-24-p.tablet | 23 +++++++++++++++++++++++ + data/wacom-cintiq-24-pt.tablet | 23 +++++++++++++++++++++++ + data/wacom-dth-246e.tablet | 22 ++++++++++++++++++++++ + data/wacom-dtk-168e.tablet | 22 ++++++++++++++++++++++ + data/wacom-dtk-246e.tablet | 22 ++++++++++++++++++++++ + 6 files changed, 136 insertions(+) + create mode 100644 data/wacom-cintiq-16-3.tablet + create mode 100644 data/wacom-cintiq-24-p.tablet + create mode 100644 data/wacom-cintiq-24-pt.tablet + create mode 100644 data/wacom-dth-246e.tablet + create mode 100644 data/wacom-dtk-168e.tablet + create mode 100644 data/wacom-dtk-246e.tablet + +diff --git ./data/wacom-cintiq-16-3.tablet ../data/wacom-cintiq-16-3.tablet +new file mode 100644 +index 000000000000..67ca8fb6b727 +--- /dev/null ++++ ../data/wacom-cintiq-16-3.tablet +@@ -0,0 +1,24 @@ ++# Wacom ++# Cintiq 16 ++# DTK168 ++# (Third Generation) ++# ++# sysinfo.zv99h6U7Eu ++# https://github.com/linuxwacom/wacom-hid-descriptors/issues/480 ++ ++[Device] ++Name=Wacom Cintiq 16 ++ModelName=DTK168 ++Class=Cintiq ++DeviceMatch=usb|056a|03e6 ++Width=14 ++Height=8 ++# No pad buttons, so no layout ++Styli=@propen3;@mobilestudio;@propengen2;@dth2242; ++IntegratedIn=Display ++ ++[Features] ++Stylus=true ++Reversible=false ++Touch=false ++NumRings=0 +diff --git ./data/wacom-cintiq-24-p.tablet ../data/wacom-cintiq-24-p.tablet +new file mode 100644 +index 000000000000..ad9dc4f68023 +--- /dev/null ++++ ../data/wacom-cintiq-24-p.tablet +@@ -0,0 +1,23 @@ ++# Wacom ++# Cintiq 24 ++# DTK246 ++# ++# sysinfo.L6MmOCV7Q2 ++# https://github.com/linuxwacom/wacom-hid-descriptors/issues/482 ++ ++[Device] ++Name=Wacom Cintiq 24 ++ModelName=DTK246 ++Class=Cintiq ++DeviceMatch=usb|056a|03e7 ++Width=21 ++Height=12 ++# No pad buttons, so no layout ++Styli=@propen3;@mobilestudio;@propengen2;@dth2242; ++IntegratedIn=Display ++ ++[Features] ++Stylus=true ++Reversible=false ++Touch=false ++NumRings=0 +diff --git ./data/wacom-cintiq-24-pt.tablet ../data/wacom-cintiq-24-pt.tablet +new file mode 100644 +index 000000000000..07536d3ca3b9 +--- /dev/null ++++ ../data/wacom-cintiq-24-pt.tablet +@@ -0,0 +1,23 @@ ++# Wacom ++# Cintiq 24 Touch ++# DTH246 ++# ++# sysinfo.CRGxDhjS94 ++# https://github.com/linuxwacom/wacom-hid-descriptors/issues/484 ++ ++[Device] ++Name=Wacom Cintiq 24 Touch ++ModelName=DTH246 ++Class=Cintiq ++DeviceMatch=usb|056a|03fd ++Width=21 ++Height=12 ++# No pad buttons, so no layout ++Styli=@propen3;@mobilestudio;@propengen2;@dth2242; ++IntegratedIn=Display ++ ++[Features] ++Stylus=true ++Reversible=false ++Touch=true ++NumRings=0 +diff --git ./data/wacom-dth-246e.tablet ../data/wacom-dth-246e.tablet +new file mode 100644 +index 000000000000..52bf04cfa33c +--- /dev/null ++++ ../data/wacom-dth-246e.tablet +@@ -0,0 +1,22 @@ ++# Wacom ++# DTH246E ++# ++# sysinfo.2ICtoho6hS ++# https://github.com/linuxwacom/wacom-hid-descriptors/issues/485 ++ ++[Device] ++Name=Wacom DTH246E ++ModelName=DTH246E ++Class=Cintiq ++DeviceMatch=usb|056a|03ff ++Width=21 ++Height=12 ++# No pad buttons, so no layout ++Styli=@propen3;@mobilestudio;@propengen2;@dth2242; ++IntegratedIn=Display ++ ++[Features] ++Stylus=true ++Reversible=false ++Touch=true ++NumRings=0 +diff --git ./data/wacom-dtk-168e.tablet ../data/wacom-dtk-168e.tablet +new file mode 100644 +index 000000000000..a31fa28cbb61 +--- /dev/null ++++ ../data/wacom-dtk-168e.tablet +@@ -0,0 +1,22 @@ ++# Wacom ++# DTK168E ++# ++# sysinfo.uLCGuCfeSd ++# https://github.com/linuxwacom/wacom-hid-descriptors/issues/481 ++ ++[Device] ++Name=Wacom DTK168E ++ModelName=DTK168E ++Class=Cintiq ++DeviceMatch=usb|056a|03ee ++Width=14 ++Height=8 ++# No pad buttons, so no layout ++Styli=@propen3;@mobilestudio;@propengen2;@dth2242; ++IntegratedIn=Display ++ ++[Features] ++Stylus=true ++Reversible=false ++Touch=false ++NumRings=0 +diff --git ./data/wacom-dtk-246e.tablet ../data/wacom-dtk-246e.tablet +new file mode 100644 +index 000000000000..c6477d5cab10 +--- /dev/null ++++ ../data/wacom-dtk-246e.tablet +@@ -0,0 +1,22 @@ ++# Wacom ++# DTK246E ++# ++# sysinfo.JNkcjQCftR ++# https://github.com/linuxwacom/wacom-hid-descriptors/issues/483 ++ ++[Device] ++Name=Wacom DTK246E ++ModelName=DTK246E ++Class=Cintiq ++DeviceMatch=usb|056a|03ef ++Width=21 ++Height=12 ++# No pad buttons, so no layout ++Styli=@propen3;@mobilestudio;@propengen2;@dth2242; ++IntegratedIn=Display ++ ++[Features] ++Stylus=true ++Reversible=false ++Touch=false ++NumRings=0 +-- +2.50.1 + diff --git a/0003-layouts-rearrange-the-Intuos-Pro-3rd-L-M-buttons.patch b/0003-layouts-rearrange-the-Intuos-Pro-3rd-L-M-buttons.patch new file mode 100644 index 0000000..a8f6f95 --- /dev/null +++ b/0003-layouts-rearrange-the-Intuos-Pro-3rd-L-M-buttons.patch @@ -0,0 +1,908 @@ +From 291b930d2ff29d3a05e5716a75d2501de0156074 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/0004-layouts-move-the-rings-of-the-Intuos-Pro-3rd-down-in.patch b/0004-layouts-move-the-rings-of-the-Intuos-Pro-3rd-down-in.patch new file mode 100644 index 0000000..2374fc1 --- /dev/null +++ b/0004-layouts-move-the-rings-of-the-Intuos-Pro-3rd-down-in.patch @@ -0,0 +1,136 @@ +From eac68337e0c9e41b58b6a1a8e9016652251b0f4c 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/0005-RHEL-pretend-the-Intuos-Pro-3rd-Gen-has-Rings-not-Di.patch b/0005-RHEL-pretend-the-Intuos-Pro-3rd-Gen-has-Rings-not-Di.patch new file mode 100644 index 0000000..941c0e5 --- /dev/null +++ b/0005-RHEL-pretend-the-Intuos-Pro-3rd-Gen-has-Rings-not-Di.patch @@ -0,0 +1,379 @@ +From 2789337d782623967920fe495142f8de83b6b6fb 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. + +Signed-off-by: Peter Hutterer +--- + 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 | 22 ++++++++--- + data/wacom-intuos-pro-3-m.tablet | 22 ++++++++--- + data/wacom-intuos-pro-3-s.tablet | 16 ++++++-- + 6 files changed, 117 insertions(+), 83 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 0f3c27c502b2..48aec1e7b20a 100644 +--- a/data/wacom-intuos-pro-3-l.tablet ++++ b/data/wacom-intuos-pro-3-l.tablet +@@ -46,12 +46,24 @@ Styli=@mobilestudio;@propengen2;@propen3;@udpen; + Stylus=true + Reversible=false + Touch=false +-NumDials=2 ++# 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 ++NumRings=2 ++StatusLEDs=Ring2;Ring + + [Buttons] + Left=A;B;C;D;I + Right=E;F;G;H;J +-Dial=I +-Dial2=J +-DialNumModes=3 +-Dial2NumModes=3 ++# 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 850532273109..de3ef0261234 100644 +--- a/data/wacom-intuos-pro-3-m.tablet ++++ b/data/wacom-intuos-pro-3-m.tablet +@@ -46,12 +46,24 @@ Styli=@mobilestudio;@propengen2;@propen3;@udpen; + Stylus=true + Reversible=false + Touch=false +-NumDials=2 ++# 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 ++NumRings=2 ++StatusLEDs=Ring2;Ring + + [Buttons] + Left=A;B;C;D;I + Right=E;F;G;H;J +-Dial=I +-Dial2=J +-DialNumModes=3 +-Dial2NumModes=3 ++# 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 cb1210aacf31..6b6f663be147 100644 +--- a/data/wacom-intuos-pro-3-s.tablet ++++ b/data/wacom-intuos-pro-3-s.tablet +@@ -46,9 +46,19 @@ Styli=@mobilestudio;@propengen2;@propen3;@udpen; + Stylus=true + Reversible=false + Touch=false +-NumDials=1 ++# 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 ++NumRings=1 + + [Buttons] + Left=A;B;C;D;E +-Dial=E +-DialNumModes=3 ++# RHEL-specific change, see above ++# Dial=E ++# DialNumModes=3 ++Ring=E ++RingNumModes=3 ++Ring2NumModes=3 +-- +2.50.1 + diff --git a/SOURCES/0001-data-Add-ISDv4-51c7-Lenovo-IdeaPad-FLEX-14API-304.patch b/SOURCES/0001-data-Add-ISDv4-51c7-Lenovo-IdeaPad-FLEX-14API-304.patch deleted file mode 100644 index 482d707..0000000 --- a/SOURCES/0001-data-Add-ISDv4-51c7-Lenovo-IdeaPad-FLEX-14API-304.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4d812e1f7031a1021d09cbcf2e58d7456759c6a1 Mon Sep 17 00:00:00 2001 -From: Jason Gerecke -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 -(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 - diff --git a/SOURCES/0001-data-Add-multiple-Lenovo-ThinkPad-X1-Yoga-Gen-6-PIDs.patch b/SOURCES/0001-data-Add-multiple-Lenovo-ThinkPad-X1-Yoga-Gen-6-PIDs.patch deleted file mode 100644 index 04275fa..0000000 --- a/SOURCES/0001-data-Add-multiple-Lenovo-ThinkPad-X1-Yoga-Gen-6-PIDs.patch +++ /dev/null @@ -1,233 +0,0 @@ -From 7175da4b10d3384748737632d91fbda44138350a Mon Sep 17 00:00:00 2001 -From: Jason Gerecke -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 -(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 - diff --git a/SOURCES/0002-data-Add-ISDv4-51f9-Lenovo-ThinkPad-L13-Yoga-358.patch b/SOURCES/0002-data-Add-ISDv4-51f9-Lenovo-ThinkPad-L13-Yoga-358.patch deleted file mode 100644 index edb97ca..0000000 --- a/SOURCES/0002-data-Add-ISDv4-51f9-Lenovo-ThinkPad-L13-Yoga-358.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4aaa8f1ff954b5fefecc20456c2d3df63f5507e5 Mon Sep 17 00:00:00 2001 -From: Jason Gerecke -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 -(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 - diff --git a/SOURCES/0002-data-Add-enovo-IdeaPad-Flex-5-14ARE05-ISDv4-5215.patch b/SOURCES/0002-data-Add-enovo-IdeaPad-Flex-5-14ARE05-ISDv4-5215.patch deleted file mode 100644 index 2fa9327..0000000 --- a/SOURCES/0002-data-Add-enovo-IdeaPad-Flex-5-14ARE05-ISDv4-5215.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9c8b75f072369cfce39fcde6b758eba1b3948852 Mon Sep 17 00:00:00 2001 -From: Jason Gerecke -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 - diff --git a/SOURCES/0003-data-Add-ISDv4-51e9-Lenovo-ThinkPad-P15-Gen-1-325.patch b/SOURCES/0003-data-Add-ISDv4-51e9-Lenovo-ThinkPad-P15-Gen-1-325.patch deleted file mode 100644 index 978ca8d..0000000 --- a/SOURCES/0003-data-Add-ISDv4-51e9-Lenovo-ThinkPad-P15-Gen-1-325.patch +++ /dev/null @@ -1,46 +0,0 @@ -From cc965fbbf2659ea6a6c7b484d2e2ec910a314833 Mon Sep 17 00:00:00 2001 -From: Jason Gerecke -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 -(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 - diff --git a/SOURCES/0003-data-Add-ISDv4-523a-Lenovo-Yoga-9-14ITL5-357.patch b/SOURCES/0003-data-Add-ISDv4-523a-Lenovo-Yoga-9-14ITL5-357.patch deleted file mode 100644 index 70ebd8a..0000000 --- a/SOURCES/0003-data-Add-ISDv4-523a-Lenovo-Yoga-9-14ITL5-357.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 3db830963fbf494ffa8a876049f73b25b7318930 Mon Sep 17 00:00:00 2001 -From: Jason Gerecke -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 -(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 - diff --git a/SOURCES/0004-data-Add-ISDv4-5202-Lenovo-YOGA-C640-13IML-322.patch b/SOURCES/0004-data-Add-ISDv4-5202-Lenovo-YOGA-C640-13IML-322.patch deleted file mode 100644 index 17f1383..0000000 --- a/SOURCES/0004-data-Add-ISDv4-5202-Lenovo-YOGA-C640-13IML-322.patch +++ /dev/null @@ -1,45 +0,0 @@ -From eff4978104a3a2bd2838638df52cb2238c316b65 Mon Sep 17 00:00:00 2001 -From: Jason Gerecke -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 - diff --git a/SOURCES/0004-data-Add-ISDv4-5204-Lenovo-YOGA-C640-13IML-356.patch b/SOURCES/0004-data-Add-ISDv4-5204-Lenovo-YOGA-C640-13IML-356.patch deleted file mode 100644 index 24430fb..0000000 --- a/SOURCES/0004-data-Add-ISDv4-5204-Lenovo-YOGA-C640-13IML-356.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 10c8bad082a20e0c237670b5ff936144527fd746 Mon Sep 17 00:00:00 2001 -From: Jason Gerecke -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 -(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 - diff --git a/SOURCES/0005-data-Add-ISDv4-5256-Lenovo-Yoga-7-15ITL5-351.patch b/SOURCES/0005-data-Add-ISDv4-5256-Lenovo-Yoga-7-15ITL5-351.patch deleted file mode 100644 index f3f4afc..0000000 --- a/SOURCES/0005-data-Add-ISDv4-5256-Lenovo-Yoga-7-15ITL5-351.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 6aa08f536af7ec259b27618a363e0c0194e04856 Mon Sep 17 00:00:00 2001 -From: Jason Gerecke -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 -(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 - diff --git a/SOURCES/0005-data-Add-Lenovo-X1-Yoga-3-Generation-ISDv4-5148-320.patch b/SOURCES/0005-data-Add-Lenovo-X1-Yoga-3-Generation-ISDv4-5148-320.patch deleted file mode 100644 index 440df4d..0000000 --- a/SOURCES/0005-data-Add-Lenovo-X1-Yoga-3-Generation-ISDv4-5148-320.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 1fa7c62f266e1c7ff15470422561490169987493 Mon Sep 17 00:00:00 2001 -From: Leon Fattakhov -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 - diff --git a/SOURCES/0006-data-Add-ISDv4-5216-Lenovo-IdeaPad-Flex-5-14IIL05-35.patch b/SOURCES/0006-data-Add-ISDv4-5216-Lenovo-IdeaPad-Flex-5-14IIL05-35.patch deleted file mode 100644 index f0237e8..0000000 --- a/SOURCES/0006-data-Add-ISDv4-5216-Lenovo-IdeaPad-Flex-5-14IIL05-35.patch +++ /dev/null @@ -1,45 +0,0 @@ -From b2aac6115763bdfddb5adf45e6e3d4e193da8589 Mon Sep 17 00:00:00 2001 -From: Jason Gerecke -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 -(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 - diff --git a/SOURCES/0007-data-Add-ISDv4-528e-Lenovo-Yoga-6-13ARE05-346.patch b/SOURCES/0007-data-Add-ISDv4-528e-Lenovo-Yoga-6-13ARE05-346.patch deleted file mode 100644 index b9aaf23..0000000 --- a/SOURCES/0007-data-Add-ISDv4-528e-Lenovo-Yoga-6-13ARE05-346.patch +++ /dev/null @@ -1,45 +0,0 @@ -From c97281874ca1ae68e966d0f972afbf82506ce35b Mon Sep 17 00:00:00 2001 -From: Jason Gerecke -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 -(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 - diff --git a/SOURCES/0008-data-Add-ISDv4-5229-Lenovo-ThinkPad-X1-Yoga-Gen-5-34.patch b/SOURCES/0008-data-Add-ISDv4-5229-Lenovo-ThinkPad-X1-Yoga-Gen-5-34.patch deleted file mode 100644 index b83fa46..0000000 --- a/SOURCES/0008-data-Add-ISDv4-5229-Lenovo-ThinkPad-X1-Yoga-Gen-5-34.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 7e3c0f35d7b4f88133d0f83fa747741fd1f8aa18 Mon Sep 17 00:00:00 2001 -From: Jason Gerecke -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 -(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 - diff --git a/SOURCES/0009-data-Add-Lenovo-ThinkPad-X13-Yoga-Gen-1-ISDv4-5220-3.patch b/SOURCES/0009-data-Add-Lenovo-ThinkPad-X13-Yoga-Gen-1-ISDv4-5220-3.patch deleted file mode 100644 index 694549a..0000000 --- a/SOURCES/0009-data-Add-Lenovo-ThinkPad-X13-Yoga-Gen-1-ISDv4-5220-3.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 3cf507ddec0e4ae3e0f310d0a822414a83e9df35 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Matthias=20Bl=C3=BCmel?= -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 - diff --git a/SOURCES/0010-data-Add-ISDv4-5072-Lenovo-ThinkPad-Yoga-11e-3rd-Gen.patch b/SOURCES/0010-data-Add-ISDv4-5072-Lenovo-ThinkPad-Yoga-11e-3rd-Gen.patch deleted file mode 100644 index c0318ac..0000000 --- a/SOURCES/0010-data-Add-ISDv4-5072-Lenovo-ThinkPad-Yoga-11e-3rd-Gen.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 694f2e10202fb6ae44aaa3d09d71228b852ed815 Mon Sep 17 00:00:00 2001 -From: Jason Gerecke -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 -(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 - diff --git a/SPECS/libwacom.spec b/libwacom.spec similarity index 56% rename from SPECS/libwacom.spec rename to libwacom.spec index 7bfea49..b57d6da 100644 --- a/SPECS/libwacom.spec +++ b/libwacom.spec @@ -1,37 +1,24 @@ Name: libwacom -Version: 1.6 +Version: 2.14.0 Release: 3%{?dist} Summary: Tablet Information Client Library Requires: %{name}-data -Group: System Environment/Libraries -License: MIT +License: HPND 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 +Source0: https://github.com/linuxwacom/libwacom/releases/download/%{name}-%{version}/%{name}-%{version}.tar.xz +Patch01: 0001-data-Add-3rd-gen-Intuos-Pro-devices.patch +Patch02: 0002-data-Add-six-new-tablet-definitions.patch +Patch03: 0003-layouts-rearrange-the-Intuos-Pro-3rd-L-M-buttons.patch +Patch04: 0004-layouts-move-the-rings-of-the-Intuos-Pro-3rd-down-in.patch +Patch05: 0005-RHEL-pretend-the-Intuos-Pro-3rd-Gen-has-Rings-not-Di.patch BuildRequires: meson gcc -BuildRequires: glib2-devel libgudev1-devel +BuildRequires: glib2-devel libgudev1-devel libevdev-devel BuildRequires: systemd systemd-devel -BuildRequires: git +BuildRequires: git-core BuildRequires: libxml2-devel Requires: %{name}-data = %{version}-%{release} @@ -42,32 +29,33 @@ 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. + +%package utils +Summary: Tablet Information Client Library Utilities Package +Requires: %{name} = %{version}-%{release} +Requires: python3-libevdev python3-pyudev + +%description utils +Utilities to handle and/or debug libwacom devices. %prep %autosetup -S git %build -%meson -Dtests=enabled -Ddocumentation=disabled +%meson -Dtests=disabled -Ddocumentation=disabled %meson_build %install @@ -84,6 +72,8 @@ install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir} %doc README.md %{_libdir}/libwacom.so.* %{_bindir}/libwacom-list-local-devices +%{_bindir}/libwacom-update-db + %{_mandir}/man1/libwacom-list-local-devices.1* %files devel @@ -103,27 +93,193 @@ install -d ${RPM_BUILD_ROOT}/%{_udevrulesdir} %dir %{_datadir}/libwacom/layouts %{_datadir}/libwacom/layouts/*.svg -%changelog -* Wed May 26 2021 Peter Hutterer 1.6-3 -- Add Lenovo tablet files from upstream (#1940874) +%files utils +%{_bindir}/libwacom-list-devices +%{_bindir}/libwacom-show-stylus +%{_mandir}/man1/libwacom-list-devices.1* +%{_mandir}/man1/libwacom-show-stylus.1* -* Wed Jan 13 2021 Peter Hutterer 1.6-2 -- Add Lenovo tablet files from upstream (#1914411) +%changelog +* Wed Aug 20 2025 Peter Hutterer - 2.14.0-3 +- Rearrange the button leaders for the Intuos Pro 3rd Gen (RHEL-101873) + +* Tue Jul 22 2025 Peter Hutterer - 2.14.0-2 +- Add Wacom Intuos Pro 3rd Gen and newest Cintiqs (RHEL-101873) + +* Mon Dec 16 2024 Peter Hutterer - 2.14-1 +- libwacom 2.14 (RHEL-70830) + +* Tue Oct 29 2024 Troy Dawson - 2.12.2-3 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 2.12.2-2 +- Bump release for June 2024 mass rebuild + +* Fri Jun 21 2024 Peter Hutterer - 2.12.2-1 +- libwacom 2.12.2 + +* Wed Jun 12 2024 Peter Hutterer 2.12.1-1 +- libwacom 2.12.1 + +* Thu Jun 06 2024 Peter Hutterer 2.12.0-1 +- libwacom 2.12 + +* Wed Feb 07 2024 Peter Hutterer - 2.10.0-1 +- libwacom 2.10.0 + +* Thu Jan 25 2024 Fedora Release Engineering - 2.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 2.9.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Nov 27 2023 Peter Hutterer - 2.9.0-1 +- libwacom 2.9.0 + +* Tue Sep 05 2023 Peter Hutterer +- SPDX migration: update to SPDX identifiers. + Turns out the COPYING file references the HPND, not MIT. + +* Thu Aug 31 2023 Peter Hutterer - 2.8.0-1 +- libwacom 2.8.0 + +* Thu Jul 20 2023 Fedora Release Engineering - 2.7.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed May 17 2023 Peter Hutterer - 2.7.0-1 +- libwacom 2.7.0 + +* Mon Jan 23 2023 Peter Hutterer - 2.6.0-1 +- libwacom 2.6.0 + +* Thu Jan 19 2023 Fedora Release Engineering - 2.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 28 2022 Peter Hutterer - 2.4.0-1 +- libwacom 2.4.0 + +* Thu Jul 21 2022 Fedora Release Engineering - 2.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 20 2022 Peter Hutterer - 2.3.0-1 +- libwacom 2.3.0 + +* Fri Mar 25 2022 Peter Hutterer - 2.2.0-1 +- libwacom 2.2.0 + +* Fri Feb 11 2022 Peter Hutterer - 2.1.0-1 +- libwacom 2.1.0 + +* Mon Jan 31 2022 Peter Hutterer - 2.0.0-3 +- Split utilities into a separate package (#2047568) + libwacom-list-local-devices is the most commonly used one so let's leave + that in the main package, the others are for debugging so let's move them + out. + +* Thu Jan 20 2022 Fedora Release Engineering - 2.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Jan 17 2022 Peter Hutterer - 2.0.0-1 +- libwacom 2.0.0 + +* Mon Dec 13 2021 Peter Hutterer - 1.99.1-1 +- libwacom 1.99.1 + +* Wed Sep 01 2021 Peter Hutterer - 1.12-1 +- libwacom 1.12 + +* Thu Jul 22 2021 Fedora Release Engineering - 1.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jul 16 2021 Peter Hutterer - 1.11-1 +- libwacom 1.11 + +* Wed Apr 28 2021 Peter Hutterer 1.10-1 +- libwacom 1.10 + +* Thu Mar 25 2021 Peter Hutterer 1.9-2 +- Add X1 Yoga6 data files (#1940872) + +* Wed Feb 24 2021 Peter Hutterer 1.9-1 +- libwacom 1.9 + +* Tue Feb 09 2021 Peter Hutterer 1.8-2 +- Add tablet file for Lenovo Yoga 6 + +* Fri Jan 29 2021 Peter Hutterer 1.8-1 +- libwacom 1.8 + +* Tue Jan 26 2021 Fedora Release Engineering - 1.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Jan 14 2021 Peter Hutterer 1.7-2 +- Add tablet file for Lenovo ThinkPad P15 (#1914409) + +* Thu Dec 17 2020 Peter Hutterer 1.7-1 +- libwacom 1.7 + +* Wed Nov 04 2020 Peter Hutterer 1.6-2 +- Change BuildRequires to git-core, we don't need full git * Tue Nov 03 2020 Peter Hutterer 1.6-1 -- libwacom 1.6 (#1878160) +- libwacom 1.6 -* Thu Jun 25 2020 Peter Hutterer 1.1-3 -- Add a set of Lenovo tablets and styli (#1850319) +* Mon Aug 31 2020 Peter Hutterer 1.5-1 +- libwacom 1.5 + +* Tue Jul 28 2020 Fedora Release Engineering - 1.4.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jun 30 2020 Peter Hutterer 1.4.1-1 +- libwacom 1.4.1 + +* Wed Jun 24 2020 Peter Hutterer 1.4-1 +- libwacom 1.4 + +* Wed Mar 25 2020 Peter Hutterer 1.3-1 +- libwacom 1.3 + +* Wed Jan 29 2020 Fedora Release Engineering - 1.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Dec 23 2019 Peter Hutterer 1.2-2 +- Disable documentation explicitly. Fedora uses --auto-features=enabled + during the build. + +* Mon Dec 23 2019 Peter Hutterer 1.2-1 +- libwacom 1.2 * Thu Nov 07 2019 Peter Hutterer 1.1-2 -- Conflict with older libwacom +- Require a libwacom-data package of the same version -* Thu Nov 07 2019 Peter Hutterer 1.1-1 -- libwacom 1.1 (#1741423) +* Mon Sep 16 2019 Peter Hutterer 1.1-1 +- libwacom 1.1 + +* Mon Aug 26 2019 Peter Hutterer 1.0-1 +- libwacom 1.0 + +* Thu Aug 08 2019 Peter Hutterer 0.99.901-1 +- libwacom 1.0rc1 +- switch to meson + +* Thu Jul 25 2019 Fedora Release Engineering - 0.33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Apr 12 2019 Peter Hutterer 0.33-1 +- libwacom 0.33 + +* Fri Feb 01 2019 Fedora Release Engineering - 0.32-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Nov 12 2018 Peter Hutterer 0.32-2 +- Move the udev rule to the noarch libwacom-data package (#1648743) + +* Mon Nov 05 2018 Peter Hutterer 0.32-1 +- libwacom 0.32 * Thu Aug 09 2018 Peter Hutterer 0.31-1 -- libwacom 0.31 (#1612758) +- libwacom 0.31 * Fri Jul 13 2018 Fedora Release Engineering - 0.30-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources new file mode 100644 index 0000000..9c33452 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (libwacom-2.14.0.tar.xz) = f2980d4728d3164be325a9a21cf0c27a7d8004c6812f9c1e730916259420b666cc2e5d6166acdb55542a8a35533291d1bd7284a58c2a194558a77215d1580f86