[arch-commits] Commit in lib32-nvidia-304xx-utils/trunk (PKGBUILD)

Felix Yan fyan at nymeria.archlinux.org
Thu Mar 13 04:15:44 UTC 2014


    Date: Thursday, March 13, 2014 @ 05:15:44
  Author: fyan
Revision: 107133

upgpkg: lib32-nvidia-304xx-utils 304.121-2

- update symlink target for new lib32-mesa package

Modified:
  lib32-nvidia-304xx-utils/trunk/PKGBUILD

----------+
 PKGBUILD |  142 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 73 insertions(+), 69 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-13 00:16:45 UTC (rev 107132)
+++ PKGBUILD	2014-03-13 04:15:44 UTC (rev 107133)
@@ -8,7 +8,7 @@
 pkgbase=lib32-$_pkgbasename
 pkgname=('lib32-nvidia-304xx-utils' 'lib32-nvidia-304xx-libgl' 'lib32-opencl-nvidia-304xx')
 pkgver=304.121
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA drivers utilities and libraries. (32-bit)"
 arch=('x86_64')
 url="http://www.nvidia.com/"
@@ -23,96 +23,100 @@
 md5sums=('b8c950f0a30a6e1f503630fbd0ca8ab9')
 
 build() {
-    sh ${_pkg}.run --extract-only
+  sh ${_pkg}.run --extract-only
 }
 
 package_lib32-opencl-nvidia-304xx() {
-    pkgdesc="OpenCL implemention for NVIDIA (32-bit)"
-    depends=('lib32-libcl' 'lib32-zlib' 'lib32-gcc-libs' 'opencl-nvidia-304xx')
-    optdepends=('opencl-headers: headers necessary for OpenCL development')
-    conflicts=('lib32-opencl-nvidia')
+  pkgdesc="OpenCL implemention for NVIDIA (32-bit)"
+  depends=('lib32-libcl' 'lib32-zlib' 'lib32-gcc-libs' 'opencl-nvidia-304xx')
+  optdepends=('opencl-headers: headers necessary for OpenCL development')
+  conflicts=('lib32-opencl-nvidia')
 
-    cd ${_pkg}
+  cd ${_pkg}
 
-    # OpenCL
-    install -D -m755 "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-compiler.so.${pkgver}"
-    ln -s "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-compiler.so.1"
-    ln -s "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-compiler.so"
+  # OpenCL
+  install -D -m755 "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-compiler.so.${pkgver}"
+  ln -s "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-compiler.so.1"
+  ln -s "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-compiler.so"
 
-    install -D -m755 "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-opencl.so.${pkgver}" 
-    ln -s "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-opencl.so.1"
-    ln -s "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-opencl.so"
+  install -D -m755 "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-opencl.so.${pkgver}" 
+  ln -s "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-opencl.so.1"
+  ln -s "libnvidia-opencl.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-opencl.so"
 }
 
 package_lib32-nvidia-304xx-libgl() {
-    pkgdesc="NVIDIA drivers libraries symlinks (32-bit)"
-    depends=('lib32-nvidia-304xx-utils' 'lib32-mesa')
-    conflicts=('lib32-libgl')
-    provides=('lib32-libgl')
-    cd ${_pkg}
+  pkgdesc="NVIDIA drivers libraries symlinks (32-bit)"
+  depends=('lib32-nvidia-304xx-utils' 'lib32-mesa')
+  conflicts=('lib32-libgl')
+  provides=('lib32-libgl')
 
-    mkdir -p "${pkgdir}/usr/lib32"
-    ln -s "/usr/lib32/nvidia/libGL.so.${pkgver}" "${pkgdir}/usr/lib32/libGL.so.${pkgver}"
-    ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib32/libGL.so.1"
-    ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib32/libGL.so"
+  cd ${_pkg}
 
-    # We have to provide symlinks to mesa, as nvidia 304xx doesn't ship them
-    ln -s mesa-libEGL.so.1.0.0        "${pkgdir}/usr/lib32/libEGL.so"
-    ln -s mesa-libEGL.so.1.0.0        "${pkgdir}/usr/lib32/libEGL.so.1"
-    ln -s mesa-libEGL.so.1.0.0        "${pkgdir}/usr/lib32/libEGL.so.1.0.0"
-    ln -s mesa-libGLESv1_CM.so.1.1.0  "${pkgdir}/usr/lib32/libGLESv1_CM.so"
-    ln -s mesa-libGLESv1_CM.so.1.1.0  "${pkgdir}/usr/lib32/libGLESv1_CM.so.1"
-    ln -s mesa-libGLESv1_CM.so.1.1.0  "${pkgdir}/usr/lib32/libGLESv1_CM.so.1.1.0"
-    ln -s mesa-libGLESv2.so.2.0.0     "${pkgdir}/usr/lib32/libGLESv2.so"
-    ln -s mesa-libGLESv2.so.2.0.0     "${pkgdir}/usr/lib32/libGLESv2.so.2"
-    ln -s mesa-libGLESv2.so.2.0.0     "${pkgdir}/usr/lib32/libGLESv2.so.2.0.0"
+  mkdir -p "${pkgdir}/usr/lib32"
+  ln -s nvidia/libGL.so.${pkgver} "${pkgdir}/usr/lib32/libGL.so.${pkgver}"
+  ln -s libGL.so.${pkgver} "${pkgdir}/usr/lib32/libGL.so.1"
+  ln -s libGL.so.${pkgver} "${pkgdir}/usr/lib32/libGL.so"
 
-    mkdir -p "${pkgdir}/usr/share/licenses"
-    ln -s $_pkgbasename "${pkgdir}/usr/share/licenses/lib32-nvidia-libgl"
+  # We have to provide symlinks to mesa, as nvidia 304xx doesn't ship them
+  ln -s mesa/libEGL.so.1.0.0 "${pkgdir}/usr/lib32/libEGL.so.1.0.0"
+  ln -s libEGL.so.1.0.0      "${pkgdir}/usr/lib32/libEGL.so.1"
+  ln -s libEGL.so.1.0.0      "${pkgdir}/usr/lib32/libEGL.so"
+
+  ln -s mesa/libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib32/libGLESv1_CM.so.1.1.0"
+  ln -s libGLESv1_CM.so.1.1.0      "${pkgdir}/usr/lib32/libGLESv1_CM.so.1"
+  ln -s libGLESv1_CM.so.1.1.0      "${pkgdir}/usr/lib32/libGLESv1_CM.so"
+
+  ln -s mesa/libGLESv2.so.2.0.0 "${pkgdir}/usr/lib32/libGLESv2.so.2.0.0"
+  ln -s libGLESv2.so.2.0.0      "${pkgdir}/usr/lib32/libGLESv2.so.2"
+  ln -s libGLESv2.so.2.0.0      "${pkgdir}/usr/lib32/libGLESv2.so"
+
+  mkdir -p "${pkgdir}/usr/share/licenses"
+  ln -s $_pkgbasename "${pkgdir}/usr/share/licenses/lib32-nvidia-libgl"
 }
 
 package_lib32-nvidia-304xx-utils() {
-    pkgdesc="NVIDIA drivers utilities (32-bit)"
-    depends=('lib32-libxvmc' 'lib32-zlib' 'lib32-gcc-libs' 'lib32-libxext')
-    optdepends=('lib32-opencl-nvidia-304xx')
-    conflicts=('lib32-nvidia-utils')
-    cd ${_pkg}
+  pkgdesc="NVIDIA drivers utilities (32-bit)"
+  depends=('lib32-libxvmc' 'lib32-zlib' 'lib32-gcc-libs' 'lib32-libxext')
+  optdepends=('lib32-opencl-nvidia-304xx')
+  conflicts=('lib32-nvidia-utils')
 
-    # OpenGL libraries
-    install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib32/nvidia/libGL.so.${pkgver}"
+  cd ${_pkg}
 
-    # OpenGL core library
-    install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-glcore.so.${pkgver}"
+  # OpenGL libraries
+  install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib32/nvidia/libGL.so.${pkgver}"
 
-    # XvMC
-    install -D -m755 "libXvMCNVIDIA.so.${pkgver}" "${pkgdir}/usr/lib32/libXvMCNVIDIA.so.${pkgver}"
+  # OpenGL core library
+  install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-glcore.so.${pkgver}"
 
-    # VDPAU
-    install -D -m755 "libvdpau_nvidia.so.${pkgver}" "${pkgdir}/usr/lib32/vdpau/libvdpau_nvidia.so.${pkgver}"
+  # XvMC
+  install -D -m755 "libXvMCNVIDIA.so.${pkgver}" "${pkgdir}/usr/lib32/libXvMCNVIDIA.so.${pkgver}"
 
-    # nvidia-tls library
-    install -D -m755 "tls/libnvidia-tls.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-tls.so.${pkgver}"
-    install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-cfg.so.${pkgver}"
-    install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-ml.so.${pkgver}"
-    
-    # CUDA
-    install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib32/libcuda.so.${pkgver}"
-    install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib32/libnvcuvid.so.${pkgver}"
+  # VDPAU
+  install -D -m755 "libvdpau_nvidia.so.${pkgver}" "${pkgdir}/usr/lib32/vdpau/libvdpau_nvidia.so.${pkgver}"
 
-    # DEBUG
-    install -D -m755 nvidia-debugdump "${pkgdir}/usr/bin/nvidia-debugdump"
+  # nvidia-tls library
+  install -D -m755 "tls/libnvidia-tls.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-tls.so.${pkgver}"
+  install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-cfg.so.${pkgver}"
+  install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-ml.so.${pkgver}"
+  
+  # CUDA
+  install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib32/libcuda.so.${pkgver}"
+  install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib32/libnvcuvid.so.${pkgver}"
 
-    # create soname links
-    for _lib in $(find "${pkgdir}" -name '*.so*'); do
-        _soname="$(dirname ${_lib})/$(LC_ALL=C readelf -d "$_lib" | sed -nr 's/.*Library soname: \[(.*)\].*/\1/p')"
-        if [ ! -e "${_soname}" ]; then
-            ln -s "$(basename ${_lib})" "${_soname}"
-            ln -s "$(basename ${_soname})" "${_soname/.[0-9]*/}"
-        fi
-    done
+  # DEBUG
+  install -D -m755 nvidia-debugdump "${pkgdir}/usr/bin/nvidia-debugdump"
 
-    rm -rf "${pkgdir}"/usr/{include,share,bin}
-    mkdir -p "${pkgdir}/usr/share/licenses"
-    ln -s $_pkgbasename "${pkgdir}/usr/share/licenses/${pkgname}"
+  # create soname links
+  for _lib in $(find "${pkgdir}" -name '*.so*'); do
+    _soname="$(dirname ${_lib})/$(LC_ALL=C readelf -d "$_lib" | sed -nr 's/.*Library soname: \[(.*)\].*/\1/p')"
+    if [ ! -e "${_soname}" ]; then
+      ln -s "$(basename ${_lib})" "${_soname}"
+      ln -s "$(basename ${_soname})" "${_soname/.[0-9]*/}"
+    fi
+  done
+
+  rm -rf "${pkgdir}"/usr/{include,share,bin}
+  mkdir -p "${pkgdir}/usr/share/licenses"
+  ln -s $_pkgbasename "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 




More information about the arch-commits mailing list