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

Felix Yan fyan at archlinux.org
Wed Feb 10 17:12:06 UTC 2016


    Date: Wednesday, February 10, 2016 @ 18:12:05
  Author: fyan
Revision: 161068

upgpkg: lib32-nvidia-utils 361.28-2

use separate libglvnd package

Modified:
  lib32-nvidia-utils/trunk/PKGBUILD

----------+
 PKGBUILD |   29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-02-10 17:00:36 UTC (rev 161067)
+++ PKGBUILD	2016-02-10 17:12:05 UTC (rev 161068)
@@ -6,9 +6,10 @@
 pkgbase=lib32-$_pkgbasename
 pkgname=('lib32-nvidia-utils' 'lib32-nvidia-libgl' 'lib32-opencl-nvidia')
 pkgver=361.28
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="http://www.nvidia.com/"
+makedepends=('nvidia-libgl')  # To avoid conflict during installation in the build chroot
 license=('custom')
 options=('!strip')
 
@@ -49,7 +50,7 @@
 
 package_lib32-nvidia-libgl() {
     pkgdesc="NVIDIA drivers libraries symlinks (32-bit)"
-    depends=('lib32-nvidia-utils')
+    depends=('lib32-nvidia-utils' 'nvidia-libgl' 'lib32-libglvnd')
     replaces=('lib32-nvidia-utils<=313.26-1')
     conflicts=('lib32-libgl')
     provides=('lib32-libgl')
@@ -56,27 +57,10 @@
     cd "${_pkg}"
 
     mkdir -p "${pkgdir}/usr/lib32"
-    ln -s "/usr/lib32/nvidia/libGLX.so.0" "${pkgdir}/usr/lib32/libGLX.so.0"
-    ln -s "libGLX.so.0" "${pkgdir}/usr/lib32/libGLX.so.${pkgver}"
-    ln -s "libGLX.so.0" "${pkgdir}/usr/lib32/libGLX.so"
-    ln -s "libGLX_nvidia.so.${pkgver}" "${pkgdir}/usr/lib32/libGLX_indirect.so.0"
-
-    ln -s "/usr/lib32/nvidia/libGL.so.1.0.0" "${pkgdir}/usr/lib32/libGL.so.1.0.0"
-    ln -s "libGL.so.1.0.0" "${pkgdir}/usr/lib32/libGL.so.${pkgver}"
-    ln -s "libGL.so.1.0.0" "${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.${pkgver}"
     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.${pkgver}"
-    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.${pkgver}"
-    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"
 }
@@ -90,19 +74,14 @@
     # 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.so.0" "${pkgdir}/usr/lib32/nvidia/libGLX.so.0"
     install -D -m755 "libGLX_nvidia.so.${pkgver}" "${pkgdir}/usr/lib32/libGLX_nvidia.so.${pkgver}"
+    ln -s "libGLX_nvidia.so.${pkgver}" "${pkgdir}/usr/lib32/libGLX_indirect.so.0"
 
     # OpenGL libraries
-    install -D -m755 "libGL.so.1.0.0" "${pkgdir}/usr/lib32/nvidia/libGL.so.1.0.0"
     install -D -m755 "libEGL.so.1" "${pkgdir}/usr/lib32/nvidia/libEGL.so.1"
     install -D -m755 "libEGL_nvidia.so.${pkgver}" "${pkgdir}/usr/lib32/libEGL_nvidia.so.${pkgver}"
-    install -D -m755 "libGLESv1_CM.so.1" "${pkgdir}/usr/lib32/nvidia/libGLESv1_CM.so.1"
     install -D -m755 "libGLESv1_CM_nvidia.so.${pkgver}" "${pkgdir}/usr/lib32/libGLESv1_CM_nvidia.so.${pkgver}"
-    install -D -m755 "libGLESv2.so.2" "${pkgdir}/usr/lib32/nvidia/libGLESv2.so.2"
     install -D -m755 "libGLESv2_nvidia.so.${pkgver}" "${pkgdir}/usr/lib32/libGLESv2_nvidia.so.${pkgver}"
-    install -D -m755 "libOpenGL.so.0" "${pkgdir}/usr/lib32/libOpenGL.so.0"
-    install -D -m755 "libGLdispatch.so.0" "${pkgdir}/usr/lib32/libGLdispatch.so.0"
 
     # OpenGL core library
     install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-glcore.so.${pkgver}"



More information about the arch-commits mailing list