From 0927bfe9a43efc3174b4f0a9419ebd3f06825bc4 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Thu, 21 Feb 2019 21:47:59 +0000 Subject: nvidia nvidia-utils nvidia-settings: update to 415.27 --- abs/core/nvidia-utils/PKGBUILD | 35 ++++++++++++++++++----------------- abs/core/nvidia/PKGBUILD | 21 ++++++++++----------- abs/extra/nvidia-settings/PKGBUILD | 5 +++-- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/abs/core/nvidia-utils/PKGBUILD b/abs/core/nvidia-utils/PKGBUILD index cb4a5c9..c379e48 100644 --- a/abs/core/nvidia-utils/PKGBUILD +++ b/abs/core/nvidia-utils/PKGBUILD @@ -1,24 +1,23 @@ -# $Id$ # Maintainer: Sven-Hendrik Haase # Maintainer: Thomas Baechler # Contributor: James Rayner pkgbase=nvidia-utils pkgname=('nvidia-utils' 'opencl-nvidia') -pkgver=390.67 +pkgver=415.27 pkgrel=1 arch=('x86_64') url="http://www.nvidia.com/" license=('custom') options=('!strip') +_pkg="NVIDIA-Linux-x86_64-${pkgver}" source=('nvidia-drm-outputclass.conf' 'nvidia-utils.sysusers' - "http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run") + "https://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run") sha512sums=('c49d246a519731bfab9d22afa5c2dd2d366db06d80182738b84881e93cd697c783f16ee04819275c05597bb063451a5d6102fbc562cd078d2a374533a23cea48' '4b3ad73f5076ba90fe0b3a2e712ac9cde76f469cd8070280f960c3ce7dc502d1927f525ae18d008075c8f08ea432f7be0a6c3a7a6b49c361126dcf42f97ec499' - 'b0cf1678fa508a584836befdb8db83147e8b94cd25dc0012f589850512c2d69f94ae4bfce6cfa3e16945939747239e3ac762ac1bd5472f8a3052c1314558eb13') + '5919333136042a227ff36c850d0c57898fb428a77d88633d205a269db4b844356a87f5b1e5c3042f40feaf083d4f82d32df5366820375b601f9d69d98cada0b6') -_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" create_links() { # create soname links @@ -58,7 +57,7 @@ package_opencl-nvidia() { package_nvidia-utils() { pkgdesc="NVIDIA drivers utilities" - depends=('xorg-server' 'libglvnd') + depends=('xorg-server' 'libglvnd' 'egl-wayland') optdepends=('nvidia-settings: configuration tool' 'xorg-server-devel: nvidia-xconfig' 'opencl-nvidia: OpenCL support') @@ -73,18 +72,15 @@ package_nvidia-utils() { install -D -m755 nvidia_drv.so "${pkgdir}/usr/lib/xorg/modules/drivers/nvidia_drv.so" # GLX extension module for X - install -D -m755 "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/libglx.so.${pkgver}" - ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/libglx.so.1" # X doesn't find glx otherwise - ln -s "libglx.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/libglx.so" # X doesn't find glx otherwise + install -D -m755 "libglxserver_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/libglxserver_nvidia.so.${pkgver}" + # Ensure that X finds glx + ln -s "libglxserver_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/libglxserver_nvidia.so.1" + ln -s "libglxserver_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/nvidia/xorg/libglxserver_nvidia.so" - install -D -m755 "libGLX_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/libGLX_nvidia.so.${pkgver}" - # now in mesa driver - #ln -s "libGLX_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/libGLX_indirect.so.0" + # X wrapped software rendering + install -D -m755 "libnvidia-wfb.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-wfb.so.${pkgver}" - # Wayland stuff - install -D -m755 "libnvidia-egl-wayland.so.1.0.2" "${pkgdir}/usr/lib/libnvidia-egl-wayland.so.1.0.2" - ln -s "libnvidia-egl-wayland.so.1.0.2" "${pkgdir}/usr/lib/libnvidia-egl-wayland.so.1" - install -D -m644 "10_nvidia_wayland.json" "${pkgdir}/usr/share/egl/egl_external_platform.d/10_nvidia_wayland.json" + install -D -m755 "libGLX_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/libGLX_nvidia.so.${pkgver}" # OpenGL libraries install -D -m755 "libEGL_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/libEGL_nvidia.so.${pkgver}" @@ -103,6 +99,7 @@ package_nvidia-utils() { 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-glvkspirv.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glvkspirv.so.${pkgver}" # Vulkan ICD install -D -m644 "nvidia_icd.json.template" "${pkgdir}/usr/share/vulkan/icd.d/nvidia_icd.json" @@ -112,7 +109,6 @@ package_nvidia-utils() { # nvidia-tls library install -D -m755 "libnvidia-tls.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-tls.so.${pkgver}" - install -D -m755 "tls/libnvidia-tls.so.${pkgver}" "${pkgdir}/usr/lib/tls/libnvidia-tls.so.${pkgver}" # CUDA install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib/libcuda.so.${pkgver}" @@ -124,6 +120,11 @@ package_nvidia-utils() { # Fat (multiarchitecture) binary loader install -D -m755 "libnvidia-fatbinaryloader.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-fatbinaryloader.so.${pkgver}" + # raytracing + install -D -m755 "libnvoptix.so.${pkgver}" "${pkgdir}/usr/lib/libnvoptix.so.${pkgver}" + install -D -m755 "libnvidia-rtcore.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-rtcore.so.${pkgver}" + install -D -m755 "libnvidia-cbl.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-cbl.so.${pkgver}" + # DEBUG install -D -m755 nvidia-debugdump "${pkgdir}/usr/bin/nvidia-debugdump" diff --git a/abs/core/nvidia/PKGBUILD b/abs/core/nvidia/PKGBUILD index c545054..cbf0f4c 100644 --- a/abs/core/nvidia/PKGBUILD +++ b/abs/core/nvidia/PKGBUILD @@ -1,25 +1,23 @@ -# $Id$ # Maintainer: Sven-Hendrik Haase # Maintainer: Felix Yan # Contributor: Thomas Baechler pkgbase=nvidia pkgname=(nvidia nvidia-dkms) -pkgver=390.67 +pkgver=415.27 _extramodules=extramodules-4.9-ARCH -pkgrel=1 +pkgrel=8 pkgdesc="NVIDIA drivers for linux" arch=('x86_64') url="http://www.nvidia.com/" -makedepends=('nvidia-libgl' "nvidia-utils=${pkgver}" 'linux' 'linux-headers>=4.9' 'linux-headers<4.10') +makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux' 'linux-headers>=4.9' 'linux-headers<4.10') license=('custom') options=('!strip') -source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run" +_pkg="NVIDIA-Linux-x86_64-${pkgver}" +source=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run" kernel-4.16.patch) -sha256sums=('4d9d4a636d568a93412cd9a2db08c594adef20861707dfdfbd6ae15db3292b26' - '622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385') - -_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32" +sha512sums=('5919333136042a227ff36c850d0c57898fb428a77d88633d205a269db4b844356a87f5b1e5c3042f40feaf083d4f82d32df5366820375b601f9d69d98cada0b6' + 'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af') prepare() { sh "${_pkg}.run" --extract-only @@ -55,8 +53,8 @@ build() { package_nvidia() { pkgdesc="NVIDIA drivers for linux" - depends=('linux>=4.9' 'linux<4.10' "nvidia-utils=${pkgver}" 'libgl') install=nvidia.install + depends=('linux>=4.9' 'linux<4.10' "nvidia-utils=${pkgver}" 'libglvnd') install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \ "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko @@ -71,9 +69,10 @@ package_nvidia() { package_nvidia-dkms() { pkgdesc="NVIDIA driver sources for linux" - depends=('dkms' "nvidia-utils=$pkgver" 'libgl') + depends=('dkms' "nvidia-utils=$pkgver" 'libglvnd') optdepends=('linux-headers: Build the module for Arch kernel' 'linux-lts-headers: Build the module for LTS Arch kernel') + provides=("nvidia=$pkgver") conflicts+=('nvidia') cd ${_pkg} diff --git a/abs/extra/nvidia-settings/PKGBUILD b/abs/extra/nvidia-settings/PKGBUILD index a9f8744..843ce14 100644 --- a/abs/extra/nvidia-settings/PKGBUILD +++ b/abs/extra/nvidia-settings/PKGBUILD @@ -1,9 +1,10 @@ +# Maintainer: Sven-Hendrik Haase # Maintainer: Felix Yan # Maintainer: Levente Polyak pkgbase=nvidia-settings pkgname=('nvidia-settings' 'libxnvctrl') -pkgver=390.48 +pkgver=415.27 pkgrel=1 pkgdesc='Tool for configuring the NVIDIA graphics driver' url='https://github.com/NVIDIA/nvidia-settings' @@ -13,7 +14,7 @@ makedepends=('git' 'inetutils' 'gtk2' 'jansson' 'gtk3' 'libxv' 'libvdpau' 'nvidi options=('staticlibs') source=(${pkgbase}-${pkgver}.tar.gz::https://github.com/NVIDIA/nvidia-settings/archive/${pkgver}.tar.gz libxnvctrl_so.patch) -sha512sums=('5f8a6403edf8636cfb2aec8f01fb160030a2538140fe3d10a71863fd1f793eea3f8a6f1bc55baa7dff047bd1bef9c3bd579cf818af38b535fa172b3aaf122e55' +sha512sums=('fdfba4612de72c6ada40191c76216d2fa1f2878b095d470852b1ca36b9ecf1d05e1a783e97ab9e5561932ed7b5753744b4915d544adba653da310ffac7147c59' 'f69f5dc84fe624579a3c9ce877f4ae4e34c2184877576afbea07b8abdd7ff01e470517f2b77cd11a904518cbcb83fb388ca1d08888006f0ef2854723920c9cf8') prepare() { -- cgit v0.12