From owner-svn-ports-all@freebsd.org Thu Oct 31 08:51:08 2019 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 32FF117FF2E; Thu, 31 Oct 2019 08:51:08 +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) server-signature RSA-PSS (4096 bits) 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 473fDr0c6jz41J6; Thu, 31 Oct 2019 08:51:08 +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 ED5382033B; Thu, 31 Oct 2019 08:51:07 +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 x9V8p7iR009629; Thu, 31 Oct 2019 08:51:07 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x9V8p7Y5009626; Thu, 31 Oct 2019 08:51:07 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201910310851.x9V8p7Y5009626@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 31 Oct 2019 08:51:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r516138 - head/x11/nvidia-driver X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/x11/nvidia-driver X-SVN-Commit-Revision: 516138 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.29 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: Thu, 31 Oct 2019 08:51:08 -0000 Author: danfe Date: Thu Oct 31 08:51:07 2019 New Revision: 516138 URL: https://svnweb.freebsd.org/changeset/ports/516138 Log: Update NVidia driver to the latest long lived branch version 430.50. PR: 232645, 241307 Modified: head/x11/nvidia-driver/Makefile head/x11/nvidia-driver/distinfo head/x11/nvidia-driver/pkg-plist Modified: head/x11/nvidia-driver/Makefile ============================================================================== --- head/x11/nvidia-driver/Makefile Thu Oct 31 07:23:52 2019 (r516137) +++ head/x11/nvidia-driver/Makefile Thu Oct 31 08:51:07 2019 (r516138) @@ -10,7 +10,7 @@ # slave ports instead (`x11/nvidia-driver-340' or `x11/nvidia-driver-304'). PORTNAME= nvidia-driver -DISTVERSION?= 410.104 +DISTVERSION?= 430.50 # Always try to set PORTREVISION as it can be overridden by the slave ports PORTREVISION?= 0 CATEGORIES= x11 @@ -24,7 +24,8 @@ COMMENT= NVidia graphics card binary drivers for hardw LICENSE_FILE= ${WRKSRC}/doc/license.txt .include "${.CURDIR}/../nvidia-driver/Makefile.common" -# Pull GNU sed(1) for "binary" patching of libEGL.so.1 (see below) +# Pull GNU sed(1) for "binary" patching of obj/libglvnd/libEGL.so.1 and +# obj/libEGL_nvidia.so.0 (see below) .if ${NVVERSION} >= 410.057 PATCH_DEPENDS= gsed:textproc/gsed .endif @@ -41,9 +42,14 @@ USE_LDCONFIG= yes # hack below to universally set NVIDIA_ROOT. Also provide X11BASE value # since it is still used by legacy drivers. GLVND_JSON_PATH= ${PREFIX}/share/glvnd/egl_vendor.d +WAYLAND_JSON_PATH= ${PREFIX}/share/egl/egl_external_platform.d MAKE_ENV= NVIDIA_ROOT=${WRKSRC} X11BASE=${LOCALBASE} \ - EGL_GLVND_JSON_PATH=${STAGEDIR}${GLVND_JSON_PATH} -SUB_FILES= pkg-deinstall pkg-install pkg-message nvidia.conf + EGL_GLVND_JSON_PATH=${STAGEDIR}${GLVND_JSON_PATH} \ + EGL_WAYLAND_JSON_PATH=${STAGEDIR}${WAYLAND_JSON_PATH} +SUB_FILES= pkg-message nvidia.conf +.if ${NVVERSION} < 410.057 +SUB_FILES+= pkg-deinstall pkg-install +.endif SUB_PATCHES= extra-patch-src-Makefile \ extra-patch-src-nv-freebsd.h \ extra-patch-src-nv-misc.h \ @@ -171,6 +177,11 @@ post-patch: .SILENT ${REINPLACE_CMD} -e 's,/usr/share/nvidia,$${DESTDIR}${DOCSDIR},' \ ${WRKSRC}/lib/libGL/Makefile ${WRKSRC}/doc/Makefile .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," \ + ${WRKSRC}/obj/libEGL_nvidia.so.0 +.endif # Finally, process OPTIONS .if ${PORT_OPTIONS:MFREEBSD_AGP} ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \ @@ -235,6 +246,10 @@ post-install: .SILENT /10_nvidia\.json/d' ${TMPPLIST} .else ${REINPLACE_CMD} -e '/extensions\/\.nvidia\/libglx/d' ${TMPPLIST} +.endif +.if ${NVVERSION} < 415.013 + ${REINPLACE_CMD} -e '/libnvidia-egl-wayland\.so/d ; \ + /10_nvidia_wayland\.json/d' ${TMPPLIST} .endif # Rename some libraries and install a libmap file to resolve conflict with # Mesa libraries. Modified: head/x11/nvidia-driver/distinfo ============================================================================== --- head/x11/nvidia-driver/distinfo Thu Oct 31 07:23:52 2019 (r516137) +++ head/x11/nvidia-driver/distinfo Thu Oct 31 08:51:07 2019 (r516138) @@ -1,9 +1,8 @@ TIMESTAMP = 1482026038 -SHA256 (NVIDIA-FreeBSD-x86_64-410.104.tar.gz) = 39bafa652026fae3dc077ceff8bea0a15401c36fd13c4770842f546b2e27498f -SIZE (NVIDIA-FreeBSD-x86_64-410.104.tar.gz) = 61995820 +SHA256 (NVIDIA-FreeBSD-x86_64-430.50.tar.gz) = 6f797e6e513fb74acfdf2738efa382afb640df07b2858f1b29185e4612c6c301 +SIZE (NVIDIA-FreeBSD-x86_64-430.50.tar.gz) = 62715888 SHA256 (NVIDIA-FreeBSD-x86_64-390.129.tar.gz) = fa109c9737a529c87efe66c3bc0a47bffa49278d6361aebc1bf6b784eb5d6968 SIZE (NVIDIA-FreeBSD-x86_64-390.129.tar.gz) = 63905694 -TIMESTAMP = 1572354940 SHA256 (NVIDIA-FreeBSD-x86-390.129.tar.gz) = 58e537c1a016e4fd362590e32c6f874ccdd90ce265839eb30cf370afcdc22bae SIZE (NVIDIA-FreeBSD-x86-390.129.tar.gz) = 64565178 SHA256 (NVIDIA-FreeBSD-x86_64-340.107.tar.gz) = 047efae28cc81e4d56c64d2a0c15d9b7ff07f09bba22696464de8276334a4df7 Modified: head/x11/nvidia-driver/pkg-plist ============================================================================== --- head/x11/nvidia-driver/pkg-plist Thu Oct 31 07:23:52 2019 (r516137) +++ head/x11/nvidia-driver/pkg-plist Thu Oct 31 08:51:07 2019 (r516138) @@ -31,6 +31,8 @@ lib/libXvMCNVIDIA.so.1 lib/libXvMCNVIDIA_dynamic.so.1 lib/libnvidia-cfg.so lib/libnvidia-cfg.so.1 +lib/libnvidia-egl-wayland.so +lib/libnvidia-egl-wayland.so.1 lib/libnvidia-eglcore.so lib/libnvidia-eglcore.so.1 lib/libnvidia-glcore.so @@ -44,6 +46,7 @@ lib/libnvidia-tls.so.1 lib/libvdpau_nvidia.so lib/vdpau/libvdpau_nvidia.so.1 man/man1/nvidia-smi.1.gz +share/egl/egl_external_platform.d/10_nvidia_wayland.json share/glvnd/egl_vendor.d/10_nvidia.json %%MODULESDIR%%/drivers/nvidia_drv.so %%MODULESDIR%%/extensions/.nvidia/libglx.so