diff options
| -rw-r--r-- | .SRCINFO | 26 | ||||
| -rw-r--r-- | PKGBUILD | 35 | ||||
| -rw-r--r-- | kernel-4.19.patch | 93 |
3 files changed, 30 insertions, 124 deletions
@@ -1,7 +1,7 @@ pkgbase = nvidia-vulkan pkgdesc = NVIDIA drivers for linux (vulkan developer branch) - pkgver = 396.54.09 - pkgrel = 3 + pkgver = 415.18.02 + pkgrel = 1 url = https://developer.nvidia.com/vulkan-driver arch = x86_64 license = custom @@ -10,34 +10,32 @@ pkgbase = nvidia-vulkan makedepends = linux-headers>=4.19 makedepends = linux-headers<4.20 options = !strip - source = NVIDIA-Linux-x86_64-396.54.09.run::https://developer.nvidia.com/linux-3965409 + source = NVIDIA-Linux-x86_64-415.18.02.run::https://developer.nvidia.com/vulkan-beta-4151802-linux source = nvidia-drm-outputclass.conf source = nvidia-vulkan-utils.sysusers source = kernel-4.16.patch - source = kernel-4.19.patch - sha512sums = 93a79b2c0432c8d4801162609a404b8eec3115ca1febe772cfea17ebbfb6265d9064c40f40ea8714969953ea7886aba1a5f1ba67e529b254e8ccd810085f1461 + sha512sums = e42316db82b34bd6c7d0826466e85d08c47c0b16e0e3299be89a218fe9ca92fe1d4cc7f65743e1ea1198f54d66fa2fb506b482d9b6ff2c7eb63947dbfd221193 sha512sums = c49d246a519731bfab9d22afa5c2dd2d366db06d80182738b84881e93cd697c783f16ee04819275c05597bb063451a5d6102fbc562cd078d2a374533a23cea48 sha512sums = 4b3ad73f5076ba90fe0b3a2e712ac9cde76f469cd8070280f960c3ce7dc502d1927f525ae18d008075c8f08ea432f7be0a6c3a7a6b49c361126dcf42f97ec499 sha512sums = ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af - sha512sums = 354c644794c9dcf7bb8d4afd720736f7b9760306e1cb9c1c98be209e0f30bdfe628b67aa371461e33ccf0e58a0efb084c7f7fc91f4351ae3df3edb991fc49e00 pkgname = nvidia-vulkan pkgdesc = NVIDIA drivers for linux (vulkan developer branch) depends = linux>=4.19 depends = linux<4.20 - depends = nvidia-vulkan-utils=396.54.09 + depends = nvidia-vulkan-utils=415.18.02 depends = libglvnd - provides = nvidia=396.54.09 + provides = nvidia=415.18.02 conflicts = nvidia pkgname = nvidia-vulkan-dkms pkgdesc = NVIDIA driver sources for linux (vulkan developer branch) depends = dkms - depends = nvidia-vulkan-utils=396.54.09 + depends = nvidia-vulkan-utils=415.18.02 depends = libglvnd optdepends = linux-headers: Build the module for Arch kernel optdepends = linux-lts-headers: Build the module for LTS Arch kernel - provides = nvidia=396.54.09 + provides = nvidia=415.18.02 conflicts = nvidia pkgname = nvidia-vulkan-utils @@ -50,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=396.54.09 + provides = nvidia-utils=415.18.02 provides = vulkan-driver provides = opengl-driver provides = nvidia-libgl @@ -65,7 +63,7 @@ pkgname = opencl-nvidia-vulkan depends = zlib optdepends = opencl-headers: headers necessary for OpenCL development provides = opencl-driver - provides = opencl-nvidia=396.54.09 + provides = opencl-nvidia=415.18.02 conflicts = opencl-nvidia pkgname = lib32-nvidia-vulkan-utils @@ -75,7 +73,7 @@ pkgname = lib32-nvidia-vulkan-utils depends = lib32-libglvnd depends = nvidia-vulkan-utils optdepends = lib32-opencl-nvidia-vulkan - provides = lib32-nvidia-utils=396.54.09 + provides = lib32-nvidia-utils=415.18.02 provides = lib32-vulkan-driver provides = lib32-opengl-driver provides = lib32-nvidia-libgl @@ -89,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=396.54.09 + provides = lib32-opencl-nvidia=415.18.02 conflicts = lib32-opencl-nvidia conflicts = lib32-opencl-nvidia-390xx @@ -7,9 +7,9 @@ pkgbase=nvidia-vulkan pkgname=('nvidia-vulkan' 'nvidia-vulkan-dkms' 'nvidia-vulkan-utils' 'opencl-nvidia-vulkan' 'lib32-nvidia-vulkan-utils' 'lib32-opencl-nvidia-vulkan') -pkgver=396.54.09 +pkgver=415.18.02 _extramodules=extramodules-ARCH -pkgrel=3 +pkgrel=1 pkgdesc="NVIDIA drivers for linux (vulkan developer branch)" arch=('x86_64') url="https://developer.nvidia.com/vulkan-driver" @@ -17,16 +17,14 @@ makedepends=('libglvnd' 'linux' 'linux-headers>=4.19' 'linux-headers<4.20') license=('custom') options=('!strip') _pkg="NVIDIA-Linux-x86_64-${pkgver}" -source=("NVIDIA-Linux-x86_64-${pkgver}.run::https://developer.nvidia.com/linux-3965409" +source=("NVIDIA-Linux-x86_64-${pkgver}.run::https://developer.nvidia.com/vulkan-beta-4151802-linux" 'nvidia-drm-outputclass.conf' 'nvidia-vulkan-utils.sysusers' - 'kernel-4.16.patch' - 'kernel-4.19.patch') -sha512sums=('93a79b2c0432c8d4801162609a404b8eec3115ca1febe772cfea17ebbfb6265d9064c40f40ea8714969953ea7886aba1a5f1ba67e529b254e8ccd810085f1461' + 'kernel-4.16.patch') +sha512sums=('e42316db82b34bd6c7d0826466e85d08c47c0b16e0e3299be89a218fe9ca92fe1d4cc7f65743e1ea1198f54d66fa2fb506b482d9b6ff2c7eb63947dbfd221193' 'c49d246a519731bfab9d22afa5c2dd2d366db06d80182738b84881e93cd697c783f16ee04819275c05597bb063451a5d6102fbc562cd078d2a374533a23cea48' '4b3ad73f5076ba90fe0b3a2e712ac9cde76f469cd8070280f960c3ce7dc502d1927f525ae18d008075c8f08ea432f7be0a6c3a7a6b49c361126dcf42f97ec499' - 'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af' - '354c644794c9dcf7bb8d4afd720736f7b9760306e1cb9c1c98be209e0f30bdfe628b67aa371461e33ccf0e58a0efb084c7f7fc91f4351ae3df3edb991fc49e00') + 'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af') create_links() { # create soname links @@ -45,7 +43,6 @@ prepare() { # Restore phys_to_dma support (still needed for 396.18) # https://bugs.archlinux.org/task/58074 patch -Np1 -i ../kernel-4.16.patch - patch -Np1 -i ../kernel-4.19.patch bsdtar -xf nvidia-persistenced-init.tar.bz2 @@ -148,13 +145,15 @@ package_nvidia-vulkan-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" + + # X wrapped software rendering + install -D -m755 "libnvidia-wfb.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-wfb.so.${pkgver}" 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" # OpenGL libraries install -D -m755 "libEGL_nvidia.so.${pkgver}" "${pkgdir}/usr/lib/libEGL_nvidia.so.${pkgver}" @@ -173,7 +172,6 @@ package_nvidia-vulkan-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-wfb.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-wfb.so.${pkgver}" install -D -m755 "libnvidia-glvkspirv.so.${pkgver}" "${pkgdir}/usr/lib/libnvidia-glvkspirv.so.${pkgver}" # Vulkan ICD @@ -184,7 +182,6 @@ package_nvidia-vulkan-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}" @@ -196,6 +193,11 @@ package_nvidia-vulkan-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" @@ -310,7 +312,6 @@ package_lib32-nvidia-vulkan-utils() { # nvidia-tls library install -D -m755 "libnvidia-tls.so.${pkgver}" "${pkgdir}/usr/lib32/libnvidia-tls.so.${pkgver}" - install -D -m755 "tls/libnvidia-tls.so.${pkgver}" "${pkgdir}/usr/lib32/tls/libnvidia-tls.so.${pkgver}" # CUDA install -D -m755 "libcuda.so.${pkgver}" "${pkgdir}/usr/lib32/libcuda.so.${pkgver}" diff --git a/kernel-4.19.patch b/kernel-4.19.patch deleted file mode 100644 index d10241f4bf73..000000000000 --- a/kernel-4.19.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff --git a/kernel/nvidia-drm/nvidia-drm-connector.c b/kernel/nvidia-drm/nvidia-drm-connector.c -index dbda66d..99333d9 100644 ---- a/kernel/nvidia-drm/nvidia-drm-connector.c -+++ b/kernel/nvidia-drm/nvidia-drm-connector.c -@@ -35,6 +35,8 @@ - #include <drm/drm_atomic.h> - #include <drm/drm_atomic_helper.h> - -+#include <linux/version.h> -+ - static void nv_drm_connector_destroy(struct drm_connector *connector) - { - struct nv_drm_connector *nv_connector = to_nv_connector(connector); -@@ -226,7 +228,11 @@ static int nv_drm_connector_get_modes(struct drm_connector *connector) - - - if (nv_connector->edid != NULL) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,19,0) - drm_mode_connector_update_edid_property( -+#else -+ drm_connector_update_edid_property( -+#endif - connector, nv_connector->edid); - } - -diff --git a/kernel/nvidia-drm/nvidia-drm-encoder.c b/kernel/nvidia-drm/nvidia-drm-encoder.c -index 3dc2400..e8b4aad 100644 ---- a/kernel/nvidia-drm/nvidia-drm-encoder.c -+++ b/kernel/nvidia-drm/nvidia-drm-encoder.c -@@ -35,6 +35,8 @@ - #include <drm/drm_atomic.h> - #include <drm/drm_atomic_helper.h> - -+#include <linux/version.h> -+ - static void nv_drm_encoder_destroy(struct drm_encoder *encoder) - { - struct nv_drm_encoder *nv_encoder = to_nv_encoder(encoder); -@@ -216,7 +218,11 @@ nv_drm_add_encoder(struct drm_device *dev, NvKmsKapiDisplay hDisplay) - - /* Attach encoder and connector */ - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,19,0) - ret = drm_mode_connector_attach_encoder(connector, encoder); -+#else -+ ret = drm_connector_attach_encoder(connector, encoder); -+#endif - - if (ret != 0) { - NV_DRM_DEV_LOG_ERR( -diff --git a/kernel/conftest.sh b/kernel/conftest.sh -index dd61566..30c88a1 100755 ---- a/kernel/conftest.sh -+++ b/kernel/conftest.sh -@@ -2363,17 +2363,22 @@ compile_test() { - - ;; - -- drm_mode_connector_list_update_has_merge_type_bits_arg) -+ drm_connector_list_update_has_merge_type_bits_arg) - # -- # Detect if drm_mode_connector_list_update() has a -+ # Detect if drm_connector_list_update() has a - # 'merge_type_bits' second argument. This argument was - # remove by: - # 2015-12-03 6af3e6561243f167dabc03f732d27ff5365cd4a4 - # - CODE=" - #include <drm/drmP.h> -- void conftest_drm_mode_connector_list_update_has_merge_type_bits_arg(void) { -+ #include <linux/version.h> -+ void conftest_drm_connector_list_update_has_merge_type_bits_arg(void) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,19,0) - drm_mode_connector_list_update( -+#else -+ drm_connector_list_update( -+#endif - NULL, /* struct drm_connector *connector */ - true); /* bool merge_type_bits */ - }" -diff --git a/kernel/nvidia-drm/nvidia-drm.Kbuild b/kernel/nvidia-drm/nvidia-drm.Kbuild -index b4a45a7..3b7f3a1 100644 ---- a/kernel/nvidia-drm/nvidia-drm.Kbuild -+++ b/kernel/nvidia-drm/nvidia-drm.Kbuild -@@ -74,7 +74,7 @@ NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_has_legacy_dev_list - NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_has_set_busid - NV_CONFTEST_TYPE_COMPILE_TESTS += drm_crtc_state_has_connectors_changed - NV_CONFTEST_TYPE_COMPILE_TESTS += drm_init_function_args --NV_CONFTEST_TYPE_COMPILE_TESTS += drm_mode_connector_list_update_has_merge_type_bits_arg -+NV_CONFTEST_TYPE_COMPILE_TESTS += drm_connector_list_update_has_merge_type_bits_arg - NV_CONFTEST_TYPE_COMPILE_TESTS += drm_helper_mode_fill_fb_struct - NV_CONFTEST_TYPE_COMPILE_TESTS += drm_master_drop_has_from_release_arg - NV_CONFTEST_TYPE_COMPILE_TESTS += drm_driver_unload_has_int_return_type |