From owner-svn-ports-all@freebsd.org Fri Feb 5 07:27:58 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 43BEB53FCD3; Fri, 5 Feb 2021 07:27:58 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DX6TB1KXkz4ckD; Fri, 5 Feb 2021 07:27:58 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 118091A9BA; Fri, 5 Feb 2021 07:27:58 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 1157RvFp030490; Fri, 5 Feb 2021 07:27:57 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 1157RtXv030475; Fri, 5 Feb 2021 07:27:55 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202102050727.1157RtXv030475@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Fri, 5 Feb 2021 07:27:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564088 - in head/x11: linux-nvidia-libs nvidia-driver nvidia-driver/files nvidia-settings nvidia-xconfig X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/x11: linux-nvidia-libs nvidia-driver nvidia-driver/files nvidia-settings nvidia-xconfig X-SVN-Commit-Revision: 564088 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Feb 2021 07:27:58 -0000 Author: danfe Date: Fri Feb 5 07:27:55 2021 New Revision: 564088 URL: https://svnweb.freebsd.org/changeset/ports/564088 Log: Update nVidia main driver, Linux libraries, and tools to version 460.36. PR: 249505, 250277 Added: head/x11/nvidia-driver/files/460-patch-lib-libGLX_nvidia-Makefile (contents, props changed) head/x11/nvidia-driver/files/460-patch-src-nvidia_linux.c.in - copied, changed from r564006, head/x11/nvidia-driver/files/extra-patch-src-nvidia_linux.c.in Modified: head/x11/linux-nvidia-libs/Makefile head/x11/linux-nvidia-libs/distinfo head/x11/nvidia-driver/Makefile head/x11/nvidia-driver/distinfo head/x11/nvidia-driver/pkg-plist head/x11/nvidia-settings/Makefile head/x11/nvidia-settings/distinfo head/x11/nvidia-xconfig/Makefile head/x11/nvidia-xconfig/distinfo Modified: head/x11/linux-nvidia-libs/Makefile ============================================================================== --- head/x11/linux-nvidia-libs/Makefile Fri Feb 5 04:29:07 2021 (r564087) +++ head/x11/linux-nvidia-libs/Makefile Fri Feb 5 07:27:55 2021 (r564088) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= nvidia-libs -DISTVERSION?= 440.100 +DISTVERSION?= 460.39 # Always try to set PORTREVISION as it can be overridden by the slave ports PORTREVISION?= 0 CATEGORIES= x11 linux @@ -40,9 +40,6 @@ LINUX_LIBS= libcuda.so.${PORTVERSION} \ libnvidia-opencl.so.${PORTVERSION} \ libnvidia-tls.so.${PORTVERSION} \ libvdpau_nvidia.so.${PORTVERSION} -.if ${NVVERSION} < 415.013 -LINUX_LIBS+= tls/libnvidia-tls.so.${PORTVERSION} -.endif LINUX_LINKS= libcuda.so.${PORTVERSION} libcuda.so.1 \ libcuda.so.${PORTVERSION} libcuda.so \ libnvcuvid.so.${PORTVERSION} libnvcuvid.so.1 \ @@ -61,6 +58,7 @@ LINUX32_LIBS= libcuda.so.${PORTVERSION} \ libnvidia-tls.so.${PORTVERSION} \ libvdpau_nvidia.so.${PORTVERSION} .if ${NVVERSION} < 415.013 +LINUX_LIBS+= tls/libnvidia-tls.so.${PORTVERSION} LINUX32_LIBS+= tls/libnvidia-tls.so.${PORTVERSION} .endif LINUX32_LINKS= libcuda.so.${PORTVERSION} libcuda.so.1 \ @@ -93,11 +91,16 @@ PLIST_RE+= '\,${LINUXBASE}.*libEGL_nvidia\.so\.${PORTV .else PLIST_RE+= '\,${LINUXBASE}.*libEGL_nvidia\.so,d' .endif +.if ${NVVERSION} >= 361.016 && ${NVVERSION} < 450.051 +LINUX_LIBS+= libnvidia-fatbinaryloader.so.${PORTVERSION} +LINUX32_LIBS+= libnvidia-fatbinaryloader.so.${PORTVERSION} +.else +PLIST_RE+= '\,${LINUXBASE}.*libnvidia-fatbinaryloader\.so,d' +.endif .if ${NVVERSION} >= 361.016 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 \ libGLESv2_nvidia.so.${PORTVERSION} libGLESv2_nvidia.so.2 \ @@ -108,7 +111,6 @@ LINUX_LINKS+= libGLESv1_CM_nvidia.so.${PORTVERSION} li LINUX32_LIBS+= libGLESv1_CM_nvidia.so.${PORTVERSION} \ libGLESv2_nvidia.so.${PORTVERSION} \ libGLX_nvidia.so.${PORTVERSION} \ - libnvidia-fatbinaryloader.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 \ @@ -119,10 +121,13 @@ LINUX32_LINKS+= libGLESv1_CM_nvidia.so.${PORTVERSION} .else PLIST_RE+= '\,${LINUXBASE}.*libGLESv(1_CM|2)_nvidia\.so,d' \ '\,${LINUXBASE}.*libGLX_(nvidia|indirect)\.so,d' \ - '\,${LINUXBASE}.*libnvidia-fatbinaryloader\.so,d' \ '\,${LINUXBASE}.*libnvidia-ptxjitcompiler\.so,d' .endif -.if ${NVVERSION} >= 440.026 +.if ${NVVERSION:R} >= 460 # 460.27.04 +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/' +.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/' Modified: head/x11/linux-nvidia-libs/distinfo ============================================================================== --- head/x11/linux-nvidia-libs/distinfo Fri Feb 5 04:29:07 2021 (r564087) +++ head/x11/linux-nvidia-libs/distinfo Fri Feb 5 07:27:55 2021 (r564088) @@ -1,6 +1,6 @@ TIMESTAMP = 1482026038 -SHA256 (NVIDIA-Linux-x86_64-440.100.run) = 649684fab4f37b178afb6cae012e7f9736377d89fa8abdfca26f24a13bbacf1f -SIZE (NVIDIA-Linux-x86_64-440.100.run) = 144653408 +SHA256 (NVIDIA-Linux-x86_64-460.39.run) = 0bf0664078013aa62ed6840caed0637b226884b9398e1fb647e127ad3ad9a37f +SIZE (NVIDIA-Linux-x86_64-460.39.run) = 178310565 SHA256 (NVIDIA-Linux-x86_64-390.141.run) = 4b389a374412c80b2eda356c0fb9e8bef5768831d2cb77c8c9f906f6172c3f7e SIZE (NVIDIA-Linux-x86_64-390.141.run) = 85330901 SHA256 (NVIDIA-Linux-x86-390.141.run) = 8dfbc8ce77d2f49780105dd7e3058bbf8e663e9b17495507b7544ece34ffaf43 Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Fri Feb 5 04:29:07 2021 (r564087) +++ head/x11/nvidia-driver/Makefile Fri Feb 5 07:27:55 2021 (r564088) @@ -11,9 +11,9 @@ # or `x11/nvidia-driver-304'). PORTNAME= nvidia-driver -DISTVERSION?= 440.100 +DISTVERSION?= 460.39 # 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} @@ -47,9 +47,7 @@ SUB_FILES+= pkg-deinstall pkg-install SUB_PATCHES= extra-patch-src-Makefile \ extra-patch-src-nv-freebsd.h \ extra-patch-src-nv-misc.h \ - extra-patch-src-nvidia_ctl.c \ extra-patch-src-nvidia_dev.c \ - extra-patch-src-nvidia_linux.c \ extra-patch-src-nvidia_pci.c DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0 MODULESDIR= lib/xorg/modules @@ -67,8 +65,15 @@ NVSRC= . NVSRC= nvidia .endif -.if ${NVVERSION} >= 358.009 +.if ${NVVERSION} < 460.039 +. if ${NVVERSION} >= 358.009 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c +. endif +SUB_PATCHES+= extra-patch-src-nvidia_ctl.c \ + extra-patch-src-nvidia_linux.c +.else +EXTRA_PATCHES+= ${FILESDIR}/460-patch-lib-libGLX_nvidia-Makefile +SUB_PATCHES+= 460-patch-src-nvidia_linux.c .endif OPTIONS_DEFINE= ACPI_PM LINUX WBINVD DOCS @@ -99,7 +104,7 @@ EXTRA_PATCHES+= ${WRKDIR}/${p} post-patch: .SILENT # We should support -CURRENT: kill the check (first #if __FreeBSD_version) - linenum=$$(${SED} -ne '/^#if __FreeBSD_version/ {=; q;}' \ + linenum=$$(${SED} -ne '/^#if __FreeBSD_version/ { = ; q ; }' \ ${WRKSRC}/src/${NVSRC}/nv-freebsd.h) ; ${REINPLACE_CMD} \ -e "$$linenum,+2d" ${WRKSRC}/src/${NVSRC}/nv-freebsd.h # Adjust Linux headers #include's after FreeBSD src r246085 @@ -213,6 +218,10 @@ post-install: .SILENT ${INSTALL_SCRIPT} ${WRKSRC}/obj/nvidia-bug-report.sh \ ${STAGEDIR}${PREFIX}/bin # pkg-plist is already overbloated, so use these hacks instead of PLIST_SUB's +.if ${NVVERSION:R} < 460 + ${REINPLACE_CMD} -e '/libnvidia-glvkspirv\.so/d ; \ + /nvidia_icd\.json/d ; /nvidia_layers\.json/d' ${TMPPLIST} +.endif .if ${NVVERSION} >= 304.128 && ${NVVERSION} < 310.019 || ${NVVERSION} >= 361.016 ${REINPLACE_CMD} -E '/libvdpau(_trace)?\.so/d' ${TMPPLIST} .endif Modified: head/x11/nvidia-driver/distinfo ============================================================================== --- head/x11/nvidia-driver/distinfo Fri Feb 5 04:29:07 2021 (r564087) +++ head/x11/nvidia-driver/distinfo Fri Feb 5 07:27:55 2021 (r564088) @@ -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 +SHA256 (NVIDIA-FreeBSD-x86_64-460.39.tar.gz) = a666f04313e9c919e3c6ecebe3c8d75d91246147955d9497ce6dae64738a314e +SIZE (NVIDIA-FreeBSD-x86_64-460.39.tar.gz) = 108214308 SHA256 (NVIDIA-FreeBSD-x86_64-390.141.tar.gz) = d51fb464a52773c285ba075628f4a513a3ece5bba8e500be8b65fd0c122f78a4 SIZE (NVIDIA-FreeBSD-x86_64-390.141.tar.gz) = 65303462 SHA256 (NVIDIA-FreeBSD-x86-390.141.tar.gz) = c0e2abc13ec350ba7d34bf68225261cf1bfa0f5b07e30c71dd090c83c0542f7d Added: head/x11/nvidia-driver/files/460-patch-lib-libGLX_nvidia-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/nvidia-driver/files/460-patch-lib-libGLX_nvidia-Makefile Fri Feb 5 07:27:55 2021 (r564088) @@ -0,0 +1,27 @@ +--- lib/libGLX_nvidia/Makefile.orig ++++ lib/libGLX_nvidia/Makefile +@@ -16,18 +16,18 @@ EXTRADEPS= nvidia-application-profiles-rc nvidia_icd.j + # look for this file. + + nvidia_icd.json: +- @mkdir -p ${VKICD_PATH} ++ @mkdir -p ${DESTDIR}${VKICD_PATH} + @${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${NVIDIA_ROOT}/nvidia_icd.json \ +- ${VKICD_PATH} +- @sed -i '' -e "s/__NV_VK_ICD__/lib${LIB}.so/" ${VKICD_PATH}/nvidia_icd.json ++ ${DESTDIR}${VKICD_PATH} ++ @sed -i '' -e "s/__NV_VK_ICD__/lib${LIB}.so/" ${DESTDIR}${VKICD_PATH}/nvidia_icd.json + + nvidia_layers.json: +- @mkdir -p ${VKLAYERS_PATH} ++ @mkdir -p ${DESTDIR}${VKLAYERS_PATH} + @${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${NVIDIA_ROOT}/nvidia_layers.json \ +- ${VKLAYERS_PATH} +- @sed -i '' -e "s/__NV_VK_ICD__/lib${LIB}.so/" ${VKLAYERS_PATH}/nvidia_layers.json ++ ${DESTDIR}${VKLAYERS_PATH} ++ @sed -i '' -e "s/__NV_VK_ICD__/lib${LIB}.so/" ${DESTDIR}${VKLAYERS_PATH}/nvidia_layers.json + + + nvidia-application-profiles-rc: Copied and modified: head/x11/nvidia-driver/files/460-patch-src-nvidia_linux.c.in (from r564006, head/x11/nvidia-driver/files/extra-patch-src-nvidia_linux.c.in) ============================================================================== --- head/x11/nvidia-driver/files/extra-patch-src-nvidia_linux.c.in Thu Feb 4 09:21:55 2021 (r564006, copy source) +++ head/x11/nvidia-driver/files/460-patch-src-nvidia_linux.c.in Fri Feb 5 07:27:55 2021 (r564088) @@ -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 }; Modified: head/x11/nvidia-driver/pkg-plist ============================================================================== --- head/x11/nvidia-driver/pkg-plist Fri Feb 5 04:29:07 2021 (r564087) +++ head/x11/nvidia-driver/pkg-plist Fri Feb 5 07:27:55 2021 (r564088) @@ -37,6 +37,8 @@ lib/libnvidia-glcore.so lib/libnvidia-glcore.so.1 lib/libnvidia-glsi.so lib/libnvidia-glsi.so.1 +lib/libnvidia-glvkspirv.so +lib/libnvidia-glvkspirv.so.1 lib/libnvidia-ml.so lib/libnvidia-ml.so.1 lib/libnvidia-tls.so @@ -79,6 +81,8 @@ lib32/vdpau/libvdpau_nvidia.so.1 man/man1/nvidia-smi.1.gz @comment share/egl/egl_external_platform.d/10_nvidia_wayland.json share/glvnd/egl_vendor.d/10_nvidia.json +share/vulkan/icd.d/nvidia_icd.json +share/vulkan/implicit_layer.d/nvidia_layers.json %%MODULESDIR%%/drivers/nvidia_drv.so %%MODULESDIR%%/extensions/.nvidia/libglx.so %%MODULESDIR%%/extensions/.nvidia/libglx.so.1 Modified: head/x11/nvidia-settings/Makefile ============================================================================== --- head/x11/nvidia-settings/Makefile Fri Feb 5 04:29:07 2021 (r564087) +++ head/x11/nvidia-settings/Makefile Fri Feb 5 07:27:55 2021 (r564088) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nvidia-settings -PORTVERSION= 440.100 +PORTVERSION= 460.39 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org Modified: head/x11/nvidia-settings/distinfo ============================================================================== --- head/x11/nvidia-settings/distinfo Fri Feb 5 04:29:07 2021 (r564087) +++ head/x11/nvidia-settings/distinfo Fri Feb 5 07:27:55 2021 (r564088) @@ -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 = 1611681405 +SHA256 (NVIDIA-nvidia-settings-460.39_GH0.tar.gz) = ea4183fcf38f4cdfedbf782f101de57a88e2c38fc25b9bd691b101087da0e5e2 +SIZE (NVIDIA-nvidia-settings-460.39_GH0.tar.gz) = 1233261 Modified: head/x11/nvidia-xconfig/Makefile ============================================================================== --- head/x11/nvidia-xconfig/Makefile Fri Feb 5 04:29:07 2021 (r564087) +++ head/x11/nvidia-xconfig/Makefile Fri Feb 5 07:27:55 2021 (r564088) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nvidia-xconfig -PORTVERSION= 440.100 +PORTVERSION= 460.39 CATEGORIES= x11 MAINTAINER= x11@FreeBSD.org Modified: head/x11/nvidia-xconfig/distinfo ============================================================================== --- head/x11/nvidia-xconfig/distinfo Fri Feb 5 04:29:07 2021 (r564087) +++ head/x11/nvidia-xconfig/distinfo Fri Feb 5 07:27:55 2021 (r564088) @@ -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 = 1611681275 +SHA256 (NVIDIA-nvidia-xconfig-460.39_GH0.tar.gz) = eb6e6034389a3ed2ea39d89b9a7a49e9f1cc4669f620abff114964867c05ed9f +SIZE (NVIDIA-nvidia-xconfig-460.39_GH0.tar.gz) = 142321