Date: Mon, 29 May 2023 10:06:27 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: 167434b6544d - main - x11/nvidia-driver: unbreak the build of two legacy driver versions Message-ID: <202305291006.34TA6RIN045130@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=167434b6544d627882603149e8bfd1db0e33a917 commit 167434b6544d627882603149e8bfd1db0e33a917 Author: Alexey Dokuchaev <danfe@FreeBSD.org> AuthorDate: 2023-05-29 10:05:20 +0000 Commit: Alexey Dokuchaev <danfe@FreeBSD.org> CommitDate: 2023-05-29 10:05:20 +0000 x11/nvidia-driver: unbreak the build of two legacy driver versions - Limit the scope of the K&R prototype fix to versions which actually have that `nvlink_freebsd.c' file - Adjust the version check for `lib/libnvidia-wayland-client.so' which had first appeared in 515.43.04 beta release and add a comment on the PLIST_FILES usage there Reported by: pkg-fallout --- x11/nvidia-driver/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile index 697c9ed82422..9146c1a35a6b 100644 --- a/x11/nvidia-driver/Makefile +++ b/x11/nvidia-driver/Makefile @@ -139,7 +139,8 @@ PLIST_SUB+= LIBGLDIR=${LIBGLDIR} LIBGLMAP="@comment " PLIST_SUB+= LIBGLDIR="@comment " LIBGLMAP="" .endif -.if ${NVVERSION} >= 515.08601 +# Not part of the pkg-plist because DISTVERSION is not on PLIST_SUB +.if ${NVVERSION} >= 515.04304 PLIST_FILES+= lib/libnvidia-wayland-client.so.${DISTVERSION} .endif @@ -267,8 +268,10 @@ post-patch: .SILENT ${WRKSRC}/src/${NVSRC}/nvidia_subr.c .endif # Fix a K&R prototype +.if ${NVVERSION:R} >= 390 ${REINPLACE_CMD} -e '/nvlink_allocLock/s,(),(void),' \ ${WRKSRC}/src/${NVSRC}/nvlink_freebsd.c +.endif # Finally, process OPTIONS .if ${PORT_OPTIONS:MFREEBSD_AGP} ${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305291006.34TA6RIN045130>