Fix build with xorg-server-1.7.1, fixes bug 291825

(Portage version: 2.1.7.3/cvs/Linux i686)

3 files changed, 54 insertions, 2 deletions

diff --git a/x11-drivers/xf86-video-neomagic/ChangeLog b/x11-drivers/xf86-video-neomagic/ChangeLog
index b551a206ba28..77faf62a06c3 100644
--- a/x11-drivers/xf86-video-neomagic/ChangeLog
+++ b/x11-drivers/xf86-video-neomagic/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/xf86-video-neomagic
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-neomagic/ChangeLog,v 1.32 2009/10/05 13:45:18 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-neomagic/ChangeLog,v 1.33 2009/11/07 14:37:37 nirbheek Exp $
+
+  07 Nov 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+  xf86-video-neomagic-1.2.4.ebuild,
+  +files/xf86-video-neomagic-1.2.4-fix-build-with-xserver-1.7.1.patch:
+  Fix build with xorg-server-1.7.1, fixes bug 291825
 
   05 Oct 2009; Christian Faulhammer <fauli@gentoo.org>
   xf86-video-neomagic-1.2.4.ebuild:
diff --git a/x11-drivers/xf86-video-neomagic/files/xf86-video-neomagic-1.2.4-fix-build-with-xserver-1.7.1.patch b/x11-drivers/xf86-video-neomagic/files/xf86-video-neomagic-1.2.4-fix-build-with-xserver-1.7.1.patch
new file mode 100644
index 000000000000..c1cddb0b8606
--- /dev/null
+++ b/x11-drivers/xf86-video-neomagic/files/xf86-video-neomagic-1.2.4-fix-build-with-xserver-1.7.1.patch
@@ -0,0 +1,46 @@
+Patch from upstream; caused due to removal of xf86UDelay()
+
+Fixes http://bugs.gentoo.org/291825
+---
+From 4e2afb88212582df60bca3ec8c447965a5a66fd5 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 26 Oct 2009 19:43:50 +0000
+Subject: s/xf86UDelay/usleep/g
+
+cf. https://bugzilla.redhat.com/show_bug.cgi?id=523800
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+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,
+--
+cgit v0.8.2
diff --git a/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.4.ebuild b/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.4.ebuild
index 2b68534acef0..2e746eb47869 100644
--- a/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.4.ebuild
+++ b/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.4.ebuild,v 1.3 2009/10/05 13:45:18 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-neomagic/xf86-video-neomagic-1.2.4.ebuild,v 1.4 2009/11/07 14:37:37 nirbheek Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -18,3 +18,4 @@ DEPEND="${RDEPEND}
 	x11-proto/xextproto
 	x11-proto/xf86dgaproto
 	x11-proto/xproto"
+PATCHES=("${FILESDIR}/${P}-fix-build-with-xserver-1.7.1.patch")