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

[Laurent Carlier]

    Date: Tuesday, February 14, 2017 @ 19:17:55
  Author: lcarlier
Revision: 212466

upgpkg: lib32-nvidia-utils 378.13-1

upstream update 378.13

Modified:
  lib32-nvidia-utils/trunk/PKGBUILD

----------+
 PKGBUILD |   67 ++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 33 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-14 18:20:50 UTC (rev 212465)
+++ PKGBUILD	2017-02-14 19:17:55 UTC (rev 212466)
@@ -4,12 +4,12 @@
 
 _pkgbasename=nvidia-utils
 pkgbase=lib32-$_pkgbasename
-pkgname=('lib32-nvidia-utils' 'lib32-opencl-nvidia')
-pkgver=375.26
-pkgrel=3
+pkgname=('lib32-nvidia-utils' 'lib32-nvidia-libgl' 'lib32-opencl-nvidia')
+pkgver=378.13
+pkgrel=1
 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')
 
@@ -16,7 +16,7 @@
 _arch='x86'
 _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
 source=("http://us.download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run")
-sha512sums=('3bc859a95469a45f3c627018248d83e178d160385c3d17d9f890b0d142ecd1220fb21c442e4fe7755b831227a9c820736f447b162acd9699819c6e8145d6d841')
+sha512sums=('b96d2558a1003a3c66cade3a1e16abd34d855c0e27cdebacdc0495e0ba3cd5c68bb84cc5f81bff1b9ddce36ac52e0dc125c56d868b77d7c8e2f606d559b13b4a')
 
 create_links() {
     # create soname links
@@ -49,40 +49,39 @@
     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-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')
-    conflicts=('lib32-nvidia-libgl')
-    provides=('lib32-vulkan-driver' 'lib32-nvidia-libgl' 'lib32-opengl-driver')
+    provides=('lib32-vulkan-driver')
     cd "${_pkg}"
 
-    # GLX extension module for X - useless ?
+    # GLX extension module for X
     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}"
@@ -89,8 +88,8 @@
     ln -s "libGLX_nvidia.so.${pkgver}" "${pkgdir}/usr/lib32/libGLX_indirect.so.0"
 
     # Wayland stuff
-    install -D -m755 "libnvidia-egl-wayland.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-egl-wayland.so.${pkgver}"
-    ln -s "libnvidia-egl-wayland.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-egl-wayland.so.0"
+    install -D -m755 "libnvidia-egl-wayland.so.1.0.1" "${pkgdir}/usr/lib32/libnvidia-egl-wayland.so.1.0.1"
+    ln -s "libnvidia-egl-wayland.so.1.0.1" "${pkgdir}/usr/lib32/libnvidia-egl-wayland.so.1"
 
     # OpenGL libraries
     install -D -m755 "libEGL_nvidia.so.${pkgver}" "${pkgdir}/usr/lib32/libEGL_nvidia.so.${pkgver}"