Update dri-devel port to a more recent snapshot. This includes fixes for XV

with R200, and irq support for some chips to reduce cpu load while running GL
programs.  Also, added warning messages that this is development code.

6 files changed, 20 insertions, 4 deletions

diff --git a/graphics/dri-devel/Makefile b/graphics/dri-devel/Makefile
index ebc4afcfed1b..850e8abe082e 100644
--- a/graphics/dri-devel/Makefile
+++ b/graphics/dri-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dri
-PORTVERSION=	20020830
+PORTVERSION=	20021008
 CATEGORIES=	graphics x11-servers
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	anholt/dri-devel
@@ -37,6 +37,13 @@ DDXLIST=	ati/r128_drv.o ati/radeon_drv.o \
 		mga/mga_drv.o tdfx/tdfx_drv.o
 XMAKEFILE_TARGETS=	VerifyOS version.def Makefiles includes depend
 
+pre-fetch::
+	@${ECHO_MSG} "********************************************************"
+	@${ECHO_MSG} "This port installs unstable, development-class drivers."
+	@${ECHO_MSG} "It comes from snapshots of DRI CVS (http://dri.sf.net)"
+	@${ECHO_MSG} "If you just want 3d, that is included with XFree86."
+	@${ECHO_MSG} "********************************************************"
+
 post-patch:
 	@${REINPLACE_CMD} -e 's/DRI trunk/DRI trunk: dri-devel-${PORTVERSION}/g' \
 		${WRKSRC}/config/cf/host.def
@@ -64,6 +71,8 @@ do-install:
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/programs/Xserver/hw/xfree86/os-support/bsd/drm/libdrm.a \
 		${PREFIX}/lib/modules/freebsd/
+	${INSTALL_DATA} ${WRKSRC}/programs/Xserver/hw/xfree86/xaa/libxaa.a \
+		${PREFIX}/lib/modules/extensions/
 	${INSTALL_DATA} ${WRKSRC}/programs/Xserver/GL/dri/libdri.a \
 		${PREFIX}/lib/modules/extensions/
 	${INSTALL_DATA} ${WRKSRC}/programs/Xserver/GL/libglx.a \
diff --git a/graphics/dri-devel/distinfo b/graphics/dri-devel/distinfo
index 007861d9a58b..04f3e051cbff 100644
--- a/graphics/dri-devel/distinfo
+++ b/graphics/dri-devel/distinfo
@@ -1,2 +1,2 @@
 MD5 (dri-20020826.tar.bz2) = 2a598aeb7833e0840ab7046978feac2b
-MD5 (dri-20020826-20020830.diff.bz2) = 90d3fde7aff2d810c565e244c87611c0
+MD5 (dri-20020826-20021008.diff.bz2) = 092791e8e40129850ae6daa277975d17
diff --git a/graphics/dri-devel/pkg-comment b/graphics/dri-devel/pkg-comment
index e7d64afcab18..8473007a0dc9 100644
--- a/graphics/dri-devel/pkg-comment
+++ b/graphics/dri-devel/pkg-comment
@@ -1 +1 @@
-Development DRI (3d HW OpenGL acceleration) drivers for some chipsets
+Unstable DRI (3d HW OpenGL acceleration) drivers for some chipsets
diff --git a/graphics/dri-devel/pkg-descr b/graphics/dri-devel/pkg-descr
index 9c386a9ea028..b5a0b0e6a08f 100644
--- a/graphics/dri-devel/pkg-descr
+++ b/graphics/dri-devel/pkg-descr
@@ -1,4 +1,4 @@
-dri-devel installs development DRI drivers from a CVS snapshot,
+dri-devel installs unstable DRI drivers from a CVS snapshot,
 replacing parts of your existing XFree86-4 install.
 
 Current major updates include r200 (8500) support, Transform and
diff --git a/graphics/dri-devel/pkg-message b/graphics/dri-devel/pkg-message
index ba2938a24798..b5b9534b0a12 100644
--- a/graphics/dri-devel/pkg-message
+++ b/graphics/dri-devel/pkg-message
@@ -1,3 +1,9 @@
+***********************************************************************
+You have installed dri-devel, unstable DRI drivers.  If you just wanted
+hardware 3d support, XFree86 comes with support for most people and
+you should reinstall XFree86-4-Server.  Use this at your own risk.
+***********************************************************************
+
 For R200 (8500) support you will require an updated DRM. Radeon 1
 users will need an updated DRM if they want TCL (Transform & Lighting)
 support.
diff --git a/graphics/dri-devel/pkg-plist b/graphics/dri-devel/pkg-plist
index 74b0b4e3c451..b8ba991d7ca6 100644
--- a/graphics/dri-devel/pkg-plist
+++ b/graphics/dri-devel/pkg-plist
@@ -15,4 +15,5 @@ lib/modules/drivers/tdfx_drv.o
 lib/modules/extensions/libGLcore.a
 lib/modules/extensions/libdri.a
 lib/modules/extensions/libglx.a
+lib/modules/extensions/libxaa.a
 lib/modules/freebsd/libdrm.a