rpms/libwacom
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import CS libwacom-2.14.0-3.el10

Browse Source
This commit is contained in:
eabdullin 2025-09-24 08:11:17 +00:00
parent 993ad96de9
commit ff101c9c9b
24 changed files with 2698 additions and 905 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/libwacom-1.6.tar.bz2
libwacom-2.14.0.tar.xz

1
.libwacom.metadata
View File

@ -1 +0,0 @@
26814fff5ec4df35f4ecdc0345741569bf898322 SOURCES/libwacom-1.6.tar.bz2

874
0001-data-Add-3rd-gen-Intuos-Pro-devices.patch Normal file
View File

@ -0,0 +1,874 @@
From 7e27962b48ccf934ad78a4a11e5185be5d7f716d Mon Sep 17 00:00:00 2001
From: Jason Gerecke <killertofu@gmail.com>
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 <jason.gerecke@wacom.com>
(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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ width="377mm"
+ height="252mm"
+ viewBox="0 0 377 252"
+ version="1.1"
+ id="intuos-pro-l-ptk870"
+ style="fill:none;stroke:#7f7f7f;stroke-width:0.25;font-size:6;font-family:monospace"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg">
+ <title
+ id="title">Wacom Intuos Pro L (PTK870)</title>
+ <g
+ id="g1">
+ <path
+ id="ButtonA"
+ class="Button A"
+ d="M 123.918 6.4004 C 118.908 1.76944 111.18 1.76813 106.168 6.3974 L 110.541 10.7699 C 113.131 8.54602 116.957 8.5473 119.546 10.7729 Z" />
+ <path
+ id="LeaderA"
+ class="Leader A"
+ d="M 93.7051 6.89279 L 109.952 6.89279" />
+ <text
+ id="LabelA"
+ class="Label A"
+ x="88.7051"
+ y="7.11235"
+ style="text-anchor:end;">A</text>
+ </g>
+ <g
+ id="g2">
+ <path
+ id="ButtonB"
+ class="Button B"
+ d="M 120.243 20.4721 L 124.629 24.8587 C 129.276 19.8443 129.277 12.0967 124.63 7.08171 L 120.242 11.4696 C 122.466 14.0587 122.466 17.8831 120.242 20.4721 Z" />
+ <path
+ id="LeaderB"
+ class="Leader B"
+ d="M 93.7051 43.56015 L 125.909 43.56015 L 125.835 19.5" />
+ <text
+ id="LabelB"
+ class="Label B"
+ x="88.7051"
+ y="43.77971"
+ style="text-anchor:end;">B</text>
+ </g>
+ <g
+ id="g3">
+ <path
+ id="ButtonC"
+ class="Button C"
+ d="M 110.519 21.1934 L 106.154 25.5581 C 111.17 30.2049 118.918 30.2035 123.932 25.5551 L 119.568 21.1904 C 116.972 23.4409 113.116 23.4417 110.519 21.1924 Z" />
+ <path
+ id="LeaderC"
+ class="Leader C"
+ d="M 93.7051 25.22647 L 109.952 25.22647" />
+ <text
+ id="LabelC"
+ class="Label C"
+ x="88.7051"
+ y="25.44603"
+ style="text-anchor:end;">C</text>
+ </g>
+ <g
+ id="g4">
+ <path
+ id="ButtonD"
+ class="Button D"
+ d="M 109.844 11.4671 L 105.472 7.09461 C 100.841 12.1059 100.841 19.8351 105.472 24.8459 L 109.844 20.4747 C 107.618 17.8848 107.618 14.057 109.844 11.4671 Z" />
+ <path
+ id="LeaderD"
+ class="Leader D"
+ d="M 93.7051 16.05963 L 104.335 16.05963" />
+ <text
+ id="LabelD"
+ class="Label D"
+ x="88.7051"
+ y="16.27919"
+ style="text-anchor:end;">D</text>
+ </g>
+ <g
+ id="g5">
+ <path
+ id="ButtonI"
+ class="Button I ModeSwitch"
+ d="M 115.039 10.6101 C 112.868 10.6101 110.911 11.9178 110.08 13.9235 C 109.25 15.9292 109.709 18.2378 111.244 19.7729 C 112.779 21.308 115.088 21.7672 117.093 20.9364 C 119.099 20.1057 120.407 18.1485 120.407 15.9776 C 120.407 14.554 119.841 13.1888 118.835 12.1822 C 117.828 11.1756 116.463 10.6101 115.039 10.6101 Z" />
+ <path
+ id="LeaderI"
+ class="Leader I ModeSwitch"
+ d="M 93.7051 34.39331 L 115.113 34.39331 L 115.039 19.5003" />
+ <text
+ id="LabelI"
+ class="Label I ModeSwitch"
+ x="88.7051"
+ y="34.61287"
+ style="text-anchor:end;">I</text>
+ </g>
+ <g
+ id="g7">
+ <path
+ id="DialCCW"
+ class="DialCCW Button"
+ d="M 143.885 5.88344 L 146.132 4.78296 L 146.132 5.51662 C 147.475 5.43235 148.804 5.82284 149.877 6.61708 C 148.73 6.00801 147.38 5.87584 146.132 6.25026 L 146.132 6.9839 Z" />
+ <path
+ id="LeaderDialCCW"
+ class="DialCCW Dial Leader"
+ d="M 151.853 6.89279 L 166.099 6.89279" />
+ <text
+ id="LabelDialCCW"
+ class="DialCCW Dial Label"
+ x="171.099"
+ y="7.2452002"
+ style="text-anchor:start;">CCW</text>
+ <path
+ id="DialCW"
+ class="DialCW Button"
+ d="M 143.883 26.4255 L 146.13 25.3251 L 146.13 26.0587 C 147.428 26.2501 148.753 25.9905 149.875 25.3251 C 148.902 26.3215 147.537 26.8566 146.13 26.7923 L 146.13 27.526 Z" />
+ <path
+ id="LeaderDialCW"
+ class="DialCW Dial Leader"
+ d="M 151.853 25.0477 L 166.099 25.0477" />
+ <text
+ id="LabelDialCW"
+ class="DialCW Dial Label"
+ x="171.099"
+ y="25.45682"
+ style="text-anchor:start;">CW</text>
+ <path
+ id="Dial"
+ class="Dial TouchDial"
+ d="M 146.854 3.00752 C 141.607 3.00752 136.878 6.16756 134.87 11.0141 C 132.863 15.8607 133.972 21.4393 137.682 25.1487 C 141.391 28.8581 146.97 29.9677 151.817 27.9602 C 156.664 25.9527 159.824 21.2234 159.824 15.9775 C 159.824 8.81439 154.017 3.00752 146.854 3.00752 Z" />
+ </g>
+ <g
+ id="g11">
+ <path
+ id="ButtonE"
+ class="Button E"
+ d="M 270.744 6.44612 C 265.734 1.81516 258.006 1.81385 252.994 6.44312 L 257.367 10.8156 C 259.957 8.59174 263.783 8.59302 266.372 10.8186 Z" />
+ <path
+ id="LeaderE"
+ class="Leader E"
+ d="M 283.198 6.93851 L 266.952 6.93851" />
+ <text
+ id="LabelE"
+ class="Label E"
+ x="288.198"
+ y="7.11235"
+ style="text-anchor:start;">E</text>
+ </g>
+ <g
+ id="g12">
+ <path
+ id="ButtonF"
+ class="Button F"
+ d="M 267.068 20.5178 L 271.455 24.9044 C 276.102 19.89 276.103 12.1424 271.456 7.12743 L 267.068 11.5153 C 269.291 14.1044 269.291 17.9288 267.068 20.5178 Z" />
+ <path
+ id="LeaderF"
+ class="Leader F"
+ d="M 283.198 16.05963 L 272.569 16.05963" />
+ <text
+ id="LabelF"
+ class="Label F"
+ x="288.198"
+ y="16.27919"
+ style="text-anchor:start;">F</text>
+ </g>
+ <g
+ id="g13">
+ <path
+ id="ButtonG"
+ class="Button G"
+ d="M 257.345 21.2391 L 252.98 25.6038 C 257.996 30.2506 265.744 30.2492 270.758 25.6008 L 266.394 21.2361 C 263.797 23.4866 259.942 23.4874 257.345 21.2381 Z" />
+ <path
+ id="LeaderG"
+ class="Leader G"
+ d="M 283.198 25.22647 L 266.952 25.22647" />
+ <text
+ id="LabelG"
+ class="Label G"
+ x="288.198"
+ y="25.44603"
+ style="text-anchor:start;">G</text>
+ </g>
+ <g
+ id="g14">
+ <path
+ id="ButtonH"
+ class="Button H"
+ d="M 256.67 11.5128 L 252.297 7.14033 C 247.667 12.1516 247.667 19.8808 252.298 24.8916 L 256.67 20.5204 C 254.443 17.9305 254.443 14.1027 256.67 11.5128 Z" />
+ <path
+ id="LeaderH"
+ class="Leader H"
+ d="M 283.198 43.56015 L 251.143 43.56015 L 251.069 19.5457" />
+ <text
+ id="LabelH"
+ class="Label H"
+ x="288.198"
+ y="43.77971"
+ style="text-anchor:start;">H</text>
+ </g>
+ <g
+ id="g15">
+ <path
+ id="ButtonJ"
+ class="Button J ModeSwitch"
+ d="M 261.865 10.6558 C 259.694 10.6558 257.737 11.9635 256.906 13.9692 C 256.075 15.9749 256.535 18.2835 258.07 19.8186 C 259.605 21.3537 261.914 21.8129 263.919 20.9821 C 265.925 20.1514 267.233 18.1942 267.233 16.0233 C 267.233 14.5997 266.667 13.2345 265.661 12.2279 C 264.654 11.2213 263.289 10.6558 261.865 10.6558 Z" />
+ <path
+ id="LeaderJ"
+ class="Leader J ModeSwitch"
+ d="M 283.198 34.39331 L 261.939 34.39331 L 261.865 19.546" />
+ <text
+ id="LabelJ"
+ class="Label J ModeSwitch"
+ x="288.198"
+ y="34.61287"
+ style="text-anchor:start;">J</text>
+ </g>
+ <g
+ id="g17">
+ <path
+ id="Dial2CCW"
+ class="Dial2CCW Dial2 Button"
+ d="M 227.31 5.92916 L 229.557 4.82868 L 229.557 5.56234 C 230.9 5.47807 232.229 5.86856 233.302 6.6628 C 232.155 6.05373 230.805 5.92156 229.557 6.29598 L 229.557 7.02962 Z" />
+ <path
+ id="LeaderDial2CCW"
+ class="Dial2CCW Dial2 Leader"
+ d="M 225.28 6.93851 L 211.034 6.93851" />
+ <text
+ id="LabelDial2CCW"
+ class="Dial2CCW Dial2 Label"
+ x="206.034"
+ y="7.2452002"
+ style="text-anchor:end;">CCW</text>
+ <path
+ id="Dial2CW"
+ class="Dial2CW Button"
+ d="M 227.308 26.4712 L 229.555 25.3708 L 229.555 26.1044 C 230.853 26.2958 232.178 26.0362 233.3 25.3708 C 232.327 26.3672 230.962 26.9023 229.555 26.838 L 229.555 27.5717 Z" />
+ <path
+ id="LeaderDial2CW"
+ class="Dial2CW Dial2 Leader"
+ d="M 225.28 25.0934 L 211.034 25.0934" />
+ <text
+ id="LabelDial2CW"
+ class="Dial2CW Dial2 Label"
+ x="206.034"
+ y="25.457001"
+ style="text-anchor:end;">CW</text>
+ <path
+ id="Dial2"
+ class="Dial2 TouchDial"
+ d="M 230.279 3.05324 C 225.033 3.05324 220.304 6.21328 218.296 11.0598 C 216.289 15.9064 217.398 21.485 221.108 25.1944 C 224.817 28.9038 230.396 30.0134 235.242 28.0059 C 240.089 25.9984 243.249 21.2691 243.249 16.0232 C 243.249 8.86011 237.442 3.05324 230.279 3.05324 Z" />
+ </g>
+</svg>
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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ width="291mm"
+ height="205mm"
+ viewBox="0 0 291 205"
+ version="1.1"
+ id="intuos-pro-m-ptk670"
+ style="fill:none;stroke:#7f7f7f;stroke-width:0.25;font-size:6;font-family:monospace"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg">
+ <title
+ id="title">Wacom Intuos Pro M (PTK670)</title>
+ <g
+ id="g1">
+ <path
+ id="ButtonA"
+ class="Button A"
+ d="M 81.0475 6.4004 C 76.0377 1.76944 68.3093 1.76813 63.2977 6.3974 L 67.6702 10.7699 C 70.2604 8.54602 74.0865 8.5473 76.6753 10.7729 Z" />
+ <path
+ id="LeaderA"
+ class="Leader A"
+ d="M 50.8345 6.89279 L 67.0815 6.89279" />
+ <text
+ id="LabelA"
+ class="Label A"
+ x="45.8345"
+ y="7.11235"
+ style="text-anchor:end;">A</text>
+ </g>
+ <g
+ id="g2">
+ <path
+ id="ButtonB"
+ class="Button B"
+ d="M 77.372 20.4721 L 81.7585 24.8587 C 86.4055 19.8443 86.4065 12.0967 81.7595 7.08171 L 77.3717 11.4696 C 79.5949 14.0587 79.5949 17.8831 77.3717 20.4721 Z" />
+ <path
+ id="LeaderB"
+ class="Leader B"
+ d="M 50.8345 43.56015 L 83.0385 43.56015 L 82.9645 19.5" />
+ <text
+ id="LabelB"
+ class="Label B"
+ x="45.8345"
+ y="43.77971"
+ style="text-anchor:end;">B</text>
+ </g>
+ <g
+ id="g3">
+ <path
+ id="ButtonC"
+ class="Button C"
+ d="M 67.6483 21.1934 L 63.2836 25.5581 C 68.2992 30.2049 76.0478 30.2035 81.0615 25.5551 L 76.6971 21.1904 C 74.1009 23.4409 70.2455 23.4417 67.6483 21.1924 Z" />
+ <path
+ id="LeaderC"
+ class="Leader C"
+ d="M 50.8345 25.22647 L 67.0815 25.22647" />
+ <text
+ id="LabelC"
+ class="Label C"
+ x="45.8345"
+ y="25.44603"
+ style="text-anchor:end;">C</text>
+ </g>
+ <g
+ id="g4">
+ <path
+ id="ButtonD"
+ class="Button D"
+ d="M 66.9734 11.4671 L 62.6009 7.09461 C 57.9703 12.1059 57.9707 19.8351 62.6019 24.8459 L 66.9731 20.4747 C 64.7469 17.8848 64.7469 14.057 66.9732 11.4671 Z" />
+ <path
+ id="LeaderD"
+ class="Leader D"
+ d="M 50.8345 16.05963 L 61.4645 16.05963" />
+ <text
+ id="LabelD"
+ class="Label D"
+ x="45.8345"
+ y="16.27919"
+ style="text-anchor:end;">D</text>
+ </g>
+ <g
+ id="g5">
+ <path
+ id="ButtonI"
+ class="Button I ModeSwitch"
+ d="M 72.1687 10.6101 C 69.9978 10.6101 68.0406 11.9178 67.2098 13.9235 C 66.379 15.9292 66.8382 18.2378 68.3733 19.7729 C 69.9084 21.308 72.2171 21.7672 74.2227 20.9364 C 76.2284 20.1057 77.5362 18.1485 77.5362 15.9776 C 77.5362 14.554 76.9707 13.1888 75.9641 12.1822 C 74.9575 11.1756 73.5922 10.6101 72.1687 10.6101 Z" />
+ <path
+ id="LeaderI"
+ class="Leader I ModeSwitch"
+ d="M 50.8345 34.39331 L 72.2426 34.39331 L 72.1686 19.5003" />
+ <text
+ id="LabelI"
+ class="Label I ModeSwitch"
+ x="45.8345"
+ y="34.61287"
+ style="text-anchor:end;">I</text>
+ </g>
+ <g
+ id="g7">
+ <path
+ id="DialCCW"
+ class="DialCCW Button"
+ d="M 101.014 5.88344 L 103.261 4.78296 L 103.261 5.51662 C 104.604 5.43235 105.933 5.82284 107.006 6.61708 C 105.859 6.00801 104.509 5.87584 103.261 6.25026 L 103.261 6.9839 Z" />
+ <path
+ id="LeaderDialCCW"
+ class="DialCCW Dial Leader"
+ d="M 108.982 6.89279 L 123.228 6.89279" />
+ <text
+ id="LabelDialCCW"
+ class="DialCCW Dial Label"
+ x="128.228"
+ y="7.2452002"
+ style="text-anchor:start;">CCW</text>
+ <path
+ id="DialCW"
+ class="DialCW Button"
+ d="M 101.012 26.4255 L 103.259 25.3251 L 103.259 26.0587 C 104.557 26.2501 105.882 25.9905 107.004 25.3251 C 106.031 26.3215 104.666 26.8566 103.259 26.7923 L 103.259 27.526 Z" />
+ <path
+ id="LeaderDialCW"
+ class="DialCW Dial Leader"
+ d="M 108.982 25.0477 L 123.228 25.0477" />
+ <text
+ id="LabelDialCW"
+ class="DialCW Dial Label"
+ x="128.228"
+ y="25.45682"
+ style="text-anchor:start;">CW</text>
+ <path
+ id="Dial"
+ class="Dial TouchDial"
+ d="M 103.983 3.00752 C 98.7365 3.00752 94.0075 6.16756 91.9995 11.0141 C 89.9925 15.8607 91.1015 21.4393 94.8115 25.1487 C 98.5205 28.8581 104.099 29.9677 108.946 27.9602 C 113.793 25.9527 116.953 21.2234 116.953 15.9775 C 116.953 8.81439 111.146 3.00752 103.983 3.00752 Z" />
+ </g>
+ <g
+ id="g11">
+ <path
+ id="ButtonE"
+ class="Button E"
+ d="M 227.873 6.44612 C 222.863 1.81516 215.135 1.81385 210.123 6.44312 L 214.496 10.8156 C 217.086 8.59174 220.912 8.59302 223.501 10.8186 Z" />
+ <path
+ id="LeaderE"
+ class="Leader E"
+ d="M 240.327 6.93851 L 224.081 6.93851" />
+ <text
+ id="LabelE"
+ class="Label E"
+ x="245.327"
+ y="7.11235"
+ style="text-anchor:start;">E</text>
+ </g>
+ <g
+ id="g12">
+ <path
+ id="ButtonF"
+ class="Button F"
+ d="M 224.197 20.5178 L 228.584 24.9044 C 233.231 19.89 233.232 12.1424 228.585 7.12743 L 224.197 11.5153 C 226.42 14.1044 226.42 17.9288 224.197 20.5178 Z" />
+ <path
+ id="LeaderF"
+ class="Leader F"
+ d="M 240.327 16.05963 L 229.698 16.05963" />
+ <text
+ id="LabelF"
+ class="Label F"
+ x="245.327"
+ y="16.27919"
+ style="text-anchor:start;">F</text>
+ </g>
+ <g
+ id="g13">
+ <path
+ id="ButtonG"
+ class="Button G"
+ d="M 214.474 21.2391 L 210.109 25.6038 C 215.125 30.2506 222.873 30.2492 227.887 25.6008 L 223.523 21.2361 C 220.926 23.4866 217.071 23.4874 214.474 21.2381 Z" />
+ <path
+ id="LeaderG"
+ class="Leader G"
+ d="M 240.327 25.22647 L 224.081 25.22647" />
+ <text
+ id="LabelG"
+ class="Label G"
+ x="245.327"
+ y="25.44603"
+ style="text-anchor:start;">G</text>
+ </g>
+ <g
+ id="g14">
+ <path
+ id="ButtonH"
+ class="Button H"
+ d="M 213.799 11.5128 L 209.426 7.14033 C 204.796 12.1516 204.796 19.8808 209.427 24.8916 L 213.799 20.5204 C 211.572 17.9305 211.572 14.1027 213.799 11.5128 Z" />
+ <path
+ id="LeaderH"
+ class="Leader H"
+ d="M 240.327 43.56015 L 208.272 43.56015 L 208.198 19.5457" />
+ <text
+ id="LabelH"
+ class="Label H"
+ x="245.327"
+ y="43.77971"
+ style="text-anchor:start;">H</text>
+ </g>
+ <g
+ id="g15">
+ <path
+ id="ButtonJ"
+ class="Button J ModeSwitch"
+ d="M 218.994 10.6558 C 216.823 10.6558 214.866 11.9635 214.035 13.9692 C 213.204 15.9749 213.664 18.2835 215.199 19.8186 C 216.734 21.3537 219.043 21.8129 221.048 20.9821 C 223.054 20.1514 224.362 18.1942 224.362 16.0233 C 224.362 14.5997 223.796 13.2345 222.79 12.2279 C 221.783 11.2213 220.418 10.6558 218.994 10.6558 Z" />
+ <path
+ id="LeaderJ"
+ class="Leader J ModeSwitch"
+ d="M 240.327 34.39331 L 219.068 34.39331 L 218.994 19.546" />
+ <text
+ id="LabelJ"
+ class="Label J ModeSwitch"
+ x="245.327"
+ y="34.61287"
+ style="text-anchor:start;">J</text>
+ </g>
+ <g
+ id="g17">
+ <path
+ id="Dial2CCW"
+ class="Dial2CCW Button"
+ d="M 184.439 5.92916 L 186.686 4.82868 L 186.686 5.56234 C 188.029 5.47807 189.358 5.86856 190.431 6.6628 C 189.284 6.05373 187.934 5.92156 186.686 6.29598 L 186.686 7.02962 Z" />
+ <path
+ id="LeaderDial2CCW"
+ class="Dial2CCW Dial2 Leader"
+ d="M 182.409 6.93851 L 168.163 6.93851" />
+ <text
+ id="LabelDial2CCW"
+ class="Dial2CCW Dial2 Label"
+ x="163.163"
+ y="7.2452002"
+ style="text-anchor:end;">CCW</text>
+ <path
+ id="Dial2CW"
+ class="Dial2CW Button"
+ d="M 184.437 26.4712 L 186.684 25.3708 L 186.684 26.1044 C 187.982 26.2958 189.307 26.0362 190.429 25.3708 C 189.456 26.3672 188.091 26.9023 186.684 26.838 L 186.684 27.5717 Z" />
+ <path
+ id="LeaderDial2CW"
+ class="Dial2CW Dial2 Leader"
+ d="M 182.409 25.0934 L 168.163 25.0934" />
+ <text
+ id="LabelDial2CW"
+ class="Dial2CW Dial2 Label"
+ x="163.163"
+ y="25.457001"
+ style="text-anchor:end;">CW</text>
+ <path
+ id="Dial2"
+ class="Dial2 TouchDial"
+ d="M 187.408 3.05324 C 182.162 3.05324 177.433 6.21328 175.425 11.0598 C 173.418 15.9064 174.527 21.485 178.237 25.1944 C 181.946 28.9038 187.525 30.0134 192.371 28.0059 C 197.218 25.9984 200.378 21.2691 200.378 16.0232 C 200.378 8.86011 194.571 3.05324 187.408 3.05324 Z" />
+ </g>
+</svg>
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 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ width="215mm"
+ height="162mm"
+ viewBox="0 0 215 162"
+ version="1.1"
+ id="intuos-pro-s-ptk470"
+ style="fill:none;stroke:#7f7f7f;stroke-width:0.25;font-size:6;font-family:monospace"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:svg="http://www.w3.org/2000/svg">
+ <title
+ id="title">Wacom Intuos Pro S (PTK470)</title>
+ <g
+ id="g1">
+ <path
+ id="ButtonA"
+ class="Button A"
+ d="M 100.597 6.4004 C 95.5872 1.76944 87.8588 1.76813 82.8472 6.3974 L 87.2197 10.7699 C 89.8099 8.54602 93.636 8.5473 96.2248 10.7729 Z" />
+ <path
+ id="LeaderA"
+ class="Leader A"
+ d="M 70.384,6.89279 H 86.631" />
+ <text
+ id="LabelA"
+ class="Label A"
+ x="65.384"
+ y="7.11235"
+ style="text-anchor:end;">A</text>
+ </g>
+ <g
+ id="g2">
+ <path
+ id="ButtonB"
+ class="Button B"
+ d="M 96.9215 20.4721 L 101.308 24.8587 C 105.955 19.8443 105.956 12.0967 101.309 7.08171 L 96.9212 11.4696 C 99.1444 14.0587 99.1444 17.8831 96.9212 20.4721 Z" />
+ <path
+ id="LeaderB"
+ class="Leader B"
+ d="m 70.384,43.56015 h 32.204 L 102.514,19.5" />
+ <text
+ id="LabelB"
+ class="Label B"
+ x="65.384"
+ y="43.77971"
+ style="text-anchor:end;">B</text>
+ </g>
+ <g
+ id="g3">
+ <path
+ id="ButtonC"
+ class="Button C"
+ d="M 87.1978 21.1934 L 82.8331 25.5581 C 87.8487 30.2049 95.5973 30.2035 100.611 25.5551 L 96.2466 21.1904 C 93.6504 23.4409 89.795 23.4417 87.1978 21.1924 Z" />
+ <path
+ id="LeaderC"
+ class="Leader C"
+ d="M 70.384,25.22647 H 86.631" />
+ <text
+ id="LabelC"
+ class="C Label"
+ x="65.384"
+ y="25.44603"
+ style="text-anchor:end;">C</text>
+ </g>
+ <g
+ id="g4">
+ <path
+ id="ButtonD"
+ class="Button D"
+ d="M 86.5229 11.4671 L 82.1504 7.09461 C 77.5198 12.1059 77.5202 19.8351 82.1514 24.8459 L 86.5226 20.4747 C 84.2964 17.8848 84.2964 14.057 86.5227 11.4671 Z" />
+ <path
+ id="LeaderD"
+ class="Leader D"
+ d="M 70.384,16.05963 H 81.014" />
+ <text
+ id="LabelD"
+ class="Label D"
+ x="65.384"
+ y="16.27919"
+ style="text-anchor:end;">D</text>
+ </g>
+ <g
+ id="g5">
+ <path
+ id="ButtonE"
+ class="Button E ModeSwitch"
+ d="M 91.7182 10.6101 C 89.5473 10.6101 87.5901 11.9178 86.7593 13.9235 C 85.9285 15.9292 86.3877 18.2378 87.9228 19.7729 C 89.4579 21.308 91.7666 21.7672 93.7722 20.9364 C 95.7779 20.1057 97.0857 18.1485 97.0857 15.9776 C 97.0857 14.554 96.5202 13.1888 95.5136 12.1822 C 94.507 11.1756 93.1417 10.6101 91.7182 10.6101 Z" />
+ <path
+ id="LeaderE"
+ class="Leader E ModeSwitch"
+ d="M 70.384 34.39331 L 91.7921 34.39331 L 91.7181 19.5003" />
+ <text
+ id="LabelE"
+ class="Label E ModeSwitch"
+ x="65.384"
+ y="34.61287"
+ style="text-anchor:end;">E</text>
+ </g>
+ <g
+ id="g7">
+ <path
+ id="DialCCW"
+ class="DialCCW Button"
+ d="M 120.563 5.88344 L 122.81 4.78296 L 122.81 5.51662 C 124.153 5.43235 125.482 5.82284 126.555 6.61708 C 125.408 6.00801 124.058 5.87584 122.81 6.25026 L 122.81 6.9839 Z" />
+ <path
+ id="LeaderDialCCW"
+ class="DialCCW Dial Leader"
+ d="m 128.531,6.89279 h 14.246" />
+ <text
+ id="LabelDialCCW"
+ class="DialCCW Dial Label"
+ x="147.777"
+ y="7.2452"
+ style="text-anchor:start;">CCW</text>
+ <path
+ id="DialCW"
+ class="DialCW Button"
+ d="M 120.561 26.4255 L 122.808 25.3251 L 122.808 26.0587 C 124.106 26.2501 125.431 25.9905 126.553 25.3251 C 125.58 26.3215 124.215 26.8566 122.808 26.7923 L 122.808 27.526 Z" />
+ <path
+ id="LeaderDialCW"
+ class="DialCW Dial Leader"
+ d="m 128.531,25.0477 h 14.246" />
+ <text
+ id="LabelDialCW"
+ class="DialCW Dial Label"
+ x="147.777"
+ y="25.45682"
+ style="text-anchor:start;">CW</text>
+ <path
+ id="Dial"
+ class="Dial TouchDial"
+ d="M 123.532 3.00752 C 118.286 3.00752 113.557 6.16756 111.549 11.0141 C 109.542 15.8607 110.651 21.4393 114.361 25.1487 C 118.07 28.8581 123.649 29.9677 128.495 27.9602 C 133.342 25.9527 136.502 21.2234 136.502 15.9775 C 136.502 8.81439 130.695 3.00752 123.532 3.00752 Z" />
+ </g>
+</svg>
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

196
0002-data-Add-six-new-tablet-definitions.patch Normal file
View File

@ -0,0 +1,196 @@
From 9c01425c38f8328fbde820cb8450ff84798b6434 Mon Sep 17 00:00:00 2001
From: Erin Skomra <erin.skomra@wacom.com>
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

908
0003-layouts-rearrange-the-Intuos-Pro-3rd-L-M-buttons.patch Normal file
View File

@ -0,0 +1,908 @@
From 291b930d2ff29d3a05e5716a75d2501de0156074 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
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">
+ <defs
+ id="defs1" />
+ <sodipodi:namedview
+ id="namedview1"
+ pagecolor="#ffffff"
+ bordercolor="#000000"
+ borderopacity="0.25"
+ inkscape:showpageshadow="2"
+ inkscape:pageopacity="0.0"
+ inkscape:pagecheckerboard="0"
+ inkscape:deskcolor="#d1d1d1"
+ inkscape:document-units="mm"
+ showgrid="false"
+ showguides="true"
+ inkscape:zoom="3.0406085"
+ inkscape:cx="799.18215"
+ inkscape:cy="210.81307"
+ inkscape:window-width="3072"
+ inkscape:window-height="1659"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="intuos-pro-l-ptk870">
+ <sodipodi:guide
+ position="129.09573,204.21859"
+ orientation="1,0"
+ id="guide1"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="131.97659,203.77923"
+ orientation="1,0"
+ id="guide3"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="247.87624,200.19217"
+ orientation="1,0"
+ id="guide4"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="244.86465,191.78454"
+ orientation="1,0"
+ id="guide5"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="135.34671,208.46448"
+ orientation="0,-1"
+ id="guide6"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="135.13871,200.89516"
+ orientation="0,-1"
+ id="guide7"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="135.29252,193.2438"
+ orientation="0,-1"
+ id="guide8"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="133.8077,185.75651"
+ orientation="0,-1"
+ id="guide9"
+ inkscape:locked="false" />
+ <sodipodi:guide
+ position="104.94332,177.96261"
+ orientation="0,-1"
+ id="guide10"
+ inkscape:locked="false" />
+ </sodipodi:namedview>
<title
id="title">Wacom Intuos Pro L (PTK870)</title>
- <g
- id="g1">
- <path
- id="ButtonA"
- class="Button A"
- d="M 123.918 6.4004 C 118.908 1.76944 111.18 1.76813 106.168 6.3974 L 110.541 10.7699 C 113.131 8.54602 116.957 8.5473 119.546 10.7729 Z" />
- <path
- id="LeaderA"
- class="Leader A"
- d="M 93.7051 6.89279 L 109.952 6.89279" />
- <text
- id="LabelA"
- class="Label A"
- x="88.7051"
- y="7.11235"
- style="text-anchor:end;">A</text>
- </g>
- <g
- id="g2">
- <path
- id="ButtonB"
- class="Button B"
- d="M 120.243 20.4721 L 124.629 24.8587 C 129.276 19.8443 129.277 12.0967 124.63 7.08171 L 120.242 11.4696 C 122.466 14.0587 122.466 17.8831 120.242 20.4721 Z" />
- <path
- id="LeaderB"
- class="Leader B"
- d="M 93.7051 43.56015 L 125.909 43.56015 L 125.835 19.5" />
- <text
- id="LabelB"
- class="Label B"
- x="88.7051"
- y="43.77971"
- style="text-anchor:end;">B</text>
- </g>
- <g
- id="g3">
- <path
- id="ButtonC"
- class="Button C"
- d="M 110.519 21.1934 L 106.154 25.5581 C 111.17 30.2049 118.918 30.2035 123.932 25.5551 L 119.568 21.1904 C 116.972 23.4409 113.116 23.4417 110.519 21.1924 Z" />
- <path
- id="LeaderC"
- class="Leader C"
- d="M 93.7051 25.22647 L 109.952 25.22647" />
- <text
- id="LabelC"
- class="Label C"
- x="88.7051"
- y="25.44603"
- style="text-anchor:end;">C</text>
- </g>
- <g
- id="g4">
- <path
- id="ButtonD"
- class="Button D"
- d="M 109.844 11.4671 L 105.472 7.09461 C 100.841 12.1059 100.841 19.8351 105.472 24.8459 L 109.844 20.4747 C 107.618 17.8848 107.618 14.057 109.844 11.4671 Z" />
- <path
- id="LeaderD"
- class="Leader D"
- d="M 93.7051 16.05963 L 104.335 16.05963" />
- <text
- id="LabelD"
- class="Label D"
- x="88.7051"
- y="16.27919"
- style="text-anchor:end;">D</text>
- </g>
- <g
- id="g5">
- <path
- id="ButtonI"
- class="Button I ModeSwitch"
- d="M 115.039 10.6101 C 112.868 10.6101 110.911 11.9178 110.08 13.9235 C 109.25 15.9292 109.709 18.2378 111.244 19.7729 C 112.779 21.308 115.088 21.7672 117.093 20.9364 C 119.099 20.1057 120.407 18.1485 120.407 15.9776 C 120.407 14.554 119.841 13.1888 118.835 12.1822 C 117.828 11.1756 116.463 10.6101 115.039 10.6101 Z" />
- <path
- id="LeaderI"
- class="Leader I ModeSwitch"
- d="M 93.7051 34.39331 L 115.113 34.39331 L 115.039 19.5003" />
- <text
- id="LabelI"
- class="Label I ModeSwitch"
- x="88.7051"
- y="34.61287"
- style="text-anchor:end;">I</text>
- </g>
+ <path
+ id="ButtonA"
+ class="Button A"
+ d="m 123.918,6.4004 c -5.01,-4.63096 -12.738,-4.63227 -17.75,-0.003 l 4.373,4.3725 c 2.59,-2.22388 6.416,-2.2226 9.005,0.003 z" />
+ <path
+ id="LeaderA"
+ class="Leader A"
+ d="m 129.09573,74.037396 -29.816137,0 L 99.157273,6.9437631 109.952,6.89279"
+ sodipodi:nodetypes="cccc" />
+ <text
+ id="LabelA"
+ class="Label A"
+ x="135.6055"
+ y="73.68782"
+ style="text-anchor:end">A</text>
+ <path
+ id="ButtonB"
+ class="Button B"
+ d="m 120.243,20.4721 4.386,4.3866 c 4.647,-5.0144 4.648,-12.762 10e-4,-17.77699 l -4.388,4.38789 c 2.224,2.5891 2.224,6.4135 0,9.0025 z" />
+ <path
+ id="LeaderB"
+ class="Leader B"
+ d="m 129.02333,43.56015 -3.11433,0 L 125.835,19.5"
+ sodipodi:nodetypes="ccc" />
+ <text
+ id="LabelB"
+ class="Label B"
+ x="135.50296"
+ y="43.41053"
+ style="text-anchor:end">B</text>
+ <path
+ id="ButtonC"
+ class="Button C"
+ d="m 110.519,21.1934 -4.365,4.3647 c 5.016,4.6468 12.764,4.6454 17.778,-0.003 l -4.364,-4.3647 c -2.596,2.2505 -6.452,2.2513 -9.049,0.002 z" />
+ <path
+ id="LeaderC"
+ class="Leader C"
+ d="M 129.09573,58.756206 H 110.04824 L 109.95204,25.22647"
+ sodipodi:nodetypes="ccc" />
+ <text
+ id="LabelC"
+ class="Label C"
+ x="135.63626"
+ y="58.546246"
+ style="text-anchor:end">C</text>
+ <path
+ id="ButtonD"
+ class="Button D"
+ d="m 109.844,11.4671 -4.372,-4.37249 c -4.631,5.01129 -4.631,12.74049 0,17.75129 l 4.372,-4.3712 c -2.226,-2.5899 -2.226,-6.4177 0,-9.0076 z" />
+ <path
+ id="LeaderD"
+ class="Leader D"
+ d="M 129.09573,66.243496 H 104.2863 L 104.335,16.05963"
+ sodipodi:nodetypes="ccc" />
+ <text
+ id="LabelD"
+ class="Label D"
+ x="135.59085"
+ y="66.1185"
+ style="text-anchor:end">D</text>
+ <path
+ id="ButtonI"
+ class="Button I ModeSwitch"
+ d="m 115.039,10.6101 c -2.171,0 -4.128,1.3077 -4.959,3.3134 -0.83,2.0057 -0.371,4.3143 1.164,5.8494 1.535,1.5351 3.844,1.9943 5.849,1.1635 2.006,-0.8307 3.314,-2.7879 3.314,-4.9588 0,-1.4236 -0.566,-2.7888 -1.572,-3.7954 -1.007,-1.0066 -2.372,-1.5721 -3.796,-1.5721 z" />
+ <path
+ id="LeaderI"
+ class="Leader I ModeSwitch"
+ d="M 129.09573,51.104847 H 115.113 L 115.039,19.5003"
+ sodipodi:nodetypes="ccc" />
+ <text
+ id="LabelI"
+ class="Label I ModeSwitch"
+ x="135.60843"
+ y="50.979851"
+ style="text-anchor:end">I</text>
<g
id="g7">
<path
@@ -132,91 +195,81 @@
class="Dial TouchDial"
d="M 146.854 3.00752 C 141.607 3.00752 136.878 6.16756 134.87 11.0141 C 132.863 15.8607 133.972 21.4393 137.682 25.1487 C 141.391 28.8581 146.97 29.9677 151.817 27.9602 C 156.664 25.9527 159.824 21.2234 159.824 15.9775 C 159.824 8.81439 154.017 3.00752 146.854 3.00752 Z" />
</g>
- <g
- id="g11">
- <path
- id="ButtonE"
- class="Button E"
- d="M 270.744 6.44612 C 265.734 1.81516 258.006 1.81385 252.994 6.44312 L 257.367 10.8156 C 259.957 8.59174 263.783 8.59302 266.372 10.8186 Z" />
- <path
- id="LeaderE"
- class="Leader E"
- d="M 283.198 6.93851 L 266.952 6.93851" />
- <text
- id="LabelE"
- class="Label E"
- x="288.198"
- y="7.11235"
- style="text-anchor:start;">E</text>
- </g>
- <g
- id="g12">
- <path
- id="ButtonF"
- class="Button F"
- d="M 267.068 20.5178 L 271.455 24.9044 C 276.102 19.89 276.103 12.1424 271.456 7.12743 L 267.068 11.5153 C 269.291 14.1044 269.291 17.9288 267.068 20.5178 Z" />
- <path
- id="LeaderF"
- class="Leader F"
- d="M 283.198 16.05963 L 272.569 16.05963" />
- <text
- id="LabelF"
- class="Label F"
- x="288.198"
- y="16.27919"
- style="text-anchor:start;">F</text>
- </g>
- <g
- id="g13">
- <path
- id="ButtonG"
- class="Button G"
- d="M 257.345 21.2391 L 252.98 25.6038 C 257.996 30.2506 265.744 30.2492 270.758 25.6008 L 266.394 21.2361 C 263.797 23.4866 259.942 23.4874 257.345 21.2381 Z" />
- <path
- id="LeaderG"
- class="Leader G"
- d="M 283.198 25.22647 L 266.952 25.22647" />
- <text
- id="LabelG"
- class="Label G"
- x="288.198"
- y="25.44603"
- style="text-anchor:start;">G</text>
- </g>
- <g
- id="g14">
- <path
- id="ButtonH"
- class="Button H"
- d="M 256.67 11.5128 L 252.297 7.14033 C 247.667 12.1516 247.667 19.8808 252.298 24.8916 L 256.67 20.5204 C 254.443 17.9305 254.443 14.1027 256.67 11.5128 Z" />
- <path
- id="LeaderH"
- class="Leader H"
- d="M 283.198 43.56015 L 251.143 43.56015 L 251.069 19.5457" />
- <text
- id="LabelH"
- class="Label H"
- x="288.198"
- y="43.77971"
- style="text-anchor:start;">H</text>
- </g>
- <g
- id="g15">
- <path
- id="ButtonJ"
- class="Button J ModeSwitch"
- d="M 261.865 10.6558 C 259.694 10.6558 257.737 11.9635 256.906 13.9692 C 256.075 15.9749 256.535 18.2835 258.07 19.8186 C 259.605 21.3537 261.914 21.8129 263.919 20.9821 C 265.925 20.1514 267.233 18.1942 267.233 16.0233 C 267.233 14.5997 266.667 13.2345 265.661 12.2279 C 264.654 11.2213 263.289 10.6558 261.865 10.6558 Z" />
- <path
- id="LeaderJ"
- class="Leader J ModeSwitch"
- d="M 283.198 34.39331 L 261.939 34.39331 L 261.865 19.546" />
- <text
- id="LabelJ"
- class="Label J ModeSwitch"
- x="288.198"
- y="34.61287"
- style="text-anchor:start;">J</text>
- </g>
+ <path
+ id="ButtonE"
+ class="Button E"
+ d="m 270.744,6.44612 c -5.01,-4.63096 -12.738,-4.63227 -17.75,-0.003 l 4.373,4.37248 c 2.59,-2.22386 6.416,-2.22258 9.005,0.003 z" />
+ <path
+ id="LeaderE"
+ class="Leader E"
+ d="m 247.87623,74.037396 30.67943,0 0.1153,-67.1859026 L 266.952,6.93851"
+ sodipodi:nodetypes="cccc" />
+ <path
+ id="ButtonF"
+ class="Button F"
+ d="m 267.068,20.5178 4.387,4.3866 c 4.647,-5.0144 4.648,-12.762 0.001,-17.77697 l -4.388,4.38787 c 2.223,2.5891 2.223,6.4135 0,9.0025 z" />
+ <path
+ id="LeaderF"
+ class="Leader F"
+ d="m 247.87623,66.243496 24.69926,0 -0.006,-50.183866"
+ sodipodi:nodetypes="ccc" />
+ <path
+ id="ButtonG"
+ class="Button G"
+ d="m 257.345,21.2391 -4.365,4.3647 c 5.016,4.6468 12.764,4.6454 17.778,-0.003 l -4.364,-4.3647 c -2.597,2.2505 -6.452,2.2513 -9.049,0.002 z" />
+ <path
+ id="LeaderG"
+ class="Leader G"
+ d="m 247.87623,58.756206 19.02269,0 0.0531,-33.529736"
+ sodipodi:nodetypes="ccc" />
+ <path
+ id="ButtonH"
+ class="Button H"
+ d="m 256.67,11.5128 -4.373,-4.37247 c -4.63,5.01127 -4.63,12.74047 0.001,17.75127 l 4.372,-4.3712 c -2.227,-2.5899 -2.227,-6.4177 0,-9.0076 z" />
+ <path
+ id="LeaderH"
+ class="Leader H"
+ d="M 247.87623,43.535527 251.143,43.56015 251.069,19.5457"
+ sodipodi:nodetypes="ccc" />
+ <path
+ id="ButtonJ"
+ class="Button J ModeSwitch"
+ d="m 261.865,10.6558 c -2.171,0 -4.128,1.3077 -4.959,3.3134 -0.831,2.0057 -0.371,4.3143 1.164,5.8494 1.535,1.5351 3.844,1.9943 5.849,1.1635 2.006,-0.8307 3.314,-2.7879 3.314,-4.9588 0,-1.4236 -0.566,-2.7888 -1.572,-3.7954 -1.007,-1.0066 -2.372,-1.5721 -3.796,-1.5721 z" />
+ <path
+ id="LeaderJ"
+ class="Leader J ModeSwitch"
+ d="m 247.87623,51.104847 14.06277,0 L 261.865,19.546"
+ sodipodi:nodetypes="ccc" />
+ <text
+ id="LabelE"
+ class="Label E"
+ x="241.36903"
+ y="73.912399"
+ style="text-anchor:start">E</text>
+ <text
+ id="LabelF"
+ class="Label F"
+ x="241.30165"
+ y="66.1185"
+ style="text-anchor:start">F</text>
+ <text
+ id="LabelG"
+ class="Label G"
+ x="241.50526"
+ y="58.546246"
+ style="text-anchor:start">G</text>
+ <text
+ id="LabelH"
+ class="Label H"
+ x="241.46571"
+ y="43.410526"
+ style="text-anchor:start">H</text>
+ <text
+ id="LabelJ"
+ class="Label J ModeSwitch"
+ x="241.71181"
+ y="50.894886"
+ style="text-anchor:start">J</text>
<g
id="g17">
<path
diff --git a/data/layouts/wacom-intuos-pro-3-m.svg b/data/layouts/wacom-intuos-pro-3-m.svg
index ac3af53affd8..ab3ba59e5abc 100644
--- a/data/layouts/wacom-intuos-pro-3-m.svg
+++ b/data/layouts/wacom-intuos-pro-3-m.svg
@@ -8,248 +8,281 @@
version="1.1"
id="intuos-pro-m-ptk670"
style="fill:none;stroke:#7f7f7f;stroke-width:0.25;font-size:6;font-family:monospace"
+ sodipodi:docname="wacom-intuos-pro-3-m.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">
+ <defs
+ id="defs1" />
+ <sodipodi:namedview
+ id="namedview1"
+ pagecolor="#ffffff"
+ bordercolor="#000000"
+ borderopacity="0.25"
+ inkscape:showpageshadow="2"
+ inkscape:pageopacity="0.0"
+ inkscape:pagecheckerboard="0"
+ inkscape:deskcolor="#d1d1d1"
+ inkscape:document-units="mm"
+ inkscape:zoom="1.8688618"
+ inkscape:cx="550.06743"
+ inkscape:cy="216.17436"
+ inkscape:window-width="3072"
+ inkscape:window-height="1659"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="intuos-pro-m-ptk670" />
<title
id="title">Wacom Intuos Pro M (PTK670)</title>
+ <path
+ id="ButtonA"
+ class="Button A"
+ d="m 80.503889,6.4003248 c -5.01,-4.63096 -12.738,-4.63227 -17.75,-0.003 l 4.373,4.3725002 c 2.59,-2.2238802 6.416,-2.2226002 9.005,0.003 z"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ <path
+ id="LeaderA"
+ class="Leader A"
+ d="M 85.681619,74.037321 H 55.865482 l -0.12232,-67.0936332 10.794727,-0.05097"
+ sodipodi:nodetypes="cccc"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ <text
+ id="LabelA"
+ class="Label A"
+ x="92.191391"
+ y="73.687744"
+ style="font-size:6px;font-family:monospace;text-anchor:end;fill:none;stroke:#7f7f7f;stroke-width:0.25">A</text>
+ <path
+ id="ButtonB"
+ class="Button B"
+ d="m 76.828889,20.472025 4.386,4.3866 c 4.647,-5.0144 4.648,-12.762 0.001,-17.7769902 l -4.388,4.3878902 c 2.224,2.5891 2.224,6.4135 0,9.0025 z"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ <path
+ id="LeaderB"
+ class="Leader B"
+ d="m 85.609219,43.560075 h -3.11433 l -0.074,-24.06015"
+ sodipodi:nodetypes="ccc"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ <text
+ id="LabelB"
+ class="Label B"
+ x="92.088852"
+ y="43.410454"
+ style="font-size:6px;font-family:monospace;text-anchor:end;fill:none;stroke:#7f7f7f;stroke-width:0.25">B</text>
+ <path
+ id="ButtonC"
+ class="Button C"
+ d="m 67.104889,21.193325 -4.365,4.3647 c 5.016,4.6468 12.764,4.6454 17.778,-0.003 l -4.364,-4.3647 c -2.596,2.2505 -6.452,2.2513 -9.049,0.002 z"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ <path
+ id="LeaderC"
+ class="Leader C"
+ d="m 85.681619,58.756131 h -19.04749 l -0.0962,-33.529736"
+ sodipodi:nodetypes="ccc"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ <text
+ id="LabelC"
+ class="Label C"
+ x="92.222153"
+ y="58.546173"
+ style="font-size:6px;font-family:monospace;text-anchor:end;fill:none;stroke:#7f7f7f;stroke-width:0.25">C</text>
+ <path
+ id="ButtonD"
+ class="Button D"
+ d="m 66.429889,11.467025 -4.372,-4.3724902 c -4.631,5.0112902 -4.631,12.7404902 0,17.7512902 l 4.372,-4.3712 c -2.226,-2.5899 -2.226,-6.4177 0,-9.0076 z"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ <path
+ id="LeaderD"
+ class="Leader D"
+ d="m 85.681619,66.243421 h -24.80943 l 0.0487,-50.183866"
+ sodipodi:nodetypes="ccc"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ <text
+ id="LabelD"
+ class="Label D"
+ x="92.176743"
+ y="66.118423"
+ style="font-size:6px;font-family:monospace;text-anchor:end;fill:none;stroke:#7f7f7f;stroke-width:0.25">D</text>
+ <path
+ id="ButtonI"
+ class="Button I ModeSwitch"
+ d="m 71.624889,10.610025 c -2.171,0 -4.128,1.3077 -4.959,3.3134 -0.83,2.0057 -0.371,4.3143 1.164,5.8494 1.535,1.5351 3.844,1.9943 5.849,1.1635 2.006,-0.8307 3.314,-2.7879 3.314,-4.9588 0,-1.4236 -0.566,-2.7888 -1.572,-3.7954 -1.007,-1.0066 -2.372,-1.5721 -3.796,-1.5721 z"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ <path
+ id="LeaderI"
+ class="Leader I ModeSwitch"
+ d="m 85.681619,51.104772 h -13.98273 l -0.074,-31.604547"
+ sodipodi:nodetypes="ccc"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ <text
+ id="LabelI"
+ class="Label I ModeSwitch"
+ x="92.194321"
+ y="50.979774"
+ style="font-size:6px;font-family:monospace;text-anchor:end;fill:none;stroke:#7f7f7f;stroke-width:0.25">I</text>
<g
- id="g1">
- <path
- id="ButtonA"
- class="Button A"
- d="M 81.0475 6.4004 C 76.0377 1.76944 68.3093 1.76813 63.2977 6.3974 L 67.6702 10.7699 C 70.2604 8.54602 74.0865 8.5473 76.6753 10.7729 Z" />
- <path
- id="LeaderA"
- class="Leader A"
- d="M 50.8345 6.89279 L 67.0815 6.89279" />
- <text
- id="LabelA"
- class="Label A"
- x="45.8345"
- y="7.11235"
- style="text-anchor:end;">A</text>
- </g>
- <g
- id="g2">
- <path
- id="ButtonB"
- class="Button B"
- d="M 77.372 20.4721 L 81.7585 24.8587 C 86.4055 19.8443 86.4065 12.0967 81.7595 7.08171 L 77.3717 11.4696 C 79.5949 14.0587 79.5949 17.8831 77.3717 20.4721 Z" />
- <path
- id="LeaderB"
- class="Leader B"
- d="M 50.8345 43.56015 L 83.0385 43.56015 L 82.9645 19.5" />
- <text
- id="LabelB"
- class="Label B"
- x="45.8345"
- y="43.77971"
- style="text-anchor:end;">B</text>
- </g>
- <g
- id="g3">
- <path
- id="ButtonC"
- class="Button C"
- d="M 67.6483 21.1934 L 63.2836 25.5581 C 68.2992 30.2049 76.0478 30.2035 81.0615 25.5551 L 76.6971 21.1904 C 74.1009 23.4409 70.2455 23.4417 67.6483 21.1924 Z" />
- <path
- id="LeaderC"
- class="Leader C"
- d="M 50.8345 25.22647 L 67.0815 25.22647" />
- <text
- id="LabelC"
- class="Label C"
- x="45.8345"
- y="25.44603"
- style="text-anchor:end;">C</text>
- </g>
- <g
- id="g4">
- <path
- id="ButtonD"
- class="Button D"
- d="M 66.9734 11.4671 L 62.6009 7.09461 C 57.9703 12.1059 57.9707 19.8351 62.6019 24.8459 L 66.9731 20.4747 C 64.7469 17.8848 64.7469 14.057 66.9732 11.4671 Z" />
- <path
- id="LeaderD"
- class="Leader D"
- d="M 50.8345 16.05963 L 61.4645 16.05963" />
- <text
- id="LabelD"
- class="Label D"
- x="45.8345"
- y="16.27919"
- style="text-anchor:end;">D</text>
- </g>
- <g
- id="g5">
- <path
- id="ButtonI"
- class="Button I ModeSwitch"
- d="M 72.1687 10.6101 C 69.9978 10.6101 68.0406 11.9178 67.2098 13.9235 C 66.379 15.9292 66.8382 18.2378 68.3733 19.7729 C 69.9084 21.308 72.2171 21.7672 74.2227 20.9364 C 76.2284 20.1057 77.5362 18.1485 77.5362 15.9776 C 77.5362 14.554 76.9707 13.1888 75.9641 12.1822 C 74.9575 11.1756 73.5922 10.6101 72.1687 10.6101 Z" />
- <path
- id="LeaderI"
- class="Leader I ModeSwitch"
- d="M 50.8345 34.39331 L 72.2426 34.39331 L 72.1686 19.5003" />
- <text
- id="LabelI"
- class="Label I ModeSwitch"
- x="45.8345"
- y="34.61287"
- style="text-anchor:end;">I</text>
- </g>
- <g
- id="g7">
+ id="g7"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25"
+ transform="translate(-43.414111,-7.5157166e-5)">
<path
id="DialCCW"
class="DialCCW Button"
- d="M 101.014 5.88344 L 103.261 4.78296 L 103.261 5.51662 C 104.604 5.43235 105.933 5.82284 107.006 6.61708 C 105.859 6.00801 104.509 5.87584 103.261 6.25026 L 103.261 6.9839 Z" />
+ 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" />
<path
id="LeaderDialCCW"
class="DialCCW Dial Leader"
- d="M 108.982 6.89279 L 123.228 6.89279" />
+ d="m 151.853,6.89279 h 14.246" />
<text
id="LabelDialCCW"
class="DialCCW Dial Label"
- x="128.228"
+ x="171.099"
y="7.2452002"
- style="text-anchor:start;">CCW</text>
+ style="text-anchor:start">CCW</text>
<path
id="DialCW"
class="DialCW Button"
- d="M 101.012 26.4255 L 103.259 25.3251 L 103.259 26.0587 C 104.557 26.2501 105.882 25.9905 107.004 25.3251 C 106.031 26.3215 104.666 26.8566 103.259 26.7923 L 103.259 27.526 Z" />
+ 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" />
<path
id="LeaderDialCW"
class="DialCW Dial Leader"
- d="M 108.982 25.0477 L 123.228 25.0477" />
+ d="m 151.853,25.0477 h 14.246" />
<text
id="LabelDialCW"
class="DialCW Dial Label"
- x="128.228"
+ x="171.099"
y="25.45682"
- style="text-anchor:start;">CW</text>
+ style="text-anchor:start">CW</text>
<path
id="Dial"
class="Dial TouchDial"
- d="M 103.983 3.00752 C 98.7365 3.00752 94.0075 6.16756 91.9995 11.0141 C 89.9925 15.8607 91.1015 21.4393 94.8115 25.1487 C 98.5205 28.8581 104.099 29.9677 108.946 27.9602 C 113.793 25.9527 116.953 21.2234 116.953 15.9775 C 116.953 8.81439 111.146 3.00752 103.983 3.00752 Z" />
+ 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" />
</g>
+ <path
+ id="ButtonE"
+ class="Button E"
+ d="m 227.32989,6.4460448 c -5.01,-4.63096 -12.738,-4.63227 -17.75,-0.003 l 4.373,4.3724802 c 2.59,-2.2238602 6.416,-2.2225802 9.005,0.003 z"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
<g
- id="g11">
- <path
- id="ButtonE"
- class="Button E"
- d="M 227.873 6.44612 C 222.863 1.81516 215.135 1.81385 210.123 6.44312 L 214.496 10.8156 C 217.086 8.59174 220.912 8.59302 223.501 10.8186 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)">
<path
id="LeaderE"
class="Leader E"
- d="M 240.327 6.93851 L 224.081 6.93851" />
- <text
- id="LabelE"
- class="Label E"
- x="245.327"
- y="7.11235"
- style="text-anchor:start;">E</text>
+ d="m 247.87623,74.037396 h 30.67943 L 278.67096,6.8514934 266.952,6.93851"
+ sodipodi:nodetypes="cccc" />
</g>
+ <path
+ id="ButtonF"
+ class="Button F"
+ d="m 223.65389,20.517725 4.387,4.3866 c 4.647,-5.0144 4.648,-12.762 0.001,-17.7769702 l -4.388,4.3878702 c 2.223,2.5891 2.223,6.4135 0,9.0025 z"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ <path
+ id="LeaderF"
+ class="Leader F"
+ d="m 204.46212,66.243421 h 24.69926 l -0.006,-50.183866"
+ sodipodi:nodetypes="ccc"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ <path
+ id="ButtonG"
+ class="Button G"
+ d="m 213.93089,21.239025 -4.365,4.3647 c 5.016,4.6468 12.764,4.6454 17.778,-0.003 l -4.364,-4.3647 c -2.597,2.2505 -6.452,2.2513 -9.049,0.002 z"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ <path
+ id="LeaderG"
+ class="Leader G"
+ d="m 204.46212,58.756131 h 19.02269 l 0.0531,-33.529736"
+ sodipodi:nodetypes="ccc"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ <path
+ id="ButtonH"
+ class="Button H"
+ d="m 213.25589,11.512725 -4.373,-4.3724702 c -4.63,5.0112702 -4.63,12.7404702 0.001,17.7512702 l 4.372,-4.3712 c -2.227,-2.5899 -2.227,-6.4177 0,-9.0076 z"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ <path
+ id="LeaderH"
+ class="Leader H"
+ d="m 204.46212,43.535452 3.26677,0.02462 -0.074,-24.01445"
+ sodipodi:nodetypes="ccc"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ <path
+ id="ButtonJ"
+ class="Button J ModeSwitch"
+ d="m 218.45089,10.655725 c -2.171,0 -4.128,1.3077 -4.959,3.3134 -0.831,2.0057 -0.371,4.3143 1.164,5.8494 1.535,1.5351 3.844,1.9943 5.849,1.1635 2.006,-0.8307 3.314,-2.7879 3.314,-4.9588 0,-1.4236 -0.566,-2.7888 -1.572,-3.7954 -1.007,-1.0066 -2.372,-1.5721 -3.796,-1.5721 z"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ <path
+ id="LeaderJ"
+ class="Leader J ModeSwitch"
+ d="m 204.46212,51.104772 h 14.06277 l -0.074,-31.558847"
+ sodipodi:nodetypes="ccc"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25" />
+ <text
+ id="LabelE"
+ class="Label E"
+ x="197.95493"
+ y="73.912323"
+ style="font-size:6px;font-family:monospace;text-anchor:start;fill:none;stroke:#7f7f7f;stroke-width:0.25">E</text>
+ <text
+ id="LabelF"
+ class="Label F"
+ x="197.88754"
+ y="66.118423"
+ style="font-size:6px;font-family:monospace;text-anchor:start;fill:none;stroke:#7f7f7f;stroke-width:0.25">F</text>
+ <text
+ id="LabelG"
+ class="Label G"
+ x="198.09116"
+ y="58.546173"
+ style="font-size:6px;font-family:monospace;text-anchor:start;fill:none;stroke:#7f7f7f;stroke-width:0.25">G</text>
+ <text
+ id="LabelH"
+ class="Label H"
+ x="198.05161"
+ y="43.41045"
+ style="font-size:6px;font-family:monospace;text-anchor:start;fill:none;stroke:#7f7f7f;stroke-width:0.25">H</text>
+ <text
+ id="LabelJ"
+ class="Label J ModeSwitch"
+ x="198.2977"
+ y="50.89481"
+ style="font-size:6px;font-family:monospace;text-anchor:start;fill:none;stroke:#7f7f7f;stroke-width:0.25">J</text>
<g
- id="g12">
- <path
- id="ButtonF"
- class="Button F"
- d="M 224.197 20.5178 L 228.584 24.9044 C 233.231 19.89 233.232 12.1424 228.585 7.12743 L 224.197 11.5153 C 226.42 14.1044 226.42 17.9288 224.197 20.5178 Z" />
- <path
- id="LeaderF"
- class="Leader F"
- d="M 240.327 16.05963 L 229.698 16.05963" />
- <text
- id="LabelF"
- class="Label F"
- x="245.327"
- y="16.27919"
- style="text-anchor:start;">F</text>
- </g>
- <g
- id="g13">
- <path
- id="ButtonG"
- class="Button G"
- d="M 214.474 21.2391 L 210.109 25.6038 C 215.125 30.2506 222.873 30.2492 227.887 25.6008 L 223.523 21.2361 C 220.926 23.4866 217.071 23.4874 214.474 21.2381 Z" />
- <path
- id="LeaderG"
- class="Leader G"
- d="M 240.327 25.22647 L 224.081 25.22647" />
- <text
- id="LabelG"
- class="Label G"
- x="245.327"
- y="25.44603"
- style="text-anchor:start;">G</text>
- </g>
- <g
- id="g14">
- <path
- id="ButtonH"
- class="Button H"
- d="M 213.799 11.5128 L 209.426 7.14033 C 204.796 12.1516 204.796 19.8808 209.427 24.8916 L 213.799 20.5204 C 211.572 17.9305 211.572 14.1027 213.799 11.5128 Z" />
- <path
- id="LeaderH"
- class="Leader H"
- d="M 240.327 43.56015 L 208.272 43.56015 L 208.198 19.5457" />
- <text
- id="LabelH"
- class="Label H"
- x="245.327"
- y="43.77971"
- style="text-anchor:start;">H</text>
- </g>
- <g
- id="g15">
- <path
- id="ButtonJ"
- class="Button J ModeSwitch"
- d="M 218.994 10.6558 C 216.823 10.6558 214.866 11.9635 214.035 13.9692 C 213.204 15.9749 213.664 18.2835 215.199 19.8186 C 216.734 21.3537 219.043 21.8129 221.048 20.9821 C 223.054 20.1514 224.362 18.1942 224.362 16.0233 C 224.362 14.5997 223.796 13.2345 222.79 12.2279 C 221.783 11.2213 220.418 10.6558 218.994 10.6558 Z" />
- <path
- id="LeaderJ"
- class="Leader J ModeSwitch"
- d="M 240.327 34.39331 L 219.068 34.39331 L 218.994 19.546" />
- <text
- id="LabelJ"
- class="Label J ModeSwitch"
- x="245.327"
- y="34.61287"
- style="text-anchor:start;">J</text>
- </g>
- <g
- id="g17">
+ id="g17"
+ style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25"
+ transform="translate(-43.414111,-7.5157166e-5)">
<path
id="Dial2CCW"
- class="Dial2CCW Button"
- d="M 184.439 5.92916 L 186.686 4.82868 L 186.686 5.56234 C 188.029 5.47807 189.358 5.86856 190.431 6.6628 C 189.284 6.05373 187.934 5.92156 186.686 6.29598 L 186.686 7.02962 Z" />
+ 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" />
<path
id="LeaderDial2CCW"
class="Dial2CCW Dial2 Leader"
- d="M 182.409 6.93851 L 168.163 6.93851" />
+ d="M 225.28,6.93851 H 211.034" />
<text
id="LabelDial2CCW"
class="Dial2CCW Dial2 Label"
- x="163.163"
+ x="206.034"
y="7.2452002"
- style="text-anchor:end;">CCW</text>
+ style="text-anchor:end">CCW</text>
<path
id="Dial2CW"
class="Dial2CW Button"
- d="M 184.437 26.4712 L 186.684 25.3708 L 186.684 26.1044 C 187.982 26.2958 189.307 26.0362 190.429 25.3708 C 189.456 26.3672 188.091 26.9023 186.684 26.838 L 186.684 27.5717 Z" />
+ 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" />
<path
id="LeaderDial2CW"
class="Dial2CW Dial2 Leader"
- d="M 182.409 25.0934 L 168.163 25.0934" />
+ d="M 225.28,25.0934 H 211.034" />
<text
id="LabelDial2CW"
class="Dial2CW Dial2 Label"
- x="163.163"
+ x="206.034"
y="25.457001"
- style="text-anchor:end;">CW</text>
+ style="text-anchor:end">CW</text>
<path
id="Dial2"
class="Dial2 TouchDial"
- d="M 187.408 3.05324 C 182.162 3.05324 177.433 6.21328 175.425 11.0598 C 173.418 15.9064 174.527 21.485 178.237 25.1944 C 181.946 28.9038 187.525 30.0134 192.371 28.0059 C 197.218 25.9984 200.378 21.2691 200.378 16.0232 C 200.378 8.86011 194.571 3.05324 187.408 3.05324 Z" />
+ 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" />
</g>
</svg>
--
2.50.1

136
0004-layouts-move-the-rings-of-the-Intuos-Pro-3rd-down-in.patch Normal file
View File

@ -0,0 +1,136 @@
From eac68337e0c9e41b58b6a1a8e9016652251b0f4c Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
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</text>
<g
id="g7">
+ <path
+ id="Dial"
+ class="Dial TouchDial"
+ d="M 146.854 3.00752 C 141.607 3.00752 136.878 6.16756 134.87 11.0141 C 132.863 15.8607 133.972 21.4393 137.682 25.1487 C 141.391 28.8581 146.97 29.9677 151.817 27.9602 C 156.664 25.9527 159.824 21.2234 159.824 15.9775 C 159.824 8.81439 154.017 3.00752 146.854 3.00752 Z" />
<path
id="DialCCW"
class="DialCCW Button"
@@ -190,10 +194,6 @@
x="171.099"
y="25.45682"
style="text-anchor:start;">CW</text>
- <path
- id="Dial"
- class="Dial TouchDial"
- d="M 146.854 3.00752 C 141.607 3.00752 136.878 6.16756 134.87 11.0141 C 132.863 15.8607 133.972 21.4393 137.682 25.1487 C 141.391 28.8581 146.97 29.9677 151.817 27.9602 C 156.664 25.9527 159.824 21.2234 159.824 15.9775 C 159.824 8.81439 154.017 3.00752 146.854 3.00752 Z" />
</g>
<path
id="ButtonE"
@@ -272,6 +272,10 @@
style="text-anchor:start">J</text>
<g
id="g17">
+ <path
+ id="Dial2"
+ class="Dial2 TouchDial"
+ d="M 230.279 3.05324 C 225.033 3.05324 220.304 6.21328 218.296 11.0598 C 216.289 15.9064 217.398 21.485 221.108 25.1944 C 224.817 28.9038 230.396 30.0134 235.242 28.0059 C 240.089 25.9984 243.249 21.2691 243.249 16.0232 C 243.249 8.86011 237.442 3.05324 230.279 3.05324 Z" />
<path
id="Dial2CCW"
class="Dial2CCW Dial2 Button"
@@ -300,9 +304,5 @@
x="206.034"
y="25.457001"
style="text-anchor:end;">CW</text>
- <path
- id="Dial2"
- class="Dial2 TouchDial"
- d="M 230.279 3.05324 C 225.033 3.05324 220.304 6.21328 218.296 11.0598 C 216.289 15.9064 217.398 21.485 221.108 25.1944 C 224.817 28.9038 230.396 30.0134 235.242 28.0059 C 240.089 25.9984 243.249 21.2691 243.249 16.0232 C 243.249 8.86011 237.442 3.05324 230.279 3.05324 Z" />
</g>
</svg>
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)">
+ <path
+ id="Dial"
+ class="Dial TouchDial"
+ 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" />
<path
id="DialCCW"
class="DialCCW Button"
@@ -154,10 +158,6 @@
x="171.099"
y="25.45682"
style="text-anchor:start">CW</text>
- <path
- id="Dial"
- class="Dial TouchDial"
- 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" />
</g>
<path
id="ButtonE"
@@ -252,6 +252,10 @@
id="g17"
style="font-size:6px;font-family:monospace;fill:none;stroke:#7f7f7f;stroke-width:0.25"
transform="translate(-43.414111,-7.5157166e-5)">
+ <path
+ id="Dial2"
+ class="Dial2 TouchDial"
+ 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" />
<path
id="Dial2CCW"
class="Dial2CCW Dial2 Button"
@@ -280,9 +284,5 @@
x="206.034"
y="25.457001"
style="text-anchor:end">CW</text>
- <path
- id="Dial2"
- class="Dial2 TouchDial"
- 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" />
</g>
</svg>
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 @@
</g>
<g
id="g7">
+ <path
+ id="Dial"
+ class="Dial TouchDial"
+ d="M 123.532 3.00752 C 118.286 3.00752 113.557 6.16756 111.549 11.0141 C 109.542 15.8607 110.651 21.4393 114.361 25.1487 C 118.07 28.8581 123.649 29.9677 128.495 27.9602 C 133.342 25.9527 136.502 21.2234 136.502 15.9775 C 136.502 8.81439 130.695 3.00752 123.532 3.00752 Z" />
<path
id="DialCCW"
class="DialCCW Button"
@@ -127,9 +131,5 @@
x="147.777"
y="25.45682"
style="text-anchor:start;">CW</text>
- <path
- id="Dial"
- class="Dial TouchDial"
- d="M 123.532 3.00752 C 118.286 3.00752 113.557 6.16756 111.549 11.0141 C 109.542 15.8607 110.651 21.4393 114.361 25.1487 C 118.07 28.8581 123.649 29.9677 128.495 27.9602 C 133.342 25.9527 136.502 21.2234 136.502 15.9775 C 136.502 8.81439 130.695 3.00752 123.532 3.00752 Z" />
</g>
</svg>
--
2.50.1

