git: d116de704f8e - main - x11/nvidia-driver: catch up with changes to pmap_unmapdev() and kmem_*()
Date: Tue, 11 Oct 2022 14:54:50 UTC
The branch main has been updated by danfe:
URL: https://cgit.FreeBSD.org/ports/commit/?id=d116de704f8e5f24b4075679a87aeaa58e312926
commit d116de704f8e5f24b4075679a87aeaa58e312926
Author: Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2022-10-11 14:54:00 +0000
Commit: Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2022-10-11 14:54:00 +0000
x11/nvidia-driver: catch up with changes to pmap_unmapdev() and kmem_*()
Reported by: pkg-fallout
Differential Revision: https://reviews.freebsd.org/D36671
---
x11/nvidia-driver/Makefile | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 130794ace1f8..3140c72454db 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -237,6 +237,15 @@ post-patch: .SILENT
${REINPLACE_CMD} -e '/^DRIVER_MODULE/s/, nvidia_devclass//' \
${WRKSRC}/src/${NVSRC}/nvidia_pci.c
.endif
+# Catch up with pmap_unmapdev() and kmem_*() changes in 14-CURRENT
+.if ${OSVERSION} >= 1400070
+ ${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 *,' \
+ ${WRKSRC}/src/${NVSRC}/nv-freebsd.h
+ ${REINPLACE_CMD} -e '/vm_offset_t address;/s,vm_offset_t ,void *,' \
+ ${WRKSRC}/src/${NVSRC}/nvidia_subr.c
+.endif
# Finally, process OPTIONS
.if ${PORT_OPTIONS:MFREEBSD_AGP}
${REINPLACE_CMD} -E 's/undef (NV_SUPPORT_OS_AGP)/define \1/' \