Update dri port to use a more recent Mesa (and drm) snapshot. Includes

many conformance/bug fixes in the core, fixes for two hangs in the radeon
driver, bugfixes in the r200 driver, adds more chip IDs, and adds fixes to
drivers whose DRM will hopefully be ported soon.  Also install i915 driver on
AMD64, as EM64T machines may have that chipset.

4 files changed, 16 insertions, 41 deletions

diff --git a/graphics/dri/Makefile b/graphics/dri/Makefile
index 75a1227256f8..62ca4c55414a 100644
--- a/graphics/dri/Makefile
+++ b/graphics/dri/Makefile
@@ -7,13 +7,13 @@
 
 PORTNAME=	dri
 PORTVERSION=	6.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	anholt
-DISTFILES=	Mesa-6.2-20041124.tar.bz2	\
-		drm-20041124.tar.bz2
+DISTFILES=	Mesa-6.2-20050109.tar.bz2	\
+		drm-20050109.tar.bz2
 
 MAINTAINER=	anholt@FreeBSD.org
 COMMENT=	OpenGL hardware acceleration drivers for the DRI
@@ -42,6 +42,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/i915_dri.so ${DRIMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/unichrome_dri.so ${DRIMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/tdfx_dri.so ${DRIMODDIR}
+.elif ${ARCH} == amd64
+	${INSTALL_PROGRAM} ${WRKSRC}/lib/i915_dri.so ${DRIMODDIR}
 .endif
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/mach64_dri.so ${DRIMODDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/mga_dri.so ${DRIMODDIR}
@@ -53,9 +55,15 @@ do-install:
 
 .if ${ARCH} == i386
 PLIST_SUB+=	I386=""
+PLIST_SUB+=	I386_AMD64=""
 ALL_TARGET=	freebsd-dri-x86
+.elif ${ARCH} == amd64
+PLIST_SUB+=	I386="@comment "
+PLIST_SUB+=	I386_AMD64=""
+ALL_TARGET=	freebsd-dri
 .else
 PLIST_SUB+=	I386="@comment "
+PLIST_SUB+=	I386_AMD64="@comment "
 ALL_TARGET=	freebsd-dri
 .endif
 .include <bsd.port.post.mk>
diff --git a/graphics/dri/distinfo b/graphics/dri/distinfo
index e03af941ae18..6c3b1830a413 100644
--- a/graphics/dri/distinfo
+++ b/graphics/dri/distinfo
@@ -1,4 +1,4 @@
-MD5 (Mesa-6.2-20041124.tar.bz2) = e6c93d64e34720c6ba617f811be5824d
-SIZE (Mesa-6.2-20041124.tar.bz2) = 4127945
-MD5 (drm-20041124.tar.bz2) = fdb9347f62d248edefadf6b7141e85ed
-SIZE (drm-20041124.tar.bz2) = 479029
+MD5 (Mesa-6.2-20050109.tar.bz2) = 70e8d5d08c9b96629cdc21f674d50ba5
+SIZE (Mesa-6.2-20050109.tar.bz2) = 4128962
+MD5 (drm-20050109.tar.bz2) = c16b1f51a589eb6cad8dc85c4db0e1ce
+SIZE (drm-20050109.tar.bz2) = 507130
diff --git a/graphics/dri/files/patch-localvars b/graphics/dri/files/patch-localvars
deleted file mode 100644
index 84701342c27a..000000000000
--- a/graphics/dri/files/patch-localvars
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/mesa/drivers/dri/r200/r200_tcl.c.orig	Thu Nov 25 01:38:38 2004
-+++ src/mesa/drivers/dri/r200/r200_tcl.c	Thu Nov 25 01:39:09 2004
-@@ -101,7 +101,7 @@
- };
-    
- 
--#define LOCAL_VARS r200ContextPtr rmesa = R200_CONTEXT(ctx); (void)rmesa
-+#define LOCAL_VARS r200ContextPtr rmesa = R200_CONTEXT(ctx)
- #define ELT_TYPE  GLushort
- 
- #define ELT_INIT(prim, hw_prim) \
---- src/mesa/drivers/dri/radeon/radeon_swtcl.c.orig	Thu Nov 25 01:54:49 2004
-+++ src/mesa/drivers/dri/radeon/radeon_swtcl.c	Thu Nov 25 01:55:10 2004
-@@ -508,7 +508,7 @@
- 
- 
- 
--#define LOCAL_VARS radeonContextPtr rmesa = RADEON_CONTEXT(ctx); (void)rmesa
-+#define LOCAL_VARS radeonContextPtr rmesa = RADEON_CONTEXT(ctx)
- #define ELTS_VARS( buf )  GLushort *dest = buf
- #define INIT( prim ) radeonDmaPrimitive( rmesa, prim )
- #define ELT_INIT(prim) radeonEltPrimitive( rmesa, prim )
---- src/mesa/drivers/dri/radeon/radeon_tcl.c.orig	Thu Nov 25 01:47:13 2004
-+++ src/mesa/drivers/dri/radeon/radeon_tcl.c	Thu Nov 25 01:47:30 2004
-@@ -105,7 +105,7 @@
- };
-    
- 
--#define LOCAL_VARS radeonContextPtr rmesa = RADEON_CONTEXT(ctx); (void)rmesa
-+#define LOCAL_VARS radeonContextPtr rmesa = RADEON_CONTEXT(ctx)
- #define ELT_TYPE  GLushort
- 
- #define ELT_INIT(prim, hw_prim) \
diff --git a/graphics/dri/pkg-plist b/graphics/dri/pkg-plist
index fd323e8ad1e5..e75ba433e57a 100644
--- a/graphics/dri/pkg-plist
+++ b/graphics/dri/pkg-plist
@@ -1,6 +1,6 @@
 %%I386%%lib/modules/dri/i810_dri.so
 %%I386%%lib/modules/dri/i830_dri.so
-%%I386%%lib/modules/dri/i915_dri.so
+%%I386_AMD64%%lib/modules/dri/i915_dri.so
 lib/modules/dri/mach64_dri.so
 lib/modules/dri/mga_dri.so
 lib/modules/dri/r128_dri.so