From owner-dev-commits-ports-all@freebsd.org Fri Apr 16 08:50:45 2021 Return-Path: Delivered-To: dev-commits-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 D69305EA401; Fri, 16 Apr 2021 08:50:45 +0000 (UTC) (envelope-from git@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 4FM90P49MRz3hyg; Fri, 16 Apr 2021 08:50:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 809542201A; Fri, 16 Apr 2021 08:50:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 13G8ojIY020763; Fri, 16 Apr 2021 08:50:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 13G8ojpJ020762; Fri, 16 Apr 2021 08:50:45 GMT (envelope-from git) Date: Fri, 16 Apr 2021 08:50:45 GMT Message-Id: <202104160850.13G8ojpJ020762@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 22a47a0e04ad - main - Unbreak nVidia driver build against new feature branch 465.xx, which now includes Vulkan driver for FreeBSD. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22a47a0e04ad1484206e364dc9ce62a638ff594e Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Apr 2021 08:50:45 -0000 The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=22a47a0e04ad1484206e364dc9ce62a638ff594e commit 22a47a0e04ad1484206e364dc9ce62a638ff594e Author: Alexey Dokuchaev AuthorDate: 2021-04-16 08:46:36 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-04-16 08:50:13 +0000 Unbreak nVidia driver build against new feature branch 465.xx, which now includes Vulkan driver for FreeBSD. We do not offer short-lived/beta driver versions as a port or package, but we try to support building against arbitrary DISTVERSIONs. Add a note about it and sort Linux libraries' port pkg-plist while I'm here. PR: 254668 --- x11/linux-nvidia-libs/pkg-plist | 6 +++--- x11/nvidia-driver/Makefile | 6 ++++++ x11/nvidia-driver/pkg-plist | 2 ++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/x11/linux-nvidia-libs/pkg-plist b/x11/linux-nvidia-libs/pkg-plist index 03d779591bfa..2e63cad81bab 100644 --- a/x11/linux-nvidia-libs/pkg-plist +++ b/x11/linux-nvidia-libs/pkg-plist @@ -53,8 +53,8 @@ %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so.1 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-fbc.so.%%SHLIB_VERSION%% %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glcore.so.%%SHLIB_VERSION%% -%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glvkspirv.so.%%SHLIB_VERSION%% %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glsi.so.%%SHLIB_VERSION%% +%%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-glvkspirv.so.%%SHLIB_VERSION%% %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so.1 %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so.%%SHLIB_VERSION%% @@ -124,8 +124,8 @@ %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.1 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-fbc.so.%%SHLIB_VERSION%% %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glcore.so.%%SHLIB_VERSION%% -%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glvkspirv.so.%%SHLIB_VERSION%% %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glsi.so.%%SHLIB_VERSION%% +%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-glvkspirv.so.%%SHLIB_VERSION%% %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk2.so.%%SHLIB_VERSION%% %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk3.so.%%SHLIB_VERSION%% %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ifr.so @@ -136,10 +136,10 @@ %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ml.so.%%SHLIB_VERSION%% %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-opencl.so.1 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-opencl.so.%%SHLIB_VERSION%% -%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-rtcore.so.%%SHLIB_VERSION%% %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ptxjitcompiler.so %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ptxjitcompiler.so.1 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-ptxjitcompiler.so.%%SHLIB_VERSION%% +%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-rtcore.so.%%SHLIB_VERSION%% %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-tls.so.%%SHLIB_VERSION%% %%LINUXBASE%%%%LINUX_LIBDIR%%/libvdpau_nvidia.so.%%SHLIB_VERSION%% %%LINUXBASE%%%%LINUX_LIBDIR%%/tls/libnvidia-tls.so.%%SHLIB_VERSION%% diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 64b1b4ba3075..712626cdfdb6 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -8,6 +8,10 @@ # you need to use legacy driver version and install one of corresponding # slave ports instead (`x11/nvidia-driver-390', `x11/nvidia-driver-340', # or `x11/nvidia-driver-304'). +# +# To simplify testing of new feature branches and beta driver versions, +# the port aims to support building against arbitrary DISTVERSION, i.e. +# ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work. PORTNAME= nvidia-driver DISTVERSION?= 460.73.01 @@ -256,6 +260,8 @@ post-install: .SILENT .endif .if ${NVVERSION} < 440.036 ${REINPLACE_CMD} -e '/lib32\//d' ${TMPPLIST} +.elif ${NVVERSION} < 465.01901 + ${REINPLACE_CMD} -e '/lib32\/libnvidia-glvkspirv\.so/d' ${TMPPLIST} .endif # Rename some libraries and install a libmap file to resolve conflict with # Mesa libraries. diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist index 5edd9ad4242c..9ae1e8fa5261 100644 --- a/x11/nvidia-driver/pkg-plist +++ b/x11/nvidia-driver/pkg-plist @@ -75,6 +75,8 @@ lib32/libnvidia-glcore.so lib32/libnvidia-glcore.so.1 lib32/libnvidia-glsi.so lib32/libnvidia-glsi.so.1 +lib32/libnvidia-glvkspirv.so +lib32/libnvidia-glvkspirv.so.1 lib32/libnvidia-tls.so lib32/libnvidia-tls.so.1 lib32/vdpau/libvdpau_nvidia.so.1