Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libwacom for openSUSE:Factory checked in at 2022-08-17 18:16:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libwacom (Old) and /work/SRC/openSUSE:Factory/.libwacom.new.1521 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libwacom" Wed Aug 17 18:16:37 2022 rev:37 rq:997115 version:2.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libwacom/libwacom.changes 2022-06-03 14:16:48.725327848 +0200 +++ /work/SRC/openSUSE:Factory/.libwacom.new.1521/libwacom.changes 2022-08-17 18:19:59.766786059 +0200 @@ -1,0 +2,13 @@ +Thu Jul 28 20:20:39 UTC 2022 - Dirk M??ller <dmuel...@suse.com> + +- update to 2.4.0: + - Huion Inspiroy H1060P + - XP-Pen Artist 12, Deco L + - Chuwi MiniBook X + - Acer Chromebook Spin 13 + - Huion HS611 + - Lenovo 14s Yoga, X13 Yoga, X1 Yoga, X380 + - Samsung Galaxy Book Pro 360, Flex2 +- Devices matching a "* Keyboard" glob are no longer treated as tablets + +------------------------------------------------------------------- Old: ---- libwacom-2.2.0.tar.xz libwacom-2.2.0.tar.xz.sig New: ---- libwacom-2.4.0.tar.xz libwacom-2.4.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libwacom.spec ++++++ --- /var/tmp/diff_new_pack.pXryDP/_old 2022-08-17 18:20:00.206786972 +0200 +++ /var/tmp/diff_new_pack.pXryDP/_new 2022-08-17 18:20:00.210786980 +0200 @@ -16,7 +16,7 @@ # Name: libwacom -Version: 2.2.0 +Version: 2.4.0 Release: 0 Summary: Library to identify wacom tablets License: MIT ++++++ libwacom-2.2.0.tar.xz -> libwacom-2.4.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwacom-2.2.0/.github/workflows/freebsd.yml new/libwacom-2.4.0/.github/workflows/freebsd.yml --- old/libwacom-2.2.0/.github/workflows/freebsd.yml 2022-03-25 07:04:16.000000000 +0100 +++ new/libwacom-2.4.0/.github/workflows/freebsd.yml 2022-07-28 01:53:23.000000000 +0200 @@ -12,7 +12,7 @@ steps: - uses: actions/checkout@v2 - name: meson test - uses: vmactions/freebsd-vm@v0.1.5 + uses: vmactions/freebsd-vm@v0.1.7 with: prepare: | pkg install -y meson pkgconf evdev-proto libgudev libxml++ bash libevdev diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwacom-2.2.0/NEWS new/libwacom-2.4.0/NEWS --- old/libwacom-2.2.0/NEWS 2022-03-25 07:04:16.000000000 +0100 +++ new/libwacom-2.4.0/NEWS 2022-07-28 01:53:23.000000000 +0200 @@ -1,3 +1,17 @@ +libwacom 2.4: +- New Devices: + - Huion Inspiroy H1060P + - XP-Pen Artist 12, Deco L + - Chuwi MiniBook X + +libwacom 2.3: +- New Devices: + - Acer Chromebook Spin 13 + - Huion HS611 + - Lenovo 14s Yoga, X13 Yoga, X1 Yoga, X380 + - Samsung Galaxy Book Pro 360, Flex2 +- Devices matching a "* Keyboard" glob are no longer treated as tablets + libwacom 2.2: - New Devices: - Lenovo X1 Yoga Gen6, X1 Titanium Gen1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwacom-2.2.0/README.md new/libwacom-2.4.0/README.md --- old/libwacom-2.2.0/README.md 2022-03-25 07:04:16.000000000 +0100 +++ new/libwacom-2.4.0/README.md 2022-07-28 01:53:23.000000000 +0200 @@ -4,8 +4,9 @@ features. It provides easy access to information such as "is this a built-in on-screen tablet", "what is the size of this model", etc. -This functionality is currently used by e.g. GNOME to map built-in tablets to -the correct screen. +This functionality is currently used by GUI toolkits (GNOME, KDE, others?) to map +built-in tablets to the correct screen. SVG layout files are used to describe +tablet construction. # Adding tablet descriptions to libwacom @@ -41,10 +42,12 @@ ### libwacom 1.10 and newer Copy the `.tablet` file into `/etc/libwacom` and run the -`libwacom-update-db` tool: +`libwacom-update-db` tool. Copy the tablet's `.svg` layout file +to `/etc/libwacom/layouts`. ``` $ cp my-tablet-file-from-upstream.tablet /etc/libwacom/ +$ cp my-tablet-file-layout.svg /etc/libwacom/layouts/ $ libwacom-update-db /etc/libwacom ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwacom-2.2.0/autogen.sh new/libwacom-2.4.0/autogen.sh --- old/libwacom-2.2.0/autogen.sh 2022-03-25 07:04:16.000000000 +0100 +++ new/libwacom-2.4.0/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -#! /bin/sh - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? - -if test -z "$NOCONFIGURE"; then - exec $srcdir/configure "$@" -fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwacom-2.2.0/data/chuwi-minibookx.tablet new/libwacom-2.4.0/data/chuwi-minibookx.tablet --- old/libwacom-2.2.0/data/chuwi-minibookx.tablet 1970-01-01 01:00:00.000000000 +0100 +++ new/libwacom-2.4.0/data/chuwi-minibookx.tablet 2022-07-28 01:53:23.000000000 +0200 @@ -0,0 +1,19 @@ +# CHUWI +# MiniBook X +# +# sysinfo.CSujtSF02A +# https://github.com/linuxwacom/wacom-hid-descriptors/issues/241 + +[Device] +Name=Chuwi Minibook X +Class=ISDV4 +DeviceMatch=i2c:27c6:011a +Width=9 +Height=6 +IntegratedIn=Display;System; +Styli=0x621 + +[Features] +Stylus=true +Touch=true +Buttons=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwacom-2.2.0/data/huion-h1060p.tablet new/libwacom-2.4.0/data/huion-h1060p.tablet --- old/libwacom-2.2.0/data/huion-h1060p.tablet 1970-01-01 01:00:00.000000000 +0100 +++ new/libwacom-2.4.0/data/huion-h1060p.tablet 2022-07-28 01:53:23.000000000 +0200 @@ -0,0 +1,26 @@ +# HUION +# H1060P +# sysinfo.H1060P.tar.gz +# https://github.com/linuxwacom/wacom-hid-descriptors/issues/230 + +[Device] +Name=HUION H1060P Tablet +ModelName= +DeviceMatch=usb:256c:006d:HUION Huion Tablet Pad;usb:256c:006d:HUION Huion Tablet Pen +Class=Bamboo +Width=10 +Height=6 +IntegratedIn= +Layout=huion-h1060p.svg +Styli=0xffffd; + +[Features] +Stylus=true +Reversible=true +Touch=false +NumStrips=0 +Buttons=12 + +[Buttons] +Left=A;B;C;D;E;F;G;H;I;J;K;L +EvdevCodes=0x100;0x101;0x102;0x103;0x104;0x105;0x106;0x107;0x108;0x109;0x130;0x131 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwacom-2.2.0/data/huion-hs611.tablet new/libwacom-2.4.0/data/huion-hs611.tablet --- old/libwacom-2.2.0/data/huion-hs611.tablet 1970-01-01 01:00:00.000000000 +0100 +++ new/libwacom-2.4.0/data/huion-hs611.tablet 2022-07-28 01:53:23.000000000 +0200 @@ -0,0 +1,56 @@ +# Huion +# HS611 +# +# Button Map: +# (A=1, B=2, C=3, ...) +# +# *-----------------* +# | | +# A | | +# B | | +# C | | +# D | | +# E | | +# | TABLET | +# F | | +# G | | +# H | | +# I | | +# J | | +# | | +# *-----------------* +# +# +# Touch Strip Map: +# (a=strip min, A=strip max) +# +# a A +# *------------------------* +# | | +# | TABLET | +# | | +# *------------------------* +# +# sysinfo.RmLwlkDGnI +# https://github.com/linuxwacom/wacom-hid-descriptors/issues/132 + +[Device] +Name=Huion HS611 +DeviceMatch=usb:256c:006d:HUION Huion Tablet_HS611 Pad;usb:256c:006d:HUION Huion Tablet_HS611 Touch Strip;usb:256c:006d:HUION Huion Tablet_HS611 Pen +Class=Bamboo +Width=10 +Height=6 +IntegratedIn= +Layout=huion-hs611.svg +Styli=0xffffd + +[Features] +Stylus=true +Reversible=true +Touch=false +NumStrips=1 +Buttons=10 + +[Buttons] +Left=A;B;C;D;E;F;G;H;I;J +EvdevCodes=0x100;0x101;0x102;0x103;0x104;0x105;0x106;0x107;0x108;0x109 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwacom-2.2.0/data/isdv4-2d1f-0066.tablet new/libwacom-2.4.0/data/isdv4-2d1f-0066.tablet --- old/libwacom-2.2.0/data/isdv4-2d1f-0066.tablet 1970-01-01 01:00:00.000000000 +0100 +++ new/libwacom-2.4.0/data/isdv4-2d1f-0066.tablet 2022-07-28 01:53:23.000000000 +0200 @@ -0,0 +1,22 @@ +# Acer Chromebook Spin 13 +# Sensor Type: EMR +# Features: Tilt +# HW Resolution: 28527 x 19018 (2540 x 2540 lpi) +# +# Autogenerated from sysinfo.MiB57j3jTx +# https://github.com/linuxwacom/wacom-hid-descriptors/issues/211#issue-1173631466 + +[Device] +Name=ISDv4 0066 +ModelName= +DeviceMatch=i2c:2d1f:0066 +Class=ISDV4 +Width=11 +Height=7 +IntegratedIn=Display;System +Styli=0xfffff;0xffffe; + +[Features] +Stylus=true +Touch=false +Buttons=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwacom-2.2.0/data/isdv4-2d1f-0114.tablet new/libwacom-2.4.0/data/isdv4-2d1f-0114.tablet --- old/libwacom-2.2.0/data/isdv4-2d1f-0114.tablet 1970-01-01 01:00:00.000000000 +0100 +++ new/libwacom-2.4.0/data/isdv4-2d1f-0114.tablet 2022-07-28 01:53:23.000000000 +0200 @@ -0,0 +1,23 @@ +# Samsung Galaxy Book Flex2 (930QCA) +# Sensor Type: EMR +# Features: Touch (External), Tilt +# HW Resolution: 29376 x 16524 (2540 x 2540 lpi) +# +# Autogenerated from sysinfo.Z0qS0b6ezo +# https://github.com/linuxwacom/wacom-hid-descriptors/issues/218#issue-1206392626 + +[Device] +Name=ISDv4 0114 +ModelName= +DeviceMatch=i2c:2d1f:0114 +PairedID=i2c:04f3:2c86 +Class=ISDV4 +Width=12 +Height=7 +IntegratedIn=Display;System +Styli=0xfffff;0xffffe; + +[Features] +Stylus=true +Touch=true +Buttons=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwacom-2.2.0/data/isdv4-2d1f-0136.tablet new/libwacom-2.4.0/data/isdv4-2d1f-0136.tablet --- old/libwacom-2.2.0/data/isdv4-2d1f-0136.tablet 1970-01-01 01:00:00.000000000 +0100 +++ new/libwacom-2.4.0/data/isdv4-2d1f-0136.tablet 2022-07-28 01:53:23.000000000 +0200 @@ -0,0 +1,23 @@ +# Samsung Galaxy Book Pro 360 (950QDB) +# Sensor Type: EMR +# Features: Touch (External), Tilt +# HW Resolution: 34422 x 19362 (2540 x 2540 lpi) +# +# Autogenerated from sysinfo.io3MkqoJgX +# https://github.com/linuxwacom/wacom-hid-descriptors/issues/219#issue-1210543809 + +[Device] +Name=ISDv4 0136 +ModelName= +DeviceMatch=i2c:2d1f:0136 +PairedID=i2c:27c6:0123 +Class=ISDV4 +Width=14 +Height=8 +IntegratedIn=Display;System +Styli=0xfffff;0xffffe; + +[Features] +Stylus=true +Touch=true +Buttons=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwacom-2.2.0/data/isdv4-5093.tablet new/libwacom-2.4.0/data/isdv4-5093.tablet --- old/libwacom-2.2.0/data/isdv4-5093.tablet 1970-01-01 01:00:00.000000000 +0100 +++ new/libwacom-2.4.0/data/isdv4-5093.tablet 2022-07-28 01:53:23.000000000 +0200 @@ -0,0 +1,22 @@ +# Lenovo ThinkPad X1 Yoga 1st +# Sensor Type: AES +# Features: Touch (Integrated) +# HW Resolution: 30914 x 17389 (2540 x 2540 lpi) +# +# Autogenerated from sysinfo.YlkAdnO0QI +# https://github.com/linuxwacom/wacom-hid-descriptors/issues/220#issue-1211531039 + +[Device] +Name=ISDv4 5093 +ModelName= +DeviceMatch=usb:056a:5093 +Class=ISDV4 +Width=12 +Height=7 +IntegratedIn=Display;System +Styli=@isdv4-aes; + +[Features] +Stylus=true +Touch=true +Buttons=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwacom-2.2.0/data/isdv4-5155.tablet new/libwacom-2.4.0/data/isdv4-5155.tablet --- old/libwacom-2.2.0/data/isdv4-5155.tablet 1970-01-01 01:00:00.000000000 +0100 +++ new/libwacom-2.4.0/data/isdv4-5155.tablet 2022-07-28 01:53:23.000000000 +0200 @@ -0,0 +1,19 @@ +# this is for the Wacom pen + touchscreen as found in some versions of the Lenovo ThinkPad X380 Yoga +# +# sysinfo.k4zWHNsL8F.tar.gz +# https://github.com/linuxwacom/wacom-hid-descriptors/issues/235 + +[Device] +Name=Wacom ISDv4 5155 +ModelName= +DeviceMatch=usb:056a:5155 +Class=ISDV4 +Width=12 +Height=7 +IntegratedIn=Display;System +Styli=@isdv4-aes; + +[Features] +Stylus=true +Touch=true +Buttons=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwacom-2.2.0/data/isdv4-526c.tablet new/libwacom-2.4.0/data/isdv4-526c.tablet --- old/libwacom-2.2.0/data/isdv4-526c.tablet 1970-01-01 01:00:00.000000000 +0100 +++ new/libwacom-2.4.0/data/isdv4-526c.tablet 2022-07-28 01:53:23.000000000 +0200 @@ -0,0 +1,22 @@ +# Lenovo ThinkBook 14s Yoga ITL +# Sensor Type: AES +# Features: Touch (Integrated), Tilt +# HW Resolution: 30931 x 17399 (2540 x 2540 lpi) +# +# Autogenerated from sysinfo.KPGH96DnV5 +# https://github.com/linuxwacom/wacom-hid-descriptors/issues/216#issue-1193382481 + +[Device] +Name=ISDv4 526c +ModelName= +DeviceMatch=i2c:056a:526c +Class=ISDV4 +Width=12 +Height=7 +IntegratedIn=Display;System +Styli=@isdv4-aes; + +[Features] +Stylus=true +Touch=true +Buttons=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwacom-2.2.0/data/isdv4-5286.tablet new/libwacom-2.4.0/data/isdv4-5286.tablet --- old/libwacom-2.2.0/data/isdv4-5286.tablet 1970-01-01 01:00:00.000000000 +0100 +++ new/libwacom-2.4.0/data/isdv4-5286.tablet 2022-07-28 01:53:23.000000000 +0200 @@ -0,0 +1,22 @@ +# Lenovo ThinkPad X13 Yoga Gen 2 +# Sensor Type: AES +# Features: Touch (Integrated), Tilt +# HW Resolution: 28604 x 17878 (2540 x 2540 lpi) +# +# Autogenerated from sysinfo.GXIByeQ9oZ +# https://github.com/linuxwacom/wacom-hid-descriptors/issues/217#issue-1197469711 + +[Device] +Name=ISDv4 5286 +ModelName= +DeviceMatch=i2c:056a:5286 +Class=ISDV4 +Width=11 +Height=7 +IntegratedIn=Display;System +Styli=@isdv4-aes; + +[Features] +Stylus=true +Touch=true +Buttons=0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwacom-2.2.0/data/layouts/huion-h1060p.svg new/libwacom-2.4.0/data/layouts/huion-h1060p.svg --- old/libwacom-2.2.0/data/layouts/huion-h1060p.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libwacom-2.4.0/data/layouts/huion-h1060p.svg 2022-07-28 01:53:23.000000000 +0200 @@ -0,0 +1,180 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" + "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg + width="360.0" + height="240.0" + style="color:#000000;font-size:8px;fill:none;stroke:#7f7f7f;stroke-width:0.25" + version="1.1" + xmlns="http://www.w3.org/2000/svg"> + <title + id="title">Huion H1060P</title> + <path + id="ButtonA" + class="A Button" + d="M 16.0 42.5 H 32.0 v 12.0 H 16.0 c -0.5 0.0 -1.0 -0.5 -1.0 -1.0 v -10.0 c 0.0 -0.5 0.5 -1.0 1.0 -1.0 z" /> + <path + id="LeaderA" + class="A Leader" + d="M 8.5 51.5 H 13.5" /> + <text + id="LabelA" + class="A Label" + x="7.0" + y="51.5" + style="text-anchor:end">A</text> + <path + id="ButtonB" + class="B Button" + d="M 49.0 42.5 H 33.0 v 12.0 h 16.0 c 0.5 0.0 1.0 -0.5 1.0 -1.0 v -10.0 c 0.0 -0.5 -0.5 -1.0 -1.0 -1.0 z" /> + <path + id="LeaderB" + class="B Leader" + d="M 56.5 51.5 H 51.5" /> + <text + id="LabelB" + class="B Label" + x="57.0" + y="51.5" + style="text-anchor:start">B</text> + <path + id="ButtonC" + class="C Button" + d="M 16.0 67.0 H 32.0 v 12.0 H 16.0 c -0.5 0 -1 -0.5 -1 -1 v -10 c 0 -0.5 0.5 -1 1 -1 z" /> + <path + id="LeaderC" + class="C Leader" + d="M 8.5 75.5 H 13.5" /> + <text + id="LabelC" + class="C Label" + x="7.0" + y="75.5" + style="text-anchor:end">C</text> + <path + id="ButtonD" + class="D Button" + d="M 49.0 67.0 H 33.0 v 12.0 h 16.0 c 0.5 0.0 1.0 -0.5 1.0 -1.0 v -10.0 c 0.0 -0.5 -0.5 -1.0 -1.0 -1.0 z" /> + <path + id="LeaderD" + class="D Leader" + d="M 56.5 75.5 H 51.5" /> + <text + id="LabelD" + class="D Label" + x="57.0" + y="75.5" + style="text-anchor:start">D</text> + <path + id="ButtonE" + class="E Button" + d="m 16.0 91.0 h 16.0 v 12.0 H 16.0 c -0.5 0.0 -1.0 -0.5 -1.0 -1.0 v -10.0 c 0.0 -0.5 0.5 -1.0 1.0 -1.0 z" /> + <path + id="LeaderE" + class="E Leader" + d="M 8.5 99.5 H 13.5" /> + <text + id="LabelE" + class="E Label" + x="7.0" + y="99.5" + style="text-anchor:end">E</text> + <path + id="ButtonF" + class="F Button" + d="M 49.0 91.0 H 33.0 v 12.0 h 16.0 c 0.5 0.0 1.0 -0.5 1.0 -1.0 v -10.0 c 0.0 -0.5 -0.5 -1.0 -1.0 -1.0 z" /> + <path + id="LeaderF" + class="F Leader" + d="M 56.5 99.5 H 51.5" /> + <text + id="LabelF" + class="F Label" + x="57.0" + y="99.5" + style="text-anchor:start">F</text> + <path + id="ButtonG" + class="G Button" + d="m 16.0 138.0 h 16.0 v 12.0 H 16.0 c -0.5 0.0 -1.0 -0.5 -1.0 -1.0 v -10.0 c 0.0 -0.5 0.5 -1.0 1.0 -1.0 z" /> + <path + id="LeaderG" + class="G Leader" + d="M 8.5 146.5 H 13.5" /> + <text + id="LabelG" + class="G Label" + x="7.0" + y="146.5" + style="text-anchor:end">G</text> + <path + id="ButtonH" + class="H Button" + d="M 49.0 138.0 H 33.0 v 12.0 h 16.0 c 0.5 0.0 1.0 -0.5 1.0 -1.0 v -10.0 c 0.0 -0.5 -0.5 -1.0 -1.0 -1.0 z" /> + <path + id="LeaderH" + class="H Leader" + d="M 56.5 146.5 H 51.5" /> + <text + id="LabelH" + class="H Label" + x="57.0" + y="146.5" + style="text-anchor:start">H</text> + <path + id="ButtonI" + class="I Button" + d="m 16.0 162.0 h 16.0 v 12.0 H 16.0 c -0.5 0.0 -1.0 -0.5 -1.0 -1.0 v -10.0 c 0.0 -0.5 0.5 -1.0 1.0 -1.0 z" /> + <path + id="LeaderI" + class="I Leader" + d="M 8.5 171.0 H 13.5" /> + <text + id="LabelI" + class="I Label" + x="7.0" + y="171.0" + style="text-anchor:end">I</text> + <path + id="ButtonJ" + class="J Button" + d="M 49.0 162.0 H 33.0 v 12.0 h 16.0 c 0.5 0.0 1.0 -0.5 1.0 -1.0 v -10.0 c 0.0 -0.5 -0.5 -1.0 -1.0 -1.0 z" /> + <path + id="LeaderJ" + class="J Leader" + d="M 56.5 171.0 H 51.5" /> + <text + id="LabelJ" + class="J Label" + x="57.0" + y="171.0" + style="text-anchor:start">J</text> + <path + id="ButtonK" + class="K Button" + d="m 16.0 186.0 h 16.0 v 12.0 H 16.0 c -0.5 0.0 -1.0 -0.5 -1.0 -1.0 v -10.0 c 0.0 -0.5 0.5 -1.0 1.0 -1.0 z" /> + <path + id="LeaderK" + class="K Leader" + d="M 8.5 195.0 H 13.5" /> + <text + id="LabelK" + class="K Label" + x="7.0" + y="195.0" + style="text-anchor:end">K</text> + <path + id="ButtonL" + class="L Button" + d="M 49.0 186.0 H 33.0 v 12.0 h 16.0 c 0.5 0.0 1.0 -0.5 1.0 -1.0 v -10.0 c 0.0 -0.5 -0.5 -1.0 -1.0 -1.0 z" /> + <path + id="LeaderL" + class="L Leader" + d="M 56.5 195.0 H 51.5" /> + <text + id="LabelL" + class="L Label" + x="57.0" + y="195.0" + style="text-anchor:start">L</text> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwacom-2.2.0/data/layouts/huion-hs611.svg new/libwacom-2.4.0/data/layouts/huion-hs611.svg --- old/libwacom-2.2.0/data/layouts/huion-hs611.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libwacom-2.4.0/data/layouts/huion-hs611.svg 2022-07-28 01:53:23.000000000 +0200 @@ -0,0 +1,272 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" + "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg + xmlns:svg="http://www.w3.org/2000/svg" + style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8" + version="1.1" + id="hs611" + height="218" + width="333"> + <title id="title">Huion HS611</title> + <g + id="E"> + <rect + id="ButtonE" + width="14.940429" + height="10.02261" + x="19.938246" + y="89.998764" + ry="5.0113049" + class="E Button" /> + <path + d="m 35.975139,95.015501 h 16" + id="LeaderE" + class="E Leader" /> + <text + style="text-anchor:start;" + x="53.963047" + y="95.742607" + id="LabelE" + class="E Label">E</text> + </g> + <g + id="F"> + <rect + ry="5.0113049" + y="119.9372" + x="19.938246" + height="10.02261" + width="14.940429" + id="ButtonF" + class="F Button" /> + <path + id="LeaderF" + d="m 35.975139,124.9581 h 16" + class="F Leader" /> + <text + style="text-anchor:start;" + x="53.963047" + y="125.83328" + id="LabelF" + class="F Label">F</text> + </g> + <g + id="J"> + <rect + ry="5.0113049" + y="179.93921" + x="19.938244" + height="10.02261" + width="14.940429" + id="ButtonJ" + class="J Button" /> + <path + id="LeaderJ" + d="m 35.975139,185.00042 h 16" + class="J Leader" /> + <text + style="text-anchor:start;" + x="53.963047" + y="185.62686" + id="LabelJ" + class="J Label">J</text> + </g> + <g + id="C"> + <rect + id="ButtonC" + width="14.940429" + height="10.02261" + x="19.938246" + y="59.961643" + ry="5.0113049" + class="C Button" /> + <path + id="DotC" + d="m 28.185834,64.955528 a 0.70261902,0.66588998 0 0 1 -0.701193,0.665889 0.70261902,0.66588998 0 0 1 -0.704039,-0.663187 0.70261902,0.66588998 0 0 1 0.698337,-0.668579 0.70261902,0.66588998 0 0 1 0.706872,0.660473" /> + <path + d="m 35.975139,64.965242 h 16" + id="LeaderC" + class="C Leader" /> + <text + style="text-anchor:start;" + x="53.963047" + y="65.990486" + id="LabelC" + class="C Label">C</text> + </g> + <g + id="H"> + <rect + ry="5.0113049" + y="149.9382" + x="19.938244" + height="10.02261" + width="14.940429" + id="ButtonH" + class="H Button" /> + <path + d="m 28.185857,155.00258 a 0.70261902,0.66588998 0 0 1 -0.701193,0.66589 0.70261902,0.66588998 0 0 1 -0.704039,-0.66319 0.70261902,0.66588998 0 0 1 0.698337,-0.66858 0.70261902,0.66588998 0 0 1 0.706872,0.66047" + id="DotH"/> + <path + id="LeaderH" + d="m 35.975139,154.99717 h 16" + class="H Leader" /> + <text + style="text-anchor:start;" + x="53.963047" + y="155.91202" + id="LabelH" + class="H Label">H</text> + </g> + <g + id="B"> + <rect + ry="5.0113049" + y="45.034912" + x="19.938244" + height="10.02261" + width="14.940429" + id="ButtonB" + class="B Button" /> + <path + d="m 26.780595,50.012591 h 1.40524" + id="LineB" /> + <path + id="LeaderB" + d="m 35.975139,50.012592 h 16" + class="B Leader" /> + <text + style="text-anchor:start;" + x="53.963047" + y="50.746315" + id="LabelB" + class="B Label">B</text> + </g> + <g + id="D"> + <rect + ry="5.0113049" + y="74.969101" + x="19.938246" + height="10.02261" + width="14.940429" + id="ButtonD" + class="D Button" /> + <path + id="LineD" + d="m 26.780597,79.990482 h 1.40524" /> + <path + id="LeaderD" + d="m 35.975139,79.990482 h 16" + class="D Leader" /> + <text + style="text-anchor:start;" + x="53.963047" + y="80.779503" + id="LabelD" + class="D Label">D</text> + </g> + <g + id="G"> + <rect + id="ButtonG" + width="14.940429" + height="10.02261" + x="19.938244" + y="134.9711" + ry="5.0113049" + class="G Button" /> + <path + d="m 26.780597,139.98334 h 1.40524" + id="LineG" /> + <path + d="m 35.975139,139.98334 h 16" + id="LeaderG" + class="G Leader" /> + <text + style="text-anchor:start;" + x="53.963047" + y="141.06967" + id="LabelG" + class="G Label">G</text> + </g> + <g + id="I"> + <rect + id="ButtonI" + width="14.940429" + height="10.02261" + x="19.938244" + y="164.97211" + ry="5.0113049" + class="I Button" /> + <path + id="LineI" + d="m 26.780597,170.00536 h 1.40524" /> + <path + d="m 35.975139,170.00536 h 16" + id="LeaderI" + class="I Leader" /> + <text + style="text-anchor:start;" + x="53.963047" + y="170.53181" + id="LabelI" + class="I Label">I</text> + </g> + <g + id="A"> + <rect + ry="5.0113049" + y="29.934193" + x="19.938246" + height="10.02261" + width="14.940429" + id="ButtonA" + class="A Button" /> + <path + id="LeaderA" + d="m 35.975139,34.923341 h 16" + class="A Leader" /> + <text + style="text-anchor:start;" + x="53.963047" + y="35.745594" + id="LabelA" + class="A Label">A</text> + </g> + <g + id="TouchStrip"> + <rect + id="Strip" + width="86.044434" + height="1.8669244" + x="43.963196" + y="14.995788" + rx="0.56326956" + ry="0.64894742" + class="Strip TouchStrip" /> + <path + id="LeaderStripUp" + d="M 46.282313,13.892746 V 9.7896363 H 137.9779" + class="StripUp Strip Leader" /> + <text + style="text-anchor:start;" + x="141" + y="12" + id="LabelStripUp" + class="StripUp Strip Label">Up</text> + <path + d="m 131.00124,16 h 7.01948" + id="LeaderStripDown" + class="StripDown Strip Leader" /> + <text + style="text-anchor:start;" + x="141" + y="19" + id="LabelStripDown" + class="StripDown Strip Label">Down</text> + </g> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwacom-2.2.0/data/layouts/xp-pen-artist12.svg new/libwacom-2.4.0/data/layouts/xp-pen-artist12.svg --- old/libwacom-2.2.0/data/layouts/xp-pen-artist12.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libwacom-2.4.0/data/layouts/xp-pen-artist12.svg 2022-07-28 01:53:23.000000000 +0200 @@ -0,0 +1,168 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" + "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg + id="xp-pen-artist12" + width="650.0" + height="400.0" + style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8" + version="1.1" + xmlns="http://www.w3.org/2000/svg"> + <g> + <rect + id="ButtonA" + class="A Button" + x="24.0" + y="139.0" + width="20.0" + height="12.0" + rx="0.5" + ry="0.5" /> + <path + id="LeaderA" + class="A Leader" + d="m 46.0 145.0 h 5.0 V 96.0 h 20.0" /> + <text + id="LabelA" + class="A Label" + x="73.0" + y="96.0" + style="text-anchor:start;">A</text> + </g> + <g> + <rect + id="ButtonB" + class="B Button" + x="24.0" + y="152.0" + width="20.0" + height="12.0" + rx="0.5" + ry="0.5" /> + <path + id="LeaderB" + class="B Leader" + d="M 46.0 158.0 H 56.0 V 122.0 H 71.0" /> + <text + id="LabelB" + class="B Label" + x="73.0" + y="122.0" + style="text-anchor:start;">B</text> + </g> + <g> + <rect + id="ButtonC" + class="C Button" + x="24.0" + y="165.0" + width="20.0" + height="12.0" + rx="0.5" + ry="0.5" /> + <path + id="LeaderC" + class="C Leader" + d="M 46.0 171.0 l 15.0 0.0 l 0.0 -23.0 l 10.0 0.0" /> + <text + id="LabelC" + class="C Label" + x="73.0" + y="148.0" + style="text-anchor:start;">C</text> + </g> + <g> + <rect + id="ButtonD" + class="D Button" + x="24.0" + y="223.0" + width="20.0" + height="12.0" + rx="0.5" + ry="0.5" /> + <path + id="LeaderD" + class="D Leader" + d="M 46.0 230.0 l 15.0 0.0 l 0.0 23.0 l 10.0 0.0" /> + <text + id="LabelD" + class="D Label" + x="73.0" + y="252.0" + style="text-anchor:start;">D</text> + </g> + <g> + <rect + id="ButtonE" + class="E Button" + x="24.0" + y="236.0" + width="20.0" + height="12.0" + rx="0.5" + ry="0.5" /> + <path + id="LeaderE" + class="E Leader" + d="m 46.0 242.0 h 10.0 v 36.0 h 15.0" /> + <text + id="LabelE" + class="E Label" + x="73.0" + y="278.0" + style="text-anchor:start;">E</text> + </g> + <g> + <rect + id="ButtonF" + class="F Button" + x="24.0" + y="249.0" + width="20.0" + height="12.0" + rx="0.5" + ry="0.5" /> + <path + id="LeaderF" + class="F Leader" + d="m 46.0 255.0 h 5.0 v 49.0 h 20.0" /> + <text + id="LabelF" + class="F Label" + x="73.0" + y="304.0" + style="text-anchor:start;">F</text> + </g> + <g> + <rect + id="Strip" + class="Strip TouchStrip" + x="24.0" + y="177.0" + width="20.0" + height="46.0" + rx="1.5" + ry="1.0" /> + <path + id="LeaderStripUp" + class="StripUp Strip Leader" + d="M 11.0 177.0 V 79.0 h 60.0" /> + <path + id="LeaderStripDown" + class="StripDown Strip Leader" + d="m 11.0 223.0 v 98.0 h 60.0" /> + <text + id="LabelStripUp" + class="StripUp Strip Label" + x="73.0" + y="79.0" + style="text-anchor:start;">Up</text> + <text + id="LabelStripDown" + class="StripDown Strip Label" + x="73.0" + y="321.0" + style="text-anchor:start;">Down</text> + </g> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwacom-2.2.0/data/layouts/xp-pen-deco-l.svg new/libwacom-2.4.0/data/layouts/xp-pen-deco-l.svg --- old/libwacom-2.2.0/data/layouts/xp-pen-deco-l.svg 1970-01-01 01:00:00.000000000 +0100 +++ new/libwacom-2.4.0/data/layouts/xp-pen-deco-l.svg 2022-07-28 01:53:23.000000000 +0200 @@ -0,0 +1,181 @@ +<?xml version="1.0" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<svg + xmlns="http://www.w3.org/2000/svg" + version="1.1" + style="color:#000000;stroke:#7f7f7f;fill:none;stroke-width:.25;font-size:8" + id="xp-pen-deco-l" + width="355" + height="250"> + <title id="title">XP-Pen Deco L</title> + <g> + <path + id="ButtonA" + class="A ModeSwitch Button" + width="22" + height="25" + x="18" + y="33" + ry="0" + style="stroke-width:0.32" + d="M 22,33 H 36 a 4,4 0 0 1 4,4 V 58 H 18 V 37 a 4,4 0 0 1 4,-4 z" /> + <path + id="LeaderA" + class="A ModeSwitch Leader" + d="m 51,58 4,0" /> + <text + id="LabelA" + class="A ModeSwitch Label" + x="57" + y="58" + style="text-anchor:start">A</text> + </g> + <g> + <rect + id="ButtonB" + class="B ModeSwitch Button" + width="22" + height="20" + x="18" + y="60" + ry="0" + style="stroke-width:0.32" /> + <path + d="m 51,80 4,0" + class="B ModeSwitch Leader" + id="LeaderB" /> + <text + style="text-anchor:start" + y="80" + x="57" + class="B ModeSwitch Label" + id="LabelB">B</text> + </g> + <g> + <rect + id="ButtonC" + class="C ModeSwitch Button" + width="22" + height="20" + x="18" + y="82" + ry="0" + style="stroke-width:0.32" /> + <path + id="LeaderC" + class="C ModeSwitch Leader" + d="m 51,102 4,0" /> + <text + id="LabelC" + class="C ModeSwitch Label" + x="57" + y="102" + style="text-anchor:start">C</text> + </g> + <g> + <rect + id="ButtonD" + class="D ModeSwitch Button" + width="22" + height="20" + x="18" + y="104" + ry="0" + style="stroke-width:0.32" /> + <path + id="LeaderD" + class="D ModeSwitch Leader" + d="m 51,124 4,0" /> + <text + id="LabelD" + class="D ModeSwitch Label" + x="57" + y="124" + style="text-anchor:start">D</text> + </g> + <g> + <rect + id="ButtonE" + class="E ModeSwitch Button" + width="22" + height="20" + x="18" + y="126" + ry="0" + style="stroke-width:0.32" /> + <path + id="LeaderE" + class="E ModeSwitch Leader" + d="m 51,146 4,0" /> + <text + id="LabelE" + class="E ModeSwitch Label" + x="57" + y="146" + style="text-anchor:start">E</text> + </g> + <g> + <rect + id="ButtonF" + class="F ModeSwitch Button" + width="22" + height="20" + x="18" + y="148" + ry="0" + style="stroke-width:0.32" /> + <path + id="LeaderF" + class="F ModeSwitch Leader" + d="m 51,168 4,0" /> + <text + id="LabelF" + class="F ModeSwitch Label" + x="57" + y="168" + style="text-anchor:start">F</text> + </g> + <g> + <rect + id="ButtonG" + class="G ModeSwitch Button" + width="22" + height="20" + x="18" + y="170" + ry="0" + style="stroke-width:0.32" /> + <path + id="LeaderG" + class="G ModeSwitch Leader" + d="m 51,190 4,0" /> + <text + id="LabelG" + class="G ModeSwitch Label" + x="57" + y="190" + style="text-anchor:start">G</text> + </g> + <g> + <path + id="ButtonH" + class="H ModeSwitch Button" + width="22" + height="20" + x="18" + y="192" + ry="0" + style="stroke-width:0.32" + d="m 18,192 h 22 v 20 a 5,5 0 0 1 -5,5 H 23 a 5,5 0 0 1 -5,-5 z" /> + <path + id="LeaderH" + class="H ModeSwitch Leader" + d="m 51,212 4,0" /> + <text + id="LabelH" + class="H ModeSwitch Label" + x="57" + y="212" + style="text-anchor:start">H</text> + </g> +</svg> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwacom-2.2.0/data/xp-pen-artist12.tablet new/libwacom-2.4.0/data/xp-pen-artist12.tablet --- old/libwacom-2.2.0/data/xp-pen-artist12.tablet 1970-01-01 01:00:00.000000000 +0100 +++ new/libwacom-2.4.0/data/xp-pen-artist12.tablet 2022-07-28 01:53:23.000000000 +0200 @@ -0,0 +1,31 @@ +# XP-Pen +# Artist 12 +# +# sysinfo.BPdqfy3fcP +# https://github.com/linuxwacom/wacom-hid-descriptors/issues/238 + +[Device] +Name=XP-Pen Artist 12 +ModelName= +DeviceMatch=usb:28bd:080a:UGTABLET 11.6 inch PenDisplay Mouse;usb:28bd:080a:UGTABLET 11.6 inch PenDisplay;usb:28bd:080a:UGTABLET 11.6 inch PenDisplay;usb:28bd:080a:UGTABLET 11.6 inch PenDisplay Keyboard +PairedIDs= +Class=Bamboo +Width=10 +Height=6 +IntegratedIn= +Layout=xp-pen-artist12.svg +Styli=0xffffe;0xfffff; + +[Features] +Stylus=true +Reversible=true +Touch=false +TouchSwitch=false +Ring=false +Ring2=false +NumStrips=1 +Buttons=6 + +[Buttons] +Left=A;B;C;D;E;F +EvdevCodes=0x100;0x101;0x102;0x103;0x104;0x105 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwacom-2.2.0/data/xp-pen-deco-l.tablet new/libwacom-2.4.0/data/xp-pen-deco-l.tablet --- old/libwacom-2.2.0/data/xp-pen-deco-l.tablet 1970-01-01 01:00:00.000000000 +0100 +++ new/libwacom-2.4.0/data/xp-pen-deco-l.tablet 2022-07-28 01:53:23.000000000 +0200 @@ -0,0 +1,31 @@ +# XP-Pen +# Deco L +# +# sysinfo.y9iVOhZiPM +# https://github.com/linuxwacom/wacom-hid-descriptors/issues/242 + +[Device] +Name=Hanvon Ugee Technology Co.,Ltd Deco L +ModelName= +DeviceMatch=usb:28bd:0935 +PairedIDs= +Class=Bamboo +Width=10 +Height=6 +IntegratedIn= +Layout=xp-pen-deco-l.svg +Styli=0xffffd + +[Features] +Stylus=true +Reversible=true +Touch=false +TouchSwitch=false +Ring=false +Ring2=false +NumStrips=0 +Buttons=8 + +[Buttons] +Left=A;B;C;D;E;F;G;H +EvdevCodes=0x100;0x101;0x102;0x103;0x104;0x105;0x106;0x107 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwacom-2.2.0/meson.build new/libwacom-2.4.0/meson.build --- old/libwacom-2.2.0/meson.build 2022-03-25 07:04:16.000000000 +0100 +++ new/libwacom-2.4.0/meson.build 2022-07-28 01:53:23.000000000 +0200 @@ -1,5 +1,5 @@ project('libwacom', 'c', - version: '2.2.0', + version: '2.4.0', license: 'MIT/Expat', default_options: [ 'c_std=gnu99', 'warning_level=2' ], meson_version: '>= 0.51.0') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libwacom-2.2.0/tools/65-libwacom.rules.in new/libwacom-2.4.0/tools/65-libwacom.rules.in --- old/libwacom-2.2.0/tools/65-libwacom.rules.in 2022-03-25 07:04:16.000000000 +0100 +++ new/libwacom-2.4.0/tools/65-libwacom.rules.in 2022-07-28 01:53:23.000000000 +0200 @@ -3,9 +3,10 @@ ACTION=="remove", GOTO="libwacom_end" KERNEL!="event[0-9]*", GOTO="libwacom_end" -# HUION and GAOMON consumer and system control devices are not tablets. +# HUION and GAOMON keyboard, consumer and system control devices are not tablets. ATTRS{name}=="* Consumer Control", GOTO="libwacom_end" ATTRS{name}=="* System Control", GOTO="libwacom_end" +ATTRS{name}=="* Keyboard", GOTO="libwacom_end" # Match all serial wacom tablets with a serial ID starting with WACf ENV{ID_BUS}=="tty|pnp", ATTRS{id}=="WACf*", ENV{ID_INPUT}="1", ENV{ID_INPUT_TABLET}="1", GOTO="libwacom_end"