Update mesa ports to 8.0-RC2.

Remove libglut and libGLw stuff from bsd.mesa.mk because they are now 
stand-alone. Disable nouveau driver in graphics/dri since we can't use it atm.
Tweak UPDATING a bit.


git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@410 058c260c-8361-11dd-a0ac-aa2bafec7d09

9 files changed, 43 insertions, 99 deletions

diff --git a/UPDATING b/UPDATING
index c74c033..9a6e170 100644
--- a/UPDATING
+++ b/UPDATING
@@ -1,18 +1,24 @@
 ** This also needs a review, as well as a correct date **
+
 20120205:
-  AFFECTS: users of libGLUT and freeglut, as well as probably everyone using
-	   OpenGL.
+  AFFECTS: users libglut, dri. 
   AUTHOR: x11@FreeBSD.org
 
-  The default implementation of the OpenGL Utility Toolkit was changed from the
-  old and unmaintained libGLUT to a new implementation called freeglut.
-  Freeglut is already used as the GLUT implementation in many Linux
-  distributions.  This change requires that all ports linking to libGLUT be
-  recompiled since libGLUT and freeglut differ in shared library version.
+  The old and unmaintained libglut shipped with MESA was replaced with a new
+  implementation called freeglut. Freeglut is already used as the GLUT
+  implementation in many Linux distributions. This change requires that all
+  ports linking to libGLUT be recompiled since libGLUT and freeglut differ in
+  shared library version.
 
   portmaster -o graphics/freeglut graphics/libglut
   portmaster -r freeglut
 
+  Starting with graphics/dri version 8.0. A number of older dri driver modules
+  where dropped. If you using one of the following you should consider not
+  using the WITH_NEW_XORG switch.
+
+  i810, mach64, mga, r128, r300, r600, savage, sis, tdfx and unichrome.  
+
 ** This needs at least a review **
 
 20120105:
diff --git a/graphics/dri/distinfo b/graphics/dri/distinfo
index 106ab0b..b1b015b 100644
--- a/graphics/dri/distinfo
+++ b/graphics/dri/distinfo
@@ -1,4 +1,4 @@
 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
+SHA256 (MesaLib-8.0-rc2.tar.bz2) = cde82c8743e72dbc464278ab85e013ac5f88392fd6a6349fe5f3cbf2db7dbf70
+SIZE (MesaLib-8.0-rc2.tar.bz2) = 5683245
diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist
index 0025383..3b0b034 100644
--- a/graphics/dri/pkg-plist
+++ b/graphics/dri/pkg-plist
@@ -1,20 +1,19 @@
 include/GL/internal/dri_interface.h
-lib/dri/i810_dri.so
+%%OLD%%lib/dri/i810_dri.so
 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
+%%OLD%%lib/dri/mach64_dri.so
+%%OLD%%lib/dri/mga_dri.so
+%%OLD%%lib/dri/r128_dri.so
 lib/dri/r200_dri.so
-lib/dri/r300_dri.so
-lib/dri/r600_dri.so
+%%OLD%%lib/dri/r300_dri.so
+%%OLD%%lib/dri/r600_dri.so
 lib/dri/radeon_dri.so
-lib/dri/savage_dri.so
-lib/dri/sis_dri.so
+%%OLD%%lib/dri/savage_dri.so
+%%OLD%%lib/dri/sis_dri.so
 lib/dri/swrast_dri.so
-lib/dri/tdfx_dri.so
-lib/dri/unichrome_dri.so
+%%OLD%%lib/dri/tdfx_dri.so
+%%OLD%%lib/dri/unichrome_dri.so
 libdata/pkgconfig/dri.pc
 @dirrm lib/dri
 @dirrmtry include/GL/internal
diff --git a/graphics/libGL/bsd.mesalib.mk b/graphics/libGL/bsd.mesalib.mk
index c01d7f4..be1e151 100644
--- a/graphics/libGL/bsd.mesalib.mk
+++ b/graphics/libGL/bsd.mesalib.mk
@@ -11,8 +11,6 @@
 #
 #    - graphics/libGL
 #    - graphics/libGLU
-#    - graphics/libGLw
-#    - graphics/libglut
 #    - graphics/dri
 #
 # $FreeBSD$
@@ -22,9 +20,9 @@ MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
 .if defined(WITH_NEW_XORG)
-MESABASEVERSION=	7.11.2
+MESABASEVERSION=	8.0
 # if there is a subversion, include the '-' between 7.11-rc2 for example.
-MESASUBVERSION=		
+MESASUBVERSION=		rc2
 PLIST_SUB+=	OLD="@comment " NEW=""
 .else
 MESABASEVERSION=	7.6.1
@@ -32,8 +30,8 @@ MESASUBVERSION=
 PLIST_SUB+=	OLD="" NEW="@comment "
 .endif
 
-MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/:mesa,glut
-DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}:mesa
+MASTER_SITES=	ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
+DISTFILES=	MesaLib-${MESADISTVERSION}${EXTRACT_SUFX}
 MAINTAINER?=	x11@FreeBSD.org
 
 BUILD_DEPENDS+=	makedepend:${PORTSDIR}/devel/makedepend \
