Attachment #179100 for bug #216285

View | Details | Raw Unified | Return to bug 216285
Collapse All | Expand All

Lines 1-8 Link Here

(-)x11-drivers/xf86-video-nv/Makefile (-2 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= xf86-video-nv	3	PORTNAME= xf86-video-nv
4	PORTVERSION= 2.1.20	4	PORTVERSION= 2.1.21
5	PORTREVISION= 7
6	CATEGORIES= x11-drivers	5	CATEGORIES= x11-drivers
7		6
8	MAINTAINER= x11@FreeBSD.org	7	MAINTAINER= x11@FreeBSD.org

Lines 1-2 Link Here

(-)x11-drivers/xf86-video-nv/distinfo (-2 / +3 lines)
1	SHA256 (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf	1	TIMESTAMP = 1484715801
2	SIZE (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 396982	2	SHA256 (xorg/driver/xf86-video-nv-2.1.21.tar.bz2) = 1f98649e6ff0e8214b9d5dcac661f1d004be8e73823d8247b9c7025fd81db32d
		3	SIZE (xorg/driver/xf86-video-nv-2.1.21.tar.bz2) = 424091

Lines 1-4 Link Here

(-)x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c (-9 / +1 lines)
1	--- src/nv_driver.c.orig 2012-07-17 06:47:02 UTC	1	--- src/nv_driver.c.orig 2017-01-17 22:41:33 UTC
2	+++ src/nv_driver.c	2	+++ src/nv_driver.c
3	@@ -1543,7 +1543,11 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)	3	@@ -1543,7 +1543,11 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
4	xf86FreeInt10(pNv->pInt);	4	xf86FreeInt10(pNv->pInt);
Lines 12-22 Link Here
12		12
13	/* We use a programmable clock */	13	/* We use a programmable clock */
14	pScrn->progClock = TRUE;	14	pScrn->progClock = TRUE;
15	@@ -2550,7 +2554,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL)
16	if (!pNv->NoAccel)
17	NVAccelInit(pScreen);
18
19	- miInitializeBackingStore(pScreen);
20	xf86SetBackingStore(pScreen);
21	xf86SetSilkenMouse(pScreen);
22




--- 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);
 




--- 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"

Lines 1-10 Link Here

(-)x11-drivers/xf86-video-nv/files/patch-src_riva__driver.c (-10 lines)
1	--- src/riva_driver.c.orig 2012-07-17 06:47:02 UTC
2	+++ src/riva_driver.c
3	@@ -1168,7 +1168,6 @@ RivaScreenInit(SCREEN_INIT_ARGS_DECL)
4	if (!pRiva->NoAccel)
5	RivaAccelInit(pScreen);
6
7	- miInitializeBackingStore(pScreen);
8	xf86SetBackingStore(pScreen);
9	xf86SetSilkenMouse(pScreen);
10




--- 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"




# ifdef away this XAA function call as done above
#
--- src/riva_xaa.c.orig	2013-02-07 07:56:01 UTC
+++ src/riva_xaa.c
@@ -91,7 +91,9 @@ RivaSetRopPattern(RivaPtr pRiva, int rop
     if (pRiva->currentRop != (rop + 16)) {
         pRiva->currentRop = rop + 16; /* +16 is important */
         RIVA_FIFO_FREE(pRiva->riva, Rop, 1);
+#ifdef HAVE_XAA_H
         pRiva->riva.Rop->Rop3 = XAAGetPatternROP(rop);
+#endif
     }
 }
 #ifdef HAVE_XAA_H

Return to bug 216285

Lines 1-18 Link Here

(-)x11-drivers/xf86-video-nv/files/patch-src_g80__driver.c (-18 lines)
1	--- src/g80_driver.c.orig 2012-07-17 06:47:02 UTC
2	+++ src/g80_driver.c
3	@@ -34,7 +34,6 @@
4	#include <xf86Resources.h>
5	#endif
6	#include <mipointer.h>
7	-#include <mibstore.h>
8	#include <micmap.h>
9	#include <xf86cmap.h>
10	#include <fb.h>
11	@@ -833,7 +832,6 @@ G80ScreenInit(SCREEN_INIT_ARGS_DECL)
12	}
13	}
14
15	- miInitializeBackingStore(pScreen);
16	xf86SetBackingStore(pScreen);
17	xf86SetSilkenMouse(pScreen);
18

Lines 1-12 Link Here

(-)x11-drivers/xf86-video-nv/files/patch-src_nv__include.h (-12 lines)
1	--- src/nv_include.h.orig 2012-07-17 06:48:19 UTC
2	+++ src/nv_include.h
3	@@ -24,9 +24,6 @@
4	/* All drivers initialising the SW cursor need this */
5	#include "mipointer.h"
6
7	-/* All drivers implementing backing store need this */
8	-#include "mibstore.h"
9	-
10	#include "micmap.h"
11
12	#include "xf86DDC.h"

Lines 1-12 Link Here

(-)x11-drivers/xf86-video-nv/files/patch-src_riva__include.h (-12 lines)
1	--- src/riva_include.h.orig 2012-07-17 06:48:45 UTC
2	+++ src/riva_include.h
3	@@ -22,9 +22,6 @@
4	/* All drivers initialising the SW cursor need this */
5	#include "mipointer.h"
6
7	-/* All drivers implementing backing store need this */
8	-#include "mibstore.h"
9	-
10	#include "micmap.h"
11
12	#include "xf86DDC.h"

Line 0 Link Here

(-)x11-drivers/xf86-video-nv/files/patch-src_riva__xaa.c (+14 lines)
	1	# ifdef away this XAA function call as done above
	2	#
	3	--- src/riva_xaa.c.orig 2013-02-07 07:56:01 UTC
	4	+++ src/riva_xaa.c
	5	@@ -91,7 +91,9 @@ RivaSetRopPattern(RivaPtr pRiva, int rop
	6	if (pRiva->currentRop != (rop + 16)) {
	7	pRiva->currentRop = rop + 16; /* +16 is important */
	8	RIVA_FIFO_FREE(pRiva->riva, Rop, 1);
	9	+#ifdef HAVE_XAA_H
	10	pRiva->riva.Rop->Rop3 = XAAGetPatternROP(rop);
	11	+#endif
	12	}
	13	}
	14	#ifdef HAVE_XAA_H