Bump to RC. The only upstream change from 7.1 is to remove DRI2 code, which is still a work in progress. (#237648) Assembly code enabling had reversed logic, so it was enabled for pic & sparc but disabled for everyone else.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.27-rc6 x86_64

3 files changed, 296 insertions, 5 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 208296faaab9..a0a60caf8b6d 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.183 2008/09/11 17:19:47 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.184 2008/09/14 18:38:41 dberkholz Exp $
+
+*mesa-7.2_rc1 (14 Sep 2008)
+
+  14 Sep 2008; Donnie Berkholz <dberkholz@gentoo.org>; +mesa-7.2_rc1.ebuild:
+  Bump to RC. The only upstream change from 7.1 is to remove DRI2 code,
+  which is still a work in progress. (#237648) Assembly code enabling had
+  reversed logic, so it was enabled for pic & sparc but disabled for
+  everyone else.
 
   11 Sep 2008; Donnie Berkholz <dberkholz@gentoo.org>; mesa-7.1.ebuild:
   Pull in mesa-progs so people don't get really confused by the lack of
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index f0f29d590d10..c4cba38dfa57 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -8,16 +8,18 @@ DIST MesaLib-6.5.2.tar.bz2 3295166 RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6
 DIST MesaLib-7.0.3.tar.bz2 3389327 RMD160 1672be9d235f19c779c42ea4f443995b1844c836 SHA1 49b92094a25f189b411f393174ee666e73dddf36 SHA256 ebdf3448eac8abb56bbfc0b7c015efce8e5d88f10ee3123dcc62c1ff47b62d22
 DIST MesaLib-7.1-rc3.tar.gz 4528917 RMD160 bbed6869cdf059fbd880d7de287f22b75722c38d SHA1 83832acf3a429b106ba473e24713ac29fadb71ac SHA256 ad6bad5df3a8a4822f022d5d200efe5603e1c7ff4026147d0b66e40a42c845a9
 DIST MesaLib-7.1.tar.bz2 3338885 RMD160 e03960762a35eeb56755105fda5ba1b580c7dacc SHA1 0b946a8a4334ca22baf3e0fe583f88187e9d74fa SHA256 d63a29bf206a5304b3c319a47fa16892db3d2e14737f2c534acf1eb220e9c550
+DIST MesaLib-7.2-rc1.tar.gz 4369849 RMD160 3ac078dc0cb0335f3b1405edc0ab1fb8101c4601 SHA1 df1facac6d677729bac9bfa47a5e8adbd756853c SHA256 dd2935c5b8a632108d7253f336a3b2c5e266ca2ef4f98a33a1eb8ba42f429ff3
 EBUILD mesa-6.5.2-r1.ebuild 9092 RMD160 bd563c07923b51075c0f954d91c6ab25cc359d92 SHA1 6b8c6d996a7d10e61db90ae5296e3f8c7122938c SHA256 69f5fe44667201b6b57bb5f46b377857f96fadf31880a72d797cd90ba6086d22
 EBUILD mesa-7.0.3.ebuild 10137 RMD160 953e56dcfe83d94981c634926793626635ed1456 SHA1 8d2681358679a25c73ef6648aa322b83ce165707 SHA256 82ace13c9a192008b87ded31fa78110a36266dee4565f0d4f39eed97d3e81ac8
 EBUILD mesa-7.1.ebuild 7231 RMD160 8e38838cf9043c936841503433fa205ae451b6d8 SHA1 f8dc495f513edb582992dd8b9316af059a4e45e2 SHA256 1abf21683b3440ffdefb6b319da63f42656f50d1d9060e6ed18ac08a5c9c51b9
 EBUILD mesa-7.1_rc3.ebuild 7497 RMD160 113d32d695fceb0585f68436978c82c0242d8a72 SHA1 f02cdb6d2047c283a6b119a9b5aa7a4754784daa SHA256 9fd7ae6bd695c0ba56f9b1e633461d126303469ac388f2618336bcd9b948fbee
-MISC ChangeLog 34401 RMD160 f62c61f190c96bb36e69dbcdce794f89e9db2deb SHA1 8ea82fa7430cc78c6d36e142d1d83dc69d139717 SHA256 69d94344fe333d62e597fda089ea96456d2926e6ad8fad5fb5ecd948b7650f33
+EBUILD mesa-7.2_rc1.ebuild 7210 RMD160 b67011145c27b4ae4ca04e9911a7044d6f7b6dd2 SHA1 d1b94b28d0ed33e3e4adc92a2a5f4eb1d51a81ee SHA256 7d0632dea6cb38062fa1fb045687439875946b0857e2399d9972c4675b642059
+MISC ChangeLog 34740 RMD160 2bbc80fcf48743b67d47e4b6d67f60168cbcdbdb SHA1 c81412dfde9dec1ec3162835002099e4c8b11a5c SHA256 2925817fa4d675467b5d5c027ec3a02286c04026a528a58632c944444452712f
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjJUzkACgkQXVaO67S1rtuu8gCgih3JWHD5eC7IMlSWP70ZpgEw
-WaUAnR7kKhpBNOlFUVc6VhmoqzoqwA8/
-=5sXz
+iEYEARECAAYFAkjNWjYACgkQXVaO67S1rtvY/gCcDSifVGGmMQqJIHzuDhiO8aM8
+5z0AoI0/qMSXe2iucbcqAOtLJHfNAV9i
+=rC83
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-7.2_rc1.ebuild b/media-libs/mesa/mesa-7.2_rc1.ebuild
new file mode 100644
index 000000000000..4c3b880cd274
--- /dev/null
+++ b/media-libs/mesa/mesa-7.2_rc1.ebuild
@@ -0,0 +1,281 @@
+# 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.2_rc1.ebuild,v 1.1 2008/09/14 18:38:41 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-1.0.6-r1
+	dev-libs/expat
+	>=x11-libs/libX11-1.1.5
+	>=x11-libs/libXext-1.0.4
+	>=x11-libs/libXxf86vm-1.0.2
+	>=x11-libs/libXi-1.1.3
+	>=x11-libs/libXmu-1.0.3
+	>=x11-libs/libXdamage-1.1.1
+	>=x11-libs/libdrm-2.3.1
+	>=x11-libs/libICE-1.0.4
+	motif? ( >=x11-libs/openmotif-2.3.1-r1 )
+	doc? ( >=app-doc/opengl-manpages-20001215 )
+	>=x11-apps/mesa-progs-7.1
+	!<=x11-base/xorg-x11-6.9"
+DEPEND="${RDEPEND}
+	!<=x11-proto/xf86driproto-2.0.3
+	dev-util/pkgconfig
+	>=x11-misc/makedepend-1.0.1
+	>=x11-proto/inputproto-1.4.4
+	>=x11-proto/xextproto-7.0.3
+	!hppa? ( >=x11-proto/xf86driproto-2.0.4 )
+	>=x11-proto/xf86vidmodeproto-2.2.2
+	>=x11-proto/glproto-1.4.9
+	motif? ( >=x11-proto/printproto-1.0.4 )"
+
+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
+
+	# 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)"
+	myconf="${myconf} $(use_enable motif)"
+
+	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
+}
+
+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
+}