379
0005-RHEL-pretend-the-Intuos-Pro-3rd-Gen-has-Rings-not-Di.patch Normal file
View File

@ -0,0 +1,379 @@
From 2789337d782623967920fe495142f8de83b6b6fb Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
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 <peter.hutterer@who-t.net>
---
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 @@
<g
id="g7">
<path
- id="Dial"
- class="Dial TouchDial"
+ id="Ring"
+ class="Ring TouchRing"
d="M 146.854 3.00752 C 141.607 3.00752 136.878 6.16756 134.87 11.0141 C 132.863 15.8607 133.972 21.4393 137.682 25.1487 C 141.391 28.8581 146.97 29.9677 151.817 27.9602 C 156.664 25.9527 159.824 21.2234 159.824 15.9775 C 159.824 8.81439 154.017 3.00752 146.854 3.00752 Z" />
<path
- id="DialCCW"
- class="DialCCW Button"
+ id="RingCCW"
+ class="RingCCW Button"
d="M 143.885 5.88344 L 146.132 4.78296 L 146.132 5.51662 C 147.475 5.43235 148.804 5.82284 149.877 6.61708 C 148.73 6.00801 147.38 5.87584 146.132 6.25026 L 146.132 6.9839 Z" />
<path
- id="LeaderDialCCW"
- class="DialCCW Dial Leader"
+ id="LeaderRingCCW"
+ class="RingCCW Ring Leader"
d="M 151.853 6.89279 L 166.099 6.89279" />
<text
- id="LabelDialCCW"
- class="DialCCW Dial Label"
+ id="LabelRingCCW"
+ class="RingCCW Ring Label"
x="171.099"
y="7.2452002"
style="text-anchor:start;">CCW</text>
<path
- id="DialCW"
- class="DialCW Button"
+ id="RingCW"
+ class="RingCW Button"
d="M 143.883 26.4255 L 146.13 25.3251 L 146.13 26.0587 C 147.428 26.2501 148.753 25.9905 149.875 25.3251 C 148.902 26.3215 147.537 26.8566 146.13 26.7923 L 146.13 27.526 Z" />
<path
- id="LeaderDialCW"
- class="DialCW Dial Leader"
+ id="LeaderRingCW"
+ class="RingCW Ring Leader"
d="M 151.853 25.0477 L 166.099 25.0477" />
<text
- id="LabelDialCW"
- class="DialCW Dial Label"
+ id="LabelRingCW"
+ class="RingCW Ring Label"
x="171.099"
y="25.45682"
style="text-anchor:start;">CW</text>
@@ -273,34 +273,34 @@
<g
id="g17">
<path
- id="Dial2"
- class="Dial2 TouchDial"
+ id="Ring2"
+ class="Ring2 TouchRing"
d="M 230.279 3.05324 C 225.033 3.05324 220.304 6.21328 218.296 11.0598 C 216.289 15.9064 217.398 21.485 221.108 25.1944 C 224.817 28.9038 230.396 30.0134 235.242 28.0059 C 240.089 25.9984 243.249 21.2691 243.249 16.0232 C 243.249 8.86011 237.442 3.05324 230.279 3.05324 Z" />
<path
- id="Dial2CCW"
- class="Dial2CCW Dial2 Button"
+ id="Ring2CCW"
+ class="Ring2CCW Ring2 Button"
d="M 227.31 5.92916 L 229.557 4.82868 L 229.557 5.56234 C 230.9 5.47807 232.229 5.86856 233.302 6.6628 C 232.155 6.05373 230.805 5.92156 229.557 6.29598 L 229.557 7.02962 Z" />
<path
- id="LeaderDial2CCW"
- class="Dial2CCW Dial2 Leader"
+ id="LeaderRing2CCW"
+ class="Ring2CCW Ring2 Leader"
d="M 225.28 6.93851 L 211.034 6.93851" />
<text
- id="LabelDial2CCW"
- class="Dial2CCW Dial2 Label"
+ id="LabelRing2CCW"
+ class="Ring2CCW Ring2 Label"
x="206.034"
y="7.2452002"
style="text-anchor:end;">CCW</text>
<path
- id="Dial2CW"
- class="Dial2CW Button"
+ id="Ring2CW"
+ class="Ring2CW Button"
d="M 227.308 26.4712 L 229.555 25.3708 L 229.555 26.1044 C 230.853 26.2958 232.178 26.0362 233.3 25.3708 C 232.327 26.3672 230.962 26.9023 229.555 26.838 L 229.555 27.5717 Z" />
<path
- id="LeaderDial2CW"
- class="Dial2CW Dial2 Leader"
+ id="LeaderRing2CW"
+ class="Ring2CW Ring2 Leader"
d="M 225.28 25.0934 L 211.034 25.0934" />
<text
- id="LabelDial2CW"
- class="Dial2CW Dial2 Label"
+ id="LabelRing2CW"
+ class="Ring2CW Ring2 Label"
x="206.034"
y="25.457001"
style="text-anchor:end;">CW</text>
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)">
<path
- id="Dial"
- class="Dial TouchDial"
+ id="Ring"
+ class="Ring TouchRing"
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" />
<path
- id="DialCCW"
- class="DialCCW Button"
+ id="RingCCW"
+ class="RingCCW Button"
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" />
<path
- id="LeaderDialCCW"
- class="DialCCW Dial Leader"
+ id="LeaderRingCCW"
+ class="RingCCW Ring Leader"
d="m 151.853,6.89279 h 14.246" />
<text
- id="LabelDialCCW"
- class="DialCCW Dial Label"
+ id="LabelRingCCW"
+ class="RingCCW Ring Label"
x="171.099"
y="7.2452002"
style="text-anchor:start">CCW</text>
<path
- id="DialCW"
- class="DialCW Button"
+ id="RingCW"
+ class="RingCW Button"
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" />
<path
- id="LeaderDialCW"
- class="DialCW Dial Leader"
+ id="LeaderRingCW"
+ class="RingCW Ring Leader"
d="m 151.853,25.0477 h 14.246" />
<text
- id="LabelDialCW"
- class="DialCW Dial Label"
+ id="LabelRingCW"
+ class="RingCW Ring Label"
x="171.099"
y="25.45682"
style="text-anchor:start">CW</text>
@@ -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)">
<path
- id="Dial2"
- class="Dial2 TouchDial"
+ id="Ring2"
+ class="Ring2 TouchRing"
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" />
<path
- id="Dial2CCW"
- class="Dial2CCW Dial2 Button"
+ id="Ring2CCW"
+ class="Ring2CCW Ring2 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" />
<path
- id="LeaderDial2CCW"
- class="Dial2CCW Dial2 Leader"
+ id="LeaderRing2CCW"
+ class="Ring2CCW Ring2 Leader"
d="M 225.28,6.93851 H 211.034" />
<text
- id="LabelDial2CCW"
- class="Dial2CCW Dial2 Label"
+ id="LabelRing2CCW"
+ class="Ring2CCW Ring2 Label"
x="206.034"
y="7.2452002"
style="text-anchor:end">CCW</text>
<path
- id="Dial2CW"
- class="Dial2CW Button"
+ id="Ring2CW"
+ class="Ring2CW Button"
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" />
<path
- id="LeaderDial2CW"
- class="Dial2CW Dial2 Leader"
+ id="LeaderRing2CW"
+ class="Ring2CW Ring2 Leader"
d="M 225.28,25.0934 H 211.034" />
<text
- id="LabelDial2CW"
- class="Dial2CW Dial2 Label"
+ id="LabelRing2CW"
+ class="Ring2CW Ring2 Label"
x="206.034"
y="25.457001"
style="text-anchor:end">CW</text>
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 @@
<g
id="g7">
<path
- id="Dial"
- class="Dial TouchDial"
+ id="Ring"
+ class="Ring TouchRing"
d="M 123.532 3.00752 C 118.286 3.00752 113.557 6.16756 111.549 11.0141 C 109.542 15.8607 110.651 21.4393 114.361 25.1487 C 118.07 28.8581 123.649 29.9677 128.495 27.9602 C 133.342 25.9527 136.502 21.2234 136.502 15.9775 C 136.502 8.81439 130.695 3.00752 123.532 3.00752 Z" />
<path
- id="DialCCW"
- class="DialCCW Button"
+ id="RingCCW"
+ class="RingCCW Button"
d="M 120.563 5.88344 L 122.81 4.78296 L 122.81 5.51662 C 124.153 5.43235 125.482 5.82284 126.555 6.61708 C 125.408 6.00801 124.058 5.87584 122.81 6.25026 L 122.81 6.9839 Z" />
<path
- id="LeaderDialCCW"
- class="DialCCW Dial Leader"
+ id="LeaderRingCCW"
+ class="RingCCW Ring Leader"
d="m 128.531,6.89279 h 14.246" />
<text
- id="LabelDialCCW"
- class="DialCCW Dial Label"
+ id="LabelRingCCW"
+ class="RingCCW Ring Label"
x="147.777"
y="7.2452"
style="text-anchor:start;">CCW</text>
<path
- id="DialCW"
- class="DialCW Button"
+ id="RingCW"
+ class="RingCW Button"
d="M 120.561 26.4255 L 122.808 25.3251 L 122.808 26.0587 C 124.106 26.2501 125.431 25.9905 126.553 25.3251 C 125.58 26.3215 124.215 26.8566 122.808 26.7923 L 122.808 27.526 Z" />
<path
- id="LeaderDialCW"
- class="DialCW Dial Leader"
+ id="LeaderRingCW"
+ class="RingCW Ring Leader"
d="m 128.531,25.0477 h 14.246" />
<text
- id="LabelDialCW"
- class="DialCW Dial Label"
+ id="LabelRingCW"
+ class="RingCW Ring Label"
x="147.777"
y="25.45682"
style="text-anchor:start;">CW</text>
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

