libwacom package update
Signed-off-by: guibuilder_pel7x64builder0 <guibuilder@powerel.org>master
parent
f1f2ac3cd5
commit
5fd75af377
|
@ -0,0 +1,149 @@
|
|||
From 4ef27af6a5b9d18717613f915d5be4fb474542a3 Mon Sep 17 00:00:00 2001
|
||||
From: Jason Gerecke <killertofu@gmail.com>
|
||||
Date: Wed, 8 Nov 2017 13:24:48 -0800
|
||||
Subject: [PATCH libwacom] Add Pro Pen 3D
|
||||
|
||||
The Wacom Pro Pen 3D includes a third barrel switch which is intended to
|
||||
be particularly useful in applications where one frequency uses pan, zoom,
|
||||
and rotate to navigate around a scene or model. The pen is compatible with
|
||||
the MobileStudio Pro, 2nd-gen Intuos Pro, and Cintiq Pro.
|
||||
|
||||
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
---
|
||||
data/cintiq-pro-13.tablet | 2 +-
|
||||
data/cintiq-pro-16.tablet | 2 +-
|
||||
data/intuos-pro-2-l-wl.tablet | 2 +-
|
||||
data/intuos-pro-2-l.tablet | 2 +-
|
||||
data/intuos-pro-2-m-wl.tablet | 2 +-
|
||||
data/intuos-pro-2-m.tablet | 2 +-
|
||||
data/libwacom.stylus | 8 ++++++++
|
||||
data/mobilestudio-pro-13.tablet | 2 +-
|
||||
data/mobilestudio-pro-16.tablet | 2 +-
|
||||
9 files changed, 16 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/data/cintiq-pro-13.tablet b/data/cintiq-pro-13.tablet
|
||||
index e9fb025..432d4cd 100644
|
||||
--- a/data/cintiq-pro-13.tablet
|
||||
+++ b/data/cintiq-pro-13.tablet
|
||||
@@ -34,7 +34,7 @@ PairedID=usb:056a:0353
|
||||
Width=12
|
||||
Height=7
|
||||
# No pad buttons, so no layout
|
||||
-Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a
|
||||
+Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a;0x80842
|
||||
IntegratedIn=Display
|
||||
|
||||
[Features]
|
||||
diff --git a/data/cintiq-pro-16.tablet b/data/cintiq-pro-16.tablet
|
||||
index 6a8e3fa..8577ef2 100644
|
||||
--- a/data/cintiq-pro-16.tablet
|
||||
+++ b/data/cintiq-pro-16.tablet
|
||||
@@ -34,7 +34,7 @@ PairedID=usb:056a:0354
|
||||
Width=14
|
||||
Height=8
|
||||
# No pad buttons, so no layout
|
||||
-Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a
|
||||
+Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a;0x80842
|
||||
IntegratedIn=Display
|
||||
|
||||
[Features]
|
||||
diff --git a/data/intuos-pro-2-l-wl.tablet b/data/intuos-pro-2-l-wl.tablet
|
||||
index 89445e1..ad82e00 100644
|
||||
--- a/data/intuos-pro-2-l-wl.tablet
|
||||
+++ b/data/intuos-pro-2-l-wl.tablet
|
||||
@@ -50,7 +50,7 @@ Width=12
|
||||
Height=8
|
||||
Layout=intuos-pro-2-l.svg
|
||||
IntegratedIn=
|
||||
-Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a
|
||||
+Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a;0x80842
|
||||
|
||||
[Features]
|
||||
Stylus=true
|
||||
diff --git a/data/intuos-pro-2-l.tablet b/data/intuos-pro-2-l.tablet
|
||||
index 52cebcd..09786c9 100644
|
||||
--- a/data/intuos-pro-2-l.tablet
|
||||
+++ b/data/intuos-pro-2-l.tablet
|
||||
@@ -50,7 +50,7 @@ Width=12
|
||||
Height=8
|
||||
Layout=intuos-pro-2-l.svg
|
||||
IntegratedIn=
|
||||
-Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a
|
||||
+Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a;0x80842
|
||||
|
||||
[Features]
|
||||
Stylus=true
|
||||
diff --git a/data/intuos-pro-2-m-wl.tablet b/data/intuos-pro-2-m-wl.tablet
|
||||
index d7d6694..a52792a 100644
|
||||
--- a/data/intuos-pro-2-m-wl.tablet
|
||||
+++ b/data/intuos-pro-2-m-wl.tablet
|
||||
@@ -50,7 +50,7 @@ Width=9
|
||||
Height=6
|
||||
Layout=intuos-pro-2-m.svg
|
||||
IntegratedIn=
|
||||
-Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a
|
||||
+Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a;0x80842
|
||||
|
||||
[Features]
|
||||
Stylus=true
|
||||
diff --git a/data/intuos-pro-2-m.tablet b/data/intuos-pro-2-m.tablet
|
||||
index b93b136..9c52f7b 100644
|
||||
--- a/data/intuos-pro-2-m.tablet
|
||||
+++ b/data/intuos-pro-2-m.tablet
|
||||
@@ -50,7 +50,7 @@ Width=9
|
||||
Height=6
|
||||
Layout=intuos-pro-2-m.svg
|
||||
IntegratedIn=
|
||||
-Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a
|
||||
+Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a;0x80842
|
||||
|
||||
[Features]
|
||||
Stylus=true
|
||||
diff --git a/data/libwacom.stylus b/data/libwacom.stylus
|
||||
index 2d42f07..d030bf0 100644
|
||||
--- a/data/libwacom.stylus
|
||||
+++ b/data/libwacom.stylus
|
||||
@@ -91,6 +91,14 @@ Buttons=2
|
||||
Axes=Tilt;Pressure;Distance;
|
||||
Type=General
|
||||
|
||||
+[0x80842]
|
||||
+# MobileStudio Pro
|
||||
+Name=Pro Pen 3D
|
||||
+HasEraser=false
|
||||
+Buttons=3
|
||||
+Axes=Tilt;Pressure;Distance;
|
||||
+Type=General
|
||||
+
|
||||
[0x852]
|
||||
# Intuos2
|
||||
Name=Grip Pen
|
||||
diff --git a/data/mobilestudio-pro-13.tablet b/data/mobilestudio-pro-13.tablet
|
||||
index 1b06421..ddec6f9 100644
|
||||
--- a/data/mobilestudio-pro-13.tablet
|
||||
+++ b/data/mobilestudio-pro-13.tablet
|
||||
@@ -41,7 +41,7 @@ PairedID=usb:056a:034a
|
||||
Width=12
|
||||
Height=7
|
||||
Layout=mobilestudio-pro-13.svg
|
||||
-Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a
|
||||
+Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a;0x80842
|
||||
IntegratedIn=Display;System
|
||||
|
||||
[Features]
|
||||
diff --git a/data/mobilestudio-pro-16.tablet b/data/mobilestudio-pro-16.tablet
|
||||
index 7121120..76fdc9a 100644
|
||||
--- a/data/mobilestudio-pro-16.tablet
|
||||
+++ b/data/mobilestudio-pro-16.tablet
|
||||
@@ -43,7 +43,7 @@ PairedID=usb:056a:034b
|
||||
Width=14
|
||||
Height=8
|
||||
Layout=mobilestudio-pro-16.svg
|
||||
-Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a
|
||||
+Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a;0x80842
|
||||
IntegratedIn=Display;System
|
||||
|
||||
[Features]
|
||||
--
|
||||
2.13.6
|
|
@ -0,0 +1,64 @@
|
|||
From 2227ac005de1d004608b163ac1cc37cf1ffb86b1 Mon Sep 17 00:00:00 2001
|
||||
From: Benjamin Tissoires <benjamin.tissoires@gmail.com>
|
||||
Date: Tue, 7 Nov 2017 14:58:32 +0100
|
||||
Subject: [PATCH libwacom] data: Add Dell Canvas 27
|
||||
|
||||
The touchscreen part is not from Wacom, so we need to
|
||||
teach libwacom and libinput that both are part of the
|
||||
same device group for them to do touch arbitration.
|
||||
|
||||
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
---
|
||||
The 0x80a Eraser is a dummy to avoid crashes in g-s-d versions
|
||||
that cannot handle eraser-less devices (pre 3.26).
|
||||
|
||||
data/dell-canvas-27.tablet | 37 +++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 37 insertions(+)
|
||||
create mode 100644 data/dell-canvas-27.tablet
|
||||
|
||||
diff --git a/data/dell-canvas-27.tablet b/data/dell-canvas-27.tablet
|
||||
new file mode 100644
|
||||
index 0000000..1c82390
|
||||
--- /dev/null
|
||||
+++ b/data/dell-canvas-27.tablet
|
||||
@@ -0,0 +1,37 @@
|
||||
+# Dell
|
||||
+# Canvas 27
|
||||
+#
|
||||
+#
|
||||
+#
|
||||
+# *-----------------------*
|
||||
+# | |
|
||||
+# | |
|
||||
+# | |
|
||||
+# | |
|
||||
+# | |
|
||||
+# | DISPLAY |
|
||||
+# | |
|
||||
+# | |
|
||||
+# | |
|
||||
+# | |
|
||||
+# | |
|
||||
+# *-----------------------*
|
||||
+#
|
||||
+
|
||||
+[Device]
|
||||
+Name=Dell Canvas 27
|
||||
+Class=Cintiq
|
||||
+DeviceMatch=usb:056a:4200
|
||||
+PairedID=usb:2575:0204
|
||||
+Width=23
|
||||
+Height=13
|
||||
+# No pad buttons, so no layout
|
||||
+Styli=0xffffd;0x80a;
|
||||
+IntegratedIn=Display
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Reversible=false
|
||||
+Touch=true
|
||||
+Ring=false
|
||||
+Buttons=0
|
||||
--
|
||||
2.13.6
|
|
@ -0,0 +1,282 @@
|
|||
From 58996610c83a36722b4558876506235ec601f0f6 Mon Sep 17 00:00:00 2001
|
||||
From: Jason Gerecke <killertofu@gmail.com>
|
||||
Date: Thu, 9 Mar 2017 10:44:10 -0800
|
||||
Subject: [PATCH libwacom 1/7] data: add multiple missing ISDv4 devices
|
||||
|
||||
Adds the following devices which are present in the wacom-hid-descriptors
|
||||
database but not libwacom:
|
||||
|
||||
* E2 (HP Pavillion dv6)
|
||||
* 104 (Cube i7 Stylus)
|
||||
* 10E (Fujitsu Lifebook T732)
|
||||
* 117 (Panasonic Toughbook CF-C2)
|
||||
* 124 (Fujitsu ARROWS Tab QH55/M)
|
||||
* 5013 (Toshiba dynabook KIRA L93/39M)
|
||||
* 5014 (Lenovo ThinkPad Helix 2)
|
||||
* 503E (Lenovo ThinkPad X1 Yoga)
|
||||
* 503F (Lenovo ThinkPad Yoga X1)
|
||||
* 5048 (Lenovo ThinkPad Yoga 260)
|
||||
* 5044 (Lenovo ThinkPad Yoga 260)
|
||||
|
||||
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
(cherry picked from commit 3b37fe15814cfa4c0ed72722edb0225d18563c5c)
|
||||
---
|
||||
data/isdv4-104.tablet | 14 ++++++++++++++
|
||||
data/isdv4-10e.tablet | 14 ++++++++++++++
|
||||
data/isdv4-117.tablet | 14 ++++++++++++++
|
||||
data/isdv4-124.tablet | 15 +++++++++++++++
|
||||
data/isdv4-5013.tablet | 14 ++++++++++++++
|
||||
data/isdv4-5014.tablet | 15 +++++++++++++++
|
||||
data/isdv4-503e.tablet | 16 ++++++++++++++++
|
||||
data/isdv4-503f.tablet | 16 ++++++++++++++++
|
||||
data/isdv4-5044.tablet | 17 +++++++++++++++++
|
||||
data/isdv4-5048.tablet | 16 ++++++++++++++++
|
||||
data/isdv4-e2.tablet | 14 ++++++++++++++
|
||||
11 files changed, 165 insertions(+)
|
||||
create mode 100644 data/isdv4-104.tablet
|
||||
create mode 100644 data/isdv4-10e.tablet
|
||||
create mode 100644 data/isdv4-117.tablet
|
||||
create mode 100644 data/isdv4-124.tablet
|
||||
create mode 100644 data/isdv4-5013.tablet
|
||||
create mode 100644 data/isdv4-5014.tablet
|
||||
create mode 100644 data/isdv4-503e.tablet
|
||||
create mode 100644 data/isdv4-503f.tablet
|
||||
create mode 100644 data/isdv4-5044.tablet
|
||||
create mode 100644 data/isdv4-5048.tablet
|
||||
create mode 100644 data/isdv4-e2.tablet
|
||||
|
||||
diff --git a/data/isdv4-104.tablet b/data/isdv4-104.tablet
|
||||
new file mode 100644
|
||||
index 0000000..358212c
|
||||
--- /dev/null
|
||||
+++ b/data/isdv4-104.tablet
|
||||
@@ -0,0 +1,14 @@
|
||||
+# this is for the Wacom pen as found in the Cube i7 Stylus
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom ISDv4 104
|
||||
+DeviceMatch=i2c:056a:0104
|
||||
+Class=ISDV4
|
||||
+Width=9
|
||||
+Height=5
|
||||
+IntegratedIn=Display;System
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Touch=false
|
||||
+Buttons=0
|
||||
diff --git a/data/isdv4-10e.tablet b/data/isdv4-10e.tablet
|
||||
new file mode 100644
|
||||
index 0000000..796e69b
|
||||
--- /dev/null
|
||||
+++ b/data/isdv4-10e.tablet
|
||||
@@ -0,0 +1,14 @@
|
||||
+# this is for the Wacom pen + touchscreen as found in the Fujitsu Lifebook T732
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom ISDv4 10E
|
||||
+DeviceMatch=usb:056a:010e
|
||||
+Class=ISDV4
|
||||
+Width=11
|
||||
+Height=6
|
||||
+IntegratedIn=Display;System
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Touch=true
|
||||
+Buttons=0
|
||||
diff --git a/data/isdv4-117.tablet b/data/isdv4-117.tablet
|
||||
new file mode 100644
|
||||
index 0000000..1aea2a1
|
||||
--- /dev/null
|
||||
+++ b/data/isdv4-117.tablet
|
||||
@@ -0,0 +1,14 @@
|
||||
+# this is for the Wacom pen + touchscreen as found in the Panasonic Toughbook CF-C2
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom ISDv4 117
|
||||
+DeviceMatch=usb:056a:0117
|
||||
+Class=ISDV4
|
||||
+Width=11
|
||||
+Height=6
|
||||
+IntegratedIn=Display;System
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Touch=true
|
||||
+Buttons=0
|
||||
diff --git a/data/isdv4-124.tablet b/data/isdv4-124.tablet
|
||||
new file mode 100644
|
||||
index 0000000..8540eef
|
||||
--- /dev/null
|
||||
+++ b/data/isdv4-124.tablet
|
||||
@@ -0,0 +1,15 @@
|
||||
+# this is for the Wacom pen as found in the Fujitsu ARROWS Tab QH55/M
|
||||
+# the touchscreen is 056a:5008
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom ISDv4 124
|
||||
+DeviceMatch=i2c:056a:0124
|
||||
+Class=ISDV4
|
||||
+Width=9
|
||||
+Height=5
|
||||
+IntegratedIn=Display;System
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Touch=false
|
||||
+Buttons=0
|
||||
diff --git a/data/isdv4-5013.tablet b/data/isdv4-5013.tablet
|
||||
new file mode 100644
|
||||
index 0000000..1f5211a
|
||||
--- /dev/null
|
||||
+++ b/data/isdv4-5013.tablet
|
||||
@@ -0,0 +1,14 @@
|
||||
+# Active electrostatic (AES) sensor used by the Toshiba dynabook KIRA L93/39M
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom ISDv4 5013
|
||||
+DeviceMatch=i2c:056a:5013
|
||||
+Class=ISDV4
|
||||
+Width=12
|
||||
+Height=7
|
||||
+IntegratedIn=Display;System
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Touch=true
|
||||
+Buttons=0
|
||||
diff --git a/data/isdv4-5014.tablet b/data/isdv4-5014.tablet
|
||||
new file mode 100644
|
||||
index 0000000..8f26933
|
||||
--- /dev/null
|
||||
+++ b/data/isdv4-5014.tablet
|
||||
@@ -0,0 +1,15 @@
|
||||
+# Active electrostatic (AES) sensor used by some versions of the
|
||||
+# Lenovo ThinkPad Helix 2
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom ISDv4 5014
|
||||
+DeviceMatch=i2c:056a:5014
|
||||
+Class=ISDV4
|
||||
+Width=10
|
||||
+Height=6
|
||||
+IntegratedIn=Display;System
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Touch=true
|
||||
+Buttons=0
|
||||
diff --git a/data/isdv4-503e.tablet b/data/isdv4-503e.tablet
|
||||
new file mode 100644
|
||||
index 0000000..3bf501b
|
||||
--- /dev/null
|
||||
+++ b/data/isdv4-503e.tablet
|
||||
@@ -0,0 +1,16 @@
|
||||
+# this is for the Wacom pen + touchscreen
|
||||
+# as found in some versions of the Lenovo
|
||||
+# Thinkpad X1 Yoga.
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom ISDv4 503E
|
||||
+DeviceMatch=usb:056a:503e
|
||||
+Class=ISDV4
|
||||
+Width=12
|
||||
+Height=7
|
||||
+IntegratedIn=Display;System
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Touch=true
|
||||
+Buttons=0
|
||||
diff --git a/data/isdv4-503f.tablet b/data/isdv4-503f.tablet
|
||||
new file mode 100644
|
||||
index 0000000..1594fc8
|
||||
--- /dev/null
|
||||
+++ b/data/isdv4-503f.tablet
|
||||
@@ -0,0 +1,16 @@
|
||||
+# this is for the Wacom pen + touchscreen
|
||||
+# as found in some versions of the Lenovo
|
||||
+# Thinkpad X1 Yoga.
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom ISDv4 503F
|
||||
+DeviceMatch=usb:056a:503f
|
||||
+Class=ISDV4
|
||||
+Width=12
|
||||
+Height=7
|
||||
+IntegratedIn=Display;System
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Touch=true
|
||||
+Buttons=0
|
||||
diff --git a/data/isdv4-5044.tablet b/data/isdv4-5044.tablet
|
||||
new file mode 100644
|
||||
index 0000000..d7ec420
|
||||
--- /dev/null
|
||||
+++ b/data/isdv4-5044.tablet
|
||||
@@ -0,0 +1,17 @@
|
||||
+# this is for the Wacom pen + touchscreen
|
||||
+# as found in the Lenovo ThinkpPad Yoga 260
|
||||
+# 20FD002HUS (12.5" FHD; 276x155mm).
|
||||
+# Pen with 2 buttons, no eraser.
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom ISDv4 5044
|
||||
+DeviceMatch=usb:056a:5044
|
||||
+Class=ISDV4
|
||||
+Width=10
|
||||
+Height=6
|
||||
+IntegratedIn=Display;System
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Touch=true
|
||||
+Buttons=0
|
||||
diff --git a/data/isdv4-5048.tablet b/data/isdv4-5048.tablet
|
||||
new file mode 100644
|
||||
index 0000000..c0b2eaf
|
||||
--- /dev/null
|
||||
+++ b/data/isdv4-5048.tablet
|
||||
@@ -0,0 +1,16 @@
|
||||
+# this is for the Wacom pen + touchscreen
|
||||
+# as found in some versions of the Lenovo
|
||||
+# ThinkpPad Yoga 260
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom ISDv4 5048
|
||||
+DeviceMatch=usb:056a:5048
|
||||
+Class=ISDV4
|
||||
+Width=10
|
||||
+Height=6
|
||||
+IntegratedIn=Display;System
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Touch=true
|
||||
+Buttons=0
|
||||
diff --git a/data/isdv4-e2.tablet b/data/isdv4-e2.tablet
|
||||
new file mode 100644
|
||||
index 0000000..c6de76d
|
||||
--- /dev/null
|
||||
+++ b/data/isdv4-e2.tablet
|
||||
@@ -0,0 +1,14 @@
|
||||
+# this is for the Wacom pen found in the HP Pavillion dv6
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom ISDv4 E2
|
||||
+DeviceMatch=usb:056a:00e2
|
||||
+Class=ISDV4
|
||||
+Width=14
|
||||
+Height=8
|
||||
+IntegratedIn=Display;System
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Touch=false
|
||||
+Buttons=0
|
||||
--
|
||||
2.13.5
|
||||
|
|
@ -0,0 +1,121 @@
|
|||
From a7f0e26a47e0caa465cf757de74574656e5cabd1 Mon Sep 17 00:00:00 2001
|
||||
From: Aaron Armstrong Skomra <skomra@gmail.com>
|
||||
Date: Wed, 1 Mar 2017 10:37:15 -0800
|
||||
Subject: [PATCH libwacom] data: add support for Cintiq Pro 13 & 16
|
||||
|
||||
These devices have no buttons, hence no .svg files.
|
||||
|
||||
Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
---
|
||||
data/cintiq-pro-13.tablet | 45 +++++++++++++++++++++++++++++++++++++++++++++
|
||||
data/cintiq-pro-16.tablet | 45 +++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 90 insertions(+)
|
||||
create mode 100644 data/cintiq-pro-13.tablet
|
||||
create mode 100644 data/cintiq-pro-16.tablet
|
||||
|
||||
diff --git a/data/cintiq-pro-13.tablet b/data/cintiq-pro-13.tablet
|
||||
new file mode 100644
|
||||
index 0000000..197ad3f
|
||||
--- /dev/null
|
||||
+++ b/data/cintiq-pro-13.tablet
|
||||
@@ -0,0 +1,45 @@
|
||||
+# Wacom
|
||||
+# Cintiq Pro 13
|
||||
+# DTH-1320K0
|
||||
+#
|
||||
+# K K K K K
|
||||
+# *-----------------------*
|
||||
+# | |
|
||||
+# | |
|
||||
+# | |
|
||||
+# | |
|
||||
+# | |
|
||||
+# | DISPLAY |
|
||||
+# | |
|
||||
+# | |
|
||||
+# | |
|
||||
+# | |
|
||||
+# | |
|
||||
+# *-----------------------*
|
||||
+#
|
||||
+# Note: The device has 5 keys as shown above. Their
|
||||
+# intended uses are, from left to right,:
|
||||
+# 1. Mode change (Display/Opaque)
|
||||
+# 2. Wacom Desktop Center
|
||||
+# 3. On screen keyboard
|
||||
+# 4. Wacom display settings
|
||||
+# 5. Touch on/off
|
||||
+#
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom Cintiq Pro 13
|
||||
+Class=Cintiq
|
||||
+DeviceMatch=usb:056a:034F
|
||||
+PairedID=usb:056a:0353
|
||||
+Width=14
|
||||
+Height=9
|
||||
+# No pad buttons, so no layout
|
||||
+Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a
|
||||
+IntegratedIn=Display
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Reversible=false
|
||||
+Touch=true
|
||||
+Ring=false
|
||||
+Buttons=0
|
||||
diff --git a/data/cintiq-pro-16.tablet b/data/cintiq-pro-16.tablet
|
||||
new file mode 100644
|
||||
index 0000000..e64bdd3
|
||||
--- /dev/null
|
||||
+++ b/data/cintiq-pro-16.tablet
|
||||
@@ -0,0 +1,45 @@
|
||||
+# Wacom
|
||||
+# Cintiq Pro 16
|
||||
+# DTH-1620K0
|
||||
+#
|
||||
+# K K K K K
|
||||
+# *-----------------------*
|
||||
+# | |
|
||||
+# | |
|
||||
+# | |
|
||||
+# | |
|
||||
+# | |
|
||||
+# | DISPLAY |
|
||||
+# | |
|
||||
+# | |
|
||||
+# | |
|
||||
+# | |
|
||||
+# | |
|
||||
+# *-----------------------*
|
||||
+#
|
||||
+# Note: The device has 5 keys as shown above. Their
|
||||
+# intended uses are, from left to right,:
|
||||
+# 1. Mode change (Display/Opaque)
|
||||
+# 2. Wacom Desktop Center
|
||||
+# 3. On screen keyboard
|
||||
+# 4. Wacom display settings
|
||||
+# 5. Touch on/off
|
||||
+#
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom Cintiq Pro 16
|
||||
+Class=Cintiq
|
||||
+DeviceMatch=usb:056a:0350
|
||||
+PairedID=usb:056a:0354
|
||||
+Width=16
|
||||
+Height=10
|
||||
+# No pad buttons, so no layout
|
||||
+Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a
|
||||
+IntegratedIn=Display
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Reversible=false
|
||||
+Touch=true
|
||||
+Ring=false
|
||||
+Buttons=0
|
||||
--
|
||||
2.9.3
|
||||
|
|
@ -0,0 +1,52 @@
|
|||
From 1588fd15d9ca5d405af3fc27235161e6032caa73 Mon Sep 17 00:00:00 2001
|
||||
From: Jason Gerecke <killertofu@gmail.com>
|
||||
Date: Mon, 17 Apr 2017 12:02:51 -0700
|
||||
Subject: [PATCH libwacom 2/7] data: Add USB Graphire tablet
|
||||
|
||||
https://github.com/linuxwacom/wacom-hid-descriptors/issues/3
|
||||
|
||||
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
(cherry picked from commit 79d049ac537efda216e17cf1ca030265ec645784)
|
||||
---
|
||||
data/graphire-usb.tablet | 28 ++++++++++++++++++++++++++++
|
||||
1 file changed, 28 insertions(+)
|
||||
create mode 100644 data/graphire-usb.tablet
|
||||
|
||||
diff --git a/data/graphire-usb.tablet b/data/graphire-usb.tablet
|
||||
new file mode 100644
|
||||
index 0000000..86d639f
|
||||
--- /dev/null
|
||||
+++ b/data/graphire-usb.tablet
|
||||
@@ -0,0 +1,28 @@
|
||||
+# Wacom
|
||||
+# Graphire
|
||||
+# ET-0405-U
|
||||
+#
|
||||
+# Button Map:
|
||||
+# (A=1, B=2, C=3, ...)
|
||||
+#
|
||||
+# *----------------------*
|
||||
+# | |
|
||||
+# | |
|
||||
+# | |
|
||||
+# | TABLET |
|
||||
+# | |
|
||||
+# | |
|
||||
+# | |
|
||||
+# *----------------------*
|
||||
+#
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom Graphire
|
||||
+DeviceMatch=usb:056a:0010
|
||||
+Class=Graphire
|
||||
+Width=5
|
||||
+Height=4
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Buttons=0
|
||||
--
|
||||
2.13.5
|
||||
|
|
@ -0,0 +1,38 @@
|
|||
From f2e3cd61dea9b94f7f4634930fe57316d9f5ee4d Mon Sep 17 00:00:00 2001
|
||||
From: Hein-Pieter van Braam <hp@tmm.cx>
|
||||
Date: Wed, 10 May 2017 01:27:37 +0200
|
||||
Subject: [PATCH libwacom 3/7] Add isdv4-4814 tablet description
|
||||
|
||||
This device was found on a HP Elite x2 1012 G1. It is a copy of the
|
||||
previously existing 4800 definition.
|
||||
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
(cherry picked from commit a5ec9b783c7c5ea16c90bad82bf5a2b6eb71b57c)
|
||||
---
|
||||
data/isdv4-4814.tablet | 14 ++++++++++++++
|
||||
1 file changed, 14 insertions(+)
|
||||
create mode 100644 data/isdv4-4814.tablet
|
||||
|
||||
diff --git a/data/isdv4-4814.tablet b/data/isdv4-4814.tablet
|
||||
new file mode 100644
|
||||
index 0000000..ad6d0fa
|
||||
--- /dev/null
|
||||
+++ b/data/isdv4-4814.tablet
|
||||
@@ -0,0 +1,14 @@
|
||||
+# Active electrostatic (AES) sensor used by the HP Elite x2 1012 G1
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom ISDv4 4814
|
||||
+DeviceMatch=i2c:056a:4814
|
||||
+Class=ISDV4
|
||||
+Width=10
|
||||
+Height=7
|
||||
+IntegratedIn=Display;System
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Touch=true
|
||||
+Buttons=0
|
||||
--
|
||||
2.13.5
|
||||
|
|
@ -0,0 +1,216 @@
|
|||
From 61bf9c0b727f17181017ac1fafaf1130dbb2a182 Mon Sep 17 00:00:00 2001
|
||||
From: Aaron Armstrong Skomra <skomra@gmail.com>
|
||||
Date: Wed, 31 May 2017 09:02:19 -0700
|
||||
Subject: [PATCH libwacom 4/7] data: Add .tablet files for Wireless Intuos Pro
|
||||
second generation
|
||||
|
||||
Also correct width and height for intuos-pro-2-l.tablet,
|
||||
cintiq-pro-13.tablet and cintiq-pro-16.tablet.
|
||||
|
||||
Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
(cherry picked from commit ecf0bf4edde53f8f08c01cdc36f4e6a2fa7ffa65)
|
||||
---
|
||||
data/cintiq-pro-13.tablet | 4 +--
|
||||
data/cintiq-pro-16.tablet | 4 +--
|
||||
data/intuos-pro-2-l-wl.tablet | 67 +++++++++++++++++++++++++++++++++++++++++++
|
||||
data/intuos-pro-2-l.tablet | 4 +--
|
||||
data/intuos-pro-2-m-wl.tablet | 67 +++++++++++++++++++++++++++++++++++++++++++
|
||||
5 files changed, 140 insertions(+), 6 deletions(-)
|
||||
create mode 100644 data/intuos-pro-2-l-wl.tablet
|
||||
create mode 100644 data/intuos-pro-2-m-wl.tablet
|
||||
|
||||
diff --git a/data/cintiq-pro-13.tablet b/data/cintiq-pro-13.tablet
|
||||
index 197ad3f..e9fb025 100644
|
||||
--- a/data/cintiq-pro-13.tablet
|
||||
+++ b/data/cintiq-pro-13.tablet
|
||||
@@ -31,8 +31,8 @@ Name=Wacom Cintiq Pro 13
|
||||
Class=Cintiq
|
||||
DeviceMatch=usb:056a:034F
|
||||
PairedID=usb:056a:0353
|
||||
-Width=14
|
||||
-Height=9
|
||||
+Width=12
|
||||
+Height=7
|
||||
# No pad buttons, so no layout
|
||||
Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a
|
||||
IntegratedIn=Display
|
||||
diff --git a/data/cintiq-pro-16.tablet b/data/cintiq-pro-16.tablet
|
||||
index e64bdd3..6a8e3fa 100644
|
||||
--- a/data/cintiq-pro-16.tablet
|
||||
+++ b/data/cintiq-pro-16.tablet
|
||||
@@ -31,8 +31,8 @@ Name=Wacom Cintiq Pro 16
|
||||
Class=Cintiq
|
||||
DeviceMatch=usb:056a:0350
|
||||
PairedID=usb:056a:0354
|
||||
-Width=16
|
||||
-Height=10
|
||||
+Width=14
|
||||
+Height=8
|
||||
# No pad buttons, so no layout
|
||||
Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a
|
||||
IntegratedIn=Display
|
||||
diff --git a/data/intuos-pro-2-l-wl.tablet b/data/intuos-pro-2-l-wl.tablet
|
||||
new file mode 100644
|
||||
index 0000000..89445e1
|
||||
--- /dev/null
|
||||
+++ b/data/intuos-pro-2-l-wl.tablet
|
||||
@@ -0,0 +1,67 @@
|
||||
+# Wacom
|
||||
+# Intuos Pro 2 L WL
|
||||
+# PTH-860
|
||||
+#
|
||||
+# Button Map:
|
||||
+# (A=1, B=2, C=3, ...)
|
||||
+#
|
||||
+# *-----------------------*
|
||||
+# | |
|
||||
+# A | |
|
||||
+# B | |
|
||||
+# C | |
|
||||
+# D | |
|
||||
+# I | TABLET |
|
||||
+# E | |
|
||||
+# F | |
|
||||
+# G | |
|
||||
+# H | |
|
||||
+# | |
|
||||
+# *-----------------------*
|
||||
+#
|
||||
+# Touch Ring Map:
|
||||
+# (A=1st ring, B=2nd ring, ...)
|
||||
+#
|
||||
+# *-----------------------*
|
||||
+# | |
|
||||
+# A | TABLET |
|
||||
+# | |
|
||||
+# *-----------------------*
|
||||
+#
|
||||
+# LED Map:
|
||||
+# (XY=Bank X, LED Y; *=Invisible)
|
||||
+#
|
||||
+# *-----------------------*
|
||||
+# | |
|
||||
+# | |
|
||||
+# 01 02 | |
|
||||
+# | TABLET |
|
||||
+# 00 03 | |
|
||||
+# | |
|
||||
+# | |
|
||||
+# *-----------------------*
|
||||
+#
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom Intuos Pro 2 L WL
|
||||
+DeviceMatch=bluetooth:056a:0361
|
||||
+Class=Intuos5
|
||||
+Width=12
|
||||
+Height=8
|
||||
+Layout=intuos-pro-2-l.svg
|
||||
+IntegratedIn=
|
||||
+Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Reversible=true
|
||||
+Touch=true
|
||||
+Buttons=9
|
||||
+Ring=true
|
||||
+StatusLEDs=Ring
|
||||
+
|
||||
+[Buttons]
|
||||
+Left=A;B;C;D;E;F;G;H;I
|
||||
+
|
||||
+Ring=I
|
||||
+RingNumModes=4
|
||||
diff --git a/data/intuos-pro-2-l.tablet b/data/intuos-pro-2-l.tablet
|
||||
index 421b971..52cebcd 100644
|
||||
--- a/data/intuos-pro-2-l.tablet
|
||||
+++ b/data/intuos-pro-2-l.tablet
|
||||
@@ -46,8 +46,8 @@
|
||||
Name=Wacom Intuos Pro 2 L
|
||||
DeviceMatch=usb:056a:0358
|
||||
Class=Intuos5
|
||||
-Width=9
|
||||
-Height=6
|
||||
+Width=12
|
||||
+Height=8
|
||||
Layout=intuos-pro-2-l.svg
|
||||
IntegratedIn=
|
||||
Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a
|
||||
diff --git a/data/intuos-pro-2-m-wl.tablet b/data/intuos-pro-2-m-wl.tablet
|
||||
new file mode 100644
|
||||
index 0000000..d7d6694
|
||||
--- /dev/null
|
||||
+++ b/data/intuos-pro-2-m-wl.tablet
|
||||
@@ -0,0 +1,67 @@
|
||||
+# Wacom
|
||||
+# Intuos Pro 2 M WL
|
||||
+# PTH-660
|
||||
+#
|
||||
+# Button Map:
|
||||
+# (A=1, B=2, C=3, ...)
|
||||
+#
|
||||
+# *-----------------------*
|
||||
+# | |
|
||||
+# A | |
|
||||
+# B | |
|
||||
+# C | |
|
||||
+# D | |
|
||||
+# I | TABLET |
|
||||
+# E | |
|
||||
+# F | |
|
||||
+# G | |
|
||||
+# H | |
|
||||
+# | |
|
||||
+# *-----------------------*
|
||||
+#
|
||||
+# Touch Ring Map:
|
||||
+# (A=1st ring, B=2nd ring, ...)
|
||||
+#
|
||||
+# *-----------------------*
|
||||
+# | |
|
||||
+# A | TABLET |
|
||||
+# | |
|
||||
+# *-----------------------*
|
||||
+#
|
||||
+# LED Map:
|
||||
+# (XY=Bank X, LED Y; *=Invisible)
|
||||
+#
|
||||
+# *-----------------------*
|
||||
+# | |
|
||||
+# | |
|
||||
+# 01 02 | |
|
||||
+# | TABLET |
|
||||
+# 00 03 | |
|
||||
+# | |
|
||||
+# | |
|
||||
+# *-----------------------*
|
||||
+#
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom Intuos Pro 2 M WL
|
||||
+DeviceMatch=bluetooth:056a:0360
|
||||
+Class=Intuos5
|
||||
+Width=9
|
||||
+Height=6
|
||||
+Layout=intuos-pro-2-m.svg
|
||||
+IntegratedIn=
|
||||
+Styli=0x842;0x84a;0x160802;0x16080a;0x100802;0x10080a;0x140802;0x14080a;0x120802;0x100804;0x10080c;0x100902;0x10090a
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Reversible=true
|
||||
+Touch=true
|
||||
+Buttons=9
|
||||
+Ring=true
|
||||
+StatusLEDs=Ring
|
||||
+
|
||||
+[Buttons]
|
||||
+Left=A;B;C;D;E;F;G;H;I
|
||||
+
|
||||
+Ring=I
|
||||
+RingNumModes=4
|
||||
--
|
||||
2.13.5
|
||||
|
|
@ -0,0 +1,45 @@
|
|||
From deb92fdd857123e77e435d2b7ecb9cfece21de2c Mon Sep 17 00:00:00 2001
|
||||
From: Aaron Armstrong Skomra <skomra@gmail.com>
|
||||
Date: Thu, 13 Jul 2017 10:03:44 -0700
|
||||
Subject: [PATCH libwacom 5/7] data: Add .tablet file for DTH-1152
|
||||
|
||||
Signed-off-by: Aaron Armstrong Skomra <aaron.skomra@wacom.com>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
(cherry picked from commit 353708e291dab3af606272bfa7c5ec5e7ded067a)
|
||||
---
|
||||
data/dth-1152.tablet | 23 +++++++++++++++++++++++
|
||||
1 file changed, 23 insertions(+)
|
||||
create mode 100644 data/dth-1152.tablet
|
||||
|
||||
diff --git a/data/dth-1152.tablet b/data/dth-1152.tablet
|
||||
new file mode 100644
|
||||
index 0000000..7b22624
|
||||
--- /dev/null
|
||||
+++ b/data/dth-1152.tablet
|
||||
@@ -0,0 +1,23 @@
|
||||
+# Wacom
|
||||
+# DTH-1152 Interactive Pen Display
|
||||
+#
|
||||
+# Note: Stylus does not have an eraser
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom DTH1152
|
||||
+DeviceMatch=usb:056a:035a
|
||||
+PairedID=usb:056a:0368
|
||||
+Class=PenDisplay
|
||||
+Width=9
|
||||
+Height=5
|
||||
+#No ExpressKeys, so no layout
|
||||
+IntegratedIn=Display
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Reversible=false
|
||||
+Touch=true
|
||||
+Ring=false
|
||||
+Ring2=false
|
||||
+NumStrips=0
|
||||
+Buttons=0
|
||||
--
|
||||
2.13.5
|
||||
|
|
@ -0,0 +1,152 @@
|
|||
From 5aabcb5855cd57289ceb63e9c7457a1c45787a71 Mon Sep 17 00:00:00 2001
|
||||
From: Jason Gerecke <killertofu@gmail.com>
|
||||
Date: Thu, 24 Aug 2017 10:54:13 -0700
|
||||
Subject: [PATCH libwacom 6/7] data: Add more ISDv4 devices
|
||||
|
||||
Dell Venue 8 Pro 5855 (0x4809 and 0x4824)
|
||||
HP EliteBook x360 1030 G2 (0x481a)
|
||||
Dell XPS 12 9250 (0x4822)
|
||||
Dell Latitude 5285 (0x484c)
|
||||
Lenovo ThinkPad T550 (0x5010)
|
||||
|
||||
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
(cherry picked from commit 6fde5ec76a3e58308ae01bc33e9f48cf708be3c7)
|
||||
---
|
||||
data/isdv4-4809.tablet | 14 ++++++++++++++
|
||||
data/isdv4-481a.tablet | 14 ++++++++++++++
|
||||
data/isdv4-4822.tablet | 14 ++++++++++++++
|
||||
data/isdv4-4824.tablet | 14 ++++++++++++++
|
||||
data/isdv4-484c.tablet | 14 ++++++++++++++
|
||||
data/isdv4-5010.tablet | 14 ++++++++++++++
|
||||
6 files changed, 84 insertions(+)
|
||||
create mode 100644 data/isdv4-4809.tablet
|
||||
create mode 100644 data/isdv4-481a.tablet
|
||||
create mode 100644 data/isdv4-4822.tablet
|
||||
create mode 100644 data/isdv4-4824.tablet
|
||||
create mode 100644 data/isdv4-484c.tablet
|
||||
create mode 100644 data/isdv4-5010.tablet
|
||||
|
||||
diff --git a/data/isdv4-4809.tablet b/data/isdv4-4809.tablet
|
||||
new file mode 100644
|
||||
index 0000000..83fe6a4
|
||||
--- /dev/null
|
||||
+++ b/data/isdv4-4809.tablet
|
||||
@@ -0,0 +1,14 @@
|
||||
+# Active electrostatic (AES) sensor used by the Dell Venue 8 Pro 5855
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom ISDv4 4809
|
||||
+DeviceMatch=i2c:056a:4809
|
||||
+Class=ISDV4
|
||||
+Width=4
|
||||
+Height=7
|
||||
+IntegratedIn=Display;System
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Touch=true
|
||||
+Buttons=0
|
||||
diff --git a/data/isdv4-481a.tablet b/data/isdv4-481a.tablet
|
||||
new file mode 100644
|
||||
index 0000000..37df21a
|
||||
--- /dev/null
|
||||
+++ b/data/isdv4-481a.tablet
|
||||
@@ -0,0 +1,14 @@
|
||||
+# Active electrostatic (AES) sensor used by the HP EliteBook x360 1030 G2
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom ISDv4 481a
|
||||
+DeviceMatch=i2c:056a:481a
|
||||
+Class=ISDV4
|
||||
+Width=12
|
||||
+Height=7
|
||||
+IntegratedIn=Display;System
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Touch=true
|
||||
+Buttons=0
|
||||
diff --git a/data/isdv4-4822.tablet b/data/isdv4-4822.tablet
|
||||
new file mode 100644
|
||||
index 0000000..14ecaf5
|
||||
--- /dev/null
|
||||
+++ b/data/isdv4-4822.tablet
|
||||
@@ -0,0 +1,14 @@
|
||||
+# Active electrostatic (AES) sensor used by the Dell XPS 12 9250
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom ISDv4 4822
|
||||
+DeviceMatch=i2c:056a:4822
|
||||
+Class=ISDV4
|
||||
+Width=11
|
||||
+Height=6
|
||||
+IntegratedIn=Display;System
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Touch=true
|
||||
+Buttons=0
|
||||
diff --git a/data/isdv4-4824.tablet b/data/isdv4-4824.tablet
|
||||
new file mode 100644
|
||||
index 0000000..3984507
|
||||
--- /dev/null
|
||||
+++ b/data/isdv4-4824.tablet
|
||||
@@ -0,0 +1,14 @@
|
||||
+# Active electrostatic (AES) sensor used by the Dell Venue 8 Pro 5855
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom ISDv4 4824
|
||||
+DeviceMatch=i2c:056a:4824
|
||||
+Class=ISDV4
|
||||
+Width=4
|
||||
+Height=7
|
||||
+IntegratedIn=Display;System
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Touch=true
|
||||
+Buttons=0
|
||||
diff --git a/data/isdv4-484c.tablet b/data/isdv4-484c.tablet
|
||||
new file mode 100644
|
||||
index 0000000..fa26138
|
||||
--- /dev/null
|
||||
+++ b/data/isdv4-484c.tablet
|
||||
@@ -0,0 +1,14 @@
|
||||
+# Active electrostatic (AES) sensor used by the Dell Latitude 5285
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom ISDv4 484c
|
||||
+DeviceMatch=i2c:056a:484c
|
||||
+Class=ISDV4
|
||||
+Width=10
|
||||
+Height=7
|
||||
+IntegratedIn=Display;System
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Touch=true
|
||||
+Buttons=0
|
||||
diff --git a/data/isdv4-5010.tablet b/data/isdv4-5010.tablet
|
||||
new file mode 100644
|
||||
index 0000000..929b697
|
||||
--- /dev/null
|
||||
+++ b/data/isdv4-5010.tablet
|
||||
@@ -0,0 +1,14 @@
|
||||
+# Active electrostatic (AES) sensor used by the Lenovo ThinkPad T550
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom ISDv4 5010
|
||||
+DeviceMatch=usb:056a:5010
|
||||
+Class=ISDV4
|
||||
+Width=11
|
||||
+Height=6
|
||||
+IntegratedIn=Display;System
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Touch=true
|
||||
+Buttons=0
|
||||
--
|
||||
2.13.5
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
From acedd40af5497d3a36bb7b5b3a53e87a4ae16835 Mon Sep 17 00:00:00 2001
|
||||
From: Jason Gerecke <killertofu@gmail.com>
|
||||
Date: Wed, 13 Sep 2017 08:37:09 -0700
|
||||
Subject: [PATCH libwacom 7/7] data: Add ISDv4 4831 (Dell XPS 13 9365)
|
||||
|
||||
Signed-off-by: Jason Gerecke <jason.gerecke@wacom.com>
|
||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
||||
(cherry picked from commit d14f423d692ff1f2121cc49bf22eff9844cb38da)
|
||||
---
|
||||
data/isdv4-4831.tablet | 14 ++++++++++++++
|
||||
1 file changed, 14 insertions(+)
|
||||
create mode 100644 data/isdv4-4831.tablet
|
||||
|
||||
diff --git a/data/isdv4-4831.tablet b/data/isdv4-4831.tablet
|
||||
new file mode 100644
|
||||
index 0000000..35a41c6
|
||||
--- /dev/null
|
||||
+++ b/data/isdv4-4831.tablet
|
||||
@@ -0,0 +1,14 @@
|
||||
+# Active electrostatic (AES) sensor used by the Dell XPS 13 9365
|
||||
+
|
||||
+[Device]
|
||||
+Name=Wacom ISDv4 4831
|
||||
+DeviceMatch=i2c:056a:4831
|
||||
+Class=ISDV4
|
||||
+Width=12
|
||||
+Height=7
|
||||
+IntegratedIn=Display;System
|
||||
+
|
||||
+[Features]
|
||||
+Stylus=true
|
||||
+Touch=true
|
||||
+Buttons=0
|
||||
--
|
||||
2.13.5
|
||||
|
|
@ -0,0 +1,213 @@
|
|||
%global udevdir %(pkg-config --variable=udevdir udev)
|
||||
|
||||
Name: libwacom
|
||||
Version: 0.24
|
||||
Release: 3%{?dist}
|
||||
Summary: Tablet Information Client Library
|
||||
Requires: %{name}-data
|
||||
|
||||
Group: System Environment/Libraries
|
||||
License: MIT
|
||||
URL: http://linuxwacom.sourceforge.net
|
||||
|
||||
Source0: http://prdownloads.sourceforge.net/linuxwacom/%{name}/%{name}-%{version}.tar.bz2
|
||||
|
||||
Patch01: 0001-data-add-support-for-Cintiq-Pro-13-16.patch
|
||||
Patch03: 0001-data-add-multiple-missing-ISDv4-devices.patch
|
||||
Patch05: 0002-data-Add-USB-Graphire-tablet.patch
|
||||
Patch06: 0003-Add-isdv4-4814-tablet-description.patch
|
||||
Patch07: 0004-data-Add-.tablet-files-for-Wireless-Intuos-Pro-secon.patch
|
||||
Patch08: 0005-data-Add-.tablet-file-for-DTH-1152.patch
|
||||
Patch09: 0006-data-Add-more-ISDv4-devices.patch
|
||||
Patch10: 0007-data-Add-ISDv4-4831-Dell-XPS-13-9365.patch
|
||||
Patch11: 0001-Add-Pro-Pen-3D.patch
|
||||
|
||||
# Bug 1506543 - Add support for the Dell Canvas 27
|
||||
Patch12: 0001-data-Add-Dell-Canvas-27.patch
|
||||
|
||||
BuildRequires: autoconf automake libtool doxygen
|
||||
BuildRequires: glib2-devel libgudev1-devel
|
||||
BuildRequires: systemd-devel
|
||||
|
||||
%description
|
||||
%{name} is a library that provides information about Wacom tablets and
|
||||
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
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: pkgconfig
|
||||
|
||||
%description devel
|
||||
Tablet information client library library development package.
|
||||
|
||||
%package data
|
||||
Summary: Tablet Information Client Library Library Data Files
|
||||
BuildArch: noarch
|
||||
|
||||
%description data
|
||||
Tablet information client library library data files.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch01 -p1
|
||||
%patch03 -p1
|
||||
%patch05 -p1
|
||||
%patch06 -p1
|
||||
%patch07 -p1
|
||||
%patch08 -p1
|
||||
%patch09 -p1
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
|
||||
%build
|
||||
autoreconf --force -v --install || exit 1
|
||||
%configure --disable-static --disable-silent-rules
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
make install DESTDIR=%{buildroot} INSTALL="install -p"
|
||||
install -d ${RPM_BUILD_ROOT}/%{udevdir}/rules.d
|
||||
# auto-generate the udev rule from the database entries
|
||||
pushd tools
|
||||
./generate-udev-rules > ${RPM_BUILD_ROOT}/%{udevdir}/rules.d/65-libwacom.rules
|
||||
popd
|
||||
|
||||
# We intentionally don't ship *.la files
|
||||
rm -f %{buildroot}%{_libdir}/*.la
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%doc COPYING README
|
||||
%{_libdir}/libwacom.so.*
|
||||
%{udevdir}/rules.d/65-libwacom.rules
|
||||
%{_bindir}/libwacom-list-local-devices
|
||||
|
||||
%files devel
|
||||
%doc COPYING
|
||||
%dir %{_includedir}/libwacom-1.0/
|
||||
%dir %{_includedir}/libwacom-1.0/libwacom
|
||||
%{_includedir}/libwacom-1.0/libwacom/libwacom.h
|
||||
%{_libdir}/libwacom.so
|
||||
%{_libdir}/pkgconfig/libwacom.pc
|
||||
|
||||
%files data
|
||||
%doc COPYING
|
||||
%dir %{_datadir}/libwacom
|
||||
%{_datadir}/libwacom/*.tablet
|
||||
%{_datadir}/libwacom/*.stylus
|
||||
%dir %{_datadir}/libwacom/layouts
|
||||
%{_datadir}/libwacom/layouts/*.svg
|
||||
|
||||
%changelog
|
||||
* Thu Nov 09 2017 Peter Hutterer <peter.hutterer@redhat.com> 0.24-3
|
||||
- Add the Pro Pen 3D (#1496646)
|
||||
- Add data for the Dell Canvas 27 (#1506543)
|
||||
|
||||
* Fri Sep 29 2017 Peter Hutterer <peter.hutterer@redhat.com> 0.24-2
|
||||
- Update with new tablet descriptions from 0.25 and 0.26 (#1496646)
|
||||
|
||||
* Wed Mar 08 2017 Peter Hutterer <peter.hutterer@redhat.com> 0.24-1
|
||||
- libwacom 0.24 (#1401752)
|
||||
|
||||
* Fri Jan 20 2017 Peter Hutterer <peter.hutterer@redhat.com> 0.22-2
|
||||
- Merge libwacom 0.22 from F25 (#1401752)
|
||||
|
||||
* Mon Apr 20 2015 Peter Hutterer <peter.hutterer@redhat.com> 0.12-1
|
||||
- Merge libwacom 0.12 from F22 (#1194848)
|
||||
|
||||
* Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 0.8-3
|
||||
- Mass rebuild 2014-01-24
|
||||
|
||||
* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 0.8-2
|
||||
- Mass rebuild 2013-12-27
|
||||
|
||||
* Mon Oct 07 2013 Peter Hutterer <peter.hutterer@redhat.com> 0.8-1
|
||||
- libwacom 0.8 (#1018428)
|
||||
|
||||
* Thu Jul 11 2013 Peter Hutterer <peter.hutterer@redhat.com> 0.7.1-3
|
||||
- Disable silent rules
|
||||
|
||||
* Wed May 01 2013 Peter Hutterer <peter.hutterer@redhat.com> 0.7.1-2
|
||||
- Use stdout, not stdin for printing
|
||||
|
||||
* Tue Apr 16 2013 Peter Hutterer <peter.hutterer@redhat.com> 0.7.1-1
|
||||
- libwacom 0.7.1
|
||||
|
||||
* Fri Feb 22 2013 Peter Hutterer <peter.hutterer@redhat.com> 0.7-3
|
||||
- Install into correct udev rules directory (#913723)
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Thu Dec 20 2012 Peter Hutterer <peter.hutterer@redhat.com> 0.7-1
|
||||
- libwacom 0.7
|
||||
|
||||
* Fri Nov 09 2012 Peter Hutterer <peter.hutterer@redhat.com> 0.6.1-1
|
||||
- libwacom 0.6.1
|
||||
- update udev.rules files for new tablet descriptions
|
||||
|
||||
* Fri Aug 17 2012 Peter Hutterer <peter.hutterer@redhat.com> 0.6-5
|
||||
- remove %defattr, not necessary anymore
|
||||
|
||||
* Mon Jul 30 2012 Peter Hutterer <peter.hutterer@redhat.com> 0.6-4
|
||||
- ... and install the rules in %libdir
|
||||
|
||||
* Mon Jul 30 2012 Peter Hutterer <peter.hutterer@redhat.com> 0.6-3
|
||||
- udev rules can go into %libdir now
|
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Tue Jul 03 2012 Peter Hutterer <peter.hutterer@redhat.com> 0.6-1
|
||||
- libwacom 0.6
|
||||
|
||||
* Tue May 08 2012 Peter Hutterer <peter.hutterer@redhat.com> 0.5-3
|
||||
- Fix crash with WACf* serial devices (if not inputattach'd) (#819191)
|
||||
|
||||
* Thu May 03 2012 Peter Hutterer <peter.hutterer@redhat.com> 0.5-2
|
||||
- Fix gnome-control-center crash for Bamboo Pen & Touch
|
||||
- Generic styli needs to have erasers, default to two tools.
|
||||
|
||||
* Wed May 02 2012 Peter Hutterer <peter.hutterer@redhat.com> 0.5-1
|
||||
- Update to 0.5
|
||||
- Fix sources again - as long as Source0 points to sourceforge this is a bz2
|
||||
|
||||
* Tue Mar 27 2012 Matthias Clasen <mclasen@redhat.com> 0.4-1
|
||||
- Update to 0.4
|
||||
|
||||
* Thu Mar 22 2012 Peter Hutterer <peter.hutterer@redhat.com> 0.3-6
|
||||
- Fix udev rules generator patch to apply ENV{ID_INPUT_TOUCHPAD} correctly
|
||||
(#803314)
|
||||
|
||||
* Thu Mar 08 2012 Olivier Fourdan <ofourdan@redhat.com> 0.3-5
|
||||
- Mark data subpackage as noarch and make it a requirement for libwacom
|
||||
- Use generated udev rule file to list only known devices from libwacom
|
||||
database
|
||||
|
||||
* Tue Mar 06 2012 Peter Hutterer <peter.hutterer@redhat.com> 0.3-4
|
||||
- libwacom-0.3-add-list-devices.patch: add API to list devices
|
||||
- libwacom-0.3-add-udev-generator.patch: add a udev rules generater tool
|
||||
- libwacom-0.3-add-bamboo-one.patch: add Bamboo One definition
|
||||
|
||||
* Tue Feb 21 2012 Olivier Fourdan <ofourdan@redhat.com> - 0.3-2
|
||||
- Add udev rules to identify Wacom as tablets for libwacom
|
||||
|
||||
* Tue Feb 21 2012 Peter Hutterer <peter.hutterer@redhat.com>
|
||||
- Source file is .bz2, not .xz
|
||||
|
||||
* Tue Feb 7 2012 Matthias Clasen <mclasen@redhat.com> - 0.3-1
|
||||
- Update to 0.3
|
||||
|
||||
* Tue Jan 17 2012 Matthias Clasen <mclasen@redhat.com> - 0.2-1
|
||||
- Update to 0.2
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Mon Dec 19 2011 Peter Hutterer <peter.hutterer@redhat.com> 0.1-1
|
||||
- Initial import (#768800)
|
Loading…
Reference in New Issue