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

[Laurent Carlier]

    Date: Thursday, February 23, 2017 @ 10:32:45
  Author: lcarlier
Revision: 213604

upgpkg: lib32-nvidia-utils 378.13-2

update libglvnd driver to 378.13

Modified:
  lib32-nvidia-utils/trunk/PKGBUILD

----------+
 PKGBUILD |   39 +++++++++------------------------------
 1 file changed, 9 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-23 09:46:50 UTC (rev 213603)
+++ PKGBUILD	2017-02-23 10:32:45 UTC (rev 213604)
@@ -4,12 +4,12 @@
 
 _pkgbasename=nvidia-utils
 pkgbase=lib32-$_pkgbasename
-pkgname=('lib32-nvidia-utils' 'lib32-nvidia-libgl' 'lib32-opencl-nvidia')
+pkgname=('lib32-nvidia-utils' 'lib32-opencl-nvidia')
 pkgver=378.13
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="http://www.nvidia.com/"
-makedepends=('nvidia-libgl')  # To avoid conflict during installation in the build chroot
+#makedepends=('nvidia-libgl')  # To avoid conflict during installation in the build chroot
 license=('custom')
 options=('!strip')
 
@@ -37,6 +37,7 @@
     depends=('lib32-zlib' 'lib32-gcc-libs')
     optdepends=('opencl-headers: headers necessary for OpenCL development')
     provides=('lib32-opencl-driver')
+
     cd "${_pkg}"
 
     # OpenCL
@@ -49,39 +50,17 @@
     ln -s $_pkgbasename "${pkgdir}/usr/share/licenses/lib32-opencl-nvidia"
 }
 
-package_lib32-nvidia-libgl() {
-    pkgdesc="NVIDIA drivers libraries symlinks (32-bit)"
-    depends=('lib32-nvidia-utils' 'nvidia-libgl')
-    replaces=('lib32-nvidia-utils<=313.26-1')
-    conflicts=('lib32-libgl' 'lib32-libegl' 'lib32-libgles')
-    provides=('lib32-libgl' 'lib32-libegl' 'lib32-libgles')
-    cd "${_pkg}"
-
-    mkdir -p "${pkgdir}/usr/lib32"
-    ln -s "/usr/lib32/nvidia/libGL.so.1" "${pkgdir}/usr/lib32/libGL.so.1"
-    ln -s "libGL.so.1" "${pkgdir}/usr/lib32/libGL.so"
-
-    ln -s "/usr/lib32/nvidia/libEGL.so.1" "${pkgdir}/usr/lib32/libEGL.so.1"
-    ln -s "libEGL.so.1" "${pkgdir}/usr/lib32/libEGL.so"
-
-    ln -s "/usr/lib32/nvidia/libGLESv1_CM.so.1" "${pkgdir}/usr/lib32/libGLESv1_CM.so.1"
-    ln -s "libGLESv1_CM.so.1" "${pkgdir}/usr/lib32/libGLESv1_CM.so"
-
-    ln -s "/usr/lib32/nvidia/libGLESv2.so.2" "${pkgdir}/usr/lib32/libGLESv2.so.2"
-    ln -s "libGLESv2.so.2" "${pkgdir}/usr/lib32/libGLESv2.so"
-
-    mkdir -p "${pkgdir}/usr/share/licenses"
-    ln -s $_pkgbasename "${pkgdir}/usr/share/licenses/lib32-nvidia-libgl"
-}
-
 package_lib32-nvidia-utils() {
     pkgdesc="NVIDIA drivers utilities (32-bit)"
     depends=('lib32-zlib' 'lib32-gcc-libs' 'lib32-libglvnd' 'nvidia-utils')
     optdepends=('lib32-opencl-nvidia')
-    provides=('lib32-vulkan-driver')
+    conflicts=('lib32-nvidia-libgl')
+    provides=('lib32-vulkan-driver' 'lib32-opengl-driver' 'lib32-nvidia-libgl')
+    replaces=('lib32-nvidia-libgl')
+
     cd "${_pkg}"
 
-    # GLX extension module for X
+    # GLX extension module for X - useless ?
     install -D -m755 "libglx.so.${pkgver}" "${pkgdir}/usr/lib32/nvidia/xorg/modules/extensions/libglx.so.${pkgver}"
     ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib32/nvidia/xorg/modules/extensions/libglx.so"	# X doesn't find glx otherwise
     install -D -m755 "libGLX_nvidia.so.${pkgver}" "${pkgdir}/usr/lib32/libGLX_nvidia.so.${pkgver}"