45
SOURCES/0001-data-Add-ISDv4-51c7-Lenovo-IdeaPad-FLEX-14API-304.patch
View File

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

233
SOURCES/0001-data-Add-multiple-Lenovo-ThinkPad-X1-Yoga-Gen-6-PIDs.patch
View File

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

45
SOURCES/0002-data-Add-ISDv4-51f9-Lenovo-ThinkPad-L13-Yoga-358.patch
View File

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

44
SOURCES/0002-data-Add-enovo-IdeaPad-Flex-5-14ARE05-ISDv4-5215.patch
View File

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

46
SOURCES/0003-data-Add-ISDv4-51e9-Lenovo-ThinkPad-P15-Gen-1-325.patch
View File

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

45
SOURCES/0003-data-Add-ISDv4-523a-Lenovo-Yoga-9-14ITL5-357.patch
View File

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

45
SOURCES/0004-data-Add-ISDv4-5202-Lenovo-YOGA-C640-13IML-322.patch
View File

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

45
SOURCES/0004-data-Add-ISDv4-5204-Lenovo-YOGA-C640-13IML-356.patch
View File

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

45
SOURCES/0005-data-Add-ISDv4-5256-Lenovo-Yoga-7-15ITL5-351.patch
View File

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

40
SOURCES/0005-data-Add-Lenovo-X1-Yoga-3-Generation-ISDv4-5148-320.patch
View File

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

