Date: Wednesday, March 12, 2014 @ 18:27:03 Author: fyan Revision: 107114
upgpkg: lib32-nvidia-304xx-utils 304.121-1 - add conflict for lib32-nvidia-304xx-utils on lib32-nvidia-utils Modified: lib32-nvidia-304xx-utils/trunk/PKGBUILD ----------+ PKGBUILD | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-03-12 16:52:48 UTC (rev 107113) +++ PKGBUILD 2014-03-12 17:27:03 UTC (rev 107114) @@ -7,8 +7,8 @@ _pkgbasename=nvidia-304xx-utils pkgbase=lib32-$_pkgbasename pkgname=('lib32-nvidia-304xx-utils' 'lib32-nvidia-304xx-libgl' 'lib32-opencl-nvidia-304xx') -pkgver=304.119 -pkgrel=4 +pkgver=304.121 +pkgrel=1 pkgdesc="NVIDIA drivers utilities and libraries. (32-bit)" arch=('x86_64') url="http://www.nvidia.com/" @@ -19,11 +19,10 @@ _arch='x86' _pkg="NVIDIA-Linux-${_arch}-${pkgver}" -source=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") -md5sums=('a2acb8066ac296005dbf560ee83ae6d9') +source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run") +md5sums=('b8c950f0a30a6e1f503630fbd0ca8ab9') build() { - cd "${srcdir}" sh ${_pkg}.run --extract-only } @@ -33,7 +32,7 @@ optdepends=('opencl-headers: headers necessary for OpenCL development') conflicts=('lib32-opencl-nvidia') - cd "${srcdir}/${_pkg}" + cd ${_pkg} # OpenCL install -D -m755 "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-compiler.so.${pkgver}" @@ -50,7 +49,7 @@ depends=('lib32-nvidia-304xx-utils' 'lib32-mesa') conflicts=('lib32-libgl') provides=('lib32-libgl') - cd "${srcdir}/${_pkg}" + cd ${_pkg} mkdir -p "${pkgdir}/usr/lib32" ln -s "/usr/lib32/nvidia/libGL.so.${pkgver}" "${pkgdir}/usr/lib32/libGL.so.${pkgver}" @@ -76,7 +75,8 @@ pkgdesc="NVIDIA drivers utilities (32-bit)" depends=('lib32-libxvmc' 'lib32-zlib' 'lib32-gcc-libs' 'lib32-libxext') optdepends=('lib32-opencl-nvidia-304xx') - cd "${srcdir}/${_pkg}" + conflicts=('lib32-nvidia-utils') + cd ${_pkg} # OpenGL libraries install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib32/nvidia/libGL.so.${pkgver}"