git: a569017b31f7 - main - x11/nvidia-driver-470, x11/linux-nvidia-libs-470: Update to 470.256.02

From: Austin Shafer <ashafer_at_FreeBSD.org>
Date: Wed, 02 Apr 2025 13:53:47 UTC
The branch main has been updated by ashafer:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a569017b31f7c967a25fa22e0ead826361c51a07

commit a569017b31f7c967a25fa22e0ead826361c51a07
Author:     Tomoaki AOKI <junchoon@dec.sakura.ne.jp>
AuthorDate: 2025-04-02 13:46:06 +0000
Commit:     Austin Shafer <ashafer@FreeBSD.org>
CommitDate: 2025-04-02 13:52:33 +0000

    x11/nvidia-driver-470, x11/linux-nvidia-libs-470: Update to 470.256.02
    
    Requested updating 470 series of legacy version of driver to 470.256.02
    at Bug 285069 - x11/nvidia-driver-470: update from 470.161.03 to
    470.256.02.
    
    Tested (by myself) make and make package only, on stable/14, amd64 at
    commit 7215aed7974cc4b7d3197ca5e5fcf545d3a28c0f as I myself am not using
    470 series of driver anymore.
    
    PR:             285069
    Tested by:      grahamperrin
    Reviewed by:    ashafer, kbowling (mentor)
    Differential Revision:  https://reviews.freebsd.org/D49457
---
 x11/linux-nvidia-libs-470/Makefile | 2 +-
 x11/linux-nvidia-libs/distinfo     | 4 ++--
 x11/nvidia-driver-470/Makefile     | 2 +-
 x11/nvidia-driver/Makefile         | 4 ++--
 x11/nvidia-driver/distinfo         | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/x11/linux-nvidia-libs-470/Makefile b/x11/linux-nvidia-libs-470/Makefile
index 5e8eb8cbf604..986743bb23b0 100644
--- a/x11/linux-nvidia-libs-470/Makefile
+++ b/x11/linux-nvidia-libs-470/Makefile
@@ -1,4 +1,4 @@
-DISTVERSION=	470.161.03
+DISTVERSION=	470.256.02
 # Explicitly set PORTREVISION as it can be overridden by the master port
 PORTREVISION=	0
 
diff --git a/x11/linux-nvidia-libs/distinfo b/x11/linux-nvidia-libs/distinfo
index 57b7fbdf509b..fd15aacc7ea1 100644
--- a/x11/linux-nvidia-libs/distinfo
+++ b/x11/linux-nvidia-libs/distinfo
@@ -1,8 +1,8 @@
 TIMESTAMP = 1740842371
 SHA256 (NVIDIA-Linux-x86_64-570.124.04.run) = 1b786a4b7122d7c4216c58ae4007688a4f778c196c148d919163815ee10d53c4
 SIZE (NVIDIA-Linux-x86_64-570.124.04.run) = 375582187
-SHA256 (NVIDIA-Linux-x86_64-470.161.03.run) = 5da82a7f8c76e781e7d7f0be7b798db4d344f26bd4facf9abcf3c71c71fe7640
-SIZE (NVIDIA-Linux-x86_64-470.161.03.run) = 272397700
+SHA256 (NVIDIA-Linux-x86_64-470.256.02.run) = d6451862deb695bb0447f3b7cd6268f73e81168c10e2c10597ff3fa01349b1de
+SIZE (NVIDIA-Linux-x86_64-470.256.02.run) = 272850014
 SHA256 (NVIDIA-Linux-x86_64-390.154.run) = f4420280c55210964c008d5b724f2615845d47ad4c9c05d8ed26a62fc6331f7c
 SIZE (NVIDIA-Linux-x86_64-390.154.run) = 84438529
 SHA256 (NVIDIA-Linux-x86-390.154.run) = 5ee871b84bd9f28e225b7a3e5f1be1f9e2d0067f37b8d6b8d0c251702f06d3e7
diff --git a/x11/nvidia-driver-470/Makefile b/x11/nvidia-driver-470/Makefile
index c2690453a1a8..6f1f8c865b7d 100644
--- a/x11/nvidia-driver-470/Makefile
+++ b/x11/nvidia-driver-470/Makefile
@@ -1,4 +1,4 @@
-DISTVERSION=	470.161.03
+DISTVERSION=	470.256.02
 # Explicitly set PORTREVISION as it can be overridden by the master port
 PORTREVISION=	1
 
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index e181e6bc5085..0a911b834b99 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -76,7 +76,7 @@ SUB_PATCHES=	extra-patch-src-Makefile \
 SUB_PATCHES+=	extra-patch-src-nvidia_dev.c \
 		extra-patch-src-nvidia_pci.c
 .endif
-.if ${NVVERSION} < 530.03002
+.if ${NVVERSION} < 470.25602 || ${NVVERSION} >= 480.00000 && ${NVVERSION} < 530.03002
 SUB_PATCHES+=	extra-patch-src-nvidia_subr.c
 .endif
 
@@ -272,7 +272,7 @@ post-patch: .SILENT
 		${WRKSRC}/src/${NVSRC}/nvidia_pci.c
 .endif
 # Catch up with pmap_unmapdev() and kmem_*() changes in 14-CURRENT
-.if ${OSVERSION} >= 1400070 && ${NVVERSION} < 530.03002
+.if ${OSVERSION} >= 1400070 && (${NVVERSION} < 470.25602  || ${NVVERSION} >= 480.00000 && ${NVVERSION} < 530.03002)
 	${REINPLACE_CMD} -e '/pmap_unmapdev/s,(vm_offset_t),,' \
 		${WRKSRC}/src/${NVSRC}/nvidia_os.c
 	${REINPLACE_CMD} -e '/vm_offset_t virtual_address/s,vm_offset_t ,char *,' \
diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
index c83dc8161d75..af69b23e3c19 100644
--- a/x11/nvidia-driver/distinfo
+++ b/x11/nvidia-driver/distinfo
@@ -1,8 +1,8 @@
 TIMESTAMP = 1740840763
 SHA256 (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = dc53493d95a0db71ff62251d21f3b828e519ec1ac9dbfc70f0b0fa30c4842026
 SIZE (NVIDIA-FreeBSD-x86_64-570.124.04.tar.xz) = 259892688
-SHA256 (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 54f87e6cadc4aedebc4f862e3d25657fddb867ddc3fe01ad06c9d54bcfa8d607
-SIZE (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 99719576
+SHA256 (NVIDIA-FreeBSD-x86_64-470.256.02.tar.xz) = 40d787fae82d653893b08afac4e0ec37a88f37154406bfb13d02bfc986881f5c
+SIZE (NVIDIA-FreeBSD-x86_64-470.256.02.tar.xz) = 99491020
 SHA256 (NVIDIA-FreeBSD-x86_64-390.154.tar.gz) = 5994c77c3510a4a89076ecf2bf402f1da635b250cca07655efc913f2a94bee84
 SIZE (NVIDIA-FreeBSD-x86_64-390.154.tar.gz) = 65339271
 SHA256 (NVIDIA-FreeBSD-x86-390.154.tar.gz) = 43fdb7ec369b747a2a6311fca6eca11a9ebd121236c6e59590659625dd799cc6