Bump.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.26-rc8 x86_64

4 files changed, 337 insertions, 5 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index a8acd532c3fa..a8b51c72d752 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.177 2008/07/01 08:35:09 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.178 2008/07/08 22:08:08 dberkholz Exp $
+
+*mesa-7.1_rc2 (08 Jul 2008)
+
+  08 Jul 2008; Donnie Berkholz <dberkholz@gentoo.org>;
+  +files/src-mesa-drivers-Makefile, +mesa-7.1_rc2.ebuild:
+  Bump.
 
   01 Jul 2008; Donnie Berkholz <dberkholz@gentoo.org>;
   +files/0001-dri-drop-asserts-to-make-build-against-stable-libdr.patch,
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index abe7721dcb1f..43b7334a16a4 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -7,21 +7,24 @@ AUX 6.5.2-i965-wine-fix.patch 2888 RMD160 e899ac128933eb1a65e5c79de97408679beb2a
 AUX 7.0.2-glw.pc.in 235 RMD160 12923cc447a04eab42c98fac48e17b8828cfbcf8 SHA1 dc0bc9ff1b2f2aa5efc101b62e2cf1870195ecfe SHA256 1b484764cb1274dc6a29998b63d3a9aa6282fb1fb31d53ac7928724a2f288dfc
 AUX lib/libGL.la 755 RMD160 a60984e0d56d559c2c15bd4693e01404a7e0a408 SHA1 d6e231ffaccd1b13c3628744031cc761ffaf76d8 SHA256 b32ffd7f3f866da7dbae80ba78b1dc5b4924b33ab133b13397af9cda0a274f91
 AUX lib/libGLU.la 752 RMD160 04de8835526a3472480d7c285dd33d497bcc0bd7 SHA1 12c57ac5e7e8a94d4d41b0f37b0fb3f470791c39 SHA256 e28519d7ae719bc106f7d4239799580474d1b69a2254ede3b2179a5e50655fe5
+AUX src-mesa-drivers-Makefile 460 RMD160 31aa1fb7de34423ff28f22df848b2b22db07b928 SHA1 20449452d011b0ee5a2a82702a9c0cc88d5864c8 SHA256 6ba5c3da59d158a25928aba00ab462f71769d8416b9513be3d654a1bdf17ecd2
 AUX version.mk 341 RMD160 274c76da254fc922efb8060bc074c3c61d63eef2 SHA1 6c3d7d8826d0fa4372a41a73879e01453bf62ea0 SHA256 534e295f28e0c188a00722b101eefa18a3a4a2917f190838a4d08baf0ae1af5f
 DIST MesaLib-6.5.2.tar.bz2 3295166 RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 SHA1 ba860bb6ee57c02202342dfd5927464a068ea18f SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f
 DIST MesaLib-7.0.2.tar.bz2 3353217 RMD160 3d471062b60889baef48a1a4596de6e32e1530cf SHA1 d16eaeb1d9d95d11d3b6d289b1ba87108b88da90 SHA256 9d4707b556960f6aef14480f91fcd4f868720f64321947ab1b2fd20e85ce7f9e
 DIST MesaLib-7.0.3.tar.bz2 3389327 RMD160 1672be9d235f19c779c42ea4f443995b1844c836 SHA1 49b92094a25f189b411f393174ee666e73dddf36 SHA256 ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22
 DIST MesaLib-7.1-rc1.tar.gz 4495101 RMD160 2468daa0fe177462fdf3f5e222012377aadfc99e SHA1 f4d5a74251577ffa5e6fe14117209c0b3f2fdb8c SHA256 d1aa69223b13ce7a6aac92e7c11a83140cae69b7913a9e879481385e8ec17ae7
