- added neomagic-usleep patch: fixes symbol xf86UDelay missing in new xorg

- patch sent by Maciej Sterna <msterna@gmail.com>

Changed files:
    neomagic-usleep.patch -> 1.1
    xorg-driver-video-neomagic.spec -> 1.20

diff --git a/neomagic-usleep.patch b/neomagic-usleep.patch
new file mode 100644 (file)
index 0000000..282947e
--- /dev/null
+++ b/neomagic-usleep.patch
@@ -0,0 +1,45 @@
+rom 4e2afb88212582df60bca3ec8c447965a5a66fd5 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@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@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

diff --git a/xorg-driver-video-neomagic.spec b/xorg-driver-video-neomagic.spec
index 6540e14b21b3c7608b3747fc72b3ace565652153..8c44df30662efc27edb6f3b5552614a6f00bbfb6 100644 (file)
--- a/xorg-driver-video-neomagic.spec
+++ b/xorg-driver-video-neomagic.spec
@@ -2,11 +2,12 @@ Summary:      X.org video driver for Neomagic graphics chipsets
 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
@@ -47,6 +48,7 @@ MagicGraph 256XL+ (NM2380).
 
 %prep
 %setup -q -n xf86-video-neomagic-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}