Update linux_dri to Mesa 7.0 libraries and current libdrm.

Most importantly, this adds the 965 DRI driver.

4 files changed, 27 insertions, 18 deletions

diff --git a/graphics/linux_dri/Makefile b/graphics/linux_dri/Makefile
index 68b1d72fa06d..43b3f05c9fba 100644
--- a/graphics/linux_dri/Makefile
+++ b/graphics/linux_dri/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	linux_dri
-PORTVERSION=	6.5
+PORTVERSION=	7.0
 CATEGORIES=	graphics linux
 MASTER_SITES=	http://people.freebsd.org/~anholt/dri/files/
 DISTFILES=	Mesa-linux-bin-${PORTVERSION}.tar.bz2 \
@@ -28,9 +28,19 @@ USE_XLIB=	yes
 # the drm.
 ONLY_FOR_ARCHS=	i386
 
-MODULELIST=	i810_dri.so i915_dri.so mach64_dri.so mga_dri.so r128_dri.so \
-		r200_dri.so r300_dri.so radeon_dri.so sis_dri.so savage_dri.so \
-		sis_dri.so tdfx_dri.so
+MODULELIST=	i810_dri.so \
+		i915_dri.so \
+		i965_dri.so \
+		mach64_dri.so \
+		mga_dri.so \
+		r128_dri.so \
+		r200_dri.so \
+		r300_dri.so \
+		radeon_dri.so \
+		savage_dri.so \
+		sis_dri.so \
+		tdfx_dri.so \
+		unichrome_dri.so
 LDCONFIG_LINUX=	${LINUXBASE}/sbin/ldconfig
 
 .include <bsd.port.pre.mk>
@@ -45,13 +55,13 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/linux_dri/libGL.so.1.2 \
 		${PREFIX}/usr/X11R6/lib
 #	${BRANDELF} -t Linux ${PREFIX}/usr/X11R6/lib/libGL.so.1.2
-	${INSTALL_PROGRAM} ${WRKSRC}/linux_dri/libGLU.so.1.3.060500 \
+	${INSTALL_PROGRAM} ${WRKSRC}/linux_dri/libGLU.so.1.3.070100 \
 		${PREFIX}/usr/X11R6/lib
-	${INSTALL_PROGRAM} ${WRKSRC}/linux_dri/libdrm.so.2.0.0 \
+	${INSTALL_PROGRAM} ${WRKSRC}/linux_dri/libdrm.so.2.3.0 \
 		${PREFIX}/usr/lib
 	${INSTALL_PROGRAM} ${WRKSRC}/linux_dri/libexpat.so.1 \
 		${PREFIX}/usr/lib
-#	${BRANDELF} -t Linux ${PREFIX}/usr/X11R6/lib/libGLU.so.1.3.060500
+#	${BRANDELF} -t Linux ${PREFIX}/usr/X11R6/lib/libGLU.so.1.3.070100
 .for i in ${MODULELIST}
 	${INSTALL_PROGRAM} ${WRKSRC}/linux_dri/${i} \
 		${PREFIX}/usr/X11R6/lib/modules/dri
diff --git a/graphics/linux_dri/distinfo b/graphics/linux_dri/distinfo
index 33ec013a7354..6ec74e42c4b5 100644
--- a/graphics/linux_dri/distinfo
+++ b/graphics/linux_dri/distinfo
@@ -1,6 +1,6 @@
-MD5 (Mesa-linux-bin-6.5.tar.bz2) = 4353481af821ee34296c23e07938127e
-SHA256 (Mesa-linux-bin-6.5.tar.bz2) = b72669ec21c625c01ee9c20397a2a0fb076f69c2ed109d542a5d0a89ef6f5dfd
-SIZE (Mesa-linux-bin-6.5.tar.bz2) = 9271190
+MD5 (Mesa-linux-bin-7.0.tar.bz2) = 6627191666a182ac964b5424e3abc15e
+SHA256 (Mesa-linux-bin-7.0.tar.bz2) = 9133f5dffe6b7fe1d590df2e6a865e677b87cd45edb4c45ec75ee47471a06ad4
+SIZE (Mesa-linux-bin-7.0.tar.bz2) = 10137014
 MD5 (linux-libglide.tar.gz) = d83fce4cbfe94086102e20c9cc16ebba
 SHA256 (linux-libglide.tar.gz) = 0fc6d3d3e99bb9ad7a6b314e1b883a6a9421d4f6fd3bf0ee541d055f4ffca237
 SIZE (linux-libglide.tar.gz) = 286591
diff --git a/graphics/linux_dri/pkg-descr b/graphics/linux_dri/pkg-descr
index 4f4276dde5c5..f1c6ee9bb517 100644
--- a/graphics/linux_dri/pkg-descr
+++ b/graphics/linux_dri/pkg-descr
@@ -1,9 +1,6 @@
 linux_dri installs binary linux DRI modules, libraries and basic programs to 
 support and test 3d hardware acceleration of linux binaries with the DRI.
-(Currently, compiled from X420src-*.tgz by anholt@freebsd.org on a chroot 
-Gentoo with a patch to xf86drm.c to fix linux compatibility).
 
-WWW: http://people.freebsd.org/~anholt/dri/
-
-- Eric Anholt
-eta@lclark.edu
+Compiled by anholt@FreeBSD.org on a debian unstable system, patched to
+disable the new Damage protocol call for rotated rendering due to it being
+unavailable in our linux base ports.
diff --git a/graphics/linux_dri/pkg-plist b/graphics/linux_dri/pkg-plist
index 2cf887d4299b..8d3ff149c3ce 100644
--- a/graphics/linux_dri/pkg-plist
+++ b/graphics/linux_dri/pkg-plist
@@ -3,9 +3,9 @@ usr/X11R6/bin/glxinfo
 usr/X11R6/lib/libGL.so.1
 usr/X11R6/lib/libGL.so.1.2
 usr/X11R6/lib/libGLU.so.1
-usr/X11R6/lib/libGLU.so.1.3.060500
+usr/X11R6/lib/libGLU.so.1.3.070100
 usr/lib/libdrm.so.2
-usr/lib/libdrm.so.2.0.0
+usr/lib/libdrm.so.2.3.0
 usr/lib/libexpat.so.1
 usr/X11R6/lib/libglide3.so.3
 usr/X11R6/lib/libglide3-v3.so
@@ -16,6 +16,7 @@ usr/X11R6/lib/libglut.so.3.7.0
 usr/X11R6/lib/libglut.so.3
 usr/X11R6/lib/modules/dri/i810_dri.so
 usr/X11R6/lib/modules/dri/i915_dri.so
+usr/X11R6/lib/modules/dri/i965_dri.so
 usr/X11R6/lib/modules/dri/mach64_dri.so
 usr/X11R6/lib/modules/dri/mga_dri.so
 usr/X11R6/lib/modules/dri/r128_dri.so
@@ -25,6 +26,7 @@ usr/X11R6/lib/modules/dri/radeon_dri.so
 usr/X11R6/lib/modules/dri/savage_dri.so
 usr/X11R6/lib/modules/dri/sis_dri.so
 usr/X11R6/lib/modules/dri/tdfx_dri.so
+usr/X11R6/lib/modules/dri/unichrome_dri.so
 @exec %D/sbin/ldconfig %D/usr/X11R6/lib
 @dirrm usr/X11R6/lib/modules/dri
 @dirrm usr/X11R6/lib/modules