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

[Felix Yan]

    Date: Wednesday, February 10, 2016 @ 18:09:01
  Author: fyan
Revision: 259037

upgpkg: nvidia-utils 361.28-2

use separate libglvnd package

Modified:
  nvidia-utils/trunk/PKGBUILD

----------+
 PKGBUILD |   28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2016-02-10 16:45:19 UTC (rev 259036)
+++ PKGBUILD    2016-02-10 17:09:01 UTC (rev 259037)
@@ -6,7 +6,7 @@
 pkgbase=nvidia-utils
 pkgname=('nvidia-utils' 'nvidia-libgl' 'opencl-nvidia')
 pkgver=361.28
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/";
 license=('custom')
@@ -54,7 +54,7 @@
 
 package_nvidia-libgl() {
     pkgdesc="NVIDIA drivers libraries symlinks"
-    depends=('nvidia-utils')
+    depends=('nvidia-utils' 'libglvnd')
     conflicts=('libgl')
     provides=('libgl')
     cd "${_pkg}"
@@ -64,27 +64,10 @@
     ln -s "libglx.so.${pkgver}" 
"${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so.1"
     ln -s "libglx.so.${pkgver}" 
"${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
 
-    ln -s "/usr/lib/nvidia/libGLX.so.0" "${pkgdir}/usr/lib/libGLX.so.0"
-    ln -s "libGLX.so.0" "${pkgdir}/usr/lib/libGLX.so.${pkgver}"
-    ln -s "libGLX.so.0" "${pkgdir}/usr/lib/libGLX.so"
-    ln -s "libGLX_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/libGLX_indirect.so.0"
-
-    ln -s "/usr/lib/nvidia/libGL.so.1.0.0" "${pkgdir}/usr/lib/libGL.so.1.0.0"
-    ln -s "libGL.so.1.0.0" "${pkgdir}/usr/lib/libGL.so.${pkgver}"
-    ln -s "libGL.so.1.0.0" "${pkgdir}/usr/lib/libGL.so"
-
     ln -s "/usr/lib/nvidia/libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so.1"
     ln -s "libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so.${pkgver}"
     ln -s "libEGL.so.1" "${pkgdir}/usr/lib/libEGL.so"
 
-    ln -s "/usr/lib/nvidia/libGLESv1_CM.so.1" 
"${pkgdir}/usr/lib/libGLESv1_CM.so.1"
-    ln -s "libGLESv1_CM.so.1" "${pkgdir}/usr/lib/libGLESv1_CM.so.${pkgver}"
-    ln -s "libGLESv1_CM.so.1" "${pkgdir}/usr/lib/libGLESv1_CM.so"
-
-    ln -s "/usr/lib/nvidia/libGLESv2.so.2" "${pkgdir}/usr/lib/libGLESv2.so.2"
-    ln -s "libGLESv2.so.2" "${pkgdir}/usr/lib/libGLESv2.so.${pkgver}"
-    ln -s "libGLESv2.so.2" "${pkgdir}/usr/lib/libGLESv2.so"
-
     mkdir -p "${pkgdir}/usr/share/licenses"
     ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-libgl"
 }
@@ -104,19 +87,14 @@
     # GLX extension module for X
     install -D -m755 "libglx.so.${pkgver}" 
"${pkgdir}/usr/lib/nvidia/xorg/modules/extensions/libglx.so.${pkgver}"
     ln -s "libglx.so.${pkgver}" 
"${pkgdir}/usr/lib/nvidia/xorg/modules/extensions/libglx.so"   # X doesn't find 
glx otherwise
-    install -D -m755 "libGLX.so.0" "${pkgdir}/usr/lib/nvidia/libGLX.so.0"
     install -D -m755 "libGLX_nvidia.so.${pkgver}" 
"${pkgdir}/usr/lib/libGLX_nvidia.so.${pkgver}"
+    ln -s "libGLX_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/libGLX_indirect.so.0"
 
     # OpenGL libraries
-    install -D -m755 "libGL.so.1.0.0" "${pkgdir}/usr/lib/nvidia/libGL.so.1.0.0"
     install -D -m755 "libEGL.so.1" "${pkgdir}/usr/lib/nvidia/libEGL.so.1"
     install -D -m755 "libEGL_nvidia.so.${pkgver}" 
"${pkgdir}/usr/lib/libEGL_nvidia.so.${pkgver}"
-    install -D -m755 "libGLESv1_CM.so.1" 
"${pkgdir}/usr/lib/nvidia/libGLESv1_CM.so.1"
     install -D -m755 "libGLESv1_CM_nvidia.so.${pkgver}" 
"${pkgdir}/usr/lib/libGLESv1_CM_nvidia.so.${pkgver}"
-    install -D -m755 "libGLESv2.so.2" "${pkgdir}/usr/lib/nvidia/libGLESv2.so.2"
     install -D -m755 "libGLESv2_nvidia.so.${pkgver}" 
"${pkgdir}/usr/lib/libGLESv2_nvidia.so.${pkgver}"
-    install -D -m755 "libOpenGL.so.0" "${pkgdir}/usr/lib/libOpenGL.so.0"
-    install -D -m755 "libGLdispatch.so.0" 
"${pkgdir}/usr/lib/libGLdispatch.so.0"
 
     # OpenGL core library
     install -D -m755 "libnvidia-glcore.so.${pkgver}" 
"${pkgdir}/usr/lib/libnvidia-glcore.so.${pkgver}"