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

[Sven-Hendrik Haase]

    Date: Wednesday, May 9, 2018 @ 03:45:12
  Author: svenstaro
Revision: 319761

upgpkg: lib32-nvidia-utils 396.24-2

Modified:
  lib32-nvidia-utils/trunk/PKGBUILD

----------+
 PKGBUILD |   17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-09 03:32:05 UTC (rev 319760)
+++ PKGBUILD	2018-05-09 03:45:12 UTC (rev 319761)
@@ -6,7 +6,7 @@
 pkgbase=lib32-$_pkgbasename
 pkgname=('lib32-nvidia-utils' 'lib32-opencl-nvidia')
 pkgver=396.24
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="http://www.nvidia.com/"
 #makedepends=('nvidia-libgl')  # To avoid conflict during installation in the build chroot
@@ -36,7 +36,7 @@
     optdepends=('opencl-headers: headers necessary for OpenCL development')
     provides=('lib32-opencl-driver')
 
-    cd "${_pkg}"
+    cd "${_pkg}"/32
 
     # OpenCL
     install -D -m755 "libnvidia-compiler.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-compiler.so.${pkgver}"
@@ -56,19 +56,10 @@
     provides=('lib32-vulkan-driver' 'lib32-opengl-driver' 'lib32-nvidia-libgl')
     replaces=('lib32-nvidia-libgl')
 
-    cd "${_pkg}"
+    cd "${_pkg}"/32
 
-    # 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}"
-    # now in lib32-mesa driver
-    #ln -s "libGLX_nvidia.so.${pkgver}" "${pkgdir}/usr/lib32/libGLX_indirect.so.0"
 
-    # Wayland stuff
-    install -D -m755 "libnvidia-egl-wayland.so.1.0.3" "${pkgdir}/usr/lib32/libnvidia-egl-wayland.so.1.0.3"
-    ln -s "libnvidia-egl-wayland.so.1.0.3" "${pkgdir}/usr/lib32/libnvidia-egl-wayland.so.1"
-
     # OpenGL libraries
     install -D -m755 "libEGL_nvidia.so.${pkgver}" "${pkgdir}/usr/lib32/libEGL_nvidia.so.${pkgver}"
     install -D -m755 "libGLESv1_CM_nvidia.so.${pkgver}" "${pkgdir}/usr/lib32/libGLESv1_CM_nvidia.so.${pkgver}"
@@ -83,9 +74,7 @@
     install -D -m755 "libnvidia-ifr.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-ifr.so.${pkgver}"
     install -D -m755 "libnvidia-fbc.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-fbc.so.${pkgver}"
     install -D -m755 "libnvidia-encode.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-encode.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 "libnvidia-wfb.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-wfb.so.${pkgver}"
     install -D -m755 "libnvidia-glvkspirv.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-glvkspirv.so.${pkgver}"
 
     # VDPAU