Update xorg-server-snap to 6.9RC2 (6.9.99.902).

7 files changed, 9 insertions, 575 deletions

diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile
index 103c91d37766..5c2e81cb4656 100644
--- a/x11-servers/xorg-server-snap/Makefile
+++ b/x11-servers/xorg-server-snap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xorg-server
-PORTVERSION=	6.8.99.16
+PORTVERSION=	6.8.99.902
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://xorg.freedesktop.org/snapshots/
 DISTNAME=	xorg-x11-${PORTVERSION}
diff --git a/x11-servers/xorg-server-snap/distinfo b/x11-servers/xorg-server-snap/distinfo
index 975dfadbc9f2..896921117e26 100644
--- a/x11-servers/xorg-server-snap/distinfo
+++ b/x11-servers/xorg-server-snap/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/xorg-x11-6.8.99.16.tar.bz2) = ae32054482f193d1579ab6f8cda66a7e
-SHA256 (xorg/xorg-x11-6.8.99.16.tar.bz2) = 9da23ad2c7eefc6b07737c3786067b12dbaed4282ead0336044cb4214fcb9f5d
-SIZE (xorg/xorg-x11-6.8.99.16.tar.bz2) = 45369937
+MD5 (xorg/xorg-x11-6.8.99.902.tar.bz2) = 6c19de769fc3c4d94970dda1381ebda0
+SHA256 (xorg/xorg-x11-6.8.99.902.tar.bz2) = 5d855845941fc6f60dfdf45ac6f2f9b2a13ba7a2f3af6e3a64fd4eecf2b65b6a
+SIZE (xorg/xorg-x11-6.8.99.902.tar.bz2) = 45785607
diff --git a/x11-servers/xorg-server-snap/files/patch-CAN-2005-2495 b/x11-servers/xorg-server-snap/files/patch-CAN-2005-2495
deleted file mode 100644
index 39e32cee29c7..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-CAN-2005-2495
+++ /dev/null
@@ -1,183 +0,0 @@
---- programs/Xserver/afb/afbpixmap.c.orig	Wed Apr 20 14:25:14 2005
-+++ programs/Xserver/afb/afbpixmap.c	Sun Sep 18 18:13:40 2005
-@@ -73,10 +73,14 @@
- 	int				depth;
- {
- 	PixmapPtr pPixmap;
--	int datasize;
--	int paddedWidth;
-+	size_t datasize;
-+	size_t paddedWidth;
- 
- 	paddedWidth = BitmapBytePad(width);
-+
-+	if (paddedWidth > 32767 || height > 32767 || depth > 4)
-+	    return NullPixmap;
-+	
- 	datasize = height * paddedWidth * depth;
- 	pPixmap = AllocatePixmap(pScreen, datasize);
- 	if (!pPixmap)
---- programs/Xserver/cfb/cfbpixmap.c.orig	Wed Apr 20 14:25:18 2005
-+++ programs/Xserver/cfb/cfbpixmap.c	Sun Sep 18 18:13:40 2005
-@@ -68,10 +68,13 @@
-     int		depth;
- {
-     PixmapPtr pPixmap;
--    int datasize;
--    int paddedWidth;
-+    size_t datasize;
-+    size_t paddedWidth;
- 
-     paddedWidth = PixmapBytePad(width, depth);
-+
-+    if (paddedWidth / 4 > 32767 || height > 32767)
-+	return NullPixmap;
-     datasize = height * paddedWidth;
-     pPixmap = AllocatePixmap(pScreen, datasize);
-     if (!pPixmap)
---- programs/Xserver/dix/dispatch.c.orig	Fri Jun 10 06:01:14 2005
-+++ programs/Xserver/dix/dispatch.c	Sun Sep 18 18:13:40 2005
-@@ -1473,6 +1473,23 @@
- 	client->errorValue = 0;
-         return BadValue;
-     }
-+    if (stuff->width > 32767 || stuff->height > 32767)
-+    {
-+	/* It is allowed to try and allocate a pixmap which is larger than
-+	 * 32767 in either dimension. However, all of the framebuffer code
-+	 * is buggy and does not reliably draw to such big pixmaps, basically
-+	 * because the Region data structure operates with signed shorts
-+	 * for the rectangles in it.
-+	 *
-+	 * Furthermore, several places in the X server computes the
-+	 * size in bytes of the pixmap and tries to store it in an
-+	 * integer. This integer can overflow and cause the allocated size
-+	 * to be much smaller.
-+	 *
-+	 * So, such big pixmaps are rejected here with a BadAlloc
-+	 */
-+	return BadAlloc;
-+    }
-     if (stuff->depth != 1)
-     {
-         pDepth = pDraw->pScreen->allowedDepths;
---- programs/Xserver/dix/pixmap.c.orig	Wed Apr 20 14:25:19 2005
-+++ programs/Xserver/dix/pixmap.c	Sun Sep 18 18:13:40 2005
-@@ -114,6 +114,9 @@
-     unsigned size;
-     int i;
- 
-+    if (pScreen->totalPixmapSize > ((size_t)-1) - pixDataSize)
-+	return NullPixmap;
-+    
-     pPixmap = (PixmapPtr)xalloc(pScreen->totalPixmapSize + pixDataSize);
-     if (!pPixmap)
- 	return NullPixmap;
---- programs/Xserver/fb/fbpixmap.c.orig	Sat Dec  4 01:42:50 2004
-+++ programs/Xserver/fb/fbpixmap.c	Sun Sep 18 18:13:40 2005
-@@ -32,12 +32,14 @@
- fbCreatePixmapBpp (ScreenPtr pScreen, int width, int height, int depth, int bpp)
- {
-     PixmapPtr	pPixmap;
--    int		datasize;
--    int		paddedWidth;
-+    size_t	datasize;
-+    size_t	paddedWidth;
-     int		adjust;
-     int		base;
- 
-     paddedWidth = ((width * bpp + FB_MASK) >> FB_SHIFT) * sizeof (FbBits);
-+    if (paddedWidth / 4 > 32767 || height > 32767)
-+	return NullPixmap;
-     datasize = height * paddedWidth;
- #ifdef PIXPRIV
-     base = pScreen->totalPixmapSize;
---- programs/Xserver/hw/xfree86/xaa/xaaInit.c.orig	Wed Apr 20 14:25:39 2005
-+++ programs/Xserver/hw/xfree86/xaa/xaaInit.c	Sun Sep 18 18:13:40 2005
-@@ -498,6 +498,9 @@
-     XAAPixmapPtr pPriv;
-     PixmapPtr pPix = NULL;
-     int size = w * h;
-+
-+    if (w > 32767 || h > 32767)
-+	return NullPixmap;
-     
-     if (!infoRec->offscreenDepthsInitialized)
- 	XAAInitializeOffscreenDepths (pScreen);
---- programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c.orig	Fri Apr 23 21:54:17 2004
-+++ programs/Xserver/hw/xfree86/xf4bpp/ppcPixmap.c	Sun Sep 18 18:13:40 2005
-@@ -85,7 +85,7 @@
-     int		depth ;
- {
-     register PixmapPtr pPixmap  = (PixmapPtr)NULL;
--    int size ;
-+    size_t size ;
-     
-     TRACE(("xf4bppCreatePixmap(pScreen=0x%x, width=%d, height=%d, depth=%d)\n", pScreen, width, height, depth)) ;
- 
-@@ -93,6 +93,10 @@
- 	return (PixmapPtr) NULL ;
- 
-     size = PixmapBytePad(width, depth);
-+
-+    if (size / 4 > 32767 || height > 32767)
-+	return (PixmapPtr) NULL ;
-+    
-     pPixmap = AllocatePixmap (pScreen, (height * size));
-     
-     if ( !pPixmap )
---- programs/Xserver/ilbm/ilbmpixmap.c.orig	Wed Apr 20 14:25:42 2005
-+++ programs/Xserver/ilbm/ilbmpixmap.c	Sun Sep 18 18:13:40 2005
-@@ -75,10 +75,12 @@
- 	int				depth;
- {
- 	PixmapPtr pPixmap;
--	int datasize;
--	int paddedWidth;
-+	size_t datasize;
-+	size_t paddedWidth;
- 
- 	paddedWidth = BitmapBytePad(width);
-+	if (paddedWidth > 32767 || height > 32767 || depth > 4)
-+		return NullPixmap;
- 	datasize = height * paddedWidth * depth;
- 	pPixmap = AllocatePixmap(pScreen, datasize);
- 	if (!pPixmap)
---- programs/Xserver/iplan2p4/iplpixmap.c.orig	Wed Apr 20 14:25:43 2005
-+++ programs/Xserver/iplan2p4/iplpixmap.c	Sun Sep 18 18:13:40 2005
-@@ -74,12 +74,14 @@
-     int		depth;
- {
-     PixmapPtr pPixmap;
--    int datasize;
--    int paddedWidth;
-+    size_t datasize;
-+    size_t paddedWidth;
-     int ipad=INTER_PLANES*2 - 1;
- 
-     paddedWidth = PixmapBytePad(width, depth);
-     paddedWidth = (paddedWidth + ipad) & ~ipad;
-+    if (paddedWidth / 4 > 32767 || height > 32767)
-+	return NullPixmap;
-     datasize = height * paddedWidth;
-     pPixmap = AllocatePixmap(pScreen, datasize);
-     if (!pPixmap)
---- programs/Xserver/mfb/mfbpixmap.c.orig	Fri Apr 22 22:49:50 2005
-+++ programs/Xserver/mfb/mfbpixmap.c	Sun Sep 18 18:13:40 2005
-@@ -71,12 +71,14 @@
-     int		depth;
- {
-     PixmapPtr pPixmap;
--    int datasize;
--    int paddedWidth;
-+    size_t datasize;
-+    size_t paddedWidth;
- 
-     if (depth != 1)
- 	return NullPixmap;
-     paddedWidth = BitmapBytePad(width);
-+    if (paddedWidth / 4 > 32767 || height > 32767)
-+	return NullPixmap;
-     datasize = height * paddedWidth;
-     pPixmap = AllocatePixmap(pScreen, datasize);
-     if (!pPixmap)
diff --git a/x11-servers/xorg-server-snap/files/patch-atimobility b/x11-servers/xorg-server-snap/files/patch-atimobility
deleted file mode 100644
index dd024a46cc9a..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-atimobility
+++ /dev/null
@@ -1,73 +0,0 @@
---- programs/Xserver/hw/xfree86/drivers/ati/atimode.c.orig	Fri Apr 23 19:26:46 2004
-+++ programs/Xserver/hw/xfree86/drivers/ati/atimode.c	Sun Feb 13 05:55:05 2005
-@@ -1,4 +1,4 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.18 2004/01/05 16:42:03 tsi Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atimode.c,v 1.20tsi Exp $ */
- /*
-  * Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
-  *
-@@ -646,7 +646,7 @@
-                             SetBits(pMode->CrtcVDisplay, CRTC_V_DISP);
-                     pATIHW->crtc_v_sync_strt_wid =
-                         SetBits(pMode->CrtcVSyncStart, CRTC_V_SYNC_STRT) |
--                            SetBits(pMode->CrtcVSyncEnd, CRTC_V_SYNC_WID);
-+                            SetBits(pMode->CrtcVSyncEnd, CRTC_V_SYNC_END_VGA);
-                     if (pMode->Flags & V_NVSYNC)
-                         pATIHW->crtc_v_sync_strt_wid |= CRTC_V_SYNC_POL;
-                 }
---- programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c.orig	Wed Dec 15 07:58:15 2004
-+++ programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c	Sun Feb 13 05:55:05 2005
-@@ -1,4 +1,4 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.74 2003/12/22 17:48:09 tsi Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atipreinit.c,v 1.79tsi Exp $ */
- /*
-  * Copyright 1999 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
-  *
-@@ -1902,10 +1902,10 @@
-                 VDisplay = GetBits(pATIHW->crtc_v_total_disp, CRTC_V_DISP);
-                 VSyncStart =
-                     GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_STRT);
--                VSyncEnd = (VSyncStart & ~MaxBits(CRTC_V_SYNC_WID)) |
--                    GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_WID);
-+                VSyncEnd = (VSyncStart & ~MaxBits(CRTC_V_SYNC_END_VGA)) |
-+                    GetBits(pATIHW->crtc_v_sync_strt_wid, CRTC_V_SYNC_END_VGA);
-                 if (VSyncStart > VSyncEnd)
--                    VSyncEnd += MaxBits(CRTC_V_SYNC_WID) + 1;
-+                    VSyncEnd += MaxBits(CRTC_V_SYNC_END_VGA) + 1;
-                 VTotal = GetBits(pATIHW->crtc_v_total_disp, CRTC_V_TOTAL);
- 
-                 VBlankStart = (VDisplay & ~0x03FFU) |
-@@ -2177,7 +2177,7 @@
-                 if ((pATIHW->horz_stretching &
-                     (HORZ_STRETCH_EN | AUTO_HORZ_RATIO)) !=
-                     (HORZ_STRETCH_EN | AUTO_HORZ_RATIO))
--                    xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
-+                    xf86DrvMsgVerb(pScreenInfo->scrnIndex, X_WARNING, 4,
-                         "Inconsistent panel horizontal dimension:"
-                         "  %d and %d.\n", pATI->LCDHorizontal, HDisplay);
-                 HDisplay = pATI->LCDHorizontal;
-@@ -2193,7 +2193,7 @@
-             {
-                 if (!(pATIHW->vert_stretching & VERT_STRETCH_EN) ||
-                     !(pATIHW->ext_vert_stretch & AUTO_VERT_RATIO))
--                    xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
-+                    xf86DrvMsgVerb(pScreenInfo->scrnIndex, X_WARNING, 4,
-                         "Inconsistent panel vertical dimension:  %d and %d.\n",
-                         pATI->LCDVertical, VDisplay);
-                 VDisplay = pATI->LCDVertical;
---- programs/Xserver/hw/xfree86/drivers/ati/atiregs.h.orig	Fri Jul 23 05:36:14 2004
-+++ programs/Xserver/hw/xfree86/drivers/ati/atiregs.h	Sun Feb 13 05:55:05 2005
-@@ -1,4 +1,4 @@
--/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.24 2003/04/23 21:51:30 tsi Exp $ */
-+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiregs.h,v 1.26tsi Exp $ */
- /*
-  * Copyright 1994 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
-  *
-@@ -551,6 +551,7 @@
- #define CRTC_V_SYNC_STRT		0x000007fful
- /*	?				0x0000f800ul */
- #define CRTC_V_SYNC_WID			0x001f0000ul
-+#define CRTC_V_SYNC_END_VGA		0x000f0000ul
- #define CRTC_V_SYNC_POL			0x00200000ul
- /*	?				0xffc00000ul */
- #define CRTC_VLINE_CRNT_VLINE	IOPortTag(0x04u, 0x04u)
diff --git a/x11-servers/xorg-server-snap/files/patch-dix-events.c b/x11-servers/xorg-server-snap/files/patch-dix-events.c
deleted file mode 100644
index 1270ee6dbde2..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-dix-events.c
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: programs/Xserver/dix/events.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/dix/events.c,v
-retrieving revision 1.16
-retrieving revision 1.17
-diff -u -u -r1.16 -r1.17
---- programs/Xserver/dix/events.c	15 Jul 2005 05:48:29 -0000	1.16
-+++ programs/Xserver/dix/events.c	25 Aug 2005 22:11:04 -0000	1.17
-@@ -1,4 +1,4 @@
--/* $XdotOrg: xc/programs/Xserver/dix/events.c,v 1.16 2005/07/15 05:48:29 kem Exp $ */
-+/* $XdotOrg: xc/programs/Xserver/dix/events.c,v 1.17 2005/08/25 22:11:04 anholt Exp $ */
- /* $XFree86: xc/programs/Xserver/dix/events.c,v 3.51 2004/01/12 17:04:52 tsi Exp $ */
- /************************************************************
- 
-@@ -675,7 +675,9 @@
- 		(sprite.current->bits->yhot != cursor->bits->yhot))
- 	    XineramaCheckPhysLimits(cursor, FALSE);
-     	(*sprite.screen->DisplayCursor)(sprite.screen, cursor);
-+	FreeCursor(sprite.current, (Cursor)0);
- 	sprite.current = cursor;
-+	sprite.current->refcnt++;
-     }
- }
- 
-@@ -930,7 +932,9 @@
- 			    (ScreenPtr)NULL);
- 	(*sprite.hotPhys.pScreen->DisplayCursor) (sprite.hotPhys.pScreen,
- 						  cursor);
-+	FreeCursor(sprite.current, (Cursor)0);
- 	sprite.current = cursor;
-+	sprite.current->refcnt++;
-     }
- }
- 
-@@ -2184,6 +2188,7 @@
- #endif
-     sprite.win = win;
-     sprite.current = wCursor (win);
-+    sprite.current->refcnt++;
-     spriteTraceGood = 1;
-     ROOT = win;
-     (*pScreen->CursorLimits) (
diff --git a/x11-servers/xorg-server-snap/files/patch-nv-update.diff b/x11-servers/xorg-server-snap/files/patch-nv-update.diff
deleted file mode 100644
index 177ea4675764..000000000000
--- a/x11-servers/xorg-server-snap/files/patch-nv-update.diff
+++ /dev/null
@@ -1,268 +0,0 @@
-Index: nv_driver.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v
-retrieving revision 1.16
-retrieving revision 1.18
-diff -u -u -r1.16 -r1.18
---- programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c	11 Jul 2005 02:29:57 -0000	1.16
-+++ programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c	29 Sep 2005 21:47:29 -0000	1.18
-@@ -1,4 +1,4 @@
--/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v 1.16 2005/07/11 02:29:57 ajax Exp $ */
-+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v 1.18 2005/09/29 21:47:29 aplattner Exp $ */
- /* $XConsortium: nv_driver.c /main/3 1996/10/28 05:13:37 kaleb $ */
- /*
-  * Copyright 1996-1997  David J. McKay
-@@ -87,6 +87,8 @@
-         0
- };
- 
-+/* Known cards as of 2005/09/21  */
-+
- static SymTabRec NVKnownChipsets[] =
- {
-   { 0x12D20018, "RIVA 128" },
-@@ -205,7 +207,7 @@
- #else
-   { 0x10DE0329, "0x0329" },
- #endif
--  { 0x10DE032A, "Quadro NVS 280 PCI" },
-+  { 0x10DE032A, "Quadro NVS 55/280 PCI" },
-   { 0x10DE032B, "Quadro FX 500/600 PCI" },
-   { 0x10DE032C, "GeForce FX Go53xx Series" },
-   { 0x10DE032D, "GeForce FX Go5100" },
-@@ -238,12 +240,14 @@
-   { 0x10DE0043, "0x0043" },
-   { 0x10DE0045, "GeForce 6800 GT" },
-   { 0x10DE0046, "GeForce 6800 GT" },
-+  { 0x10DE0048, "GeForce 6800 XT" },
-   { 0x10DE0049, "0x0049" },
-   { 0x10DE004E, "Quadro FX 4000" },
- 
-   { 0x10DE00C0, "0x00C0" },
-   { 0x10DE00C1, "GeForce 6800" },
-   { 0x10DE00C2, "GeForce 6800 LE" },
-+  { 0x10DE00C3, "GeForce 6800 XT" },
-   { 0x10DE00C8, "GeForce Go 6800" },
-   { 0x10DE00C9, "GeForce Go 6800 Ultra" },
-   { 0x10DE00CC, "Quadro FX Go1400" },
-@@ -266,16 +270,16 @@
-   { 0x10DE014E, "Quadro FX 540" },
-   { 0x10DE014F, "GeForce 6200" },
- 
--  { 0x10DE0160, "0x0160" },
-+  { 0x10DE0160, "GeForce 6500" },
-   { 0x10DE0161, "GeForce 6200 TurboCache(TM)" },
-   { 0x10DE0162, "GeForce 6200SE TurboCache(TM)" },
--  { 0x10DE0163, "0x0163" },
-+  { 0x10DE0163, "GeForce 6200 LE" },
-   { 0x10DE0164, "GeForce Go 6200" },
-   { 0x10DE0165, "Quadro NVS 285" },
-   { 0x10DE0166, "GeForce Go 6400" },
-   { 0x10DE0167, "GeForce Go 6200" },
-   { 0x10DE0168, "GeForce Go 6400" },
--  { 0x10DE0169, "0x0169" },
-+  { 0x10DE0169, "GeForce 6250" },
-   { 0x10DE016B, "0x016B" },
-   { 0x10DE016C, "0x016C" },
-   { 0x10DE016D, "0x016D" },
-@@ -293,10 +297,10 @@
- 
-   { 0x10DE0090, "0x0090" },
-   { 0x10DE0091, "GeForce 7800 GTX" },
--  { 0x10DE0092, "0x0092" },
-+  { 0x10DE0092, "GeForce 7800 GT" },
-   { 0x10DE0093, "0x0093" },
-   { 0x10DE0094, "0x0094" },
--  { 0x10DE0098, "0x0098" },
-+  { 0x10DE0098, "GeForce Go 7800" },
-   { 0x10DE0099, "GeForce Go 7800 GTX" },
-   { 0x10DE009C, "0x009C" },
-   { 0x10DE009D, "Quadro FX 4500" },
-@@ -699,6 +703,8 @@
-                case 0x0210:
-                case 0x0220:
-                case 0x0230:
-+               case 0x0290:
-+               case 0x0390:
-                    NVChipsets[numUsed].token = pciid;
-                    NVChipsets[numUsed].name = "Unknown NVIDIA chip";
-                    NVPciChipsets[numUsed].numChipset = pciid;
-@@ -1389,6 +1395,8 @@
-     case 0x0210:
-     case 0x0220:
-     case 0x0230:
-+    case 0x0290:
-+    case 0x0390:
-          pNv->Architecture =  NV_ARCH_40;
-          break;
-     default:
-@@ -1425,9 +1433,13 @@
- 	}
-     }
- 
--    pNv->FbUsableSize = pNv->FbMapSize - (128 * 1024);
-+    if(pNv->Architecture >= NV_ARCH_40)
-+       pNv->FbUsableSize = pNv->FbMapSize - (560 * 1024);
-+    else
-+       pNv->FbUsableSize = pNv->FbMapSize - (128 * 1024);
-     pNv->ScratchBufferSize = (pNv->Architecture < NV_ARCH_10) ? 8192 : 16384;
-     pNv->ScratchBufferStart = pNv->FbUsableSize - pNv->ScratchBufferSize;
-+    pNv->CursorStart = pNv->FbUsableSize + (32 * 1024);
- 
-     /*
-      * Setup the ClockRanges, which describe what clock ranges are available,
-Index: nv_hw.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c,v
-retrieving revision 1.7
-retrieving revision 1.11
-diff -u -u -r1.7 -r1.11
---- programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c	11 Jul 2005 02:29:58 -0000	1.7
-+++ programs/Xserver/hw/xfree86/drivers/nv/nv_hw.c	29 Sep 2005 21:47:29 -0000	1.11
-@@ -919,7 +919,7 @@
-     RIVA_HW_STATE *state
- )
- {
--    int i;
-+    int i, j;
- 
-     pNv->PMC[0x0140/4] = 0x00000000;
-     pNv->PMC[0x0200/4] = 0xFFFF00FF;
-@@ -932,16 +932,28 @@
- 
-     if(pNv->Architecture == NV_ARCH_04) {
-         pNv->PFB[0x0200/4] = state->config;
--    } else if ((pNv->Chipset & 0xfff0) == 0x0090) {
--        for(i = 0; i < 15; i++) {
--           pNv->PFB[(0x0600 + (i * 0x10))/4] = 0;
--           pNv->PFB[(0x0604 + (i * 0x10))/4] = pNv->FbMapSize - 1;
--        }
--    } else {
-+    } else 
-+    if((pNv->Architecture < NV_ARCH_40) ||
-+       ((pNv->Chipset & 0xfff0) == 0x0040))
-+    {
-         for(i = 0; i < 8; i++) {
-            pNv->PFB[(0x0240 + (i * 0x10))/4] = 0;
-            pNv->PFB[(0x0244 + (i * 0x10))/4] = pNv->FbMapSize - 1;
-         }
-+    } else {
-+        int regions = 12;
-+
-+        if(((pNv->Chipset & 0xfff0) == 0x0090) ||
-+           ((pNv->Chipset & 0xfff0) == 0x01D0) ||
-+           ((pNv->Chipset & 0xfff0) == 0x0290))
-+        {
-+           regions = 15;
-+        }
-+ 
-+       for(i = 0; i < regions; i++) {
-+          pNv->PFB[(0x0600 + (i * 0x10))/4] = 0;
-+          pNv->PFB[(0x0604 + (i * 0x10))/4] = pNv->FbMapSize - 1;
-+       }
-     }
- 
-     if(pNv->Architecture >= NV_ARCH_40) {
-@@ -1160,6 +1172,12 @@
-               pNv->PGRAPH[0x0090/4] = 0x00008000;
-               pNv->PGRAPH[0x0610/4] = 0x00be3c5f;
- 
-+              j = pNv->REGS[0x1540/4] & 0xff;
-+              if(j) {
-+                  for(i = 0; !(j & 1); j >>= 1, i++);
-+                  pNv->PGRAPH[0x5000/4] = i;
-+              }
-+
-               if((pNv->Chipset & 0xfff0) == 0x0040) {
-                  pNv->PGRAPH[0x09b0/4] = 0x83280fff;
-                  pNv->PGRAPH[0x09b4/4] = 0x000000a0;
-@@ -1176,6 +1194,7 @@
-                  pNv->PFB[0x033C/4] &= 0xffff7fff;
-                  break;
-               case 0x00C0:
-+              case 0x0120:
-                  pNv->PGRAPH[0x0828/4] = 0x007596ff;
-                  pNv->PGRAPH[0x082C/4] = 0x00000108;
-                  break;
-@@ -1200,6 +1219,7 @@
-                  pNv->PRAMDAC[0x0608/4] |= 0x00100000;
-                  break;
-               case 0x0090:
-+              case 0x0290:
-                  pNv->PRAMDAC[0x0608/4] |= 0x00100000;
-                  pNv->PGRAPH[0x0828/4] = 0x07830610;
-                  pNv->PGRAPH[0x082C/4] = 0x0000016A;
-@@ -1247,12 +1267,32 @@
-               }
-            }
- 
--           if((pNv->Chipset & 0xfff0) == 0x0090) {
--              for(i = 0; i < 60; i++)
--                pNv->PGRAPH[(0x0D00/4) + i] = pNv->PFB[(0x0600/4) + i];
--           } else {
--              for(i = 0; i < 32; i++)
-+           if((pNv->Architecture < NV_ARCH_40) ||
-+              ((pNv->Chipset & 0xfff0) == 0x0040)) 
-+           {
-+              for(i = 0; i < 32; i++) {
-                 pNv->PGRAPH[(0x0900/4) + i] = pNv->PFB[(0x0240/4) + i];
-+                pNv->PGRAPH[(0x6900/4) + i] = pNv->PFB[(0x0240/4) + i];
-+              }
-+           } else {
-+              if(((pNv->Chipset & 0xfff0) == 0x0090) ||
-+                 ((pNv->Chipset & 0xfff0) == 0x01D0) ||
-+                 ((pNv->Chipset & 0xfff0) == 0x0290))
-+              {
-+                 for(i = 0; i < 60; i++) {
-+                   pNv->PGRAPH[(0x0D00/4) + i] = pNv->PFB[(0x0600/4) + i];
-+                   pNv->PGRAPH[(0x6900/4) + i] = pNv->PFB[(0x0600/4) + i];
-+                 }
-+              } else {
-+                 for(i = 0; i < 48; i++) {
-+                   pNv->PGRAPH[(0x0900/4) + i] = pNv->PFB[(0x0600/4) + i];
-+                   if(((pNv->Chipset & 0xfff0) != 0x0160) &&
-+                      ((pNv->Chipset & 0xfff0) != 0x0220))
-+                   {
-+                      pNv->PGRAPH[(0x6900/4) + i] = pNv->PFB[(0x0600/4) + i];
-+                   }
-+                 }
-+              }
-            }
- 
-            if(pNv->Architecture >= NV_ARCH_40) {
-@@ -1267,7 +1307,10 @@
-                  pNv->PGRAPH[0x0864/4] = pNv->FbMapSize - 1;
-                  pNv->PGRAPH[0x0868/4] = pNv->FbMapSize - 1;
-               } else {
--                 if((pNv->Chipset & 0xfff0) == 0x0090) {
-+                 if(((pNv->Chipset & 0xfff0) == 0x0090) ||
-+                    ((pNv->Chipset & 0xfff0) == 0x01D0) ||
-+                    ((pNv->Chipset & 0xfff0) == 0x0290)) 
-+                 {
-                     pNv->PGRAPH[0x0DF0/4] = pNv->PFB[0x0200/4];
-                     pNv->PGRAPH[0x0DF4/4] = pNv->PFB[0x0204/4];
-                  } else {
-Index: nv_setup.c
-===================================================================
-RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c,v
-retrieving revision 1.8
-retrieving revision 1.10
-diff -u -u -r1.8 -r1.10
---- programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c	5 Aug 2005 03:52:28 -0000	1.8
-+++ programs/Xserver/hw/xfree86/drivers/nv/nv_setup.c	29 Sep 2005 21:47:29 -0000	1.10
-@@ -317,7 +317,6 @@
-            pNv->CrystalFreqKHz = 27000;
-     }
- 
--    pNv->CursorStart      = (pNv->RamAmountKBytes - 96) * 1024;
-     pNv->CURSOR           = NULL;  /* can't set this here */
-     pNv->MinVClockFreqKHz = 12000;
-     pNv->MaxVClockFreqKHz = pNv->twoStagePLL ? 400000 : 350000;
-@@ -448,6 +447,7 @@
-     case 0x0144:
-     case 0x0146:
-     case 0x0148:
-+    case 0x0098:
-     case 0x0099:
-         mobile = TRUE;
-         break;
diff --git a/x11-servers/xorg-server-snap/pkg-plist b/x11-servers/xorg-server-snap/pkg-plist
index 173425cb7934..2216cd1341ee 100644
--- a/x11-servers/xorg-server-snap/pkg-plist
+++ b/x11-servers/xorg-server-snap/pkg-plist
@@ -29,15 +29,15 @@ include/X11/bitmaps/shorter.xbm
 include/X11/bitmaps/taller.xbm
 include/X11/bitmaps/up.xbm
 include/X11/bitmaps/wider.xbm
+include/X11/fonts/bdfint.h
+include/X11/fonts/pcf.h
+include/X11/misc.h
+include/X11/os.h
 include/X11/pixmaps/card.xpm
 include/X11/pixmaps/computer.xpm
 include/X11/pixmaps/keyboard.xpm
 include/X11/pixmaps/monitor.xpm
 include/X11/pixmaps/mouse.xpm
-include/X11/fonts/bdfint.h
-include/X11/fonts/pcf.h
-include/X11/misc.h
-include/X11/os.h
 lib/X11/Cards
 lib/X11/Options
 lib/X11/app-defaults/XOrgCfg
@@ -166,7 +166,7 @@ lib/modules/input/wacom_drv.so
 %%ALPHA_NA%%lib/modules/libafb.so
 lib/modules/libcfb.so
 lib/modules/libcfb16.so
-lib/modules/libcfb24.so
+%%SPARC64%%lib/modules/libcfb24.so
 lib/modules/libcfb32.so
 lib/modules/libddc.so
 lib/modules/libexa.so