Update linux_dri to Mesa 6.5 binaries I rolled on a debian machine.

3 files changed, 43 insertions, 35 deletions

diff --git a/graphics/linux_dri/Makefile b/graphics/linux_dri/Makefile
index deb4dfcde464..1ccff7553792 100644
--- a/graphics/linux_dri/Makefile
+++ b/graphics/linux_dri/Makefile
@@ -6,41 +6,47 @@
 #
 
 PORTNAME=	linux_dri
-PORTVERSION=	4.4.0
+PORTVERSION=	6.5
 CATEGORIES=	graphics linux
-MASTER_SITES=	\
-		http://netmirror.org/mirror/xfree86.org/${PORTVERSION}/binaries/Linux-ix86-glibc21/:x \
-		ftp://ftp.belnet.be/mirror/ftp.xfree86.org/${PORTVERSION}/binaries/Linux-ix86-glibc21/:x \
-		ftp://ftp.gwdg.de/pub/xfree86/XFree86/${PORTVERSION}/binaries/Linux-ix86-glibc21/:x \
-		ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/binaries/Linux-ix86-glibc21/:x \
-		http://people.freebsd.org/~anholt/dri/files/:anholt
-DISTFILES=	Xbin.tgz:x \
-		Xmod.tgz:x \
-		linux-libglide.tar.gz:anholt \
-		linux-dri-tools.tar.gz:anholt
-DIST_SUBDIR=	linux_dri-${PORTVERSION}
+MASTER_SITES=	http://people.freebsd.org/~anholt/dri/files/
+DISTFILES=	Mesa-linux-bin-${PORTVERSION}.tar.bz2 \
+		linux-libglide.tar.gz \
+		linux-dri-tools.tar.gz
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Binary Linux DRI libraries for 3D hardware acceleration of linux apps
 
-WRKSRC=		${WRKDIR}/lib
+CONFLICTS=	linux_dri-6.5.2006*
+
+WRKSRC=		${WRKDIR}
 NO_BUILD=	yes
 USE_LINUX=	yes
 USE_LINUX_PREFIX=	yes
 USE_XLIB=	yes
 
-ONLY_FOR_ARCHS=	i386 amd64
+# don't package this for amd64 until we come up with 32-bit ioctl wrappers for
+# the drm.
+ONLY_FOR_ARCHS=	i386
 
-MODULELIST=	gamma_dri.so i810_dri.so i830_dri.so mga_dri.so r128_dri.so \
-		r200_dri.so radeon_dri.so sis_dri.so tdfx_dri.so
+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
 LDCONFIG_LINUX=	${LINUXBASE}/sbin/ldconfig
 
 do-install:
 	${MKDIR} ${PREFIX}/usr/X11R6/lib/modules/dri
