diff options
| author |   Nirbheek Chauhan <nirbheek@gentoo.org> | 2009-11-07 14:37:38 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@gentoo.org> | 2009-11-07 14:37:38 +0000 |
| commit | 7cce86cb21b4bc6f62dcc9cd5cc30f62941e4132 (patch) | |
| tree | 4d0e31ae617d9bbd8a3d215431077f2a83c411fc /x11-drivers/xf86-video-neomagic/files | |
| parent | Bug 200376 (diff) | |
| download | gentoo-2-7cce86cb21b4bc6f62dcc9cd5cc30f62941e4132.tar.gz gentoo-2-7cce86cb21b4bc6f62dcc9cd5cc30f62941e4132.tar.bz2 gentoo-2-7cce86cb21b4bc6f62dcc9cd5cc30f62941e4132.zip | |
Fix build with xorg-server-1.7.1, fixes bug 291825
(Portage version: 2.1.7.3/cvs/Linux i686)
Diffstat (limited to 'x11-drivers/xf86-video-neomagic/files')
| -rw-r--r-- | x11-drivers/xf86-video-neomagic/files/xf86-video-neomagic-1.2.4-fix-build-with-xserver-1.7.1.patch | 46 |
1 files changed, 46 insertions, 0 deletions
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 |