Version bump for new development version of mesa.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

3 files changed, 266 insertions, 5 deletions

diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index d59aaa217044..ac7c530142d8 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.218 2009/06/25 09:00:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.219 2009/07/21 08:42:42 scarabeus Exp $
+
+*mesa-7.5 (21 Jul 2009)
+
+  21 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org> +mesa-7.5.ebuild:
+  Version bump for new development version of mesa.
 
   25 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org> -mesa-7.4.3.ebuild:
   Remove broken version.
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 19be19303546..aeb7466c1e75 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -12,6 +12,7 @@ DIST MesaLib-7.2.tar.bz2 3341919 RMD160 1e7c2cc6aa27ebaf7e726ac2086c10a5155d0832
 DIST MesaLib-7.3.tar.bz2 3368281 RMD160 ee0b06d375d1ea91dc26ae96c807918e1d3cb7c8 SHA1 24e6278a95f5913c6a6230ab50c32c5cb13b84dc SHA256 64e6e2ea556c44af7eaeea083a514a23e4f896b7856da4f006125ffc30c4379b
 DIST MesaLib-7.4.2.tar.bz2 3371577 RMD160 e70b8fd203325e676d90485632bf266e39d46a7e SHA1 fe70945ccf2c08d18ae4e83000018f0400352065 SHA256 71b978812cfc0dbc378315de42ef44a32f171b4166733b18455ec04a7fbc6434
 DIST MesaLib-7.4.4.tar.bz2 3375615 RMD160 9c9a5e8b7f8d2fd175cc8542e2aecf48edf8c084 SHA1 1cdcef24900489bc0a879013b2138c0d9aedffe3 SHA256 eaf73d7a3a2dc959ddc0753abaa18160c64bec00b35bf4a0c96040b2072918ec
+DIST MesaLib-7.5.tar.bz2 4402222 RMD160 63f18e4c801d9a87961ef478cb056980c38c2720 SHA1 31ed47f3f0b6bb059957cb778d639a024d125b5d SHA256 d6730247b5fac0a329ec5e9190800ead62aa01e39de48faeb07703f11f80c877
 DIST mesa-7.3-gentoo-patches-01.tar.bz2 34342 RMD160 547e3d1e8a72cd7df13bf699c181a5f8d36bff33 SHA1 51310d802ad1ee8b660fc7cf77c37b5478f3794a SHA256 e3d27046f73b6fc3d89e06fdfce9d065fa79705f59950b65350fa55bd539e56a
 EBUILD mesa-6.5.2-r1.ebuild 9095 RMD160 1fa3608b454b5d54d33d538329ed7d23670a1773 SHA1 3718811497844756f136f1f4b8e8ae1da0727212 SHA256 affc70f27691d575aef42c7f9f0a89d8abd75497bcaf324cb53ad56cfd5fcdb7
 EBUILD mesa-7.0.3.ebuild 10140 RMD160 14b25168416b1f61b1e67d70d1e55ef8f34ede10 SHA1 217cd7beca39d30c9701db48629703307417d9de SHA256 7f52a916190562886251df4bfa7b0c98c8e93b431ff5b9ace3cf2beff9df10de
@@ -20,12 +21,13 @@ EBUILD mesa-7.2.ebuild 7176 RMD160 b386204b4fccc206356c1b926e000f8f5c42925d SHA1
 EBUILD mesa-7.3-r1.ebuild 7229 RMD160 b62d77615267fa439965d22fe09932ad2801e2ce SHA1 2dfbaddc6e4bf3deb00e185aed9de766915580c2 SHA256 445e702e5fab2149dbce6db69bb02a13c8fa47b7a3ebabd536550b5fab5d7871
 EBUILD mesa-7.4.2.ebuild 7725 RMD160 b5bf98f78c724d365787bbe2c425b2279e78c082 SHA1 c978b607a96df0a1f89138c47ca3557c0c8e77ad SHA256 f9e93c2ad3920a7db65c4200fee4b49b16c739658360039b4285880c92b300fb
 EBUILD mesa-7.4.4.ebuild 7722 RMD160 019abf0239996dfb0e8777f1fa43046b08d63397 SHA1 56c36e3712d73a847234e5db6d7e2b79e8d17646 SHA256 faab5636f062d3572a28ad39eb34923d0f758e2a609614ade827c29335b9793c