-	${INSTALL_PROGRAM} ${WRKSRC}/libGL.so.1.2 ${PREFIX}/usr/X11R6/lib
-	${INSTALL_PROGRAM} ${WRKSRC}/libGLU.so.1.3 ${PREFIX}/usr/X11R6/lib
+	${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 \
+		${PREFIX}/usr/X11R6/lib
+	${INSTALL_PROGRAM} ${WRKSRC}/linux_dri/libdrm.so.2.0.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
 .for i in ${MODULELIST}
-	${INSTALL_PROGRAM} ${WRKSRC}/modules/dri/${i} \
+	${INSTALL_PROGRAM} ${WRKSRC}/linux_dri/${i} \
 		${PREFIX}/usr/X11R6/lib/modules/dri
 .endfor
 #	The libglide3 distributed with linux_base is broken and is symlinked poorly, supply our own.
diff --git a/graphics/linux_dri/distinfo b/graphics/linux_dri/distinfo
index 21a2ce885965..33ec013a7354 100644
--- a/graphics/linux_dri/distinfo
+++ b/graphics/linux_dri/distinfo
@@ -1,12 +1,9 @@
-MD5 (linux_dri-4.4.0/Xbin.tgz) = ac6a81e945df36ea15463eaf82679be3
-SHA256 (linux_dri-4.4.0/Xbin.tgz) = 13ed39e0aa1a1728d7095fb83fa25a9f24641f333a5af7fa87ef12345f56060d
-SIZE (linux_dri-4.4.0/Xbin.tgz) = 5453434
-MD5 (linux_dri-4.4.0/Xmod.tgz) = a1e97a4517cad7e35bd8113633473da9
-SHA256 (linux_dri-4.4.0/Xmod.tgz) = 2c4a93a3da31440f64793f68190e48af00a2eadb32d3a70cd92e1fcbafb61cb8
-SIZE (linux_dri-4.4.0/Xmod.tgz) = 9598559
-MD5 (linux_dri-4.4.0/linux-libglide.tar.gz) = d83fce4cbfe94086102e20c9cc16ebba
-SHA256 (linux_dri-4.4.0/linux-libglide.tar.gz) = 0fc6d3d3e99bb9ad7a6b314e1b883a6a9421d4f6fd3bf0ee541d055f4ffca237
-SIZE (linux_dri-4.4.0/linux-libglide.tar.gz) = 286591
-MD5 (linux_dri-4.4.0/linux-dri-tools.tar.gz) = bfee02da0165aa49fbb5312147d64ab4
-SHA256 (linux_dri-4.4.0/linux-dri-tools.tar.gz) = 7c6262959c8f08d4a47f0cb9a77d2761e5ac24fe9dca8949b9fe07b963962a83
-SIZE (linux_dri-4.4.0/linux-dri-tools.tar.gz) = 124318
+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 (linux-libglide.tar.gz) = d83fce4cbfe94086102e20c9cc16ebba
+SHA256 (linux-libglide.tar.gz) = 0fc6d3d3e99bb9ad7a6b314e1b883a6a9421d4f6fd3bf0ee541d055f4ffca237
+SIZE (linux-libglide.tar.gz) = 286591
+MD5 (linux-dri-tools.tar.gz) = bfee02da0165aa49fbb5312147d64ab4
+SHA256 (linux-dri-tools.tar.gz) = 7c6262959c8f08d4a47f0cb9a77d2761e5ac24fe9dca8949b9fe07b963962a83
+SIZE (linux-dri-tools.tar.gz) = 124318
diff --git a/graphics/linux_dri/pkg-plist b/graphics/linux_dri/pkg-plist
index 506ecdf22416..2cf887d4299b 100644
--- a/graphics/linux_dri/pkg-plist
+++ b/graphics/linux_dri/pkg-plist
@@ -3,7 +3,10 @@ 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
+usr/X11R6/lib/libGLU.so.1.3.060500
+usr/lib/libdrm.so.2
+usr/lib/libdrm.so.2.0.0
+usr/lib/libexpat.so.1
 usr/X11R6/lib/libglide3.so.3
 usr/X11R6/lib/libglide3-v3.so
 usr/X11R6/lib/libglide3-v3.so.0
@@ -11,13 +14,15 @@ usr/X11R6/lib/libglide3-v5.so
 usr/X11R6/lib/libglide3-v5.so.0
 usr/X11R6/lib/libglut.so.3.7.0
 usr/X11R6/lib/libglut.so.3
-usr/X11R6/lib/modules/dri/gamma_dri.so
 usr/X11R6/lib/modules/dri/i810_dri.so
-usr/X11R6/lib/modules/dri/i830_dri.so
+usr/X11R6/lib/modules/dri/i915_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
-usr/X11R6/lib/modules/dri/radeon_dri.so
 usr/X11R6/lib/modules/dri/r200_dri.so
+usr/X11R6/lib/modules/dri/r300_dri.so
+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
 @exec %D/sbin/ldconfig %D/usr/X11R6/lib