Update to a 20050719 snapshot of Mesa, DRM, and now r300 CVS trunk. The r300

support includes all Radeons that I have heard of so far.  Requires
xorg-server-snap and DRM from r300 CVS (5.x-7.x DRM insufficient).  The r300 DRM
will be committed to -current soon and hopefully merged to 6.x/5.x.  Previous
r300 support in 6.x/5.x just results in hangs due to improper command
submission, among other problems.

6 files changed, 74 insertions, 19 deletions

diff --git a/graphics/dri-devel/Makefile b/graphics/dri-devel/Makefile
index 588f447cdb84..360164ed00b4 100644
--- a/graphics/dri-devel/Makefile
+++ b/graphics/dri-devel/Makefile
@@ -6,21 +6,29 @@
 #
 
 PORTNAME=	dri
-PORTVERSION=	6.2.20050419
+PORTVERSION=	6.2.20050719
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://people.freebsd.org/~anholt/dri/
 MASTER_SITE_SUBDIR=	anholt
-DISTFILES=	Mesa-20050419.tar.bz2	\
-		drm-20050419.tar.bz2
+DISTFILES=	Mesa-20050719.tar.bz2	\
+		drm-20050719.tar.bz2	\
+		r300-20050719.tar.bz2
+
+PATCH_SITES=	http://people.freebsd.org/~anholt/dri/
+PATCHFILES=	patch-r300_drm.bz2
 
 MAINTAINER=	anholt@FreeBSD.org
 COMMENT=	DRI OpenGL drivers snapshot
 
 BUILD_DEPENDS=	makedepend:${X_IMAKE_PORT}
 
-CONFLICTS=	xfree86-dri-* dri-6.2_*
+EXTRA_DISTFILES= \
+		Mesa-20050719.tar.bz2	\
+		drm-20050719.tar.bz2
+
+CONFLICTS=	xfree86-dri-[0-9]* dri-6.2_*
 
 WRKSRC=		${WRKDIR}/Mesa
 USE_X_PREFIX=	yes
@@ -41,6 +49,11 @@ DRIMODDIR=	${PREFIX}/lib/modules/dri
 USE_GCC=        3.4
 .endif
 
