(#183626) Bump. Lots of bugfixes from the 6.5.3 development release, no new features. Also appending -fno-ivopts on gcc-4.2 systems -- symptoms this fixes include black screens on glxgears. Still has a slight performance issue with nptl if using assembly optimizations, which is the case for non-hardened (see https://bugs.freedesktop.org/show_bug.cgi?id=7459 for details). Some ebuild cleanup, including safety for build directories containing spaces; removal of dead code for EGL; clean generation of libGLU symlinks; getting rid of many of those confusing makedepend warnings; change from add_drivers() function to a cleaner driver_enable() that contains conditionals internally.

Package-Manager: portage-2.1.3.2

4 files changed, 349 insertions, 15 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 97a3f391a76f..e770472a6a04 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.155 2007/08/07 12:48:39 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.156 2007/08/11 08:47:04 dberkholz Exp $
+
+*mesa-7.0.1 (11 Aug 2007)
+
+  11 Aug 2007; Donnie Berkholz <dberkholz@gentoo.org>; +mesa-7.0.1.ebuild:
+  (#183626) Bump. Lots of bugfixes from the 6.5.3 development release, no new
+  features. Also appending -fno-ivopts on gcc-4.2 systems -- symptoms this
+  fixes include black screens on glxgears. Still has a slight performance
+  issue with nptl if using assembly optimizations, which is the case for
+  non-hardened (see https://bugs.freedesktop.org/show_bug.cgi?id=7459 for
+  details). Some ebuild cleanup, including safety for build directories
+  containing spaces; removal of dead code for EGL; clean generation of libGLU
+  symlinks; getting rid of many of those confusing makedepend warnings; change
+  from add_drivers() function to a cleaner driver_enable() that contains
+  conditionals internally.
 
   07 Aug 2007; Gustavo Zacarias <gustavoz@gentoo.org> mesa-6.5.2-r1.ebuild:
   Stable on sparc wrt #175465
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 9659016539fb..6eb60d973d0c 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 6.4-dont-install-gles-headers.patch 421 RMD160 70713f143d080b444089a95712efd227227c523f SHA1 ffdf556a66229d0417d5d7e7833c8e9bfdb39741 SHA256 8f636c2e09ac7fdab0d06ebe62af5a311b52a03bf7b7bdecf4789a6e30e0777e
 MD5 ae36bba4e878c77dc2e823ce00e98869 files/6.4-dont-install-gles-headers.patch 421
 RMD160 70713f143d080b444089a95712efd227227c523f files/6.4-dont-install-gles-headers.patch 421
@@ -57,6 +54,7 @@ DIST MesaLib-6.5.1.tar.bz2 3138257 RMD160 23f8714787b053b2c41d020c7af211a02e5bea
 DIST MesaLib-6.5.2.tar.bz2 3295166 RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 SHA1 ba860bb6ee57c02202342dfd5927464a068ea18f SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f
 DIST MesaLib-6.5.3.tar.bz2 3351899 RMD160 becb4d9e9896b7086cd7c738a2ee0ebbae3bfe4e SHA1 8ab86e54976752028fbffcc21a9e0d2ebefeeff4 SHA256 f8b09b40b59d6951dcd9889d19a67d1995c5f558bafa1e978f4b0e88035a96b3
 DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA1 a77368901b0731b662d0858aef2c405a7ddf6014 SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd
+DIST MesaLib-7.0.1.tar.bz2 3343538 RMD160 b44fd8ebffd17aa72c3b6cca1c2924e66787aa78 SHA1 deb1002cf377ba8bd9407bd3cf573f8c8be31671 SHA256 5190ffac157882d9129d31f262339512f4a45dcf95ccdad213760a7d54d82de7
 EBUILD mesa-6.5-r3.ebuild 9059 RMD160 0484bdc704952f382a4e60f8842198b9d52e5265 SHA1 d0d1579fa57c90ad82df40d974f0707843adc0c2 SHA256 072139ef19e1204fa10cf46145c0787bd0cc61cc50657d05fc77a721275e1904
 MD5 f4b3593646f6067fb7818b8cc290272f mesa-6.5-r3.ebuild 9059
 RMD160 0484bdc704952f382a4e60f8842198b9d52e5265 mesa-6.5-r3.ebuild 9059
@@ -81,10 +79,14 @@ EBUILD mesa-6.5.3.ebuild 9270 RMD160 87cfdfcff627c968bbc4f44be54215c499960350 SH
 MD5 7da5951f778cfb8a7e2f4a748e557190 mesa-6.5.3.ebuild 9270
 RMD160 87cfdfcff627c968bbc4f44be54215c499960350 mesa-6.5.3.ebuild 9270
 SHA256 5477c09af361c71c4fb6c9a4762252a87f4abf1d329d4b8bc4742f6345a82bb2 mesa-6.5.3.ebuild 9270
-MISC ChangeLog 27571 RMD160 67e660910a1c7bbec0046ee3c43939bb91088902 SHA1 f790f800c92d8b67a96c7077658909c0c1f06f28 SHA256 7aa31c04b681fa9b896f0ef7bccd85b223f62930688833d273220637a44889a3
-MD5 a8c299b70b2ed0efb3c82c08c16a6338 ChangeLog 27571
-RMD160 67e660910a1c7bbec0046ee3c43939bb91088902 ChangeLog 27571
-SHA256 7aa31c04b681fa9b896f0ef7bccd85b223f62930688833d273220637a44889a3 ChangeLog 27571
+EBUILD mesa-7.0.1.ebuild 9210 RMD160 68093c6e0880249661c1ff5542d093283a97e7cc SHA1 ff74de9172f56160d452bffc679fee9ee6e8f3d2 SHA256 e03045db24274ba8195692d9aa12e457721134b882007016db0039aa77ffdcfb
+MD5 4309813d86e863eb13668445cc9576b7 mesa-7.0.1.ebuild 9210
+RMD160 68093c6e0880249661c1ff5542d093283a97e7cc mesa-7.0.1.ebuild 9210
+SHA256 e03045db24274ba8195692d9aa12e457721134b882007016db0039aa77ffdcfb mesa-7.0.1.ebuild 9210
+MISC ChangeLog 28378 RMD160 43b8cb039d816bc6fdf5b08503e594d358a69c6b SHA1 ae015678a72a60508aef551a302198cd2b0254f1 SHA256 0cd37dc3d7e8058ba72cfd71f5df72523f0d854ea2f66419cfa9f2b742cd9881
+MD5 318a1954b2190e368c40f4907bd7eb20 ChangeLog 28378
+RMD160 43b8cb039d816bc6fdf5b08503e594d358a69c6b ChangeLog 28378
+SHA256 0cd37dc3d7e8058ba72cfd71f5df72523f0d854ea2f66419cfa9f2b742cd9881 ChangeLog 28378
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
@@ -107,10 +109,6 @@ SHA256 f9339d87fc164d7137d1f589bb7a5995d6a19302bf26d4002f92e9bf4d1a9821 files/di
 MD5 94a246fcccc80a365890b769483e285e files/digest-mesa-6.5.3 247
 RMD160 a1f1af3caace92b13de7449c4a3bd84c0bf2fbbd files/digest-mesa-6.5.3 247
 SHA256 fa883ad916bf826b1e721083eeffcd8e67d692192038abf1e0bb16a0d6d6b1a6 files/digest-mesa-6.5.3 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFGuGotKRy60XGEcJIRAkIfAJ0UeOVDjUn8Kb9H30awkRxfE2xZrgCghrYj
-CifF7tTvD0T391hw1WPZ6ec=
-=WAIT
------END PGP SIGNATURE-----
+MD5 cce733a880751a9bfc49476307c38749 files/digest-mesa-7.0.1 247
+RMD160 d0a4dcc36fd9cbfb0dca31ceaf2c089e4305f709 files/digest-mesa-7.0.1 247
+SHA256 2983c69e2955a968552699bbd818a6b11551253fc6bf46a49e7c9bf4144177c4 files/digest-mesa-7.0.1 247
diff --git a/media-libs/mesa/files/digest-mesa-7.0.1 b/media-libs/mesa/files/digest-mesa-7.0.1
new file mode 100644
index 000000000000..9032b94b5b7a
--- /dev/null
+++ b/media-libs/mesa/files/digest-mesa-7.0.1
@@ -0,0 +1,3 @@
+MD5 c056abd763e899114bf745c9eedbf9ad MesaLib-7.0.1.tar.bz2 3343538
+RMD160 b44fd8ebffd17aa72c3b6cca1c2924e66787aa78 MesaLib-7.0.1.tar.bz2 3343538
+SHA256 5190ffac157882d9129d31f262339512f4a45dcf95ccdad213760a7d54d82de7 MesaLib-7.0.1.tar.bz2 3343538
diff --git a/media-libs/mesa/mesa-7.0.1.ebuild b/media-libs/mesa/mesa-7.0.1.ebuild
new file mode 100644
index 000000000000..5d35341dea54
--- /dev/null
+++ b/media-libs/mesa/mesa-7.0.1.ebuild
@@ -0,0 +1,319 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.0.1.ebuild,v 1.1 2007/08/11 08:47:04 dberkholz Exp $
+
+inherit eutils toolchain-funcs multilib flag-o-matic portability versionator
+
+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/"
+if [[ $PV = *_rc* ]]; then
+	SRC_URI="http://www.mesa3d.org/beta/${MY_SRC_P}.tar.gz"
+else
+	SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2"
+fi
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE_VIDEO_CARDS="
+	video_cards_i810
+	video_cards_mach64
+	video_cards_mga
+	video_cards_none
+	video_cards_r128
+	video_cards_radeon
+	video_cards_s3virge
+	video_cards_savage
+	video_cards_sis
+	video_cards_sunffb
+	video_cards_tdfx
+	video_cards_trident
+	video_cards_via"
+IUSE="${IUSE_VIDEO_CARDS}
+	debug
+	doc
+	hardened
+	motif
+	nptl
+	xcb"
+
+RDEPEND="dev-libs/expat
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXdamage
+	>=x11-libs/libdrm-2.2
+	x11-libs/libICE
+	motif? ( virtual/motif )
+	doc? ( app-doc/opengl-manpages )
+	!<=x11-base/xorg-x11-6.9
+	xcb? ( x11-libs/libxcb )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-misc/makedepend
+	x11-proto/inputproto
+	x11-proto/xextproto
+	app-admin/eselect-opengl
+	!hppa? ( x11-proto/xf86driproto )
+	x11-proto/xf86vidmodeproto
+	>=x11-proto/glproto-1.4.8
+	motif? ( x11-proto/printproto )"
+
+S="${WORKDIR}/${MY_P}"
+
+# Think about: ggi, svga, fbcon, no-X configs
+
+pkg_setup() {
+	if use xcb; then
+		if ! built_with_use x11-libs/libX11 xcb; then
+			msg="You must build libX11 with xcb enabled."
+			eerror ${msg}
+			die ${msg}
+		fi
+	fi
+
+	if use debug; then
+		strip-flags
+		append-flags -g
+	fi
+
+	append-flags -fno-strict-aliasing
+
+	# gcc 4.2 has buggy ivopts
+	if [[ $(gcc-version) = "4.2" ]]; then
+		append-flags -fno-ivopts
+	fi
+
+	if use x86-fbsd; then
+		CONFIG="freebsd-dri-x86"
+	elif use amd64-fbsd; then
+		CONFIG="freebsd-dri-amd64"
+	elif use kernel_FreeBSD; then
+		CONFIG="freebsd-dri"
+	elif use x86; then
+		CONFIG="linux-dri-x86"
+	elif use amd64; then
+		[[ ${ABI} == "amd64" ]] && CONFIG="linux-dri-x86-64"
+		[[ ${ABI} == "x86" ]] && CONFIG="linux-dri-x86"
+	elif use ppc; then
+		CONFIG="linux-dri-ppc"
+	else
+		CONFIG="linux-dri"
+	fi
+}
+
+src_unpack() {
+	HOSTCONF="${S}/configs/${CONFIG}"
+
+	unpack ${A}
+	cd "${S}"
+
+	# FreeBSD 6.* doesn't have posix_memalign().
+	[[ ${CHOST} == *-freebsd6.* ]] && sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configs/freebsd{,-dri}
+
+	# Don't compile debug code with USE=-debug - bug #125004
+	if ! use debug; then
+	   einfo "Removing DO_DEBUG defs in dri drivers..."
+	   find src/mesa/drivers/dri -name *.[hc] -exec egrep -l "\#define\W+DO_DEBUG\W+1" {} \; | xargs sed -i -re "s/\#define\W+DO_DEBUG\W+1/\#define DO_DEBUG 0/" ;
+	fi
+
+	# Set up libdir
+	echo "LIB_DIR = $(get_libdir)" >> ${HOSTCONF}
+
+	# Set default dri drivers directory
+	echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> ${HOSTCONF}
+
+	# Do we want thread-local storage (TLS)?
+	if use nptl; then
+		echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF}
+	fi
+
+	echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${HOSTCONF}
+	if use xcb; then
+		echo "DEFINES += -DUSE_XCB" >> ${HOSTCONF}
+		echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> ${HOSTCONF}
+		echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> ${HOSTCONF}
+	fi
+
+	# Configurable DRI drivers
+	driver_enable video_cards_i810 i810 i915 i915tex i965
+	driver_enable video_cards_mach64 mach64
+	driver_enable video_cards_mga mga
+	driver_enable video_cards_r128 r128
+	driver_enable video_cards_radeon radeon r200 r300
+	driver_enable video_cards_s3virge s3v
+	driver_enable video_cards_savage savage
+	driver_enable video_cards_sis sis
+	driver_enable video_cards_sunffb ffb
+	driver_enable video_cards_tdfx tdfx
+	driver_enable video_cards_trident trident
+	driver_enable video_cards_via unichrome
+
+	# Set drivers to everything on which we ran driver_enable()
+	echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF}
+
+	if use hardened; then
+		einfo "Deactivating assembly code for hardened build"
+		echo "ASM_FLAGS =" >> ${HOSTCONF}
+		echo "ASM_SOURCES =" >> ${HOSTCONF}
+		echo "ASM_API =" >> ${HOSTCONF}
+	fi
+
+	if use sparc; then
+		einfo "Sparc assembly code is not working; deactivating"
+		echo "ASM_FLAGS =" >> ${HOSTCONF}
+		echo "ASM_SOURCES =" >> ${HOSTCONF}
+	fi
+
+	# Replace hardcoded /usr/X11R6 with this
+	echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> ${HOSTCONF}
+
+	echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> ${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
+
+	# 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
+
+	# Shut up pointless warnings
+#	echo "MKDEP = gcc -M" >> ${HOSTCONF}
+#	echo "MKDEP_OPTIONS = -MF depend" >> ${HOSTCONF}
+	echo "MKDEP_OPTIONS = -fdepend -I$(gcc-config -L)/include" >> ${HOSTCONF}
+}
+
+src_compile() {
+	emake -j1 ${CONFIG} || die "Build failed"
+}
+
+src_install() {
+	dodir /usr
+	make \
+		INSTALL_DIR="${D}/usr" \
+		DRI_DRIVER_INSTALL_DIR="${D}/usr/\$(LIB_DIR)/dri" \
+		INCLUDE_DIR="${D}/usr/include" \
+		install || die "Installation failed"
+
+	if ! use motif; then
+		rm "${D}"/usr/include/GL/GLwMDrawA.h
+	fi
+
+	# Don't install private headers
+	rm -f "${D}"/usr/include/GL/GLw*P.h
+
+	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
+	sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \
+		> "${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
+
+	# On *BSD libcs dlopen() and similar functions are present directly in
+	# libc.so and does not require linking to libdl. portability eclass takes
+	# care of finding the needed library (if needed) witht the dlopen_lib
+	# function.
+	sed -i -e 's:-ldl:'$(dlopen_lib)':g' \
+		"${D}"/usr/$(get_libdir)/libGLU.la \
+		"${D}"/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la
+
+	# Create the two-number versioned libs (.so.#.#), since only .so.# and
+	# .so.#.#.# were made
+	local MAJOR_2="$(printf "%.2i" $(get_version_component_range 1 ${PV}))"
+	local MINOR_2="$(printf "%.2i" $(get_version_component_range 2 ${PV}))"
+	local MICRO_2="$(printf "%.2i" $(get_version_component_range 3 ${PV}))"
+	dosym \
+		libGLU.so.1.3.${MAJOR_2}${MINOR_2}${MICRO_2} \
+		/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
+	if [[ ${CHOST} == *-freebsd* ]]; then
+		# FreeBSD doesn't use major.minor versioning, so the library is only
+		# libGL.so.1 and no libGL.so.1.2 is ever used there, thus only create
+		# libGL.so symlink and leave libGL.so.1 being the real thing
+		dosym libGL.so.1 /usr/$(get_libdir)/libGL.so
+	else
+		dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so
+		dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1
+	fi
+}
+
+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}
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+driver_enable() {
+	if use $1; then
+		shift
+		DRI_DRIVERS="${DRI_DRIVERS} $@"
+	fi
+}