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

Laurent Carlier lcarlier at archlinux.org
Mon Feb 20 13:05:01 UTC 2017


    Date: Monday, February 20, 2017 @ 13:05:00
  Author: lcarlier
Revision: 213192

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

remove lib32-nvidia-304xx-libgl package, use a ld.so conf file instead

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

----------+
 PKGBUILD |   74 +++++++++++++++++++++++++------------------------------------
 1 file changed, 31 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-20 12:12:14 UTC (rev 213191)
+++ PKGBUILD	2017-02-20 13:05:00 UTC (rev 213192)
@@ -6,10 +6,10 @@
 
 _pkgbasename=nvidia-304xx-utils
 pkgbase=lib32-$_pkgbasename
-pkgname=('lib32-nvidia-304xx-utils' 'lib32-nvidia-304xx-libgl' 'lib32-opencl-nvidia-304xx')
+pkgname=('lib32-nvidia-304xx-utils' 'lib32-opencl-nvidia-304xx')
 pkgver=304.134
-pkgrel=1
-pkgdesc="NVIDIA drivers utilities and libraries. (32-bit)"
+pkgrel=2
+pkgdesc="NVIDIA drivers utilities and libraries (32-bit)"
 arch=('x86_64')
 url="http://www.nvidia.com/"
 license=('custom')
@@ -18,7 +18,7 @@
 _arch='x86'
 _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
 source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-md5sums=('9abd7e9272382bd0e6939c3a367cc1a6')
+sha256sums=('84f7891af131bb9f9a8a34401dfef4288218019406dfa4ae57b6d52b14e81c9d')
 
 create_links() {
   # create soname links
@@ -53,41 +53,13 @@
   ln -s $_pkgbasename "${pkgdir}/usr/share/licenses/lib32-opencl-nvidia"
 }
 
-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}
-
-  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"
-
-  # 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' 'nvidia-304xx-utils')
+  depends=('lib32-libxvmc' 'lib32-zlib' 'lib32-gcc-libs' 'lib32-libxext' 'lib32-mesa' 'nvidia-304xx-utils')
+  conflicts=('lib32-libgl' 'lib32-libegl' 'lib32-libgles' 'lib32-nvidia-304xx-libgl' 'lib32-nvidia-utils')
+  provides=('lib32-libgl'  'lib32-libegl' 'lib32-libgles' 'lib32-nvidia-304xx-libgl')
+  replaces=('lib32-nvidia-304xx-libgl')
   optdepends=('lib32-opencl-nvidia-304xx')
-  conflicts=('lib32-nvidia-utils')
 
   cd ${_pkg}
 
@@ -95,26 +67,42 @@
   install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib32/nvidia/libGL.so.${pkgver}"
 
   # OpenGL core library
-  install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-glcore.so.${pkgver}"
+  install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib32/nvidia/libnvidia-glcore.so.${pkgver}"
 
   # XvMC
-  install -D -m755 "libXvMCNVIDIA.so.${pkgver}" "${pkgdir}/usr/lib32/libXvMCNVIDIA.so.${pkgver}"
+  install -D -m755 "libXvMCNVIDIA.so.${pkgver}" "${pkgdir}/usr/lib32/nvidia/libXvMCNVIDIA.so.${pkgver}"
 
   # VDPAU
   install -D -m755 "libvdpau_nvidia.so.${pkgver}" "${pkgdir}/usr/lib32/vdpau/libvdpau_nvidia.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}"
+  install -D -m755 "tls/libnvidia-tls.so.${pkgver}" "${pkgdir}/usr/lib32/nvidia/libnvidia-tls.so.${pkgver}"
+  install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib32/nvidia/libnvidia-cfg.so.${pkgver}"
+  install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib32/nvidia/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}"
+  install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib32/nvidia/libcuda.so.${pkgver}"
+  install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib32/nvidia/libnvcuvid.so.${pkgver}"
 
   # DEBUG
   install -D -m755 nvidia-debugdump "${pkgdir}/usr/bin/nvidia-debugdump"
 
+  # We have to provide symlinks to mesa, as nvidia 304xx doesn't ship them
+  ln -s /usr/lib32/mesa/libEGL.so.1.0.0 "${pkgdir}/usr/lib32/nvidia/libEGL.so.1.0.0"
+  ln -s libEGL.so.1.0.0      "${pkgdir}/usr/lib32/nvidia/libEGL.so.1"
+  ln -s libEGL.so.1.0.0      "${pkgdir}/usr/lib32/nvidia/libEGL.so"
+
+  ln -s /usr/lib32/mesa/libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib32/nvidia/libGLESv1_CM.so.1.1.0"
+  ln -s libGLESv1_CM.so.1.1.0      "${pkgdir}/usr/lib32/nvidia/libGLESv1_CM.so.1"
+  ln -s libGLESv1_CM.so.1.1.0      "${pkgdir}/usr/lib32/nvidia/libGLESv1_CM.so"
+
+  ln -s /usr/lib32/mesa/libGLESv2.so.2.0.0 "${pkgdir}/usr/lib32/nvidia/libGLESv2.so.2.0.0"
+  ln -s libGLESv2.so.2.0.0      "${pkgdir}/usr/lib32/nvidia/libGLESv2.so.2"
+  ln -s libGLESv2.so.2.0.0      "${pkgdir}/usr/lib32/nvidia/libGLESv2.so"
+
+  install -dm 755 "${pkgdir}"/etc/ld.so.conf.d
+  echo -e '/usr/lib32/nvidia/' > "${pkgdir}"/etc/ld.so.conf.d/00-lib32-nvidia.conf
+
   create_links
 
   rm -rf "${pkgdir}"/usr/{include,share,bin}



More information about the arch-commits mailing list