[xorg-x11-drv-wacom/f12/master] wacom-0.10.6-artpen.patch: fix ArtPen rotation issue. (#641353)

[Peter Hutterer]

commit 31a8685ba5623817b0e405c1e10f7ec318fa21dc
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Oct 11 12:16:02 2010 +1000

    wacom-0.10.6-artpen.patch: fix ArtPen rotation issue. (#641353)

 wacom-0.10.6-artpen.patch |   33 +++++++++++++++++++++++++++++++++
 xorg-x11-drv-wacom.spec   |    9 ++++++++-
 2 files changed, 41 insertions(+), 1 deletions(-)
---
diff --git a/wacom-0.10.6-artpen.patch b/wacom-0.10.6-artpen.patch
new file mode 100644
index 0000000..fb0eb33
--- /dev/null
+++ b/wacom-0.10.6-artpen.patch
@@ -0,0 +1,33 @@
+From ea2769f8efbffffb13d2971a7f829a5590daee6d Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Tue, 11 May 2010 08:24:14 +1000
+Subject: [PATCH] Revert "Always init wheel buttons to 4/5."
+
+This commit leads to weird button events on tools like the Art Pen.
+http://sourceforge.net/mailarchive/forum.php?thread_name=AANLkTil9O7b5Q7k03-zBWS_mSEJ79dDuh0ZqsBhuOI2v%40mail.gmail.com&forum_name=linuxwacom-discuss
+
+This reverts commit 0fbd3e34d792cb17163c1974d7e8ce93c24242a0.
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ src/wcmConfig.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/wcmConfig.c b/src/wcmConfig.c
+index 597aa4e..34b00c5 100644
+--- a/src/wcmConfig.c
++++ b/src/wcmConfig.c
+@@ -88,8 +88,8 @@ static int wcmAllocate(LocalDevicePtr local)
+ 	priv->relup = 5;			/* Default relative wheel up event */
+ 	priv->reldn = 4;			/* Default relative wheel down event */
+ 
+-	priv->wheelup = 4;			/* Default absolute wheel up event */
+-	priv->wheeldn = 5;			/* Default absolute wheel down event */
++	priv->wheelup = IsPad (priv) ? 4 : 0;	/* Default absolute wheel up event */
++	priv->wheeldn = IsPad (priv) ? 5 : 0;	/* Default absolute wheel down event */
+ 	priv->striplup = 4;			/* Default left strip up event */
+ 	priv->stripldn = 5;			/* Default left strip down event */
+ 	priv->striprup = 4;			/* Default right strip up event */
+-- 
+1.7.2.3
+
diff --git a/xorg-x11-drv-wacom.spec b/xorg-x11-drv-wacom.spec
index dc3214c..0ba6672 100644
--- a/xorg-x11-drv-wacom.spec
+++ b/xorg-x11-drv-wacom.spec
@@ -5,7 +5,7 @@
 Summary:    Xorg X11 wacom input driver
 Name:       xorg-x11-drv-wacom
 Version:    0.10.6
-Release:    2%{?dist}
+Release:    3%{?dist}
 URL:        http://www.x.org
 License:    GPLv2+
 Group:      User Interface/X Hardware Support
@@ -14,6 +14,9 @@ BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0: http://prdownloads.sourceforge.net/linuxwacom/xf86-input-wacom-%{version}.tar.bz2
 
 Patch01: wacom-0.10.6-axis-mode.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=641353
+# Wacom Art Pen rotation send scrolling events
+Patch02: wacom-0.10.6-artpen.patch
 
 ExcludeArch: s390 s390x
 
@@ -35,6 +38,7 @@ X.Org X11 wacom input driver for Wacom tablets.
 %setup -q -n %{tarball}-%{version}
 
 %patch01 -p1 
+%patch02 -p1
 
 %build
 %configure --disable-static
@@ -85,6 +89,9 @@ X.Org X11 wacom input driver development files.
 %{_includedir}/xorg/wacom-properties.h
 
 %changelog
+* Mon Oct 11 2010 Peter Hutterer <peter.hutterer at redhat.com> 0.10.6-3
+- wacom-0.10.6-artpen.patch: fix ArtPen rotation issue. (#641353)
+
 * Fri May 21 2010 Peter Hutterer <peter.hutterer at redhat.com> 0.10.6-2
 - wacom-0.10.6-axis-mode.patch: Fix axis mode setting, don't set
   OutOfProximity bit.