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

Package-Manager: portage-2.1.7.3/cvs/Linux i686

4 files changed, 57 insertions, 14 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/Manifest b/x11-drivers/xf86-video-neomagic/Manifest
index 44e8274969ef..2568ed3e2b8c 100644
--- a/x11-drivers/xf86-video-neomagic/Manifest
+++ b/x11-drivers/xf86-video-neomagic/Manifest
@@ -1,7 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX neomagic.xinf 513 RMD160 c839909165d8ab42b10f474abc00676aeddeb874 SHA1 6f453219b6bc231281253182fe871466b0f56996 SHA256 f19faa0a8d5dfbcf2e05fa625f67c47dc85666fedc2b80d07333ae47d72c1c08
+AUX xf86-video-neomagic-1.2.4-fix-build-with-xserver-1.7.1.patch 1548 RMD160 71b4bd424223c310251ac297a1f0d934ec542922 SHA1 72304e749d79a16933a8ed58c0db87d5b92fed8c SHA256 1ad10113cff7f5abee8ca760a19d3c2c6dc83ff33d9ea8ac49dcb48ead16a6e9
 DIST xf86-video-neomagic-1.1.1.tar.bz2 263711 RMD160 74305baac84490cb7deab78336eb47645263e74f SHA1 45bbd2921b2fb5996fc3cdadacc87fff54132fa1 SHA256 d6497080967b8285b663fedd7cafd4457578282ebd7da0b216b6fa214dd88a86
 DIST xf86-video-neomagic-1.2.1.tar.bz2 272764 RMD160 0b563de0cd53011b89d91f66ebd3895c905e765f SHA1 fcb919e8a78fb75654b21b2358783df14d2c8dfc SHA256 96e38d5378596174f76c735c4723ff2ac336f9069644502a9b706586b845e0a5
 DIST xf86-video-neomagic-1.2.2.tar.bz2 278452 RMD160 d73d6d1b928f23ac97d551bedad630ec2bcde35b SHA1 f40c877a8592a2f977a20cfdcb8082421cbf5a60 SHA256 1c0dfeb749ad2faacb74cc75e865878e4dde2c6c3dace04be4f65286e6ae966a
@@ -9,13 +7,6 @@ DIST xf86-video-neomagic-1.2.4.tar.bz2 281374 RMD160 37647bfa947a2113c33dcdd3adf
 EBUILD xf86-video-neomagic-1.1.1.ebuild 615 RMD160 2f60b269e7db1754afccb9aaf60155ed8efb96ee SHA1 cb10d37e1986b2d16ce5419a139c7a57b87d8b04 SHA256 cf0d7027213a2f01e593a5ab766b2a740269c7751329296228b050773c098343
 EBUILD xf86-video-neomagic-1.2.1.ebuild 618 RMD160 6f72897210b5212a8242d3a4e76e10dcaf077ce5 SHA1 42bade9e7b8df4f523092b67ae62a654dfde9819 SHA256 67837264d0ec66a5b4522bd10ac7ef4924f7727ec0fcec47af3b136c7ac73d72
 EBUILD xf86-video-neomagic-1.2.2.ebuild 615 RMD160 e43e4b6eead3655a39fe38c7d199c239e8fe0bef SHA1 e8284299083b8582ce732b16359e4d36aa4910af SHA256 97ef1d6444083de988e960ea5e63af07bc454ea14e202b539573a728de56a867
-EBUILD xf86-video-neomagic-1.2.4.ebuild 614 RMD160 764d08111e0d5be629ab27fa4c84c4e7f9a67de9 SHA1 109afe442429cf2462b70ce0d00d3d9c8b52db35 SHA256 925e2715559107df4548282890ec12b4c0a5e94eabe7283acab3e61feb57c529
-MISC ChangeLog 4623 RMD160 2199bfd9ce64bce650bfd56f2e3e28ebe922cfb8 SHA1 1fd70c310758ee65f42d8139f894e8cfdb59463a SHA256 aa4139b222e6225802c0fbfca95bf7661a7f4d5427dbfd3692d0715836b5f1d1
+EBUILD xf86-video-neomagic-1.2.4.ebuild 681 RMD160 c992d719cf720d53580d394cddecf20135d9fc14 SHA1 f55d1f097a7c82b3c4c11991e954811eca00b121 SHA256 93e14894626019c26a97ba25439dc7ffc3007befbb7c266c81c6d62847b1e5f7
+MISC ChangeLog 4841 RMD160 5809fbaa2ce44489a615bb89b6ff9e1087e8e893 SHA1 c33cbd3cd655990a4783e507c960fe5b7e04ca0b SHA256 cb9e9f543be2d834935d1de888bbf9e417302f26edc9b2782085a9db9c39017a
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrJ+HQACgkQNQqtfCuFneO40wCdG3X5YDj8yIPEeOZNAelukRqx
-pK4An2tSYch4y0zOtuM9Drz+oNH63JoR
-=PRLx
------END PGP SIGNATURE-----
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")