[arch-commits] Commit in xf86-video-neomagic/repos (3 files)
Date: Monday, March 12, 2012 @ 16:53:43 Author: andyrtr Revision: 153348 db-move: moved xf86-video-neomagic from [testing] to [extra] (x86_64) Added: xf86-video-neomagic/repos/extra-x86_64/PKGBUILD (from rev 153285, xf86-video-neomagic/repos/testing-x86_64/PKGBUILD) Deleted: xf86-video-neomagic/repos/extra-x86_64/PKGBUILD xf86-video-neomagic/repos/testing-x86_64/ --+ PKGBUILD | 56 ++-- 1 file changed, 30 insertions(+), 26 deletions(-) Deleted: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2012-03-12 20:53:42 UTC (rev 153347) +++ extra-x86_64/PKGBUILD 2012-03-12 20:53:43 UTC (rev 153348) @@ -1,26 +0,0 @@ -# $Id$ -#Maintainer: Jan de Groot - -pkgname=xf86-video-neomagic -pkgver=1.2.5 -pkgrel=5 -pkgdesc="X.org neomagic video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/"; -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto') -conflicts=('xorg-server<1.11.0') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} Copied: xf86-video-neomagic/repos/extra-x86_64/PKGBUILD (from rev 153285, xf86-video-neomagic/repos/testing-x86_64/PKGBUILD) === --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-03-12 20:53:43 UTC (rev 153348) @@ -0,0 +1,30 @@ +# $Id$ +#Maintainer: Jan de Groot + +pkgname=xf86-video-neomagic +pkgver=1.2.5 +pkgrel=6 +pkgdesc="X.org neomagic video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/"; +license=('custom') +depends=('glibc') +makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto') +conflicts=('xorg-server<1.11.99.903') +groups=('xorg-drivers' 'xorg') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +}
[arch-commits] Commit in xf86-video-neomagic/repos (3 files)
Date: Monday, March 12, 2012 @ 16:53:42 Author: andyrtr Revision: 153347 db-move: moved xf86-video-neomagic from [testing] to [extra] (i686) Added: xf86-video-neomagic/repos/extra-i686/PKGBUILD (from rev 153285, xf86-video-neomagic/repos/testing-i686/PKGBUILD) Deleted: xf86-video-neomagic/repos/extra-i686/PKGBUILD xf86-video-neomagic/repos/testing-i686/ --+ PKGBUILD | 56 ++-- 1 file changed, 30 insertions(+), 26 deletions(-) Deleted: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2012-03-12 20:53:41 UTC (rev 153346) +++ extra-i686/PKGBUILD 2012-03-12 20:53:42 UTC (rev 153347) @@ -1,26 +0,0 @@ -# $Id$ -#Maintainer: Jan de Groot - -pkgname=xf86-video-neomagic -pkgver=1.2.5 -pkgrel=5 -pkgdesc="X.org neomagic video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/"; -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto') -conflicts=('xorg-server<1.11.0') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} Copied: xf86-video-neomagic/repos/extra-i686/PKGBUILD (from rev 153285, xf86-video-neomagic/repos/testing-i686/PKGBUILD) === --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-03-12 20:53:42 UTC (rev 153347) @@ -0,0 +1,30 @@ +# $Id$ +#Maintainer: Jan de Groot + +pkgname=xf86-video-neomagic +pkgver=1.2.5 +pkgrel=6 +pkgdesc="X.org neomagic video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/"; +license=('custom') +depends=('glibc') +makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto') +conflicts=('xorg-server<1.11.99.903') +groups=('xorg-drivers' 'xorg') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +}
[arch-commits] Commit in xf86-video-neomagic/repos (3 files)
Date: Sunday, February 12, 2012 @ 04:45:17 Author: andyrtr Revision: 150051 db-move: moved xf86-video-neomagic from [staging] to [testing] (x86_64) Added: xf86-video-neomagic/repos/testing-x86_64/ xf86-video-neomagic/repos/testing-x86_64/PKGBUILD (from rev 149988, xf86-video-neomagic/repos/staging-x86_64/PKGBUILD) Deleted: xf86-video-neomagic/repos/staging-x86_64/ --+ PKGBUILD | 30 ++ 1 file changed, 30 insertions(+) Copied: xf86-video-neomagic/repos/testing-x86_64/PKGBUILD (from rev 149988, xf86-video-neomagic/repos/staging-x86_64/PKGBUILD) === --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2012-02-12 09:45:17 UTC (rev 150051) @@ -0,0 +1,30 @@ +# $Id$ +#Maintainer: Jan de Groot + +pkgname=xf86-video-neomagic +pkgver=1.2.5 +pkgrel=6 +pkgdesc="X.org neomagic video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/"; +license=('custom') +depends=('glibc') +makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto') +conflicts=('xorg-server<1.11.99.903') +groups=('xorg-drivers' 'xorg') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +}
[arch-commits] Commit in xf86-video-neomagic/repos (3 files)
Date: Sunday, February 12, 2012 @ 04:45:16 Author: andyrtr Revision: 150050 db-move: moved xf86-video-neomagic from [staging] to [testing] (i686) Added: xf86-video-neomagic/repos/testing-i686/ xf86-video-neomagic/repos/testing-i686/PKGBUILD (from rev 149988, xf86-video-neomagic/repos/staging-i686/PKGBUILD) Deleted: xf86-video-neomagic/repos/staging-i686/ --+ PKGBUILD | 30 ++ 1 file changed, 30 insertions(+) Copied: xf86-video-neomagic/repos/testing-i686/PKGBUILD (from rev 149988, xf86-video-neomagic/repos/staging-i686/PKGBUILD) === --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2012-02-12 09:45:16 UTC (rev 150050) @@ -0,0 +1,30 @@ +# $Id$ +#Maintainer: Jan de Groot + +pkgname=xf86-video-neomagic +pkgver=1.2.5 +pkgrel=6 +pkgdesc="X.org neomagic video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/"; +license=('custom') +depends=('glibc') +makedepends=('xorg-server-devel>=1.11.99.903' 'xf86dgaproto') +conflicts=('xorg-server<1.11.99.903') +groups=('xorg-drivers' 'xorg') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +}
[arch-commits] Commit in xf86-video-neomagic/repos (3 files)
Date: Tuesday, October 11, 2011 @ 17:28:59 Author: jgc Revision: 140321 db-move: moved xf86-video-neomagic from [testing] to [extra] (i686) Added: xf86-video-neomagic/repos/extra-i686/PKGBUILD (from rev 140271, xf86-video-neomagic/repos/testing-i686/PKGBUILD) Deleted: xf86-video-neomagic/repos/extra-i686/PKGBUILD xf86-video-neomagic/repos/testing-i686/ --+ PKGBUILD | 52 ++-- 1 file changed, 26 insertions(+), 26 deletions(-) Deleted: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2011-10-11 21:28:57 UTC (rev 140320) +++ extra-i686/PKGBUILD 2011-10-11 21:28:59 UTC (rev 140321) @@ -1,26 +0,0 @@ -# $Id$ -#Maintainer: Jan de Groot - -pkgname=xf86-video-neomagic -pkgver=1.2.5 -pkgrel=4 -pkgdesc="X.org neomagic video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/"; -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'xf86dgaproto') -conflicts=('xorg-server<1.10.0') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} Copied: xf86-video-neomagic/repos/extra-i686/PKGBUILD (from rev 140271, xf86-video-neomagic/repos/testing-i686/PKGBUILD) === --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2011-10-11 21:28:59 UTC (rev 140321) @@ -0,0 +1,26 @@ +# $Id$ +#Maintainer: Jan de Groot + +pkgname=xf86-video-neomagic +pkgver=1.2.5 +pkgrel=5 +pkgdesc="X.org neomagic video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/"; +license=('custom') +depends=('glibc') +makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto') +conflicts=('xorg-server<1.11.0') +groups=('xorg-drivers' 'xorg') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make + make DESTDIR="${pkgdir}" install + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +}
[arch-commits] Commit in xf86-video-neomagic/repos (3 files)
Date: Tuesday, October 11, 2011 @ 17:29:00 Author: jgc Revision: 140322 db-move: moved xf86-video-neomagic from [testing] to [extra] (x86_64) Added: xf86-video-neomagic/repos/extra-x86_64/PKGBUILD (from rev 140271, xf86-video-neomagic/repos/testing-x86_64/PKGBUILD) Deleted: xf86-video-neomagic/repos/extra-x86_64/PKGBUILD xf86-video-neomagic/repos/testing-x86_64/ --+ PKGBUILD | 52 ++-- 1 file changed, 26 insertions(+), 26 deletions(-) Deleted: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2011-10-11 21:28:59 UTC (rev 140321) +++ extra-x86_64/PKGBUILD 2011-10-11 21:29:00 UTC (rev 140322) @@ -1,26 +0,0 @@ -# $Id$ -#Maintainer: Jan de Groot - -pkgname=xf86-video-neomagic -pkgver=1.2.5 -pkgrel=4 -pkgdesc="X.org neomagic video driver" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/"; -license=('custom') -depends=('glibc') -makedepends=('xorg-server-devel' 'xf86dgaproto') -conflicts=('xorg-server<1.10.0') -groups=('xorg-drivers' 'xorg') -options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make - make DESTDIR="${pkgdir}" install - install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} Copied: xf86-video-neomagic/repos/extra-x86_64/PKGBUILD (from rev 140271, xf86-video-neomagic/repos/testing-x86_64/PKGBUILD) === --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2011-10-11 21:29:00 UTC (rev 140322) @@ -0,0 +1,26 @@ +# $Id$ +#Maintainer: Jan de Groot + +pkgname=xf86-video-neomagic +pkgver=1.2.5 +pkgrel=5 +pkgdesc="X.org neomagic video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/"; +license=('custom') +depends=('glibc') +makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto') +conflicts=('xorg-server<1.11.0') +groups=('xorg-drivers' 'xorg') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make + make DESTDIR="${pkgdir}" install + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +}
[arch-commits] Commit in xf86-video-neomagic/repos (3 files)
Date: Tuesday, August 30, 2011 @ 04:45:20 Author: jgc Revision: 136525 db-move: moved xf86-video-neomagic from [staging] to [testing] (x86_64) Added: xf86-video-neomagic/repos/testing-x86_64/ xf86-video-neomagic/repos/testing-x86_64/PKGBUILD (from rev 136477, xf86-video-neomagic/repos/staging-x86_64/PKGBUILD) Deleted: xf86-video-neomagic/repos/staging-x86_64/ --+ PKGBUILD | 26 ++ 1 file changed, 26 insertions(+) Copied: xf86-video-neomagic/repos/testing-x86_64/PKGBUILD (from rev 136477, xf86-video-neomagic/repos/staging-x86_64/PKGBUILD) === --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2011-08-30 08:45:20 UTC (rev 136525) @@ -0,0 +1,26 @@ +# $Id$ +#Maintainer: Jan de Groot + +pkgname=xf86-video-neomagic +pkgver=1.2.5 +pkgrel=5 +pkgdesc="X.org neomagic video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/"; +license=('custom') +depends=('glibc') +makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto') +conflicts=('xorg-server<1.11.0') +groups=('xorg-drivers' 'xorg') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make + make DESTDIR="${pkgdir}" install + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +}
[arch-commits] Commit in xf86-video-neomagic/repos (3 files)
Date: Tuesday, August 30, 2011 @ 04:45:19 Author: jgc Revision: 136524 db-move: moved xf86-video-neomagic from [staging] to [testing] (i686) Added: xf86-video-neomagic/repos/testing-i686/ xf86-video-neomagic/repos/testing-i686/PKGBUILD (from rev 136477, xf86-video-neomagic/repos/staging-i686/PKGBUILD) Deleted: xf86-video-neomagic/repos/staging-i686/ --+ PKGBUILD | 26 ++ 1 file changed, 26 insertions(+) Copied: xf86-video-neomagic/repos/testing-i686/PKGBUILD (from rev 136477, xf86-video-neomagic/repos/staging-i686/PKGBUILD) === --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2011-08-30 08:45:19 UTC (rev 136524) @@ -0,0 +1,26 @@ +# $Id$ +#Maintainer: Jan de Groot + +pkgname=xf86-video-neomagic +pkgver=1.2.5 +pkgrel=5 +pkgdesc="X.org neomagic video driver" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/"; +license=('custom') +depends=('glibc') +makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto') +conflicts=('xorg-server<1.11.0') +groups=('xorg-drivers' 'xorg') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('02c994e2eae191b50a8cd556e5b52d82725073b3') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make + make DESTDIR="${pkgdir}" install + install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +}
[arch-commits] Commit in xf86-video-neomagic/repos (3 files)
Date: Sunday, November 29, 2009 @ 08:49:32 Author: jgc Revision: 59880 Merged revisions 59858 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/xf86-video-neomagic/trunk r59858 | jgc | 2009-11-28 14:00:38 +0100 (Sat, 28 Nov 2009) | 2 lines upgpkg: xf86-video-neomagic 1.2.4-3 Fix call to xf86UDelay, fixes FS#17299 Added: xf86-video-neomagic/repos/extra-x86_64/xf86UDelay-remove.patch (from rev 59858, xf86-video-neomagic/trunk/xf86UDelay-remove.patch) Modified: xf86-video-neomagic/repos/extra-x86_64/ (properties) xf86-video-neomagic/repos/extra-x86_64/PKGBUILD -+ PKGBUILD|5 - xf86UDelay-remove.patch | 42 ++ 2 files changed, 46 insertions(+), 1 deletion(-) Property changes on: xf86-video-neomagic/repos/extra-x86_64 ___ Modified: svnmerge-integrated - /xf86-video-neomagic/trunk:1-55607 + /xf86-video-neomagic/trunk:1-59879 Modified: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2009-11-29 13:47:15 UTC (rev 59879) +++ extra-x86_64/PKGBUILD 2009-11-29 13:49:32 UTC (rev 59880) @@ -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 Copied: xf86-video-neomagic/repos/extra-x86_64/xf86UDelay-remove.patch (from rev 59858, xf86-video-neomagic/trunk/xf86UDelay-remove.patch) === --- extra-x86_64/xf86UDelay-remove.patch(rev 0) +++ extra-x86_64/xf86UDelay-remove.patch2009-11-29 13:49:32 UTC (rev 59880) @@ -0,0 +1,42 @@ +From 4e2afb88212582df60bca3ec8c447965a5a66fd5 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Mon, 26 Oct 2009 19:43:50 + +Subject: s/xf86UDelay/usleep/g + +cf. https://bugzilla.redhat.com/show_bug.cgi?id=523800 + +Signed-off-by: Adam Jackson +--- +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 + #endif + ++#include ++ + /* 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(20); ++usleep(20); + /* + * 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(20); ++usleep(20); + /* + * This function handles restoring the generic VGA registers. */ + vgaHWRestore(pScrn, VgaReg, +-- +cgit v0.8.3-6-g21f6
[arch-commits] Commit in xf86-video-neomagic/repos (3 files)
Date: Saturday, November 28, 2009 @ 08:01:21 Author: jgc Revision: 59859 Merged revisions 59858 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/xf86-video-neomagic/trunk r59858 | jgc | 2009-11-28 14:00:38 +0100 (Sat, 28 Nov 2009) | 2 lines upgpkg: xf86-video-neomagic 1.2.4-3 Fix call to xf86UDelay, fixes FS#17299 Added: xf86-video-neomagic/repos/extra-i686/xf86UDelay-remove.patch (from rev 59858, xf86-video-neomagic/trunk/xf86UDelay-remove.patch) Modified: xf86-video-neomagic/repos/extra-i686/ (properties) xf86-video-neomagic/repos/extra-i686/PKGBUILD -+ PKGBUILD|5 - xf86UDelay-remove.patch | 42 ++ 2 files changed, 46 insertions(+), 1 deletion(-) Property changes on: xf86-video-neomagic/repos/extra-i686 ___ Modified: svnmerge-integrated - /xf86-video-neomagic/trunk:1-55609 + /xf86-video-neomagic/trunk:1-59858 Modified: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2009-11-28 13:00:38 UTC (rev 59858) +++ extra-i686/PKGBUILD 2009-11-28 13:01:21 UTC (rev 59859) @@ -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 Copied: xf86-video-neomagic/repos/extra-i686/xf86UDelay-remove.patch (from rev 59858, xf86-video-neomagic/trunk/xf86UDelay-remove.patch) === --- extra-i686/xf86UDelay-remove.patch (rev 0) +++ extra-i686/xf86UDelay-remove.patch 2009-11-28 13:01:21 UTC (rev 59859) @@ -0,0 +1,42 @@ +From 4e2afb88212582df60bca3ec8c447965a5a66fd5 Mon Sep 17 00:00:00 2001 +From: Adam Jackson +Date: Mon, 26 Oct 2009 19:43:50 + +Subject: s/xf86UDelay/usleep/g + +cf. https://bugzilla.redhat.com/show_bug.cgi?id=523800 + +Signed-off-by: Adam Jackson +--- +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 + #endif + ++#include ++ + /* 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(20); ++usleep(20); + /* + * 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(20); ++usleep(20); + /* + * This function handles restoring the generic VGA registers. */ + vgaHWRestore(pScrn, VgaReg, +-- +cgit v0.8.3-6-g21f6