@@ -50,12 +48,10 @@ MAKE_JOBS_SAFE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=--enable-gallium-llvm=no --without-gallium-drivers \
-		--disable-egl
+		--disable-egl --disable-glut --disable-glw
 
 .if defined(WITH_NEW_XORG)
-EXTRA_PATCHES+=	${PATCHDIR}/extra-mach64_context.h \
-		${PATCHDIR}/extra-sis_context.h \
-		${PATCHDIR}/extra-src-glsl_ir_constant_expression.cpp
+EXTRA_PATCHES+=	${PATCHDIR}/extra-src-glsl_ir_constant_expression.cpp
 .else
 EXTRA_PATCHES+=	${PATCHDIR}/extra-src__mesa__x86-64__glapi_x86-64.S \
 		${PATCHDIR}/extra-src__mesa__x86-64__xform4.S \
@@ -66,7 +62,7 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-src__mesa__x86-64__glapi_x86-64.S \
 ALL_TARGET=		default
 
 PATCHDIR=		${.CURDIR}/../../graphics/libGL/files
-WRKSRC=			${WRKDIR}/Mesa-${MESABASEVERSION}${MESASUBVERSION}
+WRKSRC=			${WRKDIR}/Mesa-${MESADISTVERSION}
 
 .if !defined(ARCH)
 ARCH!=			uname -p
@@ -74,24 +70,14 @@ ARCH!=			uname -p
 
 COMPONENT=		${PORTNAME:L:C/^lib//:C/mesa-//}
 
-.if ${COMPONENT:Mglut} == ""
-. if ${COMPONENT:Mglu} == ""
-CONFIGURE_ARGS+=	--disable-glu --disable-glut
-. else
-CONFIGURE_ARGS+=	--disable-glut
-. endif
-.else
-DISTFILES+=		MesaGLUT-${MESADISTVERSION}${EXTRACT_SUFX}:glut
-.endif
-
-.if ${COMPONENT:Mglw} == ""
-CONFIGURE_ARGS+=	--disable-glw
-.else
-CONFIGURE_ARGS+=	--enable-motif
+.if ${COMPONENT:Mglu} == ""
+CONFIGURE_ARGS+=	--disable-glu
 .endif
 
 .if ${COMPONENT:Mdri} == ""
 CONFIGURE_ARGS+=	--with-dri-drivers=no
+.else
+CONFIGURE_ARGS+=	--with-dri-drivers="i915,i965,r200,radeon,swrast"
 .endif
 
 .if defined(WITHOUT_XCB)
@@ -105,10 +91,6 @@ post-patch:
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/src/glu/Makefile \
-		${WRKSRC}/src/glw/Makefile \
 		${WRKSRC}/src/mesa/Makefile \
 		${WRKSRC}/src/mesa/drivers/dri/Makefile
-.if ${COMPONENT:Mglut} != ""
-	@${REINPLACE_CMD} -e 's|[$$](INSTALL_LIB_DIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
-		${WRKSRC}/src/glut/glx/Makefile
-.endif
+
diff --git a/graphics/libGL/distinfo b/graphics/libGL/distinfo
index 106ab0b..b1b015b 100644
--- a/graphics/libGL/distinfo
+++ b/graphics/libGL/distinfo
@@ -1,4 +1,4 @@
 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
+SHA256 (MesaLib-8.0-rc2.tar.bz2) = cde82c8743e72dbc464278ab85e013ac5f88392fd6a6349fe5f3cbf2db7dbf70
+SIZE (MesaLib-8.0-rc2.tar.bz2) = 5683245
diff --git a/graphics/libGL/files/extra-mach64_context.h b/graphics/libGL/files/extra-mach64_context.h
deleted file mode 100644
index f844599..0000000
--- a/graphics/libGL/files/extra-mach64_context.h
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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
deleted file mode 100644
index 0e16f51..0000000
--- a/graphics/libGL/files/extra-sis_context.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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/pkg-plist b/graphics/libGL/pkg-plist
index 4125f74..bc0e3c7 100644
--- a/graphics/libGL/pkg-plist
+++ b/graphics/libGL/pkg-plist
@@ -3,11 +3,11 @@
 include/GL/gl.h
 include/GL/gl_mangle.h
 include/GL/glext.h
-include/GL/glfbdev.h
+%%OLD%%include/GL/glfbdev.h
 include/GL/glx.h
 include/GL/glx_mangle.h
 include/GL/glxext.h
-include/GL/mesa_wgl.h
+%%OLD%%include/GL/mesa_wgl.h
 %%OLD%%include/GL/mglmesa.h
 include/GL/osmesa.h
 %%OLD%%include/GL/svgamesa.h
diff --git a/graphics/libGLU/distinfo b/graphics/libGLU/distinfo
index 106ab0b..b1b015b 100644
--- a/graphics/libGLU/distinfo
+++ b/graphics/libGLU/distinfo
@@ -1,4 +1,4 @@
 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
+SHA256 (MesaLib-8.0-rc2.tar.bz2) = cde82c8743e72dbc464278ab85e013ac5f88392fd6a6349fe5f3cbf2db7dbf70
+SIZE (MesaLib-8.0-rc2.tar.bz2) = 5683245