Date: Wed, 30 Jun 2021 10:50:12 GMT
From: Alexey Dokuchaev <danfe@FreeBSD.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject: git: d64eb42e5b50 - main - x11/{linux-nvidia-libs, nvidia-driver}: ports had been updated (+)
Message-ID: <202106301050.15UAoCjr055492@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=d64eb42e5b50c43cec29f672d32f04ddb7d8dca8 commit d64eb42e5b50c43cec29f672d32f04ddb7d8dca8 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2021-06-30 10:48:48 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2021-06-30 10:49:04 +0000 x11/{linux-nvidia-libs,nvidia-driver}: ports had been updated (+) - Update nVidia driver and Linux libraries to version 460.84 - Add support to build with DISTVERSION=470.42.01 (latest beta) PR: 256888, 256889 Submitted by: jkim --- x11/linux-nvidia-libs/Makefile | 8 ++++++-- x11/linux-nvidia-libs/distinfo | 4 ++-- x11/nvidia-driver/Makefile | 11 ++++++++--- x11/nvidia-driver/distinfo | 6 ++---- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/x11/linux-nvidia-libs/Makefile b/x11/linux-nvidia-libs/Makefile index f23351174486..fad5d35ed71d 100644 --- a/x11/linux-nvidia-libs/Makefile +++ b/x11/linux-nvidia-libs/Makefile @@ -1,5 +1,5 @@ PORTNAME= nvidia-libs -DISTVERSION?= 460.80 +DISTVERSION?= 460.84 # Always try to set PORTREVISION as it can be overridden by the slave ports PORTREVISION?= 0 CATEGORIES= x11 linux @@ -121,7 +121,11 @@ PLIST_RE+= '\,${LINUXBASE}.*libGLESv(1_CM|2)_nvidia\.so,d' \ '\,${LINUXBASE}.*libGLX_(nvidia|indirect)\.so,d' \ '\,${LINUXBASE}.*libnvidia-ptxjitcompiler\.so,d' .endif -.if ${NVVERSION:R} >= 460 # 460.27.04 +.if ${NVVERSION} >= 470.04201 # 470.42.01 +LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.7 +LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.7 libnvidia-egl-wayland.so.1 +PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.7/' +.elif ${NVVERSION} >= 460.02704 # 460.27.04 LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.5 LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.5 libnvidia-egl-wayland.so.1 PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.5/' diff --git a/x11/linux-nvidia-libs/distinfo b/x11/linux-nvidia-libs/distinfo index de251c87f17f..d996f2ea8766 100644 --- a/x11/linux-nvidia-libs/distinfo +++ b/x11/linux-nvidia-libs/distinfo @@ -1,6 +1,6 @@ TIMESTAMP = 1620395714 -SHA256 (NVIDIA-Linux-x86_64-460.80.run) = ca6cb416d52ee5672b35b63df187e491698b27e5ceb4d7967c1483ffb91d09f8 -SIZE (NVIDIA-Linux-x86_64-460.80.run) = 176338282 +SHA256 (NVIDIA-Linux-x86_64-460.84.run) = a10d2171d6b2c55f63791f58264f9e92829ee4b2779b9b1d011274e63b46b960 +SIZE (NVIDIA-Linux-x86_64-460.84.run) = 177840337 SHA256 (NVIDIA-Linux-x86_64-390.143.run) = b722aa70f33bd44acaf196472cfb719a0ad6cefead7c49b1051bde092c1394ef SIZE (NVIDIA-Linux-x86_64-390.143.run) = 85686808 SHA256 (NVIDIA-Linux-x86-390.143.run) = 01e96b7534dea3fdfe65d5cad229e264307c80952479942d368466db9cfe6d06 diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 23efd76bbbda..4791f9f0fce5 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -14,9 +14,9 @@ # ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work. PORTNAME?= nvidia-driver -DISTVERSION?= 460.80 +DISTVERSION?= 460.84 # Always try to set PORTREVISION as it can be overridden by the slave ports -PORTREVISION?= 1 +PORTREVISION?= 0 CATEGORIES= x11 MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION} DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION} @@ -36,6 +36,9 @@ BUILD_DEPENDS= pkg-config:devel/pkgconf libglvnd>0:graphics/libglvnd .endif USES= kmod uidfix xorg +.if ${NVVERSION} >= 470.04201 +USES+= tar:xz +.endif USE_XORG= x11 xorg-server xext USE_LDCONFIG= yes @@ -53,7 +56,6 @@ 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 \ extra-patch-src-nvidia_dev.c \ extra-patch-src-nvidia_pci.c DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0 @@ -85,6 +87,9 @@ EXTRA_PATCHES+= ${FILESDIR}/460-patch-lib-libGLX_nvidia-Makefile \ ${FILESDIR}/460-patch-src-nvidia-nvidia_linux.c \ ${FILESDIR}/460-patch-src_nvidia-modeset_nvidia-modeset-freebsd.c .endif +.if ${NVVERSION} < 470.04201 +SUB_PATCHES+= extra-patch-src-nv-misc.h +.endif OPTIONS_DEFINE= ACPI_PM LINUX WBINVD DOCS OPTIONS_DEFINE_i386= PAE diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo index 20ecec19cccb..f1d01fb61968 100644 --- a/x11/nvidia-driver/distinfo +++ b/x11/nvidia-driver/distinfo @@ -1,10 +1,8 @@ TIMESTAMP = 1620395718 -SHA256 (NVIDIA-FreeBSD-x86_64-460.80.tar.gz) = 9f8d99b5da2ed5eccea420b78d6c3cf26d28c67e7d4e724ad2659d28f4d5085e -SIZE (NVIDIA-FreeBSD-x86_64-460.80.tar.gz) = 108266521 -TIMESTAMP = 1621509436 +SHA256 (NVIDIA-FreeBSD-x86_64-460.84.tar.gz) = 920cca0df1bf3eedcc2dbe8fca1711b3ab0e09b7864e0bbc990dfd7d35bde0e8 +SIZE (NVIDIA-FreeBSD-x86_64-460.84.tar.gz) = 108291070 SHA256 (NVIDIA-FreeBSD-x86_64-390.143.tar.gz) = 2727e6d9a804bdfb24651db0483e5783cf871209a614e29626d4f0489a5342a3 SIZE (NVIDIA-FreeBSD-x86_64-390.143.tar.gz) = 65303039 -TIMESTAMP = 1621509441 SHA256 (NVIDIA-FreeBSD-x86-390.143.tar.gz) = 918d4d04a492933a20b2f646790a05fd16dc540c01fe495290ccedf3eecb0566 SIZE (NVIDIA-FreeBSD-x86-390.143.tar.gz) = 65965455 SHA256 (NVIDIA-FreeBSD-x86_64-340.108.tar.gz) = f58fc793995008fd07719e3d001b1ad4b3547cfbc7084aec769098daa02e336f
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106301050.15UAoCjr055492>