rpms/xorg-x11-drv-neomagic/devel neomagic-usleep.patch, NONE, 1.1 xorg-x11-drv-neomagic.spec, 1.23, 1.24

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-neomagic/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26896

Modified Files:
	xorg-x11-drv-neomagic.spec 
Added Files:
	neomagic-usleep.patch 
Log Message:
* Mon Oct 26 2009 Adam Jackson <ajax at redhat.com> 1.2.4-2
- neomagic-usleep.patch: Fix for new server ABI. (#523800)


neomagic-usleep.patch:
 neo_driver.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

--- NEW FILE neomagic-usleep.patch ---
>From 4e2afb88212582df60bca3ec8c447965a5a66fd5 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Mon, 26 Oct 2009 15:43:50 -0400
Subject: [PATCH] s/xf86UDelay/usleep/g

cf. https://bugzilla.redhat.com/show_bug.cgi?id=523800

Signed-off-by: Adam Jackson <ajax at redhat.com>
---
 src/neo_driver.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/neo_driver.c b/src/neo_driver.c
index ddb6812..e4c60f2 100644
--- a/src/neo_driver.c
+++ b/src/neo_driver.c
@@ -114,6 +114,8 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <X11/extensions/xf86dgastr.h>
 #endif
 
+#include <unistd.h>
+
 /* Mandatory functions */
 static const OptionInfoRec *	NEOAvailableOptions(int chipid, int busid);
 static void     NEOIdentify(int flags);
@@ -2489,7 +2491,7 @@ neoRestore(ScrnInfoPtr pScrn, vgaRegPtr VgaReg, NeoRegPtr restore,
      * In some rare cases a lockup might occur if we don't delay
      * here. (Reported by Miles Lane)
      */
-    xf86UDelay(200000);
+    usleep(200000);
     /*
      * Disable horizontal and vertical graphics and text expansions so
      * that vgaHWRestore works properly.
@@ -2502,7 +2504,7 @@ neoRestore(ScrnInfoPtr pScrn, vgaRegPtr VgaReg, NeoRegPtr restore,
      * Sleep for 200ms to make sure that the two operations above have
      * had time to take effect.
      */
-    xf86UDelay(200000);
+    usleep(200000);
     /*
      * This function handles restoring the generic VGA registers.  */
     vgaHWRestore(pScrn, VgaReg,
-- 
1.6.4.4



Index: xorg-x11-drv-neomagic.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-neomagic/devel/xorg-x11-drv-neomagic.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- xorg-x11-drv-neomagic.spec	4 Aug 2009 05:30:16 -0000	1.23
+++ xorg-x11-drv-neomagic.spec	26 Oct 2009 19:47:13 -0000	1.24
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 neomagic video driver
 Name:      xorg-x11-drv-neomagic
 Version:   1.2.4
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -14,6 +14,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   neomagic.xinf
 
+Patch0:	    neomagic-usleep.patch
+
 ExclusiveArch: %{ix86}
 
 BuildRequires: pkgconfig
@@ -26,6 +28,7 @@ X.Org X11 neomagic video driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p1 -b .usleep
 
 %build
 %configure --disable-static
@@ -53,6 +56,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/neomagic.4*
 
 %changelog
+* Mon Oct 26 2009 Adam Jackson <ajax at redhat.com> 1.2.4-2
+- neomagic-usleep.patch: Fix for new server ABI. (#523800)
+
 * Tue Aug 04 2009 Dave Airlie <airlied at redhat.com> 1.2.4-1
 - neomagic 1.2.4