Date: Saturday, November 28, 2009 @ 08:00:38 Author: jgc Revision: 59858
upgpkg: xf86-video-neomagic 1.2.4-3 Fix call to xf86UDelay, fixes FS#17299 Added: xf86-video-neomagic/trunk/xf86UDelay-remove.patch Modified: xf86-video-neomagic/trunk/PKGBUILD -------------------------+ PKGBUILD | 5 ++++- xf86UDelay-remove.patch | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2009-11-28 12:05:20 UTC (rev 59857) +++ PKGBUILD 2009-11-28 13:00:38 UTC (rev 59858) @@ -3,7 +3,7 @@ pkgname=xf86-video-neomagic pkgver=1.2.4 -pkgrel=2 +pkgrel=3 pkgdesc="X.org neomagic video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -14,12 +14,15 @@ groups=('xorg-video-drivers') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + xf86UDelay-remove.patch LICENSE) md5sums=('2d722ee9b9fe8da49109f280689c9c25' + '7c623f3b6deb4b0164690cc4d375712e' 'e2db3e2e5c75dc8084660fb30a2e2203') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/xf86UDelay-remove.patch" || return 1 ./configure --prefix=/usr || return 1 make || return 1 make DESTDIR="${pkgdir}" install || return 1 Added: xf86UDelay-remove.patch =================================================================== --- xf86UDelay-remove.patch (rev 0) +++ xf86UDelay-remove.patch 2009-11-28 13:00:38 UTC (rev 59858) @@ -0,0 +1,42 @@ +From 4e2afb88212582df60bca3ec8c447965a5a66fd5 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <a...@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 <a...@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.3-6-g21f6