rpms/xorg-x11-drv-magellan/devel magellan-1.1.0-build-fixes.patch, NONE, 1.1 xorg-x11-drv-magellan.spec, 1.15, 1.16

[Adam Jackson (ajax)]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-magellan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32606

Modified Files:
	xorg-x11-drv-magellan.spec 
Added Files:
	magellan-1.1.0-build-fixes.patch 
Log Message:
* Fri Feb 22 2008 Adam Jackson <ajax at redhat.com> 1.1.0-6
- magellan-1.1.0-build-fixes.patch: Misc build fixes.


magellan-1.1.0-build-fixes.patch:

--- NEW FILE magellan-1.1.0-build-fixes.patch ---
diff -up xf86-input-magellan-1.1.0/src/magellan.h.jx xf86-input-magellan-1.1.0/src/magellan.h
--- xf86-input-magellan-1.1.0/src/magellan.h.jx	2004-04-23 15:54:03.000000000 -0400
+++ xf86-input-magellan-1.1.0/src/magellan.h	2008-02-22 13:59:05.000000000 -0500
@@ -68,7 +68,7 @@ MAGELLANState;
 
 #define MagellanNibble(Value)       (Value&0x0F)
 
-#define milisleep(ms) xf86usleep (ms * 1000)
+#define milisleep(ms) usleep (ms * 1000)
 
 typedef struct _MagellanPrivateRec
 {
diff -up xf86-input-magellan-1.1.0/src/magellan.c.jx xf86-input-magellan-1.1.0/src/magellan.c
--- xf86-input-magellan-1.1.0/src/magellan.c.jx	2006-04-07 13:49:24.000000000 -0400
+++ xf86-input-magellan-1.1.0/src/magellan.c	2008-02-22 13:59:07.000000000 -0500
@@ -249,7 +249,6 @@ MagellanPreInit(InputDriverPtr drv, IDev
         }
 	
 	priv->buffer = XisbNew (pInfo->fd, 200);
-	DBG (9, XisbTrace (priv->buffer, 1));
 
 	/* 
 	 * Verify the hardware is attached and functional


Index: xorg-x11-drv-magellan.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-magellan/devel/xorg-x11-drv-magellan.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xorg-x11-drv-magellan.spec	20 Feb 2008 07:30:18 -0000	1.15
+++ xorg-x11-drv-magellan.spec	22 Feb 2008 19:03:36 -0000	1.16
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 magellan input driver
 Name:      xorg-x11-drv-magellan
 Version: 1.1.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -13,6 +13,8 @@
 
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
+Patch0: magellan-1.1.0-build-fixes.patch
+
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
@@ -24,6 +26,7 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch -p1 -b .build
 
 %build
 %configure --disable-static
@@ -46,6 +49,9 @@
 %{driverdir}/magellan_drv.so
 
 %changelog
+* Fri Feb 22 2008 Adam Jackson <ajax at redhat.com> 1.1.0-6
+- magellan-1.1.0-build-fixes.patch: Misc build fixes.
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.1.0-5
 - Autorebuild for GCC 4.3