Bump to release candidate for 7.1. Lots of new code, including the swrast DRI driver so we don't need to have Mesa source code during the xorg-server build anymore. There's also a new autoconf build system that simplifies the ebuild considerably.

Package-Manager: portage-2.1.5.4

3 files changed, 298 insertions, 5 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 7719dc3ab1c5..5875f7029d71 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,14 @@
 # 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.170 2008/05/02 01:18:59 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.171 2008/06/10 07:08:40 dberkholz Exp $
+
+*mesa-7.1_rc1 (10 Jun 2008)
+
+  10 Jun 2008; Donnie Berkholz <dberkholz@gentoo.org>; +mesa-7.1_rc1.ebuild:
+  Bump to release candidate for 7.1. Lots of new code, including the swrast
+  DRI driver so we don't need to have Mesa source code during the
+  xorg-server build anymore. There's also a new autoconf build system that
+  simplifies the ebuild considerably.
 
   02 May 2008; Donnie Berkholz <dberkholz@gentoo.org>; mesa-7.0.3.ebuild:
   Revert the libdrm dependency change. 7.0.3 does not compile with current
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 928d4ab54972..79d068381e03 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -8,15 +8,17 @@ AUX lib/libGLU.la 752 RMD160 04de8835526a3472480d7c285dd33d497bcc0bd7 SHA1 12c57
 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
 EBUILD mesa-6.5.2-r1.ebuild 9090 RMD160 e625707b6acda5455b26fc7d237227ad619ac023 SHA1 e433ca38d4c0457756b88155a729c6c673c5c79b SHA256 e093c6c6a45f9608d2a85be26d8fbf0b9c3d3afdbe7ca5c369099fbdef2fe351
 EBUILD mesa-7.0.2.ebuild 9949 RMD160 b1f3160a99372db459d7fb178cf2dc5760920ceb SHA1 8f08837f5a3524b93743a020957522048869e350 SHA256 fe06d16a513ac9bf8ddac27a3d871ee0251ac4634b9e9737aaabe5df13f0124d
 EBUILD mesa-7.0.3.ebuild 10138 RMD160 7c16b54159c22659ac9d079a8be5e556979af878 SHA1 95a55cf5d17fb27ad8f6f3ecc59c0d3866ab59af SHA256 2a7c03fc4a6e0989aeb30aa105e07e8c7f449c75436c298ae4c6aa615135ccd9
-MISC ChangeLog 31597 RMD160 b36c5fbba50392f2b84e28728048a4cd21737623 SHA1 0b7f14ee361a1c2ca72bc3b05c3cf27f549dc0de SHA256 85a386a74d40208c1d873e2bf545234534a53859e1afe516a5cdb46308071621
+EBUILD mesa-7.1_rc1.ebuild 7438 RMD160 6ec0a0be54a1add41fbeaa60e16c89b0d2356eaa SHA1 2a66c12bbb3cea65deb484931aca7fc31b774830 SHA256 9eb5c79f1e001a764f464a1e2799069d96ed0f3f72977323456734eb0e8bde35
+MISC ChangeLog 31959 RMD160 110ae0f4cff3eca30cf779f9821388bf28345e75 SHA1 0552c050706f212f5cf36392592b865ec0337c47 SHA256 3eef1af965dbfcebb071493d0429851054130b6bf79c01e7eb0c0c43aacf4d8a
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgabAkACgkQXVaO67S1rtuZ/wCgkw7Ag65HmPKvm2NFkEEDu/C2
-rYsAoPvMwYlqYPr/FCENWVmcMqpmVzac
-=BQMj
+iEYEARECAAYFAkhOKH4ACgkQXVaO67S1rtvZ4QCfQqmfra2EBF+NbouX5zyVH0Zq
+NAsAn3lls0ycty0xlBXPQ/xTib1Q0ybZ
+=mvFF
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-7.1_rc1.ebuild b/media-libs/mesa/mesa-7.1_rc1.ebuild
new file mode 100644
index 000000000000..303010d90479
--- /dev/null
+++ b/media-libs/mesa/mesa-7.1_rc1.ebuild
@@ -0,0 +1,283 @@
+# 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_rc1.ebuild,v 1.1 2008/06/10 07:08:40 dberkholz Exp $
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
+
+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-9999
+	x11-libs/libICE
+	motif? ( virtual/motif )
+	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() {
+	git_src_unpack
+	cd "${S}"
+
+	# FreeBSD 6.* doesn't have posix_memalign().
+	[[ ${CHOST} == *-freebsd6.* ]] && sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configure.ac
+
+	# 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
+
+	eautoreconf
+}
+
+src_compile() {
+	local myconf
+
+	# This is where we might later change to build xlib/osmesa
+	myconf="${myconf} --with-driver=dri"
+
+	# 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)"
+
+	# 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
+}