Update to 6.8.99.12, and incorporate the PCI ID fix for a Radeon X600. Add a

soon-to-be-committed-upstream patch to fix the build after the removal of
xf86drmCompat.c.  Also includes the fix for ports/32121, which had been
committed.

4 files changed, 56 insertions, 3 deletions

diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile
index f6d745741b1c..d32511bb6c76 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.10
+PORTVERSION=	6.8.99.12
 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 f4a44a65683c..087df41cbd20 100644
--- a/x11-servers/xorg-server-snap/distinfo
+++ b/x11-servers/xorg-server-snap/distinfo
@@ -1,2 +1,2 @@
-MD5 (xorg/xorg-x11-6.8.99.10.tar.bz2) = c740f5137e0b7baba99e7b7cd2aca6c9
-SIZE (xorg/xorg-x11-6.8.99.10.tar.bz2) = 44933624
+MD5 (xorg/xorg-x11-6.8.99.12.tar.bz2) = 4d717b2c0bb1214e8f85ad3992690d2c
+SIZE (xorg/xorg-x11-6.8.99.12.tar.bz2) = 44997357
diff --git a/x11-servers/xorg-server-snap/files/patch-drm-Imakefile b/x11-servers/xorg-server-snap/files/patch-drm-Imakefile
new file mode 100644
index 000000000000..096db6c4f0cb
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-drm-Imakefile
@@ -0,0 +1,38 @@
+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))
diff --git a/x11-servers/xorg-server-snap/files/patch-radeon_driver.c b/x11-servers/xorg-server-snap/files/patch-radeon_driver.c
new file mode 100644
index 000000000000..f54541a29c2c
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-radeon_driver.c
@@ -0,0 +1,15 @@
+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;