Date: Tue, 11 Jul 2023 14:00:57 GMT From: Kevin Bowling <kbowling@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 67ae03d7eaf7 - main - x11/nvidia-driver, x11/linux-nvidia-libs: update to 535.54.03 Message-ID: <202307111400.36BE0vq4002083@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=67ae03d7eaf7f9fdfdd8f5d34cd623a617565ca7 commit 67ae03d7eaf7f9fdfdd8f5d34cd623a617565ca7 Author: Kevin Bowling <kbowling@FreeBSD.org> AuthorDate: 2023-07-11 13:49:32 +0000 Commit: Kevin Bowling <kbowling@FreeBSD.org> CommitDate: 2023-07-11 14:00:45 +0000 x11/nvidia-driver, x11/linux-nvidia-libs: update to 535.54.03 New production branch Changes https://www.nvidia.com/Download/driverResults.aspx/205466/en-us/ PR: 271523 Approved by: danfe --- x11/linux-nvidia-libs/Makefile | 18 +++++++++++------- x11/linux-nvidia-libs/distinfo | 6 +++--- x11/nvidia-driver/Makefile | 12 ++++++++---- x11/nvidia-driver/distinfo | 6 +++--- 4 files changed, 25 insertions(+), 17 deletions(-) diff --git a/x11/linux-nvidia-libs/Makefile b/x11/linux-nvidia-libs/Makefile index 18d109be6142..d1d8f5f92e2e 100644 --- a/x11/linux-nvidia-libs/Makefile +++ b/x11/linux-nvidia-libs/Makefile @@ -1,5 +1,5 @@ PORTNAME= nvidia-libs -DISTVERSION?= 525.116.03 +DISTVERSION?= 535.54.03 # Always try to set PORTREVISION as it can be overridden by the slave ports PORTREVISION?= 0 CATEGORIES= x11 linux @@ -33,7 +33,6 @@ LINUX_LIBDIR= /usr/lib${ARCH:S/i386//:S/amd//} LINUX_LIBS= libcuda.so.${PORTVERSION} \ libnvcuvid.so.${PORTVERSION} \ libnvidia-cfg.so.${PORTVERSION} \ - libnvidia-compiler.so.${PORTVERSION} \ libnvidia-glcore.so.${PORTVERSION} \ libnvidia-ml.so.${PORTVERSION} \ libnvidia-opencl.so.${PORTVERSION} \ @@ -50,7 +49,6 @@ LINUX_LINKS= libcuda.so.${PORTVERSION} libcuda.so.1 \ libnvidia-opencl.so.${PORTVERSION} libnvidia-opencl.so.1 \ libvdpau_nvidia.so.${PORTVERSION} vdpau/libvdpau_nvidia.so.1 LINUX32_LIBS= libcuda.so.${PORTVERSION} \ - libnvidia-compiler.so.${PORTVERSION} \ libnvidia-glcore.so.${PORTVERSION} \ libnvidia-ml.so.${PORTVERSION} \ libnvidia-opencl.so.${PORTVERSION} \ @@ -122,10 +120,16 @@ PLIST_RE+= '\,${LINUXBASE}.*libGLESv(1_CM|2)_nvidia\.so,d' \ '\,${LINUXBASE}.*libGLX_(nvidia|indirect)\.so,d' \ '\,${LINUXBASE}.*libnvidia-ptxjitcompiler\.so,d' .endif -.if ${NVVERSION} >= 525.08902 # 525.89.02 -LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.10 -LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.10 libnvidia-egl-wayland.so.1 -PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.10/' +.if ${NVVERSION} >= 535.05403 # 535.54.03 +PLIST_RE+= '\,${LINUXBASE}.*libnvidia-compiler\.so,d' +.else +LINUX_LIBS+= libnvidia-compiler.so.${PORTVERSION} +LINUX32_LIBS+= libnvidia-compiler.so.${PORTVERSION} +.endif +.if ${NVVERSION} >= 535.05403 # 535.54.03 +LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.11 +LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.11 libnvidia-egl-wayland.so.1 +PLIST_RE+= '\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.11/' .elif ${NVVERSION} >= 495.02905 # 495.29.05 LINUX_LIBS+= libnvidia-egl-wayland.so.1.1.9 LINUX_LINKS+= libnvidia-egl-wayland.so.1.1.9 libnvidia-egl-wayland.so.1 diff --git a/x11/linux-nvidia-libs/distinfo b/x11/linux-nvidia-libs/distinfo index cc8487e5596a..a4fe3d4c4cc4 100644 --- a/x11/linux-nvidia-libs/distinfo +++ b/x11/linux-nvidia-libs/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1682616491 -SHA256 (NVIDIA-Linux-x86_64-525.116.03.run) = 5c295b02ebec2e9a9ec0d79ba9292eb623b4b2fbba8a6ed619060929a30d0469 -SIZE (NVIDIA-Linux-x86_64-525.116.03.run) = 414602354 +TIMESTAMP = 1687976311 +SHA256 (NVIDIA-Linux-x86_64-535.54.03.run) = 454764f57ea1b9e19166a370f78be10e71f0626438fb197f726dc3caf05b4082 +SIZE (NVIDIA-Linux-x86_64-535.54.03.run) = 347109768 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-390.154.run) = f4420280c55210964c008d5b724f2615845d47ad4c9c05d8ed26a62fc6331f7c diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 9146c1a35a6b..4d3ba3bc7db1 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -12,7 +12,7 @@ # ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work. PORTNAME?= nvidia-driver -DISTVERSION?= 525.116.03 +DISTVERSION?= 535.54.03 # Always try to set PORTREVISION as it can be overridden by the slave ports PORTREVISION?= 0 CATEGORIES= x11 @@ -68,12 +68,14 @@ SUB_FILES+= nvidia.conf SUB_FILES+= pkg-deinstall pkg-install .endif SUB_PATCHES= extra-patch-src-Makefile \ - extra-patch-src-nv-freebsd.h \ - extra-patch-src-nvidia_subr.c + extra-patch-src-nv-freebsd.h .if ${NVVERSION} < 510.03901 SUB_PATCHES+= extra-patch-src-nvidia_dev.c \ extra-patch-src-nvidia_pci.c .endif +.if ${NVVERSION} < 530.03002 +SUB_PATCHES+= extra-patch-src-nvidia_subr.c +.endif DOCSDIR= ${PREFIX}/share/doc/NVIDIA_GLX-1.0 MODULESDIR= lib/xorg/modules @@ -179,10 +181,12 @@ post-patch: .SILENT ${WRKSRC}/src/nvidia-modeset/nvidia-modeset-freebsd.c .endif # KPI of kmem_alloc_contig(),kmem_free() changed in FreeBSD src r338143,r338318 +.if ${NVVERSION} < 530.03002 ${REINPLACE_CMD} \ -e 's/kmem_alloc_contig(kmem_arena, /kmem_alloc_contig(/' \ -e 's/kmem_free(kmem_arena, /kmem_free(/' \ ${WRKSRC}/src/${NVSRC}/nvidia_subr.c +.endif # Pull the right header after FreeBSD src r347984 .if ${OSVERSION} >= 1300029 && ${NVVERSION} >= 358.009 ${REINPLACE_CMD} -e '/^#include/s:lock\.h:mutex.h:' \ @@ -259,7 +263,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 +.if ${OSVERSION} >= 1400070 && ${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 596370000f3e..f48b796541d6 100644 --- a/x11/nvidia-driver/distinfo +++ b/x11/nvidia-driver/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1682616247 -SHA256 (NVIDIA-FreeBSD-x86_64-525.116.03.tar.xz) = 7a4cca406cc58b928c422bd62e1f2d2ab6d82b7ad756ea67a656240ec432a9cd -SIZE (NVIDIA-FreeBSD-x86_64-525.116.03.tar.xz) = 136885220 +TIMESTAMP = 1687819912 +SHA256 (NVIDIA-FreeBSD-x86_64-535.54.03.tar.xz) = 5a4bc850c0edd76f9397722bb06e1d74581c3e096a75e1f094861dc3fc20a1e9 +SIZE (NVIDIA-FreeBSD-x86_64-535.54.03.tar.xz) = 141546052 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-390.154.tar.gz) = 5994c77c3510a4a89076ecf2bf402f1da635b250cca07655efc913f2a94bee84
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307111400.36BE0vq4002083>