+post-extract:
+	(cd ${WRKSRC}/src/mesa/drivers/dri && \
+		${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
+		${DISTDIR}/r300-20050719.tar.bz2 ${EXTRACT_AFTER_ARGS} )
+
 .if ${X_WINDOW_SYSTEM:L} != xorg
 IGNORE=	requires libGL from X.Org.
 .endif
@@ -59,6 +72,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/mga_dri.so ${DRIMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/r128_dri.so ${DRIMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/r200_dri.so ${DRIMODDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/r300_dri.so ${DRIMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/radeon_dri.so ${DRIMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/savage_dri.so ${DRIMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/sis_dri.so ${DRIMODDIR}
diff --git a/graphics/dri-devel/distinfo b/graphics/dri-devel/distinfo
index 398eca69740a..be86d6fe3a79 100644
--- a/graphics/dri-devel/distinfo
+++ b/graphics/dri-devel/distinfo
@@ -1,4 +1,8 @@
-MD5 (Mesa-20050419.tar.bz2) = cfab0106bf4828353dc8883a9f9fbb45
-SIZE (Mesa-20050419.tar.bz2) = 4797357
-MD5 (drm-20050419.tar.bz2) = 3d9b9585eea95009ea1e8b6bdc54358b
-SIZE (drm-20050419.tar.bz2) = 520707
+MD5 (Mesa-20050719.tar.bz2) = a1d544f745acd30ba3165ef35fe94873
+SIZE (Mesa-20050719.tar.bz2) = 4803354
+MD5 (drm-20050719.tar.bz2) = 41e97f1d4e72bccb94652489e2a17481
+SIZE (drm-20050719.tar.bz2) = 574577
+MD5 (r300-20050719.tar.bz2) = c0efa93184cc6a24d5c12d0d542429be
+SIZE (r300-20050719.tar.bz2) = 183141
+MD5 (patch-r300_drm.bz2) = f119e27184c3171c8ac4994ffd6b4cfe
+SIZE (patch-r300_drm.bz2) = 15578
diff --git a/graphics/dri-devel/files/patch-freebsd-dri b/graphics/dri-devel/files/patch-freebsd-dri
index 079470eec1b1..2c32b250391d 100644
--- a/graphics/dri-devel/files/patch-freebsd-dri
+++ b/graphics/dri-devel/files/patch-freebsd-dri
@@ -1,6 +1,6 @@
---- configs/freebsd-dri.orig	Tue Apr 19 18:46:31 2005
-+++ configs/freebsd-dri	Tue Apr 19 19:51:06 2005
-@@ -6,28 +6,29 @@
+--- configs/freebsd-dri.orig	Sat May 28 13:17:06 2005
++++ configs/freebsd-dri	Wed Jul 20 00:17:01 2005
+@@ -6,30 +6,30 @@
  CONFIG_NAME = freebsd-dri
  
  # Compiler and flags
@@ -12,23 +12,29 @@
 -OPT_FLAGS = -O
 +OPT_FLAGS = $(FBSDCFLAGS)
  
- X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
+-EXPAT_INCLUDES = -I/usr/local/include
+-X11_INCLUDES = -I/usr/X11R6/include -I/usr/X11R6/include/X11/extensions
++EXPAT_INCLUDES = -I${LOCALBASE}/include
++X11_INCLUDES = -I${X11BASE}/include -I${X11BASE}/include/X11/extensions
  DEFINES = -DDRI_NEW_INTERFACE_ONLY 
--CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99  -Wundef -fPIC -ffast-math -I/usr/local/include $(X11_INCLUDES)
+-CFLAGS = $(DEFINES) -Wmissing-prototypes -g -std=c99  -Wundef -fPIC \
+-	-ffast-math $(X11_INCLUDES)
 +CFLAGS = $(FBSDCFLAGS) $(DEFINES) -Wmissing-prototypes -g -std=c99  -Wundef \
-+	-fPIC -I/usr/local/include $(X11_INCLUDES)
++	-fPIC -ffast-math $(X11_INCLUDES)
  CXXFLAGS = $(DEFINES) -Wall -g -ansi -pedantic -fPIC
  
  ASM_SOURCES = 
  
  # Library/program dependencies
 -DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat
--GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -pthread
-+DRI_LIB_DEPS = -L/usr/local/lib -lm -lexpat ${PTHREAD_LIBS}
-+GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm ${PTHREAD_LIBS}
+-GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lm -lpthread
++DRI_LIB_DEPS = -L${LOCALBASE}/lib -lm ${PTHREAD_LIBS} -lexpat
++GL_LIB_DEPS = -L${X11BASE}/lib -lX11 -lXext -lm ${PTHREAD_LIBS}
  
- GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
- GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11
+-GLUT_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
+-GLW_LIB_DEPS = -L$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lXm -lX11
++GLUT_LIB_DEPS = -L$(LIB_DIR) -L${X11BASE}/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm
++GLW_LIB_DEPS = -L$(LIB_DIR) -L${X11BASE}/lib -lGL -lXt -lXm -lX11
  
  
  # Directories
@@ -37,3 +43,11 @@
  DRIVER_DIRS = dri
  PROGRAM_DIRS = 
  WINDOW_SYSTEM=dri
+@@ -38,6 +38,6 @@
+ 
+ # ffb and gamma are missing because they have not been converted to use the new
+ # interface.
+-DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 radeon tdfx \
++DRI_DIRS = dri_client i810 i830 i915 mach64 mga r128 r200 r300 radeon tdfx \
+ 	   unichrome savage sis
+ 
diff --git a/graphics/dri-devel/files/patch-glext.h b/graphics/dri-devel/files/patch-glext.h
new file mode 100644
index 000000000000..a24eff3c0d4a
--- /dev/null
+++ b/graphics/dri-devel/files/patch-glext.h
@@ -0,0 +1,11 @@
+--- include/GL/glext.h.orig	Wed Jul 20 00:37:30 2005
++++ include/GL/glext.h	Wed Jul 20 00:37:39 2005
+@@ -4192,7 +4192,7 @@
+ #ifndef GL_EXT_texture3D
+ #define GL_EXT_texture3D 1
+ #ifdef GL_GLEXT_PROTOTYPES
+-GLAPI void APIENTRY glTexImage3DEXT (GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
++GLAPI void APIENTRY glTexImage3DEXT (GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *);
+ GLAPI void APIENTRY glTexSubImage3DEXT (GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *);
+ #endif /* GL_GLEXT_PROTOTYPES */
+ typedef void (APIENTRYP PFNGLTEXIMAGE3DEXTPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels);
diff --git a/graphics/dri-devel/files/patch-r300_context.c b/graphics/dri-devel/files/patch-r300_context.c
new file mode 100644
index 000000000000..14469ff338de
--- /dev/null
+++ b/graphics/dri-devel/files/patch-r300_context.c
@@ -0,0 +1,11 @@
+--- src/mesa/drivers/dri/r300/r300_context.c.orig	Wed Jul 20 01:01:19 2005
++++ src/mesa/drivers/dri/r300/r300_context.c	Wed Jul 20 01:01:23 2005
+@@ -66,7 +66,7 @@
+ int future_hw_tcl_on=0;
+ int hw_tcl_on=0;
+ 
+-#if 1
++#if 0
+ #define need_GL_ARB_multisample
+ #define need_GL_ARB_texture_compression
+ #define need_GL_EXT_blend_minmax
diff --git a/graphics/dri-devel/pkg-plist b/graphics/dri-devel/pkg-plist
index e75ba433e57a..3913219c4a3b 100644
--- a/graphics/dri-devel/pkg-plist
+++ b/graphics/dri-devel/pkg-plist
@@ -5,6 +5,7 @@ lib/modules/dri/mach64_dri.so
 lib/modules/dri/mga_dri.so
 lib/modules/dri/r128_dri.so
 lib/modules/dri/r200_dri.so
+lib/modules/dri/r300_dri.so
 lib/modules/dri/radeon_dri.so
 lib/modules/dri/savage_dri.so
 lib/modules/dri/sis_dri.so