summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO24
-rw-r--r--PKGBUILD15
-rw-r--r--fs62142.patch13
3 files changed, 36 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7ab01296efc6..f013749344c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = nvidia-vulkan
pkgdesc = NVIDIA drivers for linux (vulkan developer branch)
- pkgver = 418.49.04
+ pkgver = 418.52.03
pkgrel = 2
url = https://developer.nvidia.com/vulkan-driver
arch = x86_64
@@ -9,31 +9,33 @@ pkgbase = nvidia-vulkan
makedepends = linux
makedepends = linux-headers
options = !strip
- source = NVIDIA-Linux-x86_64-418.49.04.run::https://developer.nvidia.com/vulkan-beta-4184904-linux
+ source = NVIDIA-Linux-x86_64-418.52.03.run::https://developer.nvidia.com/vulkan-beta-4185203-linux
source = nvidia-drm-outputclass.conf
source = nvidia-vulkan-utils.sysusers
source = kernel-4.16.patch
- sha512sums = bfc59a1295e120149f3ae11486ea9f87293d44bc9c62a25176f4d4eb7d75119818411404b334982085d5b61062701685a4ddb09232383d8c430a3ed2cae81858
+ source = fs62142.patch
+ sha512sums = 52e4f7ad1acad8574a75cf49ba20ce66c30a368482bf7eb6f61e79b57e84d7c6b905053350bcf3b61c3c38e2e0c3ea494987e6e44baa460009f25d3950c06a5c
sha512sums = c49d246a519731bfab9d22afa5c2dd2d366db06d80182738b84881e93cd697c783f16ee04819275c05597bb063451a5d6102fbc562cd078d2a374533a23cea48
sha512sums = 4b3ad73f5076ba90fe0b3a2e712ac9cde76f469cd8070280f960c3ce7dc502d1927f525ae18d008075c8f08ea432f7be0a6c3a7a6b49c361126dcf42f97ec499
sha512sums = ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af
+ sha512sums = df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752
pkgname = nvidia-vulkan
pkgdesc = NVIDIA drivers for linux (vulkan developer branch)
depends = linux
- depends = nvidia-vulkan-utils=418.49.04
+ depends = nvidia-vulkan-utils=418.52.03
depends = libglvnd
- provides = nvidia=418.49.04
+ provides = nvidia=418.52.03
conflicts = nvidia
pkgname = nvidia-vulkan-dkms
pkgdesc = NVIDIA driver sources for linux (vulkan developer branch)
depends = dkms
- depends = nvidia-vulkan-utils=418.49.04
+ depends = nvidia-vulkan-utils=418.52.03
depends = libglvnd
optdepends = linux-headers: Build the module for Arch kernel
optdepends = linux-lts-headers: Build the module for LTS Arch kernel
- provides = nvidia=418.49.04
+ provides = nvidia=418.52.03
conflicts = nvidia
pkgname = nvidia-vulkan-utils
@@ -46,7 +48,7 @@ pkgname = nvidia-vulkan-utils
optdepends = gtk3: nvidia-settings (GTK+ v3)
optdepends = xorg-server-devel: nvidia-xconfig
optdepends = opencl-nvidia-vulkan: OpenCL support
- provides = nvidia-utils=418.49.04
+ provides = nvidia-utils=418.52.03
provides = vulkan-driver
provides = opengl-driver
provides = nvidia-libgl
@@ -61,7 +63,7 @@ pkgname = opencl-nvidia-vulkan
depends = zlib
optdepends = opencl-headers: headers necessary for OpenCL development
provides = opencl-driver
- provides = opencl-nvidia=418.49.04
+ provides = opencl-nvidia=418.52.03
conflicts = opencl-nvidia
pkgname = lib32-nvidia-vulkan-utils
@@ -71,7 +73,7 @@ pkgname = lib32-nvidia-vulkan-utils
depends = lib32-libglvnd
depends = nvidia-vulkan-utils
optdepends = lib32-opencl-nvidia-vulkan
- provides = lib32-nvidia-utils=418.49.04
+ provides = lib32-nvidia-utils=418.52.03
provides = lib32-vulkan-driver
provides = lib32-opengl-driver
provides = lib32-nvidia-libgl
@@ -85,7 +87,7 @@ pkgname = lib32-opencl-nvidia-vulkan
depends = lib32-gcc-libs
optdepends = opencl-headers: headers necessary for OpenCL development
provides = lib32-opencl-driver
- provides = lib32-opencl-nvidia=418.49.04
+ provides = lib32-opencl-nvidia=418.52.03
conflicts = lib32-opencl-nvidia
conflicts = lib32-opencl-nvidia-390xx
diff --git a/PKGBUILD b/PKGBUILD
index fbf3a9ff464c..5c437fa5a541 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
pkgbase=nvidia-vulkan
pkgname=('nvidia-vulkan' 'nvidia-vulkan-dkms' 'nvidia-vulkan-utils' 'opencl-nvidia-vulkan' 'lib32-nvidia-vulkan-utils' 'lib32-opencl-nvidia-vulkan')
-pkgver=418.49.04
+pkgver=418.52.03
_extramodules=extramodules-ARCH
pkgrel=2
pkgdesc="NVIDIA drivers for linux (vulkan developer branch)"
@@ -17,14 +17,16 @@ makedepends=('libglvnd' 'linux' 'linux-headers')
license=('custom')
options=('!strip')
_pkg="NVIDIA-Linux-x86_64-${pkgver}"
-source=("${_pkg}.run::https://developer.nvidia.com/vulkan-beta-4184904-linux"
+source=("${_pkg}.run::https://developer.nvidia.com/vulkan-beta-4185203-linux"
'nvidia-drm-outputclass.conf'
'nvidia-vulkan-utils.sysusers'
- 'kernel-4.16.patch')
-sha512sums=('bfc59a1295e120149f3ae11486ea9f87293d44bc9c62a25176f4d4eb7d75119818411404b334982085d5b61062701685a4ddb09232383d8c430a3ed2cae81858'
+ 'kernel-4.16.patch'
+ 'fs62142.patch')
+sha512sums=('52e4f7ad1acad8574a75cf49ba20ce66c30a368482bf7eb6f61e79b57e84d7c6b905053350bcf3b61c3c38e2e0c3ea494987e6e44baa460009f25d3950c06a5c'
'c49d246a519731bfab9d22afa5c2dd2d366db06d80182738b84881e93cd697c783f16ee04819275c05597bb063451a5d6102fbc562cd078d2a374533a23cea48'
'4b3ad73f5076ba90fe0b3a2e712ac9cde76f469cd8070280f960c3ce7dc502d1927f525ae18d008075c8f08ea432f7be0a6c3a7a6b49c361126dcf42f97ec499'
- 'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
+ 'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af'
+ 'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
create_links() {
# create soname links
@@ -44,6 +46,9 @@ prepare() {
# https://bugs.archlinux.org/task/58074
patch -Np1 -i ../kernel-4.16.patch
+ # Fix https://bugs.archlinux.org/task/62142
+ patch -Np1 -i ../fs62142.patch
+
bsdtar -xf nvidia-persistenced-init.tar.bz2
sed -i 's/__NV_VK_ICD__/libGLX_nvidia.so.0/' nvidia_icd.json.template
diff --git a/fs62142.patch b/fs62142.patch
new file mode 100644
index 000000000000..04806bd8d154
--- /dev/null
+++ b/fs62142.patch
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
++++ b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+ const struct dma_map_ops *ops = get_dma_ops(&nvl->dev->dev);
+
+- return (ops->map_resource != NULL);
++ return (ops && ops->map_resource);
+ #else
+ return NV_FALSE;
+ #endif