From nobody Tue Nov 2 09:59:01 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D1EB41832F7F; Tue, 2 Nov 2021 09:59:01 +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 4Hk52s5Kyhz4Sc0; Tue, 2 Nov 2021 09:59:01 +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 96FED22C28; Tue, 2 Nov 2021 09:59:01 +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 1A29x1kU071034; Tue, 2 Nov 2021 09:59:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1A29x1T1071033; Tue, 2 Nov 2021 09:59:01 GMT (envelope-from git) Date: Tue, 2 Nov 2021 09:59:01 GMT Message-Id: <202111020959.1A29x1T1071033@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: 2f121355b0fe - main - x11/nvidia-driver: add support for the new feature branch 495.xx List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org 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: 2f121355b0fe67fc2d3991479a7d61eaf46f3da9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f121355b0fe67fc2d3991479a7d61eaf46f3da9 commit 2f121355b0fe67fc2d3991479a7d61eaf46f3da9 Author: Alexey Dokuchaev AuthorDate: 2021-11-02 09:58:24 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-11-02 09:58:25 +0000 x11/nvidia-driver: add support for the new feature branch 495.xx The `libnvidia-egl-gbm' library is not yet on the SUBDIR list in the `lib/Makefile', so record newly added pkg-plist entries as commented out for the moment. PR: 259496 (part 2) Submitted by: jkim --- x11/nvidia-driver/Makefile | 14 +++++++++++--- x11/nvidia-driver/pkg-plist | 3 +++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 29a06020e5a3..721a25074f81 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -43,15 +43,19 @@ USES+= tar:xz USE_XORG= x11 xorg-server xext USE_LDCONFIG= yes +EGL_JSON_PATH= ${PREFIX}/share/egl/egl_external_platform.d 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} \ VKICD_PATH=${STAGEDIR}${VKICD_PATH} \ VKLAYERS_PATH=${STAGEDIR}${VKLAYERS_PATH} +.if ${NVVERSION} < 495.02905 +MAKE_ENV+= EGL_WAYLAND_JSON_PATH=${STAGEDIR}${EGL_JSON_PATH} +.else +MAKE_ENV+= EGL_EXTERNAL_PLATFORM_JSON_PATH=${STAGEDIR}${EGL_JSON_PATH} +.endif SUB_FILES= pkg-message .if !defined(LIBGLDIR) SUB_FILES+= nvidia.conf @@ -208,7 +212,7 @@ post-patch: .SILENT .endif .if ${NVVERSION} >= 415.013 prefix="${PREFIX}" ; padding=$$(($${#prefix}+3)) ; \ - gsed ${REINPLACE_ARGS} -E "s,/etc/egl/egl_external_platform\.d.{$$padding},${WAYLAND_JSON_PATH}\x00," \ + gsed ${REINPLACE_ARGS} -E "s,/etc/egl/egl_external_platform\.d.{$$padding},${EGL_JSON_PATH}\x00," \ ${WRKSRC}/obj/libEGL_nvidia.so.0 .endif # Finally, process OPTIONS @@ -292,6 +296,10 @@ post-install: .SILENT .if ${NVVERSION} < 470.074 ${REINPLACE_CMD} -e '/libnvidia-vulkan-producer\.so/d' ${TMPPLIST} .endif +.if ${NVVERSION} < 495.02905 + ${REINPLACE_CMD} -e '/libnvidia-egl-gbm\.so/d ; \ + /15_nvidia_gbm\.json/d' ${TMPPLIST} +.endif .if ${NVVERSION} < 410.057 # 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 e3c2ccfda9bb..796e2a79bdad 100644 --- a/x11/nvidia-driver/pkg-plist +++ b/x11/nvidia-driver/pkg-plist @@ -32,6 +32,8 @@ lib/libXvMCNVIDIA.so.1 lib/libXvMCNVIDIA_dynamic.so.1 lib/libnvidia-cfg.so lib/libnvidia-cfg.so.1 +@comment lib/libnvidia-egl-gbm.so +@comment lib/libnvidia-egl-gbm.so.1 @comment lib/libnvidia-egl-wayland.so @comment lib/libnvidia-egl-wayland.so.1 lib/libnvidia-eglcore.so @@ -87,6 +89,7 @@ lib32/libnvidia-tls.so.1 lib32/vdpau/libvdpau_nvidia.so.1 man/man1/nvidia-smi.1.gz @comment share/egl/egl_external_platform.d/10_nvidia_wayland.json +@comment share/egl/egl_external_platform.d/15_nvidia_gbm.json share/glvnd/egl_vendor.d/10_nvidia.json share/vulkan/icd.d/nvidia_icd.json share/vulkan/implicit_layer.d/nvidia_layers.json