[Midnightbsd-cvs] mports [19231] trunk/x11-drivers/xf86-video-nv/files: fix patchset for nvidia cards

[laffer1 at midnightbsd.org]

Revision: 19231
          http://svnweb.midnightbsd.org/mports/?rev=19231
Author:   laffer1
Date:     2015-05-29 18:25:59 -0400 (Fri, 29 May 2015)
Log Message:
-----------
fix patchset for nvidia cards

Modified Paths:
--------------
    trunk/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c

Added Paths:
-----------
    trunk/x11-drivers/xf86-video-nv/files/patch-src_g80__driver.c
    trunk/x11-drivers/xf86-video-nv/files/patch-src_nv__include.h
    trunk/x11-drivers/xf86-video-nv/files/patch-src_riva__driver.c
    trunk/x11-drivers/xf86-video-nv/files/patch-src_riva__include.h

Modified: trunk/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c
===================================================================
--- trunk/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c	2015-05-29 22:24:45 UTC (rev 19230)
+++ trunk/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c	2015-05-29 22:25:59 UTC (rev 19231)
@@ -1,6 +1,6 @@
---- src/nv_driver.c.orig	2014-01-19 15:24:45.000000000 -0600
-+++ src/nv_driver.c	2014-01-19 15:24:07.000000000 -0600
-@@ -1543,7 +1543,11 @@
+--- src/nv_driver.c.orig	2012-07-17 06:47:02 UTC
++++ src/nv_driver.c
+@@ -1543,7 +1543,11 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
  	xf86FreeInt10(pNv->pInt);
  	return FALSE;
      }
@@ -12,3 +12,11 @@
      
      /* We use a programmable clock */
      pScrn->progClock = TRUE;
+@@ -2550,7 +2554,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
+     if (!pNv->NoAccel)
+ 	NVAccelInit(pScreen);
+     
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 

Added: trunk/x11-drivers/xf86-video-nv/files/patch-src_g80__driver.c
===================================================================
--- trunk/x11-drivers/xf86-video-nv/files/patch-src_g80__driver.c	                        (rev 0)
+++ trunk/x11-drivers/xf86-video-nv/files/patch-src_g80__driver.c	2015-05-29 22:25:59 UTC (rev 19231)
@@ -0,0 +1,18 @@
+--- src/g80_driver.c.orig	2012-07-17 06:47:02 UTC
++++ src/g80_driver.c
+@@ -34,7 +34,6 @@
+ #include <xf86Resources.h>
+ #endif
+ #include <mipointer.h>
+-#include <mibstore.h>
+ #include <micmap.h>
+ #include <xf86cmap.h>
+ #include <fb.h>
+@@ -833,7 +832,6 @@ G80ScreenInit(SCREEN_INIT_ARGS_DECL)
+         }
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 


Property changes on: trunk/x11-drivers/xf86-video-nv/files/patch-src_g80__driver.c
___________________________________________________________________
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
Added: trunk/x11-drivers/xf86-video-nv/files/patch-src_nv__include.h
===================================================================
--- trunk/x11-drivers/xf86-video-nv/files/patch-src_nv__include.h	                        (rev 0)
+++ trunk/x11-drivers/xf86-video-nv/files/patch-src_nv__include.h	2015-05-29 22:25:59 UTC (rev 19231)
@@ -0,0 +1,12 @@
+--- src/nv_include.h.orig	2012-07-17 06:48:19 UTC
++++ src/nv_include.h
+@@ -24,9 +24,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"


Property changes on: trunk/x11-drivers/xf86-video-nv/files/patch-src_nv__include.h
___________________________________________________________________
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
Added: trunk/x11-drivers/xf86-video-nv/files/patch-src_riva__driver.c
===================================================================
--- trunk/x11-drivers/xf86-video-nv/files/patch-src_riva__driver.c	                        (rev 0)
+++ trunk/x11-drivers/xf86-video-nv/files/patch-src_riva__driver.c	2015-05-29 22:25:59 UTC (rev 19231)
@@ -0,0 +1,10 @@
+--- src/riva_driver.c.orig	2012-07-17 06:47:02 UTC
++++ src/riva_driver.c
+@@ -1168,7 +1168,6 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL)
+     if (!pRiva->NoAccel)
+ 	RivaAccelInit(pScreen);
+     
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 


Property changes on: trunk/x11-drivers/xf86-video-nv/files/patch-src_riva__driver.c
___________________________________________________________________
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
Added: trunk/x11-drivers/xf86-video-nv/files/patch-src_riva__include.h
===================================================================
--- trunk/x11-drivers/xf86-video-nv/files/patch-src_riva__include.h	                        (rev 0)
+++ trunk/x11-drivers/xf86-video-nv/files/patch-src_riva__include.h	2015-05-29 22:25:59 UTC (rev 19231)
@@ -0,0 +1,12 @@
+--- src/riva_include.h.orig	2012-07-17 06:48:45 UTC
++++ src/riva_include.h
+@@ -22,9 +22,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ #include "micmap.h"
+ 
+ #include "xf86DDC.h"


Property changes on: trunk/x11-drivers/xf86-video-nv/files/patch-src_riva__include.h
___________________________________________________________________
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