View | Details | Raw Unified | Return to bug 216050 | Differences between
and this patch

Collapse All | Expand All

(-)x11/nvidia-driver/Makefile (-2 / +3 lines)
Lines 12-18 Link Here
12 
PORTNAME=	nvidia-driver
 12 
PORTNAME=	nvidia-driver
13 
DISTVERSION?=	375.26
 13 
DISTVERSION?=	375.26
14 
# Always try to set PORTREVISION as it can be overridden by the slave ports
 14 
# Always try to set PORTREVISION as it can be overridden by the slave ports
15 
PORTREVISION?=	0
 15 
PORTREVISION?=	1
16 
CATEGORIES=	x11
 16 
CATEGORIES=	x11
17 
MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
 17 
MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
18 
DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
 18 
DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
Lines 65-71 NVSRC= . Link Here
65 
.else
 65 
.else
66 
EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_nvidia_Makefile \
 66 
EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_nvidia_Makefile \
67 
		${FILESDIR}/extra-patch-src_nvidia_nv-freebsd.h \
 67 
		${FILESDIR}/extra-patch-src_nvidia_nv-freebsd.h \
68 
		${FILESDIR}/extra-patch-src_nvidia_nv-misc.h
 68 
		${FILESDIR}/extra-patch-src_nvidia_nv-misc.h \
69 
		${FILESDIR}/extra-patch-src_nvidia_nvidia_os.c
69 
NVSRC=		nvidia
 70 
NVSRC=		nvidia
70 
.endif
 71 
.endif
71 
.if ${NVVERSION} >= 358.009
 72 
.if ${NVVERSION} >= 358.009
(-)x11/nvidia-driver/files/extra-patch-src_nvidia_nvidia_os.c (+30 lines)
Line 0 Link Here
1 
--- src/nvidia/nvidia_os.c.orig	2016-12-09 01:17:24 UTC
2 
+++ src/nvidia/nvidia_os.c
3 
@@ -13,9 +13,11 @@
4 
 #include "nv.h"
5 
 #include "nv-freebsd.h"
6
7 
+#if 0
8 
 #include <sys/consio.h>
9 
 #include <sys/fbio.h>
10 
 #include <dev/syscons/syscons.h>
11 
+#endif
12
13 
 MALLOC_DEFINE(M_NVIDIA, "nvidia", "NVIDIA memory allocations");
14 
 TASKQUEUE_DEFINE_THREAD(nvidia);
15 
@@ -740,6 +743,7 @@ void NV_API_CALL os_get_screen_info(
16 
     NvU16 *pFbPitch
17 
 )
18 
 {
19 
+#if 0
20 
     const sc_softc_t *sc = sc_get_softc(0, SC_KERNEL_CONSOLE);
21
22 
     if (sc)
23 
@@ -761,6 +765,7 @@ void NV_API_CALL os_get_screen_info(
24 
             }
25 
         }
26 
     }
27 
+#endif
28
29 
     *pPhysicalAddress = 0;
30 
     *pFbWidth = *pFbHeight = *pFbDepth = *pFbPitch = 0;

Return to bug 216050