From owner-svn-ports-all@freebsd.org Mon May 18 08:51:28 2020 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 C9C8013ACD8; Mon, 18 May 2020 08:51:28 +0000 (UTC) (envelope-from arrowd@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49QXmw4vsTz4PlQ; Mon, 18 May 2020 08:51:28 +0000 (UTC) (envelope-from arrowd@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 A3F231EF1B; Mon, 18 May 2020 08:51:28 +0000 (UTC) (envelope-from arrowd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04I8pSXl042826; Mon, 18 May 2020 08:51:28 GMT (envelope-from arrowd@FreeBSD.org) Received: (from arrowd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04I8pSl4042823; Mon, 18 May 2020 08:51:28 GMT (envelope-from arrowd@FreeBSD.org) Message-Id: <202005180851.04I8pSl4042823@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: arrowd set sender to arrowd@FreeBSD.org using -f From: Gleb Popov Date: Mon, 18 May 2020 08:51:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r535731 - head/x11/linux-nvidia-libs X-SVN-Group: ports-head X-SVN-Commit-Author: arrowd X-SVN-Commit-Paths: head/x11/linux-nvidia-libs X-SVN-Commit-Revision: 535731 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.33 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: Mon, 18 May 2020 08:51:28 -0000 Author: arrowd Date: Mon May 18 08:51:28 2020 New Revision: 535731 URL: https://svnweb.freebsd.org/changeset/ports/535731 Log: x11/linux-nvidia-libs: Install libnvidia-glvkspirv.so, libnvidia-rtcore.so, libnvidia-cbl.so. PR: 232645 Approved by: danfe Modified: head/x11/linux-nvidia-libs/Makefile head/x11/linux-nvidia-libs/pkg-plist Modified: head/x11/linux-nvidia-libs/Makefile ============================================================================== --- head/x11/linux-nvidia-libs/Makefile Mon May 18 08:27:40 2020 (r535730) +++ head/x11/linux-nvidia-libs/Makefile Mon May 18 08:51:28 2020 (r535731) @@ -3,7 +3,7 @@ PORTNAME= nvidia-libs DISTVERSION?= 440.82 # Always try to set PORTREVISION as it can be overridden by the slave ports -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11 linux MASTER_SITES= NVIDIA/XFree86/Linux-${ARCH_SUFX}/${DISTVERSION}/ DISTNAME= NVIDIA-Linux-${ARCH_SUFX}-${DISTVERSION} @@ -232,6 +232,19 @@ PLIST_RE+= '\,${LINUXBASE},s/cuda-mps/cuda-proxy/' \ LINUX_DATA+= nvidia_icd.json /etc/vulkan/icd.d .else PLIST_RE+= '\,${LINUXBASE}/etc/vulkan,d' +.endif +.if ${NVVERSION} >= 410.057 +LINUX_LIBS+= libnvidia-cbl.so.${PORTVERSION} \ + libnvidia-rtcore.so.${PORTVERSION} +.else +PLIST_RE+= '\,${LINUXBASE}.*libnvidia-cbl\.so,d' \ + '\,${LINUXBASE}.*libnvidia-rtcore\.so,d' +.endif +.if ${NVVERSION} >= 396.018 +LINUX_LIBS+= libnvidia-glvkspirv.so.${PORTVERSION} +LINUX32_LIBS+= libnvidia-glvkspirv.so.${PORTVERSION} +.else +PLIST_RE+= '\,${LINUXBASE}.*libnvidia-glvkspirv\.so,d' .endif PLIST_SUB+= LINUXBASE=${LINUXBASE} \ Modified: head/x11/linux-nvidia-libs/pkg-plist ============================================================================== --- head/x11/linux-nvidia-libs/pkg-plist Mon May 18 08:27:40 2020 (r535730) +++ head/x11/linux-nvidia-libs/pkg-plist Mon May 18 08:51:28 2020 (r535731) @@ -53,6 +53,7 @@ %%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-ifr.so %%LINUX32%%%%LINUXBASE%%/usr/lib/libnvidia-ifr.so.1 @@ -107,6 +108,7 @@ %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvcuvid.so %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvcuvid.so.1 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvcuvid.so.%%SHLIB_VERSION%% +%%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-cbl.so.%%SHLIB_VERSION%% %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-cfg.so %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-cfg.so.1 %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-cfg.so.%%SHLIB_VERSION%% @@ -122,6 +124,7 @@ %%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-gtk2.so.%%SHLIB_VERSION%% %%LINUXBASE%%%%LINUX_LIBDIR%%/libnvidia-gtk3.so.%%SHLIB_VERSION%% @@ -133,6 +136,7 @@ %%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%%