+DIST MesaLib-7.1-rc2.tar.gz 4526392 RMD160 e23bc5b9c9f80bbcdabbcce83f4a960492df3a98 SHA1 b039b1dee62bc9b41835a13d0a16e62dd55e1cad SHA256 b6dff2ab423716f1219a34f9f3a3c0c2d49c291728a9c6a826b1ff5c66b703fb
 EBUILD mesa-6.5.2-r1.ebuild 9092 RMD160 bd563c07923b51075c0f954d91c6ab25cc359d92 SHA1 6b8c6d996a7d10e61db90ae5296e3f8c7122938c SHA256 69f5fe44667201b6b57bb5f46b377857f96fadf31880a72d797cd90ba6086d22
 EBUILD mesa-7.0.2.ebuild 9948 RMD160 90dd90f1c7078730af0d6d2f26397d16fd021297 SHA1 2e037d9ec5e988f55355330ccf65b69e135b1921 SHA256 786b2b690af732def65625a3af2854bb6601c89b7ec895f4a67c11a1dba21cac
 EBUILD mesa-7.0.3.ebuild 10137 RMD160 953e56dcfe83d94981c634926793626635ed1456 SHA1 8d2681358679a25c73ef6648aa322b83ce165707 SHA256 82ace13c9a192008b87ded31fa78110a36266dee4565f0d4f39eed97d3e81ac8
 EBUILD mesa-7.1_rc1.ebuild 7718 RMD160 8ec8a3d04770b0199a0585ac1665abf852eac6b3 SHA1 12918ef895dd1c92ab232c07937aa2c5d650d2b1 SHA256 999bd838d41c7934861b77b768aac6e3ee283519fa2c7d911ff8aa02c3742e37
