wacom 0.29.99.1
This commit is contained in:
parent
7fdda1921c
commit
a687355fc0
1
.gitignore
vendored
1
.gitignore
vendored
@ -38,3 +38,4 @@ xf86-input-wacom-20101119.tar.bz2
|
|||||||
/xf86-input-wacom-0.28.0.tar.bz2
|
/xf86-input-wacom-0.28.0.tar.bz2
|
||||||
/xf86-input-wacom-0.28.99.1.tar.bz2
|
/xf86-input-wacom-0.28.99.1.tar.bz2
|
||||||
/xf86-input-wacom-0.29.0.tar.bz2
|
/xf86-input-wacom-0.29.0.tar.bz2
|
||||||
|
/xf86-input-wacom-0.29.99.1.tar.bz2
|
||||||
|
@ -1,51 +0,0 @@
|
|||||||
From 8501c0433587a64ff5ef2f2f42d7a2d54330c3a7 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Benjamin Tissoires <benjamin.tissoires@redhat.com>
|
|
||||||
Date: Fri, 13 Mar 2015 11:24:27 -0400
|
|
||||||
Subject: [PATCH] Allow PAD only interfaces without EV_ABS and/or EV_X/Y to
|
|
||||||
report events
|
|
||||||
|
|
||||||
commit 0cfe113 (Allow PAD only interface without setting up EV_ABS
|
|
||||||
and/or EV_X/Y) allows xf86-input-wacom to handle Pad only interface but
|
|
||||||
such interface do not report any events.
|
|
||||||
|
|
||||||
We need to call usbWcmInitPadState() to be able to forward events.
|
|
||||||
|
|
||||||
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
|
|
||||||
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
||||||
---
|
|
||||||
src/wcmUSB.c | 5 +++--
|
|
||||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/wcmUSB.c b/src/wcmUSB.c
|
|
||||||
index b7c81c1..c15cd4a 100644
|
|
||||||
--- a/src/wcmUSB.c
|
|
||||||
+++ b/src/wcmUSB.c
|
|
||||||
@@ -553,7 +553,7 @@ int usbWcmGetRanges(InputInfoPtr pInfo)
|
|
||||||
/* may be an expresskey only interface */
|
|
||||||
if (ISBITSET(common->wcmKeys, BTN_FORWARD) ||
|
|
||||||
ISBITSET(common->wcmKeys, BTN_0))
|
|
||||||
- return Success;
|
|
||||||
+ goto pad_init;
|
|
||||||
|
|
||||||
xf86Msg(X_ERROR, "%s: no abs bits.\n", pInfo->name);
|
|
||||||
return !Success;
|
|
||||||
@@ -572,7 +572,7 @@ int usbWcmGetRanges(InputInfoPtr pInfo)
|
|
||||||
/* may be a PAD only interface */
|
|
||||||
if (ISBITSET(common->wcmKeys, BTN_FORWARD) ||
|
|
||||||
ISBITSET(common->wcmKeys, BTN_0))
|
|
||||||
- return Success;
|
|
||||||
+ goto pad_init;
|
|
||||||
|
|
||||||
xf86Msg(X_ERROR, "%s: unable to ioctl xmax value.\n", pInfo->name);
|
|
||||||
return !Success;
|
|
||||||
@@ -787,6 +787,7 @@ int usbWcmGetRanges(InputInfoPtr pInfo)
|
|
||||||
common->wcmHWTouchSwitchState = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
+pad_init:
|
|
||||||
usbWcmInitPadState(pInfo);
|
|
||||||
|
|
||||||
return Success;
|
|
||||||
--
|
|
||||||
2.3.2
|
|
||||||
|
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
50786440df6044a483cdab2008a7efe7 xf86-input-wacom-0.29.0.tar.bz2
|
ef428fcd296c9ed06d73919b3a3a40b9 xf86-input-wacom-0.29.99.1.tar.bz2
|
||||||
|
@ -8,8 +8,8 @@
|
|||||||
|
|
||||||
Summary: Xorg X11 wacom input driver
|
Summary: Xorg X11 wacom input driver
|
||||||
Name: xorg-x11-drv-wacom
|
Name: xorg-x11-drv-wacom
|
||||||
Version: 0.29.0
|
Version: 0.29.99.1
|
||||||
Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
|
Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
|
||||||
URL: http://www.x.org
|
URL: http://www.x.org
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Group: User Interface/X Hardware Support
|
Group: User Interface/X Hardware Support
|
||||||
@ -22,8 +22,6 @@ Source2: commitid
|
|||||||
Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{version}.tar.bz2
|
Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{version}.tar.bz2
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Patch01: 0001-Allow-PAD-only-interfaces-without-EV_ABS-and-or-EV_X.patch
|
|
||||||
|
|
||||||
ExcludeArch: s390 s390x
|
ExcludeArch: s390 s390x
|
||||||
|
|
||||||
BuildRequires: xorg-x11-server-devel >= 1.10.99.902
|
BuildRequires: xorg-x11-server-devel >= 1.10.99.902
|
||||||
@ -43,7 +41,6 @@ X.Org X11 wacom input driver for Wacom tablets.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
|
%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
|
||||||
%patch01 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf --force -v --install || exit 1
|
autoreconf --force -v --install || exit 1
|
||||||
@ -103,6 +100,9 @@ X.Org X11 wacom input driver development files.
|
|||||||
%{_bindir}/isdv4-serial-debugger
|
%{_bindir}/isdv4-serial-debugger
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jun 01 2015 Peter Hutterer <peter.hutterer@redhat.com> 0.29.99.1-1
|
||||||
|
- wacom 0.29.99.1
|
||||||
|
|
||||||
* Fri Mar 20 2015 Peter Hutterer <peter.hutterer@redhat.com> 0.29.0-2
|
* Fri Mar 20 2015 Peter Hutterer <peter.hutterer@redhat.com> 0.29.0-2
|
||||||
- Allow for PAD devices without x/y (HUION tablets)
|
- Allow for PAD devices without x/y (HUION tablets)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user