cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 2.1.21 (wich is compatible with newer xorg)

Browse Source 
PR:		216285
Submitted by:	matthew@reztek.cz
This commit is contained in:
Baptiste Daroussin 2017-01-23 00:21:11 +00:00
parent 535f02b771
commit 2eff77dd59
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=432175
8 changed files with 19 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11-drivers/xf86-video-nv/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= xf86-video-nv
PORTVERSION= 2.1.20
PORTREVISION= 7
PORTVERSION= 2.1.21
CATEGORIES= x11-drivers
MAINTAINER= x11@FreeBSD.org

5
x11-drivers/xf86-video-nv/distinfo
View File

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

10
x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c
View File

@ -1,4 +1,4 @@
--- src/nv_driver.c.orig 2012-07-17 06:47:02 UTC
--- src/nv_driver.c.orig 2017-01-17 22:41:33 UTC
+++ src/nv_driver.c
@@ -1543,7 +1543,11 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
xf86FreeInt10(pNv->pInt);
@ -12,11 +12,3 @@
/* 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);

18
x11-drivers/xf86-video-nv/files/patch-src_g80__driver.c
View File

@ -1,18 +0,0 @@
--- 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);

12
x11-drivers/xf86-video-nv/files/patch-src_nv__include.h
View File

@ -1,12 +0,0 @@
--- 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"

10
x11-drivers/xf86-video-nv/files/patch-src_riva__driver.c
View File

@ -1,10 +0,0 @@
--- 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);

12
x11-drivers/xf86-video-nv/files/patch-src_riva__include.h
View File

@ -1,12 +0,0 @@
--- 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"

14
x11-drivers/xf86-video-nv/files/patch-src_riva__xaa.c Normal file
View File

@ -0,0 +1,14 @@
# 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