Really fix direct rendering on amd64. Also remove old versions.

(Portage version: 2.1_pre4-r1)

8 files changed, 48 insertions, 265 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 3ce7daf60322..3968f130b7e5 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/mesa
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.68 2006/02/14 20:29:12 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.69 2006/02/16 04:30:02 spyderous Exp $
+
+*mesa-6.4.2-r1 (16 Feb 2006)
+
+  16 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/64bit-fix-have-dix-config.patch,
+  +files/64bit-fix-indirect-vertex-array.patch,
+  -files/6.4.1-amd64-include-assyntax.patch, -mesa-6.4.1-r1.ebuild,
+  -mesa-6.4.2.ebuild, +mesa-6.4.2-r1.ebuild:
+  Really fix direct rendering on amd64. Also remove old versions.
 
   14 Feb 2006; Markus Rothe <corsair@gentoo.org> mesa-6.4.1-r1.ebuild,
   mesa-6.4.2.ebuild:
diff --git a/media-libs/mesa/files/6.4.1-amd64-include-assyntax.patch b/media-libs/mesa/files/6.4.1-amd64-include-assyntax.patch
deleted file mode 100644
index 8600abf071a7..000000000000
--- a/media-libs/mesa/files/6.4.1-amd64-include-assyntax.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-CVSROOT:	/cvs/mesa
-Module name:	Mesa
-Repository:	Mesa/src/mesa/x86-64/
-Changes by:	idr@gabe.	05/12/01 16:25:00
-
-Log message:
-  Fix build issues on x86-64 due to missing include path in
-  glapi_x86-64.S.
-  
-  Bug: #5602
-
-Modified files:
-      Mesa/src/mesa/glapi/:	Tag: mesa_6_4_branch
-        gl_x86-64_asm.py 
-      Mesa/src/mesa/x86-64/:	Tag: mesa_6_4_branch
-        glapi_x86-64.S 
-  
-  Revision      Changes    Path
-  1.4.2.2       +1 -1      Mesa/src/mesa/glapi/gl_x86-64_asm.py
-  http://cvs.freedesktop.org/mesa/Mesa/src/mesa/glapi/gl_x86-64_asm.py
-  1.4.2.2       +1 -1      Mesa/src/mesa/x86-64/glapi_x86-64.S
-  http://cvs.freedesktop.org/mesa/Mesa/src/mesa/x86-64/glapi_x86-64.S
-
-Index: src/mesa/x86-64/glapi_x86-64.S
-===================================================================
-RCS file: /cvs/mesa/Mesa/src/mesa/x86-64/glapi_x86-64.S,v
-retrieving revision 1.5
-retrieving revision 1.6
-diff -u -b -B -r1.5 -r1.6
---- src/mesa/x86-64/glapi_x86-64.S	2 Nov 2005 20:59:37 -0000	1.5
-+++ src/mesa/x86-64/glapi_x86-64.S	2 Dec 2005 00:25:06 -0000	1.6
-@@ -29,7 +29,7 @@
-  * the symbol visibility mode to 'default'.
-  */
- 
--#include "assyntax.h"
-+#include "../x86/assyntax.h"
- 
- #if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
- #  pragma GCC visibility push(default)
diff --git a/media-libs/mesa/files/64bit-fix-have-dix-config.patch b/media-libs/mesa/files/64bit-fix-have-dix-config.patch
new file mode 100644
index 000000000000..29e6f4016847
--- /dev/null
+++ b/media-libs/mesa/files/64bit-fix-have-dix-config.patch
@@ -0,0 +1,18 @@
+===================================================================
+RCS file: /cvs/mesa/Mesa/src/mesa/main/glheader.h,v
+rcsdiff: /cvs/mesa/Mesa/src/mesa/main/glheader.h,v: warning: Unknown phrases like `commitid ...;' are present.
+retrieving revision 1.70
+retrieving revision 1.71
+diff -u -r1.70 -r1.71
+--- Mesa/src/mesa/main/glheader.h	2006/02/11 02:59:38	1.70
++++ Mesa/src/mesa/main/glheader.h	2006/02/15 21:03:34	1.71
+@@ -46,6 +46,9 @@
+ #ifndef GLHEADER_H
+ #define GLHEADER_H
+ 
++#ifdef HAVE_DIX_CONFIG_H
++#include "dix-config.h"
++#endif
+ 
+ #if defined(XFree86LOADER) && defined(IN_MODULE) && !defined(NO_LIBCWRAPPER)
+ #include "xf86_ansic.h"
diff --git a/media-libs/mesa/files/64bit-fix-indirect-vertex-array.patch b/media-libs/mesa/files/64bit-fix-indirect-vertex-array.patch
new file mode 100644
index 000000000000..4e744e91287d
--- /dev/null
+++ b/media-libs/mesa/files/64bit-fix-indirect-vertex-array.patch
@@ -0,0 +1,17 @@
+===================================================================
+RCS file: /cvs/mesa/Mesa/src/glx/x11/indirect_vertex_array.c,v
+rcsdiff: /cvs/mesa/Mesa/src/glx/x11/indirect_vertex_array.c,v: warning: Unknown phrases like `commitid ...;' are present.
+retrieving revision 1.6
+retrieving revision 1.7
+diff -u -r1.6 -r1.7
+--- Mesa/src/glx/x11/indirect_vertex_array.c	2005/08/19 18:53:26	1.6
++++ Mesa/src/glx/x11/indirect_vertex_array.c	2006/02/14 15:04:45	1.7
+@@ -530,7 +530,7 @@
+ emit_DrawArrays_header_old( __GLXcontext * gc,
+ 			    struct array_state_vector * arrays,
+ 			    size_t * elements_per_request,
+-			    size_t * total_requests,
++			    unsigned int * total_requests,
+ 			    GLenum mode, GLsizei count )
+ {
+     size_t command_size;
diff --git a/media-libs/mesa/files/digest-mesa-6.4.1-r1 b/media-libs/mesa/files/digest-mesa-6.4.1-r1
deleted file mode 100644
index efa86c4ad2e9..000000000000
--- a/media-libs/mesa/files/digest-mesa-6.4.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ea148c828ec6f645526451db1b8556f1 MesaLib-6.4.1.tar.bz2 2913887
-RMD160 e3a54d6442fa5d6e446bb0b6704bd22c31fb4927 MesaLib-6.4.1.tar.bz2 2913887
-SHA256 2c1c8784cccab416a52ef9512e3539a0063b88dcc9b0abbcf1a407f9808758cf MesaLib-6.4.1.tar.bz2 2913887
diff --git a/media-libs/mesa/files/digest-mesa-6.4.2 b/media-libs/mesa/files/digest-mesa-6.4.2-r1
index 13d7ad4d3f73..13d7ad4d3f73 100644
--- a/media-libs/mesa/files/digest-mesa-6.4.2
+++ b/media-libs/mesa/files/digest-mesa-6.4.2-r1
diff --git a/media-libs/mesa/mesa-6.4.1-r1.ebuild b/media-libs/mesa/mesa-6.4.1-r1.ebuild
deleted file mode 100644
index 12acc9a881c1..000000000000
--- a/media-libs/mesa/mesa-6.4.1-r1.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.4.1-r1.ebuild,v 1.8 2006/02/14 20:29:12 corsair Exp $
-
-inherit eutils toolchain-funcs multilib flag-o-matic
-
-# Arches that need to define their own sets of DRI drivers, please do so in
-# a variable up here, and use that variable below. This helps us to separate the
-# data from the code.
-DRI_DRIVERS_SPARC="ffb mach64 mga radeon savage"
-
-OPENGL_DIR="xorg-x11"
-
-MY_PN="${PN/m/M}"
-MY_P="${MY_PN}-${PV}"
-MY_SRC_P="${MY_PN}Lib-${PV}"
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="debug motif"
-
-RDEPEND="dev-libs/expat
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXxf86vm
-	x11-libs/libXi
-	x11-libs/libXmu
-	>=x11-libs/libdrm-1.0.5
-	x11-libs/libICE
-	app-admin/eselect-opengl
-	motif? ( virtual/motif )
-	!<=x11-base/xorg-x11-6.9"
-DEPEND="${RDEPEND}
-	x11-misc/makedepend
-	x11-proto/xf86vidmodeproto
-	>=x11-proto/glproto-1.4-r1
-	motif? ( x11-proto/printproto )"
-
-PROVIDE="virtual/opengl virtual/glu"
-
-S="${WORKDIR}/${MY_P}"
-
-# Think about: ggi, svga, fbcon, no-X configs
-
-if use debug; then
-	RESTRICT="${RESTRICT} nostrip"
-fi
-
-pkg_setup() {
-	if use debug; then
-		strip-flags
-		append-flags -ggdb
-	fi
-
-	if [[ ${KERNEL} == "FreeBSD" ]]; then
-		CONFIG="freebsd"
-	elif use x86; then
-		CONFIG="linux-dri-x86"
-	elif use amd64; then
-		CONFIG="linux-dri-x86-64"
-	elif use ppc; then
-		CONFIG="linux-dri-ppc"
-	else
-		CONFIG="linux-dri"
-	fi
-}
-
-src_unpack() {
-	HOSTCONF="${S}/configs/${CONFIG}"
-
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/makedepend-location.patch
-	epatch ${FILESDIR}/6.4-dont-install-gles-headers.patch
-	epatch ${FILESDIR}/change-default-dri-driver-dir.patch
-	epatch ${FILESDIR}/6.4-multilib-fix.patch
-	epatch ${FILESDIR}/${PV}-amd64-include-assyntax.patch
-
-	# Set default dri drivers directory
-	echo "DEFINES += -DDEFAULT_DRIVER_DIR='\"/usr/$(get_libdir)/xorg/modules/dri\"'" >> ${HOSTCONF}
-
-	# Set up linux-dri configs
-	if use sparc; then
-		einfo "Define the sparc DRI drivers."
-		echo "DRI_DIRS = ${DRI_DRIVERS_SPARC}" >> ${HOSTCONF}
-		einfo "Explicitly note that sparc assembly code is not working."
-		echo "ASM_FLAGS =" >> ${HOSTCONF}
-		echo "ASM_SOURCES =" >> ${HOSTCONF}
-	fi
-
-	# Kill this; we don't want /usr/X11R6/lib ever to be searched in this
-	# build.
-	echo "EXTRA_LIB_PATH =" >> ${HOSTCONF}
-
-	echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
-	echo "CC = $(tc-getCC)" >> ${HOSTCONF}
-	echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
-	# bug #110840 - Build with PIC, since it hasn't been shown to slow it down
-	echo "PIC_FLAGS = -fPIC" >> ${HOSTCONF}
-
-	# Removed glut, since we have separate freeglut/glut ebuilds
-	# Remove EGL, since Brian Paul says it's not ready for a release
-	echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF}
-
-	# Get rid of glut includes
-	rm -f ${S}/include/GL/glut*h
-
-	# r200 breaks without this, since it's the only EGL-enabled driver so far
-	echo "USING_EGL = 0" >> ${HOSTCONF}
-
-	# Don't build EGL demos. EGL isn't ready for release, plus they produce a
-	# circular dependency with glut.
-	echo "PROGRAM_DIRS =" >> ${HOSTCONF}
-
-	# Documented in configs/default
-	if use motif; then
-		# Add -lXm
-		echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
-		# Add GLwMDrawA.c
-		echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF}
-	fi
-}
-
-src_compile() {
-	emake -j1 ${CONFIG} || die "Build failed"
-}
-
-src_install() {
-	dodir /usr
-	make \
-		DESTDIR=${D}/usr \
-		INCLUDE_DIR=${D}/usr/include \
-		LIB_DIR=${D}/usr/$(get_libdir) \
-		install || die "Installation failed"
-
-	##
-	# Install the actual drivers --- 'make install' doesn't install them
-	# anywhere.
-	dodir /usr/$(get_libdir)/xorg/modules/dri
-	exeinto /usr/$(get_libdir)/xorg/modules/dri
-	einfo "Installing drivers to ${EXEDESTTREE}."
-	find ${S}/lib* -name '*_dri.so' | xargs doexe
-
-	insinto /usr/include/GL
-	doins ${S}/src/glw/GLwDrawA.h
-	if use motif; then
-		doins ${S}/src/glw/GLwMDrawA.h
-	fi
-
-	fix_opengl_symlinks
-	dynamic_libgl_install
-
-	# Install libtool archives
-	insinto /usr/$(get_libdir)
-	# (#67729) Needs to be lib, not $(get_libdir)
-	doins ${FILESDIR}/lib/libGLU.la
-	insinto /usr/$(get_libdir)/opengl/xorg-x11/lib
-	doins ${FILESDIR}/lib/libGL.la
-
-	# Create the two-number versioned libs (.so.#.#), since only .so.# and
-	# .so.#.#.# were made
-	dosym libGLU.so.1.3.060401 /usr/$(get_libdir)/libGLU.so.1.3
-	dosym libGLw.so.1.0.0 /usr/$(get_libdir)/libGLw.so.1.0
-
-	# libGLU doesn't get the plain .so symlink either
-	dosym libGLU.so.1 /usr/$(get_libdir)/libGLU.so
-
-	# Figure out why libGL.so.1.5 is built (directfb), and why it's linked to
-	# as the default libGL.so.1
-}
-
-pkg_postinst() {
-	switch_opengl_implem
-}
-
-fix_opengl_symlinks() {
-	# Remove invalid symlinks
-	local LINK
-	for LINK in $(find ${D}/usr/$(get_libdir) \
-		-name libGL\.* -type l); do
-		rm -f ${LINK}
-	done
-	# Create required symlinks
-	dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so
-	dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1
-}
-
-dynamic_libgl_install() {
-	# next section is to setup the dynamic libGL stuff
-	ebegin "Moving libGL and friends for dynamic switching"
-		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include}
-		local x=""
-		for x in ${D}/usr/$(get_libdir)/libGL.so* \
-			${D}/usr/$(get_libdir)/libGL.la \
-			${D}/usr/$(get_libdir)/libGL.a; do
-			if [ -f ${x} -o -L ${x} ]; then
-				# libGL.a cause problems with tuxracer, etc
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib
-			fi
-		done
-		# glext.h added for #54984
-		for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
-			if [ -f ${x} -o -L ${x} ]; then
-				mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
-			fi
-		done
-	eend 0
-}
-
-switch_opengl_implem() {
-		# Switch to the xorg implementation.
-		# Use new opengl-update that will not reset user selected
-		# OpenGL interface ...
-		echo
-		eselect opengl set --use-old ${OPENGL_DIR}
-}
diff --git a/media-libs/mesa/mesa-6.4.2.ebuild b/media-libs/mesa/mesa-6.4.2-r1.ebuild
index b18cc6f08132..f255f57b0134 100644
--- a/media-libs/mesa/mesa-6.4.2.ebuild
+++ b/media-libs/mesa/mesa-6.4.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.4.2.ebuild,v 1.5 2006/02/14 20:29:12 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.4.2-r1.ebuild,v 1.1 2006/02/16 04:30:02 spyderous Exp $
 
 inherit eutils toolchain-funcs multilib flag-o-matic
 
@@ -87,6 +87,8 @@ src_unpack() {
 	epatch ${FILESDIR}/6.4-dont-install-gles-headers.patch
 	epatch ${FILESDIR}/change-default-dri-driver-dir.patch
 	epatch ${FILESDIR}/6.4-multilib-fix.patch
+	epatch ${FILESDIR}/64bit-fix-have-dix-config.patch
+	epatch ${FILESDIR}/64bit-fix-indirect-vertex-array.patch
 
 	# Set default dri drivers directory
 	echo "DEFINES += -DDEFAULT_DRIVER_DIR='\"/usr/$(get_libdir)/xorg/modules/dri\"'" >> ${HOSTCONF}