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

Laurent Carlier lcarlier at archlinux.org
Sun Feb 19 19:02:28 UTC 2017


    Date: Sunday, February 19, 2017 @ 19:02:27
  Author: lcarlier
Revision: 289275

upgpkg: nvidia-304xx-utils 304.134-4

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

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

----------+
 PKGBUILD |   70 +++++++++++++++++++++++++------------------------------------
 1 file changed, 29 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-19 16:55:28 UTC (rev 289274)
+++ PKGBUILD	2017-02-19 19:02:27 UTC (rev 289275)
@@ -3,9 +3,9 @@
 # Contributor: Andreas Radke <andyrtr at archlinux.org>
 
 pkgbase=nvidia-304xx-utils
-pkgname=('nvidia-304xx-utils' 'nvidia-304xx-libgl' 'opencl-nvidia-304xx')
+pkgname=('nvidia-304xx-utils' 'opencl-nvidia-304xx')
 pkgver=304.134
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
 license=('custom')
@@ -59,40 +59,12 @@
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/opencl-nvidia-304xx/LICENSE"
 }
 
-package_nvidia-304xx-libgl() {
-  pkgdesc="NVIDIA drivers libraries symlinks, 304xx legacy branch"
-  depends=('nvidia-304xx-utils' 'mesa')
-  conflicts=('libgl' 'libgles' 'libegl' 'nvidia-libgl')
-  provides=('libgl' 'libgles' 'libegl' 'nvidia-libgl')
-
-  cd ${_pkg}
-
-  mkdir -p "${pkgdir}/usr/lib/"
-
-  ln -s nvidia/libGL.so.${pkgver} "${pkgdir}/usr/lib/libGL.so.${pkgver}"
-  ln -s libGL.so.${pkgver} "${pkgdir}/usr/lib/libGL.so.1"
-  ln -s libGL.so.${pkgver} "${pkgdir}/usr/lib/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/lib/libEGL.so.1.0.0"
-  ln -s libEGL.so.1.0.0      "${pkgdir}/usr/lib/libEGL.so.1"
-  ln -s libEGL.so.1.0.0      "${pkgdir}/usr/lib/libEGL.so"
-
-  ln -s mesa/libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0"
-  ln -s libGLESv1_CM.so.1.1.0      "${pkgdir}/usr/lib/libGLESv1_CM.so.1"
-  ln -s libGLESv1_CM.so.1.1.0      "${pkgdir}/usr/lib/libGLESv1_CM.so"
-
-  ln -s mesa/libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/libGLESv2.so.2.0.0"
-  ln -s libGLESv2.so.2.0.0      "${pkgdir}/usr/lib/libGLESv2.so.2"
-  ln -s libGLESv2.so.2.0.0      "${pkgdir}/usr/lib/libGLESv2.so"
-
-  mkdir -p "${pkgdir}/usr/share/licenses"
-  ln -s nvidia-304xx "${pkgdir}/usr/share/licenses/nvidia-304xx-libgl"
-}
-
 package_nvidia-304xx-utils() {
   pkgdesc="NVIDIA drivers utilities and libraries, 304xx legacy branch"
-  depends=('xorg-server' 'libxvmc')
+  depends=('xorg-server' 'libxvmc' 'mesa')
+  conflicts=('libgl' 'libgles' 'libegl' 'nvidia-libgl' 'nvidia-304xx-libgl')
+  provides=('libgl' 'libgles' 'libegl' 'nvidia-libgl' 'nvidia-304xx-libgl')
+  replaces=('nvidia-304xx-gl')
   optdepends=('gtk2: nvidia-settings'
               'pkg-config: nvidia-xconfig'
               'opencl-nvidia-304xx: OpenCL support')
@@ -113,22 +85,22 @@
   install -D -m755 "libGL.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libGL.so.${pkgver}"
 
   # OpenGL core library
-  install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glcore.so.${pkgver}"
+  install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvidia-glcore.so.${pkgver}"
 
   # XvMC
-  install -D -m755 "libXvMCNVIDIA.so.${pkgver}" "${pkgdir}/usr/lib/libXvMCNVIDIA.so.${pkgver}"
+  install -D -m755 "libXvMCNVIDIA.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libXvMCNVIDIA.so.${pkgver}"
 
   # VDPAU
   install -D -m755 "libvdpau_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/vdpau/libvdpau_nvidia.so.${pkgver}"
 
   # nvidia-tls library
-  install -D -m755 "tls/libnvidia-tls.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-tls.so.${pkgver}"
-  install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-cfg.so.${pkgver}"
-  install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-ml.so.${pkgver}"
+  install -D -m755 "tls/libnvidia-tls.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvidia-tls.so.${pkgver}"
+  install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvidia-cfg.so.${pkgver}"
+  install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvidia-ml.so.${pkgver}"
   
   # CUDA
-  install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib/libcuda.so.${pkgver}"
-  install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib/libnvcuvid.so.${pkgver}"
+  install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libcuda.so.${pkgver}"
+  install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvcuvid.so.${pkgver}"
 
   # DEBUG
   install -D -m755 nvidia-debugdump "${pkgdir}/usr/bin/nvidia-debugdump"
@@ -158,9 +130,25 @@
   install -D -m644 NVIDIA_Changelog "${pkgdir}/usr/share/doc/nvidia-304xx/NVIDIA_Changelog"
   ln -s nvidia-304xx "${pkgdir}/usr/share/doc/nvidia-304xx-utils"
 
+  # We have to provide symlinks to mesa, as nvidia 304xx doesn't ship them
+  ln -s mesa/libEGL.so.1.0.0 "${pkgdir}/usr/lib/nvidia/libEGL.so.1.0.0"
+  ln -s libEGL.so.1.0.0      "${pkgdir}/usr/lib/nvidia/libEGL.so.1"
+  ln -s libEGL.so.1.0.0      "${pkgdir}/usr/lib/nvidia/libEGL.so"
+
+  ln -s mesa/libGLESv1_CM.so.1.1.0 "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so.1.1.0"
+  ln -s libGLESv1_CM.so.1.1.0      "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so.1"
+  ln -s libGLESv1_CM.so.1.1.0      "${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so"
+
+  ln -s mesa/libGLESv2.so.2.0.0 "${pkgdir}/usr/lib/nvidia/libGLESv2.so.2.0.0"
+  ln -s libGLESv2.so.2.0.0      "${pkgdir}/usr/lib/nvidia/libGLESv2.so.2"
+  ln -s libGLESv2.so.2.0.0      "${pkgdir}/usr/lib/nvidia/libGLESv2.so"
+
   # distro specific files must be installed in /usr/share/X11/xorg.conf.d
   install -m755 -d "${pkgdir}/usr/share/X11/xorg.conf.d"
   install -m644 "${srcdir}/nvidia-drm-outputclass.conf" "${pkgdir}/usr/share/X11/xorg.conf.d/"
 
+  install -dm 755 "${pkgdir}"/etc/ld.so.conf.d
+  echo -e '/usr/lib/nvidia/' > "${pkgdir}"/etc/ld.so.conf.d/00-nvidia.conf
+
   create_links
 }



More information about the arch-commits mailing list