From owner-dev-commits-ports-branches@freebsd.org Mon Aug 2 23:18:55 2021 Return-Path: Delivered-To: dev-commits-ports-branches@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 D15DC67BB63; Mon, 2 Aug 2021 23:18:55 +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 4Gdv8H5Y54z3ly2; Mon, 2 Aug 2021 23:18:55 +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 A6EE960D; Mon, 2 Aug 2021 23:18:55 +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 172NIt55026100; Mon, 2 Aug 2021 23:18:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 172NItJK026099; Mon, 2 Aug 2021 23:18:55 GMT (envelope-from git) Date: Mon, 2 Aug 2021 23:18:55 GMT Message-Id: <202108022318.172NItJK026099@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kevin Bowling Subject: git: 2dd724a0cab2 - 2021Q3 - x11/nvidia-driver: make vulkan PREFIX safe MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q3 X-Git-Reftype: branch X-Git-Commit: 2dd724a0cab2d45321ac5ade9517b4464ef1b440 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Aug 2021 23:18:55 -0000 The branch 2021Q3 has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=2dd724a0cab2d45321ac5ade9517b4464ef1b440 commit 2dd724a0cab2d45321ac5ade9517b4464ef1b440 Author: Alex S AuthorDate: 2021-08-02 23:13:40 +0000 Commit: Kevin Bowling CommitDate: 2021-08-02 23:18:09 +0000 x11/nvidia-driver: make vulkan PREFIX safe PR: 253285 Reported by: mi Approved by: danfe (maintainer) (cherry picked from commit ec9fff767494883b0dc6b677c9a00a516f9df045) --- x11/nvidia-driver/Makefile | 9 +++++--- .../files/460-patch-lib-libGLX_nvidia-Makefile | 27 ---------------------- 2 files changed, 6 insertions(+), 30 deletions(-) diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 4791f9f0fce5..b4e0b2906533 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -44,9 +44,13 @@ USE_LDCONFIG= yes GLVND_JSON_PATH= ${PREFIX}/share/glvnd/egl_vendor.d WAYLAND_JSON_PATH= ${PREFIX}/share/egl/egl_external_platform.d +VKICD_PATH= ${PREFIX}/share/vulkan/icd.d +VKLAYERS_PATH= ${PREFIX}/share/vulkan/implicit_layer.d MAKE_ENV= DEBUG_FLAGS=${DEBUG_FLAGS} \ EGL_GLVND_JSON_PATH=${STAGEDIR}${GLVND_JSON_PATH} \ - EGL_WAYLAND_JSON_PATH=${STAGEDIR}${WAYLAND_JSON_PATH} + EGL_WAYLAND_JSON_PATH=${STAGEDIR}${WAYLAND_JSON_PATH} \ + VKICD_PATH=${STAGEDIR}${VKICD_PATH} \ + VKLAYERS_PATH=${STAGEDIR}${VKLAYERS_PATH} SUB_FILES= pkg-message .if !defined(LIBGLDIR) SUB_FILES+= nvidia.conf @@ -82,8 +86,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_nvidia-modeset_nvidia-modeset-freebs SUB_PATCHES+= extra-patch-src-nvidia_ctl.c \ extra-patch-src-nvidia_linux.c .else -EXTRA_PATCHES+= ${FILESDIR}/460-patch-lib-libGLX_nvidia-Makefile \ - ${FILESDIR}/460-patch-src-nvidia-nvidia_ctl.c \ +EXTRA_PATCHES+= ${FILESDIR}/460-patch-src-nvidia-nvidia_ctl.c \ ${FILESDIR}/460-patch-src-nvidia-nvidia_linux.c \ ${FILESDIR}/460-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c .endif diff --git a/x11/nvidia-driver/files/460-patch-lib-libGLX_nvidia-Makefile b/x11/nvidia-driver/files/460-patch-lib-libGLX_nvidia-Makefile deleted file mode 100644 index 44dbc0e633b3..000000000000 --- a/x11/nvidia-driver/files/460-patch-lib-libGLX_nvidia-Makefile +++ /dev/null @@ -1,27 +0,0 @@ ---- 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: