rpms/linuxwacom/devel linuxwacom-0.8.2.2-fix-mapping.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 linuxwacom.spec, 1.68, 1.69 sources, 1.15, 1.16

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/linuxwacom/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30696

Modified Files:
	.cvsignore linuxwacom.spec sources 
Added Files:
	linuxwacom-0.8.2.2-fix-mapping.patch 
Log Message:
* Thu Jan 29 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.2.2-1
- update to 0.8.2.2
- linuxwacom-0.8.2.2-fix-mapping.patch: fix button mapping, the X server
  starts with 1, not with 0.




linuxwacom-0.8.2.2-fix-mapping.patch:

--- NEW FILE linuxwacom-0.8.2.2-fix-mapping.patch ---
>From e29f4d9cc0667b9c03e6c191e9de76a8d08102ab Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Thu, 29 Jan 2009 11:42:22 +1000
Subject: [PATCH] Fix the button mapping offset.

There's no button 0 in the server, all offsets have to begin at 1.
---
 src/xdrv/wcmCommon.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/xdrv/wcmCommon.c b/src/xdrv/wcmCommon.c
index ff834f4..d5e3ed6 100644
--- a/src/xdrv/wcmCommon.c
+++ b/src/xdrv/wcmCommon.c
@@ -527,7 +527,9 @@ static void sendAButton(LocalDevicePtr local, int button, int mask,
 		return; 
 	}
 
-	button_idx = button;
+        /* Fix for current X servers, they start button mappings with 1, not
+         * with 0. */
+	button_idx = button + 1;
 	button = priv->button[button];
 	if (!button)  /* ignore this button event */
 		return;
@@ -748,12 +750,12 @@ static void sendWheelStripEvents(LocalDevicePtr local, const WacomDeviceState* d
 	{
 	    case AC_BUTTON:
 		/* send both button on/off in the same event for pad */
-		local->dev->button->map [0] = fakeButton & AC_CODE;
+		local->dev->button->map [1] = fakeButton & AC_CODE;
 	
-		xf86PostButtonEvent(local->dev, is_absolute, 0,
+		xf86PostButtonEvent(local->dev, is_absolute, 1,
 			1,0,naxes,x,y,z,v3,v4,v5);
 
-		xf86PostButtonEvent(local->dev, is_absolute, 0,
+		xf86PostButtonEvent(local->dev, is_absolute, 1,
 			0,0,naxes,x,y,z,v3,v4,v5);
 	    break;
 
-- 
1.6.0.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	15 Jan 2009 21:02:53 -0000	1.15
+++ .cvsignore	29 Jan 2009 11:10:12 -0000	1.16
@@ -1,4 +1 @@
-linuxwacom-0.7.9-8.tar.bz2
-linuxwacom-0.8.1-4.tar.bz2
-linuxwacom-0.8.0-3.tar.bz2
-linuxwacom-0.8.2-1.tar.bz2
+linuxwacom-0.8.2-2.tar.bz2


Index: linuxwacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- linuxwacom.spec	15 Jan 2009 21:02:53 -0000	1.68
+++ linuxwacom.spec	29 Jan 2009 11:10:12 -0000	1.69
@@ -1,8 +1,8 @@
-%define tarname		%{name}-0.8.2-1
+%define tarname		%{name}-0.8.2-2
 
 # Upstream's versioning is goofy.  Note the mapping from tarname to version.
 Name:		linuxwacom
-Version:	0.8.2.1
+Version:	0.8.2.2
 Release:	1%{?dist}
 Summary:	Wacom Drivers from Linux Wacom Project
 
@@ -15,6 +15,7 @@
 Patch1:		linuxwacom-0.7.8.3-sdk-me-harder.patch
 Patch2:		linuxwacom-0.7.9.7-fix_build.patch
 Patch3:		linuxwacom-0.8.2.1-fix_build.patch
+Patch4:		linuxwacom-0.8.2.2-fix-mapping.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	libX11-devel libXi-devel ncurses-devel
@@ -44,6 +45,7 @@
 %patch1 -p1 -b .sdk
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 
@@ -105,6 +107,11 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Thu Jan 29 2009 Peter Hutterer <peter.hutterer at redhat.com> 0.8.2.2-1
+- update to 0.8.2.2
+- linuxwacom-0.8.2.2-fix-mapping.patch: fix button mapping, the X server
+  starts with 1, not with 0.
+
 * Thu Jan 15 2009 Aristeu Rozanski <aris at redhat.com> 0.8.1.2-1
 - new production release
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	15 Jan 2009 21:02:53 -0000	1.15
+++ sources	29 Jan 2009 11:10:12 -0000	1.16
@@ -1 +1 @@
-c06a12b029b7ad8c879e08042d5c4a46  linuxwacom-0.8.2-1.tar.bz2
+bdfaf6da49b446e251ac1f98754a89a2  linuxwacom-0.8.2-2.tar.bz2