Index: Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-server-snap/Makefile,v retrieving revision 1.29 diff -u -r1.29 Makefile --- Makefile 12 Sep 2005 14:21:40 -0000 1.29 +++ Makefile 15 Sep 2005 16:02:46 -0000 @@ -6,7 +6,7 @@ # PORTNAME= xorg-server -PORTVERSION= 6.8.99.12 +PORTVERSION= 6.8.99.16 PORTREVISION= 1 CATEGORIES= x11-servers MASTER_SITES= http://xorg.freedesktop.org/snapshots/ Index: distinfo =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-server-snap/distinfo,v retrieving revision 1.6 diff -u -r1.6 distinfo --- distinfo 23 Jun 2005 01:19:08 -0000 1.6 +++ distinfo 9 Aug 2005 23:25:14 -0000 @@ -1,2 +1,2 @@ -MD5 (xorg/xorg-x11-6.8.99.12.tar.bz2) = 4d717b2c0bb1214e8f85ad3992690d2c -SIZE (xorg/xorg-x11-6.8.99.12.tar.bz2) = 44997357 +MD5 (xorg/xorg-x11-6.8.99.16.tar.bz2) = ae32054482f193d1579ab6f8cda66a7e +SIZE (xorg/xorg-x11-6.8.99.16.tar.bz2) = 45369937 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-server-snap/pkg-plist,v retrieving revision 1.12 diff -u -r1.12 pkg-plist --- pkg-plist 1 Aug 2005 10:27:21 -0000 1.12 +++ pkg-plist 9 Aug 2005 23:25:15 -0000 @@ -29,6 +29,10 @@ 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 @@ -164,8 +168,6 @@ lib/modules/libcfb16.so lib/modules/libcfb24.so lib/modules/libcfb32.so -lib/modules/libcw.so -lib/modules/libdamage.so lib/modules/libddc.so lib/modules/libfb.so lib/modules/libi2c.so Index: files/patch-drm-Imakefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-server-snap/files/patch-drm-Imakefile,v retrieving revision 1.1 diff -u -r1.1 patch-drm-Imakefile --- files/patch-drm-Imakefile 23 Jun 2005 01:19:08 -0000 1.1 +++ files/patch-drm-Imakefile 9 Aug 2005 23:25:15 -0000 @@ -1,38 +0,0 @@ -Index: programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile,v -retrieving revision 1.3 -diff -u -r1.3 Imakefile ---- programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile 16 Jun 2004 09:39:15 -0000 1.3 -+++ programs/Xserver/hw/xfree86/os-support/bsd/drm/Imakefile 22 Jun 2005 23:22:13 -0000 -@@ -15,8 +15,6 @@ - #endif - - #if defined(FreeBSDArchitecture) --COMPATSRC = xf86drmCompat.c --COMPATOBJ = xf86drmCompat.o - OS_SUBDIR = freebsd - #elif defined(NetBSDArchitecture) - OS_SUBDIR = netbsd -@@ -30,14 +28,12 @@ - xf86drmHash.c \ - xf86drmRandom.c \ - xf86drmSL.c \ -- $(COMPATSRC) \ - $(MSRC) - - OBJS = xf86drm.o \ - xf86drmHash.o \ - xf86drmRandom.o \ - xf86drmSL.o \ -- $(COMPATOBJ) \ - $(MOBJ) - - INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I. -I$(SERVERSRC)/include \ -@@ -63,6 +59,5 @@ - LinkSourceFile(xf86drmHash.c,$(XF86OSSRC)/linux/drm) - LinkSourceFile(xf86drmRandom.c,$(XF86OSSRC)/linux/drm) - LinkSourceFile(xf86drmSL.c,$(XF86OSSRC)/linux/drm) --LinkSourceFile(xf86drmCompat.c,$(XF86OSSRC)/linux/drm) - - InstallDriverSDKLibraryModule(drm,$(DRIVERSDKMODULEDIR),$(OS_SUBDIR)) Index: files/patch-radeon_driver.c =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-server-snap/files/patch-radeon_driver.c,v retrieving revision 1.4 diff -u -r1.4 patch-radeon_driver.c --- files/patch-radeon_driver.c 23 Jun 2005 01:19:08 -0000 1.4 +++ files/patch-radeon_driver.c 9 Aug 2005 23:25:15 -0000 @@ -1,15 +1,89 @@ -Index: programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c -=================================================================== -RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c,v -retrieving revision 1.54 -diff -u -r1.54 radeon_driver.c ---- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 15 Jun 2005 23:40:50 -0000 1.54 -+++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 22 Jun 2005 22:37:22 -0000 -@@ -2501,6 +2501,7 @@ - case PCI_CHIP_RV370_5464: - info->IsMobility = TRUE; - case PCI_CHIP_RV370_5B60: -+ case PCI_CHIP_RV370_5B62: - case PCI_CHIP_RV370_5B64: - case PCI_CHIP_RV370_5B65: - info->ChipFamily = CHIP_FAMILY_RV380; +diff -u -r1.63 -r1.69 +--- programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005/07/11 02:29:45 1.63 ++++ programs/Xserver/hw/xfree86/drivers/ati/radeon_driver.c 2005/08/08 23:42:36 1.69 +@@ -2211,7 +2211,10 @@ + unsigned char *RADEONMMIO = info->MMIO; + CARD32 mc_fb_location; + CARD32 mc_agp_location = INREG(RADEON_MC_AGP_LOCATION); +- ++ CARD32 bus_cntl = INREG(RADEON_BUS_CNTL); ++ ++ OUTREG (RADEON_BUS_CNTL, bus_cntl | RADEON_BUS_MASTER_DIS); ++ RADEONWaitForIdleMMIO(pScrn); + + /* This function has many problems with newer cards. + * Even with older cards, all registers changed here are not +@@ -2221,18 +2224,6 @@ + * we just hardcode these values for now. + * Need to revisit this whole function!!! + */ +- if (IS_R300_VARIANT) { +- info->fbLocation = 0; +- +- if (!info->IsSecondary) { +- RADEONWaitForIdleMMIO(pScrn); +- OUTREG (RADEON_MC_FB_LOCATION, (INREG(RADEON_CONFIG_MEMSIZE) - 1) & 0xffff0000); +- OUTREG(RADEON_DISPLAY_BASE_ADDR, info->fbLocation); +- OUTREG(RADEON_DISPLAY2_BASE_ADDR, info->fbLocation); +- OUTREG(RADEON_OV0_BASE_ADDR, info->fbLocation); +- } +- return; +- } + + if (info->IsIGP) { + mc_fb_location = INREG(RADEON_NB_TOM); +@@ -2271,6 +2262,8 @@ + OUTREG(RADEON_DISPLAY2_BASE_ADDR, info->fbLocation); + OUTREG(RADEON_OV0_BASE_ADDR, info->fbLocation); + ++ OUTREG (RADEON_BUS_CNTL, bus_cntl); ++ RADEONWaitForIdleMMIO(pScrn); + + /* Set display0/1 priority up on r3/4xx in the memory controller for + * high res modes if the user specifies HIGH for displaypriority +@@ -2537,9 +2530,9 @@ + case PCI_CHIP_RC410_5A61: + case PCI_CHIP_RS480_5954: + case PCI_CHIP_RS482_5974: +- info->ChipFamily = CHIP_FAMILY_RS300; /*CHIP_FAMILY_RS400*/ +- info->IsIGP = TRUE; +- info->HasSingleDAC = TRUE; /*?*/ ++ info->ChipFamily = CHIP_FAMILY_RV380; /*CHIP_FAMILY_RS400*/ ++ /*info->IsIGP = TRUE;*/ /* ??? */ ++ /*info->HasSingleDAC = TRUE;*/ /* ??? */ + break; + + case PCI_CHIP_RV410_564A: +@@ -5137,11 +5130,9 @@ + xf86DrvMsg(scrnIndex, X_WARNING, + "Enabling DRM support\n\n" + "\t*** Direct rendering support is highly experimental for Radeon 9500\n" +- "\t*** and newer cards. In fact, the only thing you could probably use\n" +- "\t*** it for is better 2d acceleration. The 3d mesa driver is not \n" +- "\t*** provided in this tree. A very experimental (and incomplete)\n" +- "\t*** version is available from http://r300.sourceforge.net\n" +- "\t*** This message has been last modified on 12/12/04.\n\n" ++ "\t*** and newer cards. The 3d mesa driver is not provided in this tree.\n" ++ "\t*** A very experimental (and incomplete) version is available from Mesa CVS.\n" "\t*** Additional information can be found on http://r300.sourceforge.net\n" ++ "\t*** This message has been last modified on 2005-08-07.\n\n" + ); + info->directRenderingEnabled = RADEONDRIScreenInit(pScreen); + } else if (info->IsSecondary) { +@@ -5633,7 +5624,8 @@ + } + + } else { +- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Direct rendering disabled\n"); ++ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, ++ "Direct rendering disabled\n"); + } + #endif + +@@ -8693,6 +8685,7 @@ + info->CRT2IsScrn0 = TRUE; + } else if(!xf86NameCmp(tempstr,"RightOf")) { + info->CRT2Position = radeonRightOf; ++ valid = TRUE; + if(result == 2) { + if(ival < 0) info->CRT1YOffs = -ival; + else info->CRT2YOffs = ival; Index: files/patch-xkbout.c =================================================================== RCS file: /home/ncvs/ports/x11-servers/xorg-server-snap/files/patch-xkbout.c,v retrieving revision 1.1 diff -u -r1.1 patch-xkbout.c --- files/patch-xkbout.c 10 May 2004 05:05:00 -0000 1.1 +++ files/patch-xkbout.c 9 Aug 2005 23:25:15 -0000 @@ -1,10 +0,0 @@ ---- lib/xkbfile/xkbout.c.orig Fri May 7 18:05:29 2004 -+++ lib/xkbfile/xkbout.c Fri May 7 18:05:29 2004 -@@ -54,7 +54,6 @@ - #include "XKBsrv.h" - - #include --#include "extensions/XKBfile.h" - - #endif -