Attachment 178889 Details for Bug 216050 – patch

[patch] patch

nvidia-driver.patch (text/plain), 2.22 KB, created by Tijl Coosemans on 2017-01-14 17:51:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2017-01-14 17:51:10 UTC

Size: 2.22 KB

patch

obsolete

>Index: x11/nvidia-driver/Makefile
>===================================================================
>--- x11/nvidia-driver/Makefile	(revision 431371)
>+++ x11/nvidia-driver/Makefile	(working copy)
>@@ -12,7 +12,7 @@
> PORTNAME=	nvidia-driver
> DISTVERSION?=	375.26
> # Always try to set PORTREVISION as it can be overridden by the slave ports
>-PORTREVISION?=	0
>+PORTREVISION?=	1
> CATEGORIES=	x11
> MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
> DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
>@@ -65,7 +65,8 @@ NVSRC=		.
> .else
> EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_nvidia_Makefile \
> 		${FILESDIR}/extra-patch-src_nvidia_nv-freebsd.h \
>-		${FILESDIR}/extra-patch-src_nvidia_nv-misc.h
>+		${FILESDIR}/extra-patch-src_nvidia_nv-misc.h \
>+		${FILESDIR}/extra-patch-src_nvidia_nvidia_os.c
> NVSRC=		nvidia
> .endif
> .if ${NVVERSION} >= 358.009
>Index: x11/nvidia-driver/files/extra-patch-src_nvidia_nvidia_os.c
>===================================================================
>--- x11/nvidia-driver/files/extra-patch-src_nvidia_nvidia_os.c	(nonexistent)
>+++ x11/nvidia-driver/files/extra-patch-src_nvidia_nvidia_os.c	(working copy)
>@@ -0,0 +1,30 @@
>+--- src/nvidia/nvidia_os.c.orig	2016-12-09 01:17:24 UTC
>++++ src/nvidia/nvidia_os.c
>+@@ -13,10 +13,12 @@
>+ #include "nv.h"
>+ #include "nv-freebsd.h"
>+ 
>++#if 0
>+ #include <sys/consio.h>
>+ #include <sys/fbio.h>
>+ #include <dev/syscons/syscons.h>
>++#endif
>+ 
>+ MALLOC_DEFINE(M_NVIDIA, "nvidia", "NVIDIA memory allocations");
>+ TASKQUEUE_DEFINE_THREAD(nvidia);
>+@@ -740,6 +743,7 @@ void NV_API_CALL os_get_screen_info(
>+     NvU16 *pFbPitch
>+ )
>+ {
>++#if 0
>+     const sc_softc_t *sc = sc_get_softc(0, SC_KERNEL_CONSOLE);
>+ 
>+     if (sc)
>+@@ -761,6 +765,7 @@ void NV_API_CALL os_get_screen_info(
>+             }
>+         }
>+     }
>++#endif
>+ 
>+     *pPhysicalAddress = 0;
>+     *pFbWidth = *pFbHeight = *pFbDepth = *pFbPitch = 0;
>
>Property changes on: x11/nvidia-driver/files/extra-patch-src_nvidia_nvidia_os.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 216050: 178889 | 178905 | 183217 | 185615 | 213300