rpms/linuxwacom/devel linuxwacom-0.8.0.3-build-fixes.patch, NONE, 1.1 linuxwacom.spec, 1.65, 1.66

[Peter Hutterer]

Author: whot

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

Modified Files:
	linuxwacom.spec 
Added Files:
	linuxwacom-0.8.0.3-build-fixes.patch 
Log Message:
* Mon Dec 22 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.8.0.3-6
- Rebuild for server 1.6
  add build-fixes.patch: protect against XINPUT ABI 3, and other build
  issues



linuxwacom-0.8.0.3-build-fixes.patch:

--- NEW FILE linuxwacom-0.8.0.3-build-fixes.patch ---
>From ad96075b07472fb598ef63fadc565b58437fbc9a Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer at who-t.net>
Date: Mon, 22 Dec 2008 16:29:41 +1000
Subject: [PATCH] Build fixes for server 1.6

---
 src/xdrv/wcmConfig.c |    2 +-
 src/xdrv/xf86Wacom.c |    2 ++
 src/xdrv/xf86Wacom.h |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/xdrv/wcmConfig.c b/src/xdrv/wcmConfig.c
index 95a13f2..68aad95 100644
--- a/src/xdrv/wcmConfig.c
+++ b/src/xdrv/wcmConfig.c
@@ -975,7 +975,7 @@ static XF86ModuleVersionInfo xf86WcmVersionRec =
 	MODULEVENDORSTRING,
 	MODINFOSTRING1,
 	MODINFOSTRING2,
-	XF86_VERSION_CURRENT,
+	XORG_VERSION_CURRENT,
 	1, 0, 0,
 	ABI_CLASS_XINPUT,
 	ABI_XINPUT_VERSION,
diff --git a/src/xdrv/xf86Wacom.c b/src/xdrv/xf86Wacom.c
index 821b306..f617826 100644
--- a/src/xdrv/xf86Wacom.c
+++ b/src/xdrv/xf86Wacom.c
@@ -574,7 +574,9 @@ static int xf86WcmRegisterX11Devices (LocalDevicePtr local)
 					  xf86GetMotionEvents,
 					  local->history_size,
 #else
+#if ABI_XINPUT_VERSION < 3
 					  GetMotionHistory,
+#endif
 					  GetMotionHistorySize(),
 #endif
 					  ((priv->flags & ABSOLUTE_FLAG) ?
diff --git a/src/xdrv/xf86Wacom.h b/src/xdrv/xf86Wacom.h
index eb67188..c915550 100644
--- a/src/xdrv/xf86Wacom.h
+++ b/src/xdrv/xf86Wacom.h
@@ -23,7 +23,7 @@
 /****************************************************************************/
 
 #include "../include/xdrv-config.h"
-#include <xf86Version.h>
+#include <xorg-server.h>
 #include "../include/Xwacom.h"
 
 /*****************************************************************************
-- 
1.6.0.4



Index: linuxwacom.spec
===================================================================
RCS file: /cvs/pkgs/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- linuxwacom.spec	14 Nov 2008 19:51:40 -0000	1.65
+++ linuxwacom.spec	22 Dec 2008 06:37:09 -0000	1.66
@@ -3,7 +3,7 @@
 # Upstream's versioning is goofy.  Note the mapping from tarname to version.
 Name:		linuxwacom
 Version:	0.8.0.3
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -16,12 +16,13 @@
 Patch3:		linuxwacom-0.7.8.3-sdk-me-harder.patch
 Patch4:		linuxwacom-0.7.9.7-fix_build.patch
 Patch5:		linuxwacom-dont_call_devproc_again_in_uninit.patch
+Patch6:		linuxwacom-0.8.0.3-build-fixes.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
 BuildRequires:	libX11-devel libXi-devel ncurses-devel
-BuildRequires:  xorg-x11-server-sdk >= 1.4.99.1
+BuildRequires:  xorg-x11-server-sdk >= 1.5.99.1
 BuildRequires:  autoconf automake libtool xorg-x11-server-Xorg
-Requires:	xorg-x11-server-Xorg >= 1.4.99.1, udev >= 030-21
+Requires:	xorg-x11-server-Xorg >= 1.5.99.1, udev >= 030-21
 ExclusiveArch:  %{ix86} x86_64 alpha ia64 ppc ppc64 sparcv9 sparc64
 
 %description 
@@ -46,6 +47,7 @@
 %patch3 -p1 -b .sdk
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1 -b .buildfixes
 
 %build
 
@@ -107,6 +109,11 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Mon Dec 22 2008 Peter Hutterer <peter.hutterer at redhat.com> 0.8.0.3-6
+- Rebuild for server 1.6
+  add build-fixes.patch: protect against XINPUT ABI 3, and other build
+  issues
+
 * Fri Nov 14 2008 Aristeu Rozanski <aris at redhat.com> 0.8.0.3-5
 - don't call devproc with DEVICE_OFF in Uninit in new X servers