- 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@.

8 files changed, 57 insertions, 11 deletions

diff --git a/graphics/libGL/files/extra-mach64_context.h b/graphics/libGL/files/extra-mach64_context.h
new file mode 100644
index 000000000000..f844599bfa68
--- /dev/null
+++ b/graphics/libGL/files/extra-mach64_context.h
@@ -0,0 +1,21 @@
+--- src/mesa/drivers/dri/mach64/mach64_context.h.orig	2011-05-13 01:47:18.000000000 +0200
++++ src/mesa/drivers/dri/mach64/mach64_context.h	2011-07-27 09:59:53.000000000 +0200
+@@ -289,7 +289,7 @@
+ /* ================================================================
+  * 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)
+@@ -298,6 +298,9 @@
+ #if defined(__OpenBSD__) || defined(__NetBSD__)
+ #include <machine/endian.h>
+ #define bswap_32 bswap32
++#elif defined(__FreeBSD__)
++#include <sys/endian.h>
++#define bswap_32 bswap32
+ #else
+ #include <byteswap.h>
+ #endif
diff --git a/graphics/libGL/files/extra-sis_context.h b/graphics/libGL/files/extra-sis_context.h
new file mode 100644
index 000000000000..0e16f51c0a10
--- /dev/null
+++ b/graphics/libGL/files/extra-sis_context.h
@@ -0,0 +1,22 @@
+--- src/mesa/drivers/dri/sis/sis_context.h.orig	2010-12-14 22:43:15.000000000 +0100
++++ src/mesa/drivers/dri/sis/sis_context.h	2011-07-27 09:58:22.000000000 +0200
+@@ -400,10 +400,18 @@
+ #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(__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/libGL/files/extra-src-glsl_ir_constant_expression.cpp b/graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp
new file mode 100644
index 000000000000..8df40432dfc9
--- /dev/null
+++ b/graphics/libGL/files/extra-src-glsl_ir_constant_expression.cpp
@@ -0,0 +1,14 @@
+--- src/glsl/ir_constant_expression.cpp.orig	2011-07-23 15:08:44.000000000 +0200
++++ src/glsl/ir_constant_expression.cpp	2011-07-23 15:09:03.000000000 +0200
+@@ -39,6 +39,11 @@
+ #include "ir_visitor.h"
+ #include "glsl_types.h"
+ 
++#include <sys/param.h>
++#if __FreeBSD_version <= 704100 || (__FreeBSD_version >= 800000 && __FreeBSD_version < 802502) || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900027)
++#define log2(x) (log(x) / log(2))
++#endif
++
+ static float
+ dot(ir_constant *op0, ir_constant *op1)
+ {
diff --git a/graphics/libGL/files/patch-src__mesa__x86-64__glapi_x86-64.S b/graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S
index 908a6fe300aa..908a6fe300aa 100644
--- a/graphics/libGL/files/patch-src__mesa__x86-64__glapi_x86-64.S
+++ b/graphics/libGL/files/extra-src__mesa__x86-64__glapi_x86-64.S
diff --git a/graphics/libGL/files/patch-src__mesa__x86-64__xform4.S b/graphics/libGL/files/extra-src__mesa__x86-64__xform4.S
index 193e6cc30fbe..193e6cc30fbe 100644
--- a/graphics/libGL/files/patch-src__mesa__x86-64__xform4.S
+++ b/graphics/libGL/files/extra-src__mesa__x86-64__xform4.S
diff --git a/graphics/libGL/files/patch-src__mesa__x86__glapi_x86.S b/graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S
index 71da78c83ffd..71da78c83ffd 100644
--- a/graphics/libGL/files/patch-src__mesa__x86__glapi_x86.S
+++ b/graphics/libGL/files/extra-src__mesa__x86__glapi_x86.S
diff --git a/graphics/libGL/files/patch-src__mesa__x86__read_rgba_span_x86.S b/graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S
index 37b08d1cda3c..37b08d1cda3c 100644
--- a/graphics/libGL/files/patch-src__mesa__x86__read_rgba_span_x86.S
+++ b/graphics/libGL/files/extra-src__mesa__x86__read_rgba_span_x86.S
diff --git a/graphics/libGL/files/mesalib74-configure b/graphics/libGL/files/mesalib74-configure
deleted file mode 100644
index af45b71f21c3..000000000000
--- a/graphics/libGL/files/mesalib74-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2009-03-28 00:59:46.000000000 +0000
-+++ configure	2009-04-05 11:53:44.000000000 +0000
-@@ -5739,7 +5739,7 @@
-     ;;
- *freebsd* | dragonfly*)
-     case "$host_cpu" in
--    i*86|x86_64) default_driver="dri";;
-+    i*86|x86_64|powerpc*|sparc*) default_driver="dri";;
-     esac
-     ;;
- esac