Index: x11/linux-nvidia-libs/Makefile =================================================================== --- x11/linux-nvidia-libs/Makefile (revision 557315) +++ x11/linux-nvidia-libs/Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= nvidia-libs -DISTVERSION?= 440.100 +DISTVERSION?= 460.32.03 # Always try to set PORTREVISION as it can be overridden by the slave ports PORTREVISION?= 0 CATEGORIES= x11 linux @@ -93,10 +93,31 @@ PLIST_RE+= '\,${LINUXBASE}.*libEGL_nvidia\.so\.${P .else PLIST_RE+= '\,${LINUXBASE}.*libEGL_nvidia\.so,d' .endif -.if ${NVVERSION} >= 361.016 +.if ${NVVERSION} >= 450.057 LINUX_LIBS+= libGLESv1_CM_nvidia.so.${PORTVERSION} \ libGLESv2_nvidia.so.${PORTVERSION} \ libGLX_nvidia.so.${PORTVERSION} \ + libnvidia-ptxjitcompiler.so.${PORTVERSION} +LINUX_LINKS+= libGLESv1_CM_nvidia.so.${PORTVERSION} libGLESv1_CM_nvidia.so.1 \ + libGLESv2_nvidia.so.${PORTVERSION} libGLESv2_nvidia.so.2 \ + libGLX_nvidia.so.${PORTVERSION} libGLX_nvidia.so.0 \ + libGLX_nvidia.so.${PORTVERSION} libGLX_indirect.so.0 \ + libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so.1 \ + libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so +LINUX32_LIBS+= libGLESv1_CM_nvidia.so.${PORTVERSION} \ + libGLESv2_nvidia.so.${PORTVERSION} \ + libGLX_nvidia.so.${PORTVERSION} \ + libnvidia-ptxjitcompiler.so.${PORTVERSION} +LINUX32_LINKS+= libGLESv1_CM_nvidia.so.${PORTVERSION} libGLESv1_CM_nvidia.so.1 \ + libGLESv2_nvidia.so.${PORTVERSION} libGLESv2_nvidia.so.2 \ + libGLX_nvidia.so.${PORTVERSION} libGLX_nvidia.so.0 \ + libGLX_nvidia.so.${PORTVERSION} libGLX_indirect.so.0 \ + libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so.1 \ + libnvidia-ptxjitcompiler.so.${PORTVERSION} libnvidia-ptxjitcompiler.so +.elif ${NVVERSION} >= 361.016 && ${NVVERSION} < 450.057 +LINUX_LIBS+= libGLESv1_CM_nvidia.so.${PORTVERSION} \ + libGLESv2_nvidia.so.${PORTVERSION} \ + libGLX_nvidia.so.${PORTVERSION} \ libnvidia-fatbinaryloader.so.${PORTVERSION} \ libnvidia-ptxjitcompiler.so.${PORTVERSION} LINUX_LINKS+= libGLESv1_CM_nvidia.so.${PORTVERSION} libGLESv1_CM_nvidia.so.1 \ @@ -122,7 +147,11 @@ '\,${LINUXBASE}.*libnvidia-fatbinaryloader\.so,d' \ '\,${LINUXBASE}.*libnvidia-ptxjitcompiler\.so,d' .endif +.if ${NVVERSION} >= 460.030 +LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.5 +LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.5 libnvidia-egl-wayland.so.1 +PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.5/' -.if ${NVVERSION} >= 440.026 +.elif ${NVVERSION} >= 440.026 LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.4 LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.4 libnvidia-egl-wayland.so.1 PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.4/' Index: x11/linux-nvidia-libs/distinfo =================================================================== --- x11/linux-nvidia-libs/distinfo (revision 557315) +++ x11/linux-nvidia-libs/distinfo (working copy) @@ -1,6 +1,6 @@ -TIMESTAMP = 1482026038 -SHA256 (NVIDIA-Linux-x86_64-440.100.run) = 649684fab4f37b178afb6cae012e7f9736377d89fa8abdfca26f24a13bbacf1f -SIZE (NVIDIA-Linux-x86_64-440.100.run) = 144653408 +TIMESTAMP = 1610554579 +SHA256 (NVIDIA-Linux-x86_64-460.32.03.run) = 4f2122fc23655439f214717c4c35ab9b4f5ab8537cddfdf059a5682f1b726061 +SIZE (NVIDIA-Linux-x86_64-460.32.03.run) = 178089544 SHA256 (NVIDIA-Linux-x86_64-390.138.run) = 5ffb19e6c86c28e51d710f9679386e3c755161cf747bf3e83647a3486859d666 SIZE (NVIDIA-Linux-x86_64-390.138.run) = 83780873 SHA256 (NVIDIA-Linux-x86-390.138.run) = 7bf67323a393e857a09f979f155baa1ed13183653add0c344edf4d409f977878 Index: x11/linux-nvidia-libs/pkg-plist =================================================================== --- x11/linux-nvidia-libs/pkg-plist (revision 557315) +++ x11/linux-nvidia-libs/pkg-plist (working copy) @@ -48,7 +48,6 @@ %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-encode.so %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-encode.so.1 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-encode.so.%%SHLIB_VERSION%% -%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fatbinaryloader.so.%%SHLIB_VERSION%% %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so.1 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so.%%SHLIB_VERSION%% @@ -119,7 +118,6 @@ %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so.1 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-encode.so.%%SHLIB_VERSION%% -%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fatbinaryloader.so.%%SHLIB_VERSION%% %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.1 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.%%SHLIB_VERSION%% Index: x11/nvidia-driver/Makefile =================================================================== --- x11/nvidia-driver/Makefile (revision 557315) +++ x11/nvidia-driver/Makefile (working copy) @@ -11,9 +11,9 @@ # or `x11/nvidia-driver-304'). PORTNAME= nvidia-driver -DISTVERSION?= 440.100 +DISTVERSION?= 460.32.03 # Always try to set PORTREVISION as it can be overridden by the slave ports -PORTREVISION?= 1 +PORTREVISION?= 0 CATEGORIES= x11 MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION} DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION} Index: x11/nvidia-driver/distinfo =================================================================== --- x11/nvidia-driver/distinfo (revision 557315) +++ x11/nvidia-driver/distinfo (working copy) @@ -1,6 +1,6 @@ -TIMESTAMP = 1482026038 -SHA256 (NVIDIA-FreeBSD-x86_64-440.100.tar.gz) = da5abe605560890405976785eb28e6d9fa79181ac7d158e52e5327d4d0faef5f -SIZE (NVIDIA-FreeBSD-x86_64-440.100.tar.gz) = 82523267 +TIMESTAMP = 1610548737 +SHA256 (NVIDIA-FreeBSD-x86_64-460.32.03.tar.gz) = 830883bd3977e097024572ebc8f14383b2158366dd156076dbb1be9d0066ef99 +SIZE (NVIDIA-FreeBSD-x86_64-460.32.03.tar.gz) = 108182001 SHA256 (NVIDIA-FreeBSD-x86_64-390.138.tar.gz) = 51cb38cd826ba34c1cc71db5bd3ef645b4cfb5647311e255b4631e5c41d0ba07 SIZE (NVIDIA-FreeBSD-x86_64-390.138.tar.gz) = 65280213 SHA256 (NVIDIA-FreeBSD-x86-390.138.tar.gz) = ca06e877af81e2e895a92fc9ec6f5bc106a48a0223912992d5cb0f482c9dac9a Index: x11/nvidia-driver/files/extra-patch-src-nvidia_ctl.c.in =================================================================== --- x11/nvidia-driver/files/extra-patch-src-nvidia_ctl.c.in (revision 557315) +++ x11/nvidia-driver/files/extra-patch-src-nvidia_ctl.c.in (working copy) @@ -1,4 +1,4 @@ ---- src/%%NVSRC%%/nvidia_ctl.c.orig 2017-09-14 20:46:30 UTC +--- src/%%NVSRC%%/nvidia_ctl.c.orig 2020-09-23 00:54:46 UTC +++ src/%%NVSRC%%/nvidia_ctl.c @@ -13,6 +13,12 @@ #include "nv.h" @@ -11,9 +11,9 @@ +#endif + static d_open_t nvidia_ctl_open; - static void nvidia_ctl_dtor(void *arg); static d_ioctl_t nvidia_ctl_ioctl; -@@ -138,6 +144,18 @@ static int nvidia_ctl_poll( + static d_poll_t nvidia_ctl_poll; +@@ -162,6 +168,18 @@ static int nvidia_ctl_mmap_single( int nvidia_ctl_attach(void) { @@ -32,7 +32,7 @@ if (nvidia_count == 0) { nvidia_ctl_cdev = make_dev(&nvidia_ctl_cdevsw, CDEV_CTL_MINOR, -@@ -145,6 +163,10 @@ int nvidia_ctl_attach(void) +@@ -169,6 +187,10 @@ int nvidia_ctl_attach(void) "%s", nvidia_ctl_cdevsw.d_name); if (nvidia_ctl_cdev == NULL) return ENOMEM; @@ -43,7 +43,7 @@ } nvidia_count++; -@@ -153,13 +175,28 @@ int nvidia_ctl_attach(void) +@@ -177,10 +199,26 @@ int nvidia_ctl_attach(void) int nvidia_ctl_detach(void) { @@ -58,9 +58,7 @@ + .linux_char_device = 1 + }; +#endif - struct nvidia_softc *sc; - - sc = &nvidia_ctl_sc; ++ nvidia_count--; - if (nvidia_count == 0) Index: x11/nvidia-driver/files/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c =================================================================== --- x11/nvidia-driver/files/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c (revision 557315) +++ x11/nvidia-driver/files/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c (working copy) @@ -1,14 +1,14 @@ ---- src/nvidia-modeset/nvidia-modeset-freebsd.c.orig 2018-08-21 23:09:28 UTC +--- src/nvidia-modeset/nvidia-modeset-freebsd.c.orig 2020-09-23 00:54:46 UTC +++ src/nvidia-modeset/nvidia-modeset-freebsd.c -@@ -25,6 +25,7 @@ - #include +@@ -26,6 +26,7 @@ #include #include + #include +#include #include "nvkms-ioctl.h" #include "nvidia-modeset-os-interface.h" -@@ -48,6 +49,7 @@ +@@ -51,6 +52,7 @@ #include "machine/../linux32/linux32_proto.h" #endif #include @@ -16,7 +16,7 @@ #endif -@@ -250,7 +252,7 @@ struct nvkms_ref_ptr { +@@ -276,7 +278,7 @@ struct nvkms_ref_ptr { struct nvkms_ref_ptr* NVKMS_API_CALL nvkms_alloc_ref_ptr(void *ptr) { @@ -25,7 +25,7 @@ if (ref_ptr) { mtx_init(&ref_ptr->lock, "nvkms-ref-ptr-lock", NULL, MTX_SPIN); // The ref_ptr owner counts as a reference on the ref_ptr itself. -@@ -867,33 +869,31 @@ static int nvkms_poll( +@@ -894,29 +896,31 @@ static int nvkms_poll( *************************************************************************/ #if defined(NVKMS_SUPPORT_LINUX_COMPAT) @@ -49,12 +49,8 @@ - u_long cmd; + static const uint32_t dir[4] = { IOC_VOID, IOC_IN, IOC_OUT, IOC_INOUT }; --#if NV_FGET_HAS_CAP_RIGHTS_T_ARG - cap_rights_t rights; - status = fget(td, args->fd, cap_rights_init(&rights, CAP_IOCTL), &fp); --#else -- status = fget(td, args->fd, &fp); --#endif - - if (status != 0) { - return status; @@ -76,7 +72,7 @@ } #define NVKMS_LINUX_IOCTL_MIN _IOC(0, NVKMS_IOCTL_MAGIC, NVKMS_IOCTL_CMD, 0) -@@ -909,6 +909,7 @@ static struct linux_ioctl_handler nvkms_linux_ioctl_ha +@@ -930,6 +930,7 @@ static struct linux_ioctl_handler nvkms_linux_ioctl_ha static void nvkms_linux_compat_load(void) { #if defined(NVKMS_SUPPORT_LINUX_COMPAT) @@ -84,7 +80,7 @@ linux_ioctl_register_handler(&nvkms_linux_ioctl_handler); #endif } -@@ -917,6 +918,7 @@ static void nvkms_linux_compat_unload(void) +@@ -940,6 +941,7 @@ static void nvkms_linux_compat_unload(void) { #if defined(NVKMS_SUPPORT_LINUX_COMPAT) linux_ioctl_unregister_handler(&nvkms_linux_ioctl_handler); @@ -92,7 +88,7 @@ #endif } -@@ -1100,4 +1102,9 @@ MODULE_DEPEND(nvidia_modeset, /* module +@@ -1121,4 +1131,9 @@ MODULE_DEPEND(nvidia_modeset, /* module MODULE_DEPEND(nvidia_modeset, /* module name */ linux, /* prerequisite module */ 1, 1, 1); /* vmin, vpref, vmax */ --- x11/nvidia-driver/files/extra-patch-src-nvidia_linux.c.in.orig 2019-06-29 10:46:03.738403000 +0900 +++ x11/nvidia-driver/files/extra-patch-src-nvidia_linux.c.in 2021-01-13 23:30:45.740700000 +0900 @@ -1,14 +1,12 @@ --- src/%%NVSRC%%/nvidia_linux.c.orig 2017-09-14 20:46:30 UTC +++ src/%%NVSRC%%/nvidia_linux.c -@@ -35,23 +35,16 @@ int linux_ioctl_nvidia( +@@ -35,21 +35,16 @@ int linux_ioctl_nvidia( struct linux_ioctl_args *args ) { - struct file *fp; - int error; --#if __FreeBSD_version >= 1000053 - cap_rights_t rights; --#endif - u_long cmd; + static const uint32_t dir[4] = { IOC_VOID, IOC_IN, IOC_OUT, IOC_INOUT }; Index: x11/nvidia-driver/files/patch-mk_nvidia.lib.mk =================================================================== --- x11/nvidia-driver/files/patch-mk_nvidia.lib.mk (revision 557315) +++ x11/nvidia-driver/files/patch-mk_nvidia.lib.mk (working copy) @@ -1,8 +1,8 @@ ---- mk/nvidia.lib.mk.orig 2013-08-16 10:53:30.000000000 +0200 -+++ mk/nvidia.lib.mk 2014-01-27 16:55:39.000000000 +0100 -@@ -46,8 +46,8 @@ - .endif +--- mk/nvidia.lib.mk.orig 2020-09-23 00:45:08 UTC ++++ mk/nvidia.lib.mk +@@ -52,8 +52,8 @@ install: ${EXTRADEPS} .endif + .endif .if defined(AUXLINK_TGT) - @rm -f ${AUXLINK_LINK} - @ln -fs ${AUXLINK_TGT} ${AUXLINK_LINK} @@ -10,4 +10,4 @@ + @ln -fs ${AUXLINK_TGT} ${DESTDIR}${AUXLINK_LINK} .endif .if defined(STATICLIB_NAME) - @rm -f ${DESTDIR}${LIBDIR}/${STATICLIB_NAME} + @rm -f ${DESTDIR}${THISLIBDIR}/${STATICLIB_NAME} Index: x11/nvidia-driver/files/extra-patch-src-nv-freebsd.h.in =================================================================== --- x11/nvidia-driver/files/extra-patch-src-nv-freebsd.h.in (revision 557315) +++ x11/nvidia-driver/files/extra-patch-src-nv-freebsd.h.in (working copy) @@ -1,5 +1,18 @@ --- src/%%NVSRC%%/nv-freebsd.h.orig 2017-09-14 20:46:30 UTC +++ src/%%NVSRC%%/nv-freebsd.h +@@ -13,9 +13,9 @@ + + #include + +-#if __FreeBSD_version >= 1300000 +-#error This driver does not support FreeBSD 13.x/-CURRENT! +-#endif ++#if __FreeBSD_version >= 1500000 ++#error This driver does not support FreeBSD 15.x/-NONEXISTENT! ++#endif + #if __FreeBSD_version >= 1200000 && __FreeBSD_version < 1200086 + #error This driver requires FreeBSD 12.0-RC3 or later! + #endif @@ -157,6 +157,11 @@ MALLOC_DECLARE(M_NVIDIA); #define NV_SUPPORT_ACPI_PM Index: x11/nvidia-settings/Makefile =================================================================== --- x11/nvidia-settings/Makefile (revision 557315) +++ x11/nvidia-settings/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nvidia-settings -PORTVERSION= 440.100 +PORTVERSION= 460.32.03 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org Index: x11/nvidia-settings/distinfo =================================================================== --- x11/nvidia-settings/distinfo (revision 557315) +++ x11/nvidia-settings/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1593032511 -SHA256 (NVIDIA-nvidia-settings-440.100_GH0.tar.gz) = 562e487261986f4e5241f554b14b799fd9184cdb121532c0e3fe309709c37719 -SIZE (NVIDIA-nvidia-settings-440.100_GH0.tar.gz) = 1314731 +TIMESTAMP = 1610555840 +SHA256 (NVIDIA-nvidia-settings-460.32.03_GH0.tar.gz) = ddcb4c6ea7330cb0f9dc272e36e8a0a4867cfce9a930a22d21fad1307173f0b7 +SIZE (NVIDIA-nvidia-settings-460.32.03_GH0.tar.gz) = 1233195 Index: x11/nvidia-xconfig/Makefile =================================================================== --- x11/nvidia-xconfig/Makefile (revision 557315) +++ x11/nvidia-xconfig/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nvidia-xconfig -PORTVERSION= 440.100 +PORTVERSION= 460.32.03 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org Index: x11/nvidia-xconfig/distinfo =================================================================== --- x11/nvidia-xconfig/distinfo (revision 557315) +++ x11/nvidia-xconfig/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1593032427 -SHA256 (NVIDIA-nvidia-xconfig-440.100_GH0.tar.gz) = 2517e614b8500f69099b74abceb782ca4741c61dc288560d9d39c40cfa458b1d -SIZE (NVIDIA-nvidia-xconfig-440.100_GH0.tar.gz) = 141048 +TIMESTAMP = 1610556592 +SHA256 (NVIDIA-nvidia-xconfig-460.32.03_GH0.tar.gz) = 6a081c42c19189ddbe7b072468d19ddf127a1fef7e6b6c609c7bc26ad7fa92ff +SIZE (NVIDIA-nvidia-xconfig-460.32.03_GH0.tar.gz) = 142333