-MISC ChangeLog 39829 RMD160 040946daf56f6f525aa2ecff9eaa7427f88d65c9 SHA1 0db748e075fc59e0524c096d2e61d848ddeba25f SHA256 e11bf8ae6635e6dd96ac70873b0f4772e1d853957ed217041058fb710b734925
+EBUILD mesa-7.5.ebuild 6971 RMD160 b5603efc968fe4f88bb5e9d52b96d56c666ed4eb SHA1 22faae104001b978e48edc595420d62a781d256c SHA256 6a1a377a58be90bdd14fdac28b0b9aa6819bfca737dbc653621d9e01ecdaa851
+MISC ChangeLog 39980 RMD160 c7ef3c4e2568bcf2ad679bda440e5da8a8f86930 SHA1 1f9011ec1e527592049f96c3034889a8a5e9c324 SHA256 308e9e16524240296f66445a134a130d99a0b99fd920087ccace7883f9c04108
 MISC metadata.xml 251 RMD160 e6e718c1f8c8ab33331fcdc2ed16dc7da35d04aa SHA1 a753e5190a6008a77db021b70d5962cbc2e9e488 SHA256 689bc8ac5839e4eb6173899024bf1f6169a5d3f3a1e82e4cdd80011e3e43a8de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkpDPNsACgkQHB6c3gNBRYfbewCdFBQ66LnFVTsZBgdz3K+iTHF7