-MISC ChangeLog 33198 RMD160 f7012bf8da062b27fe66a5823970e8341bfa244d SHA1 13ef4e7829928f360e22e18348290b25061c0e0b SHA256 6c0c5f8ef50552daf175f12e8df605c53d66026246720cfc0b3a1a820b5af22d
+EBUILD mesa-7.1_rc2.ebuild 7586 RMD160 ace16bbc8c0db2dde86607f305d726fc43c5d4e1 SHA1 d8897a765da87de6cd509130a27315c3b1ae1dec SHA256 b8f5fd4c8332ba428b00bcd8fb475f033751742aa53c5d93f1b559767657ddaa
+MISC ChangeLog 33349 RMD160 93c2e86e61f9cf89a67496e17af49561311a9581 SHA1 328945d1ce1c00ec1da95b2ff6331180347b5e70 SHA256 768b3da88d13daa2d1544e344feb8efcaae3f483877a8e00cfedceac1bb7fe68
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhp7EIACgkQXVaO67S1rtsc/wCdGyIKS4yBiGLrZ4aiVjPq9Gsf
-wicAoPvEhG/hyIou967RambHQub09K/D
-=9v2h
+iEYEARECAAYFAkhz5U4ACgkQXVaO67S1rtsu6gCgm6gSsocbhrtVQAGDYwo7hgCL
+3BgAmwRFIlsBGIrakwaKH/nYo660GDmw
+=i0sP
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/files/src-mesa-drivers-Makefile b/media-libs/mesa/files/src-mesa-drivers-Makefile
new file mode 100644
index 000000000000..c5998413e86d
--- /dev/null
+++ b/media-libs/mesa/files/src-mesa-drivers-Makefile
@@ -0,0 +1,29 @@
+# src/mesa/drivers/Makefile
+
+TOP = ../../..
+include $(TOP)/configs/current
+
+
+default:
+	@for dir in $(DRIVER_DIRS) ; do \
+		if [ -d $$dir ] ; then \
+			(cd $$dir && $(MAKE)) || exit 1; \
+		fi \
+	done
+
+
+clean:
+	@for dir in $(DRIVER_DIRS) ; do \
+		if [ -d $$dir ] ; then \
+			(cd $$dir && $(MAKE) clean) || exit 1; \
+		fi \
+	done
+
+
+install:
+	@for dir in $(DRIVER_DIRS) ; do \
+		if [ -d $$dir ] ; then \
+			(cd $$dir && $(MAKE) install) || exit 1; \
+		fi \
+	done
+
diff --git a/media-libs/mesa/mesa-7.1_rc2.ebuild b/media-libs/mesa/mesa-7.1_rc2.ebuild
new file mode 100644
index 000000000000..21da366d6128
--- /dev/null
+++ b/media-libs/mesa/mesa-7.1_rc2.ebuild
@@ -0,0 +1,294 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.1_rc2.ebuild,v 1.1 2008/07/08 22:08:08 dberkholz Exp $
+
+GIT=
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
+	GIT="git"
+fi
+
+inherit autotools multilib flag-o-matic ${GIT} portability
+
+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"
+elif [[ $PV = 9999 ]]; then
+	SRC_URI=""
+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
+	pic
+	motif
+	nptl
+	xcb
+	kernel_FreeBSD"
+
+RDEPEND="app-admin/eselect-opengl
+	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.3.1
+	x11-libs/libICE
+	motif? ( x11-libs/openmotif )
+	doc? ( app-doc/opengl-manpages )
+	!<=x11-base/xorg-x11-6.9"
+DEPEND="${RDEPEND}
+	!<=x11-proto/xf86driproto-2.0.3
+	dev-util/pkgconfig
+	x11-misc/makedepend
+	x11-proto/inputproto
+	x11-proto/xextproto
+	!hppa? ( x11-proto/xf86driproto )
+	x11-proto/dri2proto
+	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
+		append-flags -g
+	fi
+
+	# gcc 4.2 has buggy ivopts
+	if [[ $(gcc-version) = "4.2" ]]; then
+		append-flags -fno-ivopts
+	fi
+
+	# recommended by upstream
+	append-flags -ffast-math
+}
+
+src_unpack() {
+	if [[ ${PV} = 9999* ]]; then
+		git_src_unpack
+	else
+		unpack ${A}
+		cd "${S}"
+	fi
+
+	cp "${FILESDIR}"/src-mesa-drivers-Makefile \
+		"${S}"/src/mesa/drivers/Makefile || die
+
+	# 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
+}
+
+src_compile() {
+	local myconf
+
+	# This is where we might later change to build xlib/osmesa
+	myconf="${myconf} --with-driver=dri"
+
+	# No TTM
+	myconf="${myconf} --disable-ttm-api"
+
+	# Do we want thread-local storage (TLS)?
+	myconf="${myconf} $(use_enable nptl glx-tls)"
+
+	# Configurable DRI drivers
+	driver_enable swrast
+	driver_enable video_cards_i810 i810 i915 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()
+	myconf="${myconf} --with-dri-drivers=${DRI_DRIVERS}"
+
+	# Deactivate assembly code for pic build
+	myconf="${myconf} $(use_enable pic asm)"
+
+	# Sparc assembly code is not working
+	myconf="${myconf} $(use_enable sparc asm)"
+
+	myconf="${myconf} --disable-glut"
+
+	myconf="${myconf} --without-demos"
+
+	myconf="${myconf} $(use_enable xcb)"
+
+	myconf="${myconf} $(use_enable debug)"
+
+	# Get rid of glut includes
+	rm -f "${S}"/include/GL/glut*h
+
+	myconf="${myconf} $(use_enable motif glw)"
+
+	econf ${myconf} || die
+	emake || die
+}
+
+src_install() {
+	dodir /usr
+	emake \
+		DESTDIR="${D}" \
+		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
+
+	# 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
+
+	# We need the outer check, because xorg-server may not be installed
+	# first, and built_with_use() dies if the package isn't installed.
+	if has_version x11-base/xorg-server; then
+		if built_with_use x11-base/xorg-server nptl; then
+			ewarn "Rebuild x11-base/xorg-server without USE=nptl"
+			ewarn "or AIGLX (compiz, etc.) will not work."
+			ewarn "This is because of a bug in the Mesa NPTL assembly code"
+			ewarn "in all Mesa 7.0.x versions (Mesa 6.x is OK)."
+		fi
+	fi
+}
+
+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() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			DRI_DRIVERS="${DRI_DRIVERS},$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					DRI_DRIVERS="${DRI_DRIVERS},${i}"
+				done
+			fi
+			;;
+	esac
+}