45
SOURCES/0006-data-Add-ISDv4-5216-Lenovo-IdeaPad-Flex-5-14IIL05-35.patch
View File

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

45
SOURCES/0007-data-Add-ISDv4-528e-Lenovo-Yoga-6-13ARE05-346.patch
View File

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

45
SOURCES/0008-data-Add-ISDv4-5229-Lenovo-ThinkPad-X1-Yoga-Gen-5-34.patch
View File

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

43
SOURCES/0009-data-Add-Lenovo-ThinkPad-X13-Yoga-Gen-1-ISDv4-5220-3.patch
View File

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

45
SOURCES/0010-data-Add-ISDv4-5072-Lenovo-ThinkPad-Yoga-11e-3rd-Gen.patch
View File

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

250
SPECS/libwacom.spec → libwacom.spec
View File

@ -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 <peter.hutterer@redhat.com> 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 <peter.hutterer@redhat.com> 1.6-2
- Add Lenovo tablet files from upstream (#1914411)
%changelog
* Wed Aug 20 2025 Peter Hutterer <peter.hutterer@redhat.com> - 2.14.0-3
- Rearrange the button leaders for the Intuos Pro 3rd Gen (RHEL-101873)
* Tue Jul 22 2025 Peter Hutterer <peter.hutterer@redhat.com> - 2.14.0-2
- Add Wacom Intuos Pro 3rd Gen and newest Cintiqs (RHEL-101873)
* Mon Dec 16 2024 Peter Hutterer <peter.hutterer@redhat.com> - 2.14-1
- libwacom 2.14 (RHEL-70830)
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.12.2-3
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.12.2-2
- Bump release for June 2024 mass rebuild
* Fri Jun 21 2024 Peter Hutterer <peter.hutterer@redhat.com> - 2.12.2-1
- libwacom 2.12.2
* Wed Jun 12 2024 Peter Hutterer <peter.hutterer@redhat.com> 2.12.1-1
- libwacom 2.12.1
* Thu Jun 06 2024 Peter Hutterer <peter.hutterer@redhat.com> 2.12.0-1
- libwacom 2.12
* Wed Feb 07 2024 Peter Hutterer <peter.hutterer@redhat.com> - 2.10.0-1
- libwacom 2.10.0
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.9.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Nov 27 2023 Peter Hutterer <peter.hutterer@redhat.com> - 2.9.0-1
- libwacom 2.9.0
* Tue Sep 05 2023 Peter Hutterer <peter.hutterer@redhat.com>
- SPDX migration: update to SPDX identifiers.
Turns out the COPYING file references the HPND, not MIT.
* Thu Aug 31 2023 Peter Hutterer <peter.hutterer@redhat.com> - 2.8.0-1
- libwacom 2.8.0
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.7.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed May 17 2023 Peter Hutterer <peter.hutterer@redhat.com> - 2.7.0-1
- libwacom 2.7.0
* Mon Jan 23 2023 Peter Hutterer <peter.hutterer@redhat.com> - 2.6.0-1
- libwacom 2.6.0
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 28 2022 Peter Hutterer <peter.hutterer@redhat.com> - 2.4.0-1
- libwacom 2.4.0
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 20 2022 Peter Hutterer <peter.hutterer@redhat.com> - 2.3.0-1
- libwacom 2.3.0
* Fri Mar 25 2022 Peter Hutterer <peter.hutterer@redhat.com> - 2.2.0-1
- libwacom 2.2.0
* Fri Feb 11 2022 Peter Hutterer <peter.hutterer@redhat.com> - 2.1.0-1
- libwacom 2.1.0
* Mon Jan 31 2022 Peter Hutterer <peter.hutterer@redhat.com> - 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 <releng@fedoraproject.org> - 2.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Jan 17 2022 Peter Hutterer <peter.hutterer@redhat.com> - 2.0.0-1
- libwacom 2.0.0
* Mon Dec 13 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.99.1-1
- libwacom 1.99.1
* Wed Sep 01 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.12-1
- libwacom 1.12
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jul 16 2021 Peter Hutterer <peter.hutterer@redhat.com> - 1.11-1
- libwacom 1.11
* Wed Apr 28 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.10-1
- libwacom 1.10
* Thu Mar 25 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.9-2
- Add X1 Yoga6 data files (#1940872)
* Wed Feb 24 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.9-1
- libwacom 1.9
* Tue Feb 09 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.8-2
- Add tablet file for Lenovo Yoga 6
* Fri Jan 29 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.8-1
- libwacom 1.8
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Jan 14 2021 Peter Hutterer <peter.hutterer@redhat.com> 1.7-2
- Add tablet file for Lenovo ThinkPad P15 (#1914409)
* Thu Dec 17 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.7-1
- libwacom 1.7
* Wed Nov 04 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.6-2
- Change BuildRequires to git-core, we don't need full git
* Tue Nov 03 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.6-1
- libwacom 1.6 (#1878160)
- libwacom 1.6
* Thu Jun 25 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.1-3
- Add a set of Lenovo tablets and styli (#1850319)
* Mon Aug 31 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.5-1
- libwacom 1.5
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jun 30 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.4.1-1
- libwacom 1.4.1
* Wed Jun 24 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.4-1
- libwacom 1.4
* Wed Mar 25 2020 Peter Hutterer <peter.hutterer@redhat.com> 1.3-1
- libwacom 1.3
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Dec 23 2019 Peter Hutterer <peter.hutterer@redhat.com> 1.2-2
- Disable documentation explicitly. Fedora uses --auto-features=enabled
during the build.
* Mon Dec 23 2019 Peter Hutterer <peter.hutterer@redhat.com> 1.2-1
- libwacom 1.2
* Thu Nov 07 2019 Peter Hutterer <peter.hutterer@redhat.com> 1.1-2
- Conflict with older libwacom
- Require a libwacom-data package of the same version
* Thu Nov 07 2019 Peter Hutterer <peter.hutterer@redhat.com> 1.1-1
- libwacom 1.1 (#1741423)
* Mon Sep 16 2019 Peter Hutterer <peter.hutterer@redhat.com> 1.1-1
- libwacom 1.1
* Mon Aug 26 2019 Peter Hutterer <peter.hutterer@redhat.com> 1.0-1
- libwacom 1.0
* Thu Aug 08 2019 Peter Hutterer <peter.hutterer@redhat.com> 0.99.901-1
- libwacom 1.0rc1
- switch to meson
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.33-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Apr 12 2019 Peter Hutterer <peter.hutterer@redhat.com> 0.33-1
- libwacom 0.33
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.32-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Nov 12 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.32-2
- Move the udev rule to the noarch libwacom-data package (#1648743)
* Mon Nov 05 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.32-1
- libwacom 0.32
* Thu Aug 09 2018 Peter Hutterer <peter.hutterer@redhat.com> 0.31-1
- libwacom 0.31 (#1612758)
- libwacom 0.31
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.30-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (libwacom-2.14.0.tar.xz) = f2980d4728d3164be325a9a21cf0c27a7d8004c6812f9c1e730916259420b666cc2e5d6166acdb55542a8a35533291d1bd7284a58c2a194558a77215d1580f86