Page MenuHomeFreeBSD

D56214.id174725.diff
No OneTemporary

D56214.id174725.diff

diff --git a/graphics/nvidia-drm-510-kmod/Makefile b/graphics/nvidia-drm-510-kmod/Makefile
--- a/graphics/nvidia-drm-510-kmod/Makefile
+++ b/graphics/nvidia-drm-510-kmod/Makefile
@@ -7,6 +7,4 @@
.include "${.CURDIR}/../drm-510-kmod/Makefile.version"
.include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common"
-.include <bsd.port.options.mk>
-.include <bsd.port.mk>
diff --git a/graphics/nvidia-drm-515-kmod/Makefile b/graphics/nvidia-drm-515-kmod/Makefile
--- a/graphics/nvidia-drm-515-kmod/Makefile
+++ b/graphics/nvidia-drm-515-kmod/Makefile
@@ -8,4 +8,3 @@
.include "${.CURDIR}/../drm-515-kmod/Makefile.version"
.include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common"
-.include <bsd.port.mk>
diff --git a/graphics/nvidia-drm-61-kmod/Makefile b/graphics/nvidia-drm-61-kmod/Makefile
--- a/graphics/nvidia-drm-61-kmod/Makefile
+++ b/graphics/nvidia-drm-61-kmod/Makefile
@@ -8,4 +8,3 @@
.include "${.CURDIR}/../drm-61-kmod/Makefile.version"
.include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common"
-.include <bsd.port.mk>
diff --git a/graphics/nvidia-drm-66-kmod/Makefile b/graphics/nvidia-drm-66-kmod/Makefile
--- a/graphics/nvidia-drm-66-kmod/Makefile
+++ b/graphics/nvidia-drm-66-kmod/Makefile
@@ -8,4 +8,3 @@
.include "${.CURDIR}/../drm-66-kmod/Makefile.version"
.include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common"
-.include <bsd.port.mk>
diff --git a/graphics/nvidia-drm-kmod/Makefile.common b/graphics/nvidia-drm-kmod/Makefile.common
--- a/graphics/nvidia-drm-kmod/Makefile.common
+++ b/graphics/nvidia-drm-kmod/Makefile.common
@@ -82,3 +82,13 @@
linenum=$$(${SED} -ne '/^#if __FreeBSD_version/ { = ; q ; }' \
${WRKSRC}/../nvidia/nv-freebsd.h) ; ${REINPLACE_CMD} \
-e "$$linenum,+2d" ${WRKSRC}/../nvidia/nv-freebsd.h
+
+ # Workaround for build failure on any base without pm_vt_switch_required().
+ # 13.5, 14.3 and 15.0 doesn't have the stub (blank) function.
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} < 1403507 || ${OSVERSION} >= 1500000 && ${OSVERSION} < 1500504
+pre-build:
+ ${REINPLACE_CMD} -e '/pm_vt_switch_required(dev->dev, true)/d' ${WRKSRC}/nvidia-drm-drv.c
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/graphics/nvidia-drm-latest-kmod/Makefile b/graphics/nvidia-drm-latest-kmod/Makefile
--- a/graphics/nvidia-drm-latest-kmod/Makefile
+++ b/graphics/nvidia-drm-latest-kmod/Makefile
@@ -8,4 +8,3 @@
.include "${.CURDIR}/../drm-latest-kmod/Makefile.version"
.include "${.CURDIR}/../nvidia-drm-kmod/Makefile.common"
-.include <bsd.port.mk>

File Metadata

Mime Type
text/plain
Expires
Fri, Jul 24, 6:51 AM (16 h, 8 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
35434723
Default Alt Text
D56214.id174725.diff (2 KB)

Event Timeline