-9SwAoIJNFy6Jl/CNY5vHzaLIKkc6xAgQ
-=btJm
+iEYEARECAAYFAkplf6YACgkQHB6c3gNBRYee6QCfXTJw8SNhHVfPcrxx/i41OT3d
+gakAn0i2z4K/heja1w667guNBPajch9S
+=tZWF
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-7.5.ebuild b/media-libs/mesa/mesa-7.5.ebuild
new file mode 100644
index 000000000000..b00a3449b8cc
--- /dev/null
+++ b/media-libs/mesa/mesa-7.5.ebuild
@@ -0,0 +1,254 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.5.ebuild,v 1.1 2009/07/21 08:42:42 scarabeus Exp $
+
+EAPI="2"
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git"
+	EXPERIMENTAL="true"
+	IUSE_VIDEO_CARDS_UNSTABLE="video_cards_nouveau"
+	IUSE_UNSTABLE="gallium"
+	# User can also specify branch by simply adding MESA_LIVE_BRANCH="blesmrt"
+	# to the make.conf, where blesmrt is desired branch.
+	[[ -z ${MESA_LIVE_BRANCH} ]] || EGIT_BRANCH="${MESA_LIVE_BRANCH}"
+fi
+
+inherit autotools multilib flag-o-matic ${GIT_ECLASS} 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/"
+
+#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2"
+if [[ $PV = *_rc* ]]; then
+	SRC_URI="http://www.mesa3d.org/beta/${MY_SRC_P}.tar.gz
+		${SRC_PATCHES}"
+elif [[ $PV = 9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2
+		${SRC_PATCHES}"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+
+IUSE_VIDEO_CARDS="${IUSE_VIDEO_CARDS_UNSTABLE}
+	video_cards_intel
+	video_cards_mach64
+	video_cards_mga
+	video_cards_none
+	video_cards_r128
+	video_cards_radeon
+	video_cards_radeonhd
+	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} ${IUSE_UNSTABLE}
+	debug doc motif nptl pic xcb kernel_FreeBSD"
+
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND="!<=x11-base/xorg-x11-6.9
+	!<=x11-proto/xf86driproto-2.0.3
+	app-admin/eselect-opengl
+	dev-libs/expat
+	>=x11-libs/libdrm-2.4.9
+	x11-libs/libICE
+	x11-libs/libX11[xcb?]
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXxf86vm
+	motif? ( x11-libs/openmotif )
+	doc? ( app-doc/opengl-manpages )
+"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	x11-misc/makedepend
+	>=x11-proto/dri2proto-1.99.3
+	>=x11-proto/glproto-1.4.8
+	x11-proto/inputproto
+	x11-proto/xextproto
+	x11-proto/xf86driproto
+	x11-proto/xf86vidmodeproto
+"
+# glew depend on mesa and it is needed in runtime
+PDEPEND=">=media-libs/glew-1.5.1"
+
+S="${WORKDIR}/${MY_P}"
+
+# Think about: ggi, svga, fbcon, no-X configs
+
+pkg_setup() {
+	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() {
+	[[ $PV = 9999* ]] && git_src_unpack || unpack ${A}
+}
+
+src_prepare() {
+	# apply patches
+	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/patches" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+	# FreeBSD 6.* doesn't have posix_memalign().
+	[[ ${CHOST} == *-freebsd6.* ]] && \
+		sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configure.ac
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# Configurable DRI drivers
+	driver_enable swrast
+	driver_enable video_cards_intel i810 i915 i965
+	driver_enable video_cards_mach64 mach64
+	driver_enable video_cards_mga mga
+	driver_enable video_cards_r128 r128
+	# ATI has two implementations as video_cards
+	driver_enable video_cards_radeon radeon r200 r300
+	driver_enable video_cards_radeonhd 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
+
+	# all live (experimental) stuff is wrapped around with experimental variable
+	# so the users cant get to this parts even with enabled useflags (downgrade
+	# from live to stable for example)
+	if [[ -n ${EXPERIMENTAL} ]]; then
+		# nouveau works only with gallium and intel, radeon, radeonhd can use
+		# gallium as alternative implementation (NOTE: THIS IS EXPERIMENTAL)
+		if use video_cards_nouveau && ! use gallium ; then
+			elog "Nouveau driver is available only via gallium interface."
+			elog "Enable gallium useflag if you want to use nouveau."
+			echo
+		fi
+		# state trackers, for now enable the one i want
+		# think about this bit more...
+		myconf="${myconf} $(use_enable gallium)"
+		if use gallium; then
+			elog "Warning gallium interface is highly experimental so use"
+			elog "it only if you feel really really brave."
+			elog
+			elog "Intel: works only i915."
+			elog "Nouveau: only available implementation, so no other choice"
+			elog "Radeon: not working, disabled."
+			echo
+			myconf="${myconf}
+				--with-state-trackers=glx,dri,egl
+				$(use_enable video_cards_nouveau gallium-nouveau)
+				$(use_enable video_cards_intel gallium-intel)"
+				#$(use_enable video_cards_radeon gallium-radeon)
+				#$(use_enable video_cards_radeonhd gallium-radeon)"
+		fi
+	fi
+
+	# Deactivate assembly code for pic build
+	# Sparc assembly code is not working
+	myconf="${myconf} $(use_enable !pic asm)"
+	myconf="${myconf} $(use_enable !sparc asm)"
+
+	# --with-driver=dri|xlib|osmesa ; might get changed later to something
+	# else than dri
+	econf \
+		--with-driver=dri \
+		--disable-glut \
+		--without-demos \
+		$(use_enable debug) \
+		$(use_enable motif glw) \
+		$(use_enable motif) \
+		$(use_enable nptl glx-tls) \
+		$(use_enable xcb) \
+		--with-dri-drivers=${DRI_DRIVERS} \
+		${myconf}
+}
+
+src_install() {
+	dodir /usr
+	emake DESTDIR="${D}" install || die "Installation failed"
+
+	# Remove redundant headers
+	# GLUT thing
+	rm -f "${D}"/usr/include/GL/glut*.h || die "Removing glut include failed."
+	# Glew includes
+	rm -f "${D}"/usr/include/GL/{glew,glxew,wglew}.h \
+		|| die "Removing glew includes failed."
+
+	# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
+	# because user can eselect desired GL provider.
+	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.{la,a,so*}; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \
+					|| die "Failed to move ${x}"
+			fi
+		done
+		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 \
+					|| die "Failed to move ${x}"
+			fi
+		done
+	eend $?
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	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
+}