packages: xorg-driver-video-neomagic/xorg-driver-video-neomagic.spec, xorg-...

[sparky]

Author: sparky                       Date: Tue Mar 30 23:31:18 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added neomagic-usleep patch: fixes symbol xf86UDelay missing in new xorg
- patch sent by Maciej Sterna <msterna at gmail.com>

---- Files affected:
packages/xorg-driver-video-neomagic:
   xorg-driver-video-neomagic.spec (1.19 -> 1.20) , neomagic-usleep.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xorg-driver-video-neomagic/xorg-driver-video-neomagic.spec
diff -u packages/xorg-driver-video-neomagic/xorg-driver-video-neomagic.spec:1.19 packages/xorg-driver-video-neomagic/xorg-driver-video-neomagic.spec:1.20
--- packages/xorg-driver-video-neomagic/xorg-driver-video-neomagic.spec:1.19	Fri Oct  2 10:28:16 2009
+++ packages/xorg-driver-video-neomagic/xorg-driver-video-neomagic.spec	Wed Mar 31 01:31:13 2010
@@ -3,11 +3,12 @@
 Summary(pl.UTF-8):	Sterownik obrazu X.org dla układów graficznych Neomagic
 Name:		xorg-driver-video-neomagic
 Version:	1.2.4
-Release:	2
+Release:	3
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/releases/individual/driver/xf86-video-neomagic-%{version}.tar.bz2
 # Source0-md5:	2d722ee9b9fe8da49109f280689c9c25
+Patch0:		neomagic-usleep.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
@@ -48,6 +49,7 @@
 
 %prep
 %setup -q -n xf86-video-neomagic-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -83,6 +85,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2010/03/30 23:31:13  sparky
+- added neomagic-usleep patch: fixes symbol xf86UDelay missing in new xorg
+- patch sent by Maciej Sterna <msterna at gmail.com>
+
 Revision 1.19  2009/10/02 08:28:16  arekm
 - release 2
 

================================================================
Index: packages/xorg-driver-video-neomagic/neomagic-usleep.patch
diff -u /dev/null packages/xorg-driver-video-neomagic/neomagic-usleep.patch:1.1
--- /dev/null	Wed Mar 31 01:31:18 2010
+++ packages/xorg-driver-video-neomagic/neomagic-usleep.patch	Wed Mar 31 01:31:13 2010
@@ -0,0 +1,45 @@
+rom 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-neomagic/xorg-driver-video-neomagic.spec?r1=1.19&r2=1.20&f=u