rpms/xorg-x11-drv-wacom
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Match N-Trig DuoSense (#1031343)

Browse Source
This commit is contained in:
Peter Hutterer 2014-01-20 11:15:03 +10:00
parent 630bab116e
commit 7e39948ffb
2 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
0001-conf-add-N-Trig-DuoSense-to-our-matched-devices.patch Normal file
View File

@ -0,0 +1,47 @@
From a0df8d1cddccde9368b075d19347632934bfdafc Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon, 20 Jan 2014 11:07:37 +1000
Subject: [PATCH] conf: add N-Trig DuoSense to our matched devices
That device has a pen and an eraser tool, as well as a touch device. Handle it
with the wacom driver by default, the evdev driver isn't quite up to scratch
here.
This also fixes a missing match in the .fdi file for the base N-Trig devices -
just in case.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
---
conf/50-wacom.conf | 2 +-
conf/wacom.fdi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/conf/50-wacom.conf b/conf/50-wacom.conf
index 567b900..21f75e6 100644
--- a/conf/50-wacom.conf
+++ b/conf/50-wacom.conf
@@ -29,7 +29,7 @@ EndSection
# N-Trig Duosense Electromagnetic Digitizer
Section "InputClass"
Identifier "Wacom N-Trig class"
- MatchProduct "HID 1b96:0001|N-Trig Pen"
+ MatchProduct "HID 1b96:0001|N-Trig Pen|N-trig DuoSense"
MatchDevicePath "/dev/input/event*"
Driver "wacom"
Option "Button2" "3"
diff --git a/conf/wacom.fdi b/conf/wacom.fdi
index 70304d2..dd623a4 100644
--- a/conf/wacom.fdi
+++ b/conf/wacom.fdi
@@ -15,7 +15,7 @@
</match>
</match>
<!-- N-Trig Duosense Electromagnetic Digitizer -->
- <match key="info.product" contains="HID 1b96:0001">
+ <match key="info.product" contains_outof="HID 1b96:0001;N-Trig Pen;N-trig DuoSense">
<match key="info.parent" contains="if0">
<merge key="input.x11_driver" type="string">wacom</merge>
</match>
--
1.8.4.2

8
xorg-x11-drv-wacom.spec
View File

@ -9,7 +9,7 @@
Summary: Xorg X11 wacom input driver
Name: xorg-x11-drv-wacom
Version: 0.23.0
Release: 9%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
Release: 10%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
URL: http://www.x.org
License: GPLv2+
Group: User Interface/X Hardware Support
@ -24,6 +24,8 @@ Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{versio
Source3: 70-wacom.rules
Source4: wacom-inputattach@.service
Patch01: 0001-conf-add-N-Trig-DuoSense-to-our-matched-devices.patch
ExcludeArch: s390 s390x
BuildRequires: xorg-x11-server-devel >= 1.10.99.902
@ -44,6 +46,7 @@ X.Org X11 wacom input driver for Wacom tablets.
%prep
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
%patch01 -p1
%build
autoreconf --force -v --install || exit 1
@ -103,6 +106,9 @@ X.Org X11 wacom input driver development files.
%{_bindir}/isdv4-serial-debugger
%changelog
* Mon Jan 20 2014 Peter Hutterer <peter.hutterer@redhat.com> 0.23.0-10
- Match N-Trig DuoSense (#1031343)
* Fri Jan 17 2014 Peter Hutterer <peter.hutterer@redhat.com> 0.23.0-9
- Let systemd restart inputattach when it exits (i.e. after suspend)
(#1046912)