Date: Tuesday, February 21, 2017 @ 14:18:30 Author: lcarlier Revision: 289350
upgpkg: nvidia-340xx-utils 340.102-2 remove nvidia-340xx-libgl package, use a ld.so conf file instead Modified: nvidia-340xx-utils/trunk/PKGBUILD ----------+ PKGBUILD | 64 +++++++++++++++++++------------------------------------------ 1 file changed, 20 insertions(+), 44 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-02-21 12:21:26 UTC (rev 289349) +++ PKGBUILD 2017-02-21 14:18:30 UTC (rev 289350) @@ -4,9 +4,9 @@ # Contributor: James Rayner <[email protected]> pkgbase=nvidia-340xx-utils -pkgname=('nvidia-340xx-utils' 'nvidia-340xx-libgl' 'opencl-nvidia-340xx') +pkgname=('nvidia-340xx-utils' 'opencl-nvidia-340xx') pkgver=340.102 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://www.nvidia.com/"; license=('custom') @@ -56,35 +56,6 @@ ln -s nvidia "${pkgdir}/usr/share/licenses/opencl-nvidia" } -package_nvidia-340xx-libgl() { - pkgdesc="NVIDIA drivers libraries symlinks" - depends=('nvidia-340xx-utils') - conflicts=('libgl' 'libgles' 'libegl' 'nvidia-libgl') - provides=('libgl' 'libgles' 'libegl' 'nvidia-libgl') - cd "${_pkg}" - - mkdir -p "${pkgdir}/usr/lib/" - - ln -s "/usr/lib/nvidia/libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.${pkgver}" - ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so.1" - ln -s "libGL.so.${pkgver}" "${pkgdir}/usr/lib/libGL.so" - - ln -s "/usr/lib/nvidia/libEGL.so.${pkgver}" "${pkgdir}/usr/lib/libEGL.so.${pkgver}" - ln -s "libEGL.so.${pkgver}" "${pkgdir}/usr/lib/libEGL.so.1" - ln -s "libEGL.so.${pkgver}" "${pkgdir}/usr/lib/libEGL.so" - - ln -s "/usr/lib/nvidia/libGLESv1_CM.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv1_CM.so.${pkgver}" - ln -s "libGLESv1_CM.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv1_CM.so.1" - ln -s "libGLESv1_CM.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv1_CM.so" - - ln -s "/usr/lib/nvidia/libGLESv2.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv2.so.${pkgver}" - ln -s "libGLESv2.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv2.so.2" - ln -s "libGLESv2.so.${pkgver}" "${pkgdir}/usr/lib/libGLESv2.so" - - mkdir -p "${pkgdir}/usr/share/licenses" - ln -s nvidia "${pkgdir}/usr/share/licenses/nvidia-libgl" -} - package_nvidia-340xx-utils() { pkgdesc="NVIDIA drivers utilities" depends=('xorg-server') @@ -91,9 +62,11 @@ optdepends=('gtk2: nvidia-settings' 'xorg-server-devel: nvidia-xconfig' 'opencl-nvidia-340xx: OpenCL support') - conflicts=('nvidia-utils' 'libglvnd') - provides=('nvidia-utils') + conflicts=('nvidia-utils' 'libgl' 'libgles' 'libegl' 'nvidia-libgl' 'nvidia-340xx-libgl') + provides=('nvidia-utils' 'libgl' 'libgles' 'libegl' 'nvidia-libgl' 'nvidia-340xx-libgl') + replaces=('nvidia-340xx-libgl') install="${pkgname}.install" + cd "${_pkg}" # X driver @@ -111,26 +84,26 @@ install -D -m755 "libGLESv2.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libGLESv2.so.${pkgver}" # OpenGL core library - install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glcore.so.${pkgver}" - install -D -m755 "libnvidia-eglcore.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-eglcore.so.${pkgver}" - install -D -m755 "libnvidia-glsi.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glsi.so.${pkgver}" + install -D -m755 "libnvidia-glcore.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvidia-glcore.so.${pkgver}" + install -D -m755 "libnvidia-eglcore.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvidia-eglcore.so.${pkgver}" + install -D -m755 "libnvidia-glsi.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvidia-glsi.so.${pkgver}" # misc - install -D -m755 "libnvidia-ifr.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-ifr.so.${pkgver}" - install -D -m755 "libnvidia-fbc.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-fbc.so.${pkgver}" - install -D -m755 "libnvidia-encode.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-encode.so.${pkgver}" - install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-cfg.so.${pkgver}" - install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-ml.so.${pkgver}" + install -D -m755 "libnvidia-ifr.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvidia-ifr.so.${pkgver}" + install -D -m755 "libnvidia-fbc.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvidia-fbc.so.${pkgver}" + install -D -m755 "libnvidia-encode.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvidia-encode.so.${pkgver}" + install -D -m755 "libnvidia-cfg.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvidia-cfg.so.${pkgver}" + install -D -m755 "libnvidia-ml.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvidia-ml.so.${pkgver}" # VDPAU install -D -m755 "libvdpau_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/vdpau/libvdpau_nvidia.so.${pkgver}" # nvidia-tls library - install -D -m755 "tls/libnvidia-tls.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-tls.so.${pkgver}" + install -D -m755 "tls/libnvidia-tls.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvidia-tls.so.${pkgver}" # CUDA - install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib/libcuda.so.${pkgver}" - install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib/libnvcuvid.so.${pkgver}" + install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libcuda.so.${pkgver}" + install -D -m755 "libnvcuvid.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/libnvcuvid.so.${pkgver}" # DEBUG install -D -m755 nvidia-debugdump "${pkgdir}/usr/bin/nvidia-debugdump" @@ -184,5 +157,8 @@ install -m755 -d "${pkgdir}/usr/share/X11/xorg.conf.d" install -m644 "${srcdir}/nvidia-drm-outputclass.conf" "${pkgdir}/usr/share/X11/xorg.conf.d/" + install -dm 755 "${pkgdir}"/etc/ld.so.conf.d + echo -e '/usr/lib/nvidia/' > "${pkgdir}"/etc/ld.so.conf.d/00-nvidia.conf + create_links }
