- Please welcome Xorg 7.5.2

       The Xorg Team is pleased to announce the next round of Xorg updates.
       The team created a new flag called WITH_NEW_XORG that users can include
       in /etc/make.conf. This was created for the intel KMS work being done
       althouthough It probably works for other chips. Unfortunately, the intel
       KMS driver will only work on FreeBSD 9(RELENG|STABLE) or 10/HEAD users.
       Older version of FreeBSD will not be supported. Intel users will need
       to patch their source manually with Konstantin?s KMS kernel patch to get
       the newer chips to work. Please carefully read UPDATING entry.

Changes:

        - libdrm 2.4.31 (including KMS support)
        - mesa 7.11.2
        - xorg-server 1.10.6
        - a lot of new Graphic Drivers.

    I would like to thank:

         Koop Mast
         Eitan Adler
         Niclas Zeising
         and all helpers and testers from x11@.

5 files changed, 4 insertions, 62 deletions

diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index 6678c0ab875d..922c37e5f3ab 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -14,17 +14,9 @@ COMMENT=	OpenGL hardware acceleration drivers for the DRI
 
 LIB_DEPENDS=	drm:${PORTSDIR}/graphics/libdrm \
 		expat.6:${PORTSDIR}/textproc/expat2
-BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
-
-CONFLICTS=	dri-6.2.2005* dri-6.5.2006*
-MAKE_JOBS_UNSAFE=	yes
 
 USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto
 
-EXTRA_PATCHES+=	${FILESDIR}/patch-mach64_context.h \
-		${FILESDIR}/patch-sis_context.h
-
-
 do-install:
 	cd ${WRKSRC}/src/mesa; ${GMAKE} install-dri
 
diff --git a/graphics/dri/distinfo b/graphics/dri/distinfo
index 18c51665b5c4..106ab0bf5805 100644
--- a/graphics/dri/distinfo
+++ b/graphics/dri/distinfo
@@ -1,4 +1,4 @@
-SHA256 (MesaLib-7.4.4.tar.bz2) = eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
-SIZE (MesaLib-7.4.4.tar.bz2) = 3375615
 SHA256 (MesaLib-7.6.1.tar.bz2) = 701f0e4cb85d6298181651b780d1c0a439fadd02aad29ee6623fc05588bb8d44
 SIZE (MesaLib-7.6.1.tar.bz2) = 4886995
+SHA256 (MesaLib-7.11.2.tar.bz2) = 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
+SIZE (MesaLib-7.11.2.tar.bz2) = 6257280
diff --git a/graphics/dri/files/patch-mach64_context.h b/graphics/dri/files/patch-mach64_context.h
deleted file mode 100644
index 90fe99b3f1c7..000000000000
--- a/graphics/dri/files/patch-mach64_context.h
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/mesa/drivers/dri/mach64/mach64_context.h.orig	2009-01-21 10:55:48.000000000 -0500
-+++ src/mesa/drivers/dri/mach64/mach64_context.h	2009-01-22 13:48:00.000000000 -0500
-@@ -288,17 +288,20 @@
- /* ================================================================
-  * Byte ordering
-  */
--#if MESA_LITTLE_ENDIAN == 1
-+#if defined(MESA_LITTLE_ENDIAN) && MESA_LITTLE_ENDIAN == 1
- #define LE32_IN( x )		( *(GLuint *)(x) )
- #define LE32_IN_FLOAT( x )	( *(GLfloat *)(x) )
- #define LE32_OUT( x, y )	do { *(GLuint *)(x) = (y); } while (0)
- #define LE32_OUT_FLOAT( x, y )	do { *(GLfloat *)(x) = (y); } while (0)
- #else
--#ifndef __OpenBSD__
--#include <byteswap.h>
--#else
-+#if defined(__OpenBSD__)
- #include <machine/endian.h>
- #define bswap_32 bswap32
-+#elif defined(__FreeBSD__)
-+#include <sys/endian.h>
-+#define bswap_32 bswap32
-+#else
-+#include <byteswap.h>
- #endif
- 
- #define LE32_IN( x )		bswap_32( *(GLuint *)(x) )
diff --git a/graphics/dri/files/patch-sis_context.h b/graphics/dri/files/patch-sis_context.h
deleted file mode 100644
index 3152e2db0f7d..000000000000
--- a/graphics/dri/files/patch-sis_context.h
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/mesa/drivers/dri/sis/sis_context.h.orig	2008-09-22 13:38:53.000000000 +0100
-+++ src/mesa/drivers/dri/sis/sis_context.h	2008-09-22 13:40:51.000000000 +0100
-@@ -401,10 +401,20 @@
- #define MMIO_READ(reg) *(volatile GLint *)(smesa->IOBase + (reg))
- #define MMIO_READf(reg) *(volatile GLfloat *)(smesa->IOBase + (reg))
- 
--#if defined(__i386__) || defined(__x86_64__)
-+#if defined(__alpha__)
-+#define MMIO_WMB()	__asm __volatile("wmb" : : : "memory")
-+#elif defined(__i386__) || defined(__x86_64__) || defined(__amd64__)
- #define MMIO_WMB()	__asm __volatile("" : : : "memory")
- #elif defined(__ia64__)
- #define MMIO_WMB()	__asm __volatile("mf" : : : "memory")
-+#elif defined(__powerpc__)
-+#define MMIO_WMB()	__asm __volatile("eieio" : : : "memory")
-+#elif defined(__sparc64__)
-+/*
-+ * #StoreStore probably would be sufficient for this driver at the
-+ * time of this writing but we use #Sync for safety.
-+ */
-+#define MMIO_WMB()	__asm __volatile("membar #Sync" : : : "memory")
- #else
- #error platform needs WMB
- #endif
diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist
index 8a12d059e36b..00253838e40b 100644
--- a/graphics/dri/pkg-plist
+++ b/graphics/dri/pkg-plist
@@ -4,10 +4,11 @@ lib/dri/i915_dri.so
 lib/dri/i965_dri.so
 lib/dri/mach64_dri.so
 lib/dri/mga_dri.so
+%%NEW%%lib/dri/nouveau_vieux_dri.so
 lib/dri/r128_dri.so
 lib/dri/r200_dri.so
 lib/dri/r300_dri.so
-%%MESALIB76%%lib/dri/r600_dri.so
+lib/dri/r600_dri.so
 lib/dri/radeon_dri.so
 lib/dri/savage_dri.so
 lib/dri/sis_dri.so