version bump

Package-Manager: portage-2.2.0_alpha49/cvs/Linux x86_64

3 files changed, 278 insertions, 5 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 2d627e7978a0..7a73283c9d71 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.435 2011/07/30 18:48:45 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.436 2011/07/30 19:05:32 aballier Exp $
+
+*ffmpeg-0.8.1 (30 Jul 2011)
+
+  30 Jul 2011; Alexis Ballier <aballier@gentoo.org> +ffmpeg-0.8.1.ebuild:
+  version bump
 
   30 Jul 2011; Alexis Ballier <aballier@gentoo.org> ffmpeg-0.7.1.ebuild,
   ffmpeg-0.7.2.ebuild, ffmpeg-0.8.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 659170014c1f..0bb8f52fe222 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -4,18 +4,20 @@ Hash: SHA1
 DIST ffmpeg-0.7-rc1.tar.bz2 4782516 RMD160 26bad1c174e7b58a3bc207c6327d052670b53203 SHA1 d15c005f46483fbfc3b678cb1c89123762b56b82 SHA256 55703829d2bef30c5f294aee9a3a62beb772ca443fbbd688e79c6a0bd012aa1e
 DIST ffmpeg-0.7.1.tar.bz2 4555714 RMD160 6539f725d869b97a1821636bd1416312970a6457 SHA1 d006cf0fb61d654c0845240da868ecf3a94c043f SHA256 243a770661b52cfa57bd59ab20b417f13bf8d076887f3c32bce533cbf92dea03
 DIST ffmpeg-0.7.2.tar.bz2 4520731 RMD160 2dc4f1d087241e1d3e1cba85977fc9960e33e809 SHA1 1952e2fc30a55a1cfff0075aab5c527311f5c731 SHA256 657a1699f6bc4bf37f0c6bcd6068df95a709014e149b08c5bae228881e1aa8f0
+DIST ffmpeg-0.8.1.tar.bz2 4509503 RMD160 40109c3b87264a21df0d211740ef834a5f3ae17e SHA1 db9371ac11e36b8cb2684af5f2c2d443f8e408d2 SHA256 5b70c7bad4e3b3e2b4a7072dfc5aa1635dadb1e7b1b53668b8a5449deb32b86d
 DIST ffmpeg-0.8.tar.bz2 4551071 RMD160 766f6b8ccc556b0c76e1a238d63131dbe74537ab SHA1 461f87c4fc080e10ac0acc48287aaa706021bbc4 SHA256 3e26fdc317970386f96b27c9821890832ad2970b07e434a5bb27048d03e3fc0f
 EBUILD ffmpeg-0.7.1.ebuild 8240 RMD160 3276dd9c67045e78313d5c5ca332d38d188e1b3e SHA1 0b65ef3c94c53047611d04048a8baef11312d8d1 SHA256 cb3a7e2874d414a3f47317f4b2a68d56d8f4a94ba57f53ca89422e0c80650f76
 EBUILD ffmpeg-0.7.2.ebuild 8240 RMD160 813de5abe437a29409c025ae0cc7444a1160d1e2 SHA1 26ecdd16b56b5eee64fdfb6fa573cfda2ca0a8c1 SHA256 a2d4a9ee08a20c0846cbde4c1f4449fb7ef30bbdcb3920f2e2302cbc8f7a0e86
 EBUILD ffmpeg-0.7_rc1.ebuild 8231 RMD160 b25976076ec15e196ce5d3decbe32e2e32bdc167 SHA1 0f36eff5f4523cace149e30c617f7b69b5376437 SHA256 bf591ef1bd97fbbb0679049b994258d4421f37988beb3908fb843ff189ab0d66
+EBUILD ffmpeg-0.8.1.ebuild 7856 RMD160 d5621e18800fb01f01c03f6a886187203b0a91cf SHA1 3584a2766bb87d2807ad7f7194bb32bb31b4ef14 SHA256 2950418be4dd4f2b940b9dc2ef89cb1c746b83f8a9b69de3be078676c00f9822
 EBUILD ffmpeg-0.8.ebuild 8238 RMD160 7b26d81ad7c5c37d6de8afb640b287747650d8ab SHA1 9f0b20f908cc96973e8297db958d90af1b9ba19c SHA256 5077b8f250594a993f6b966ae229807162e70cacd36f95e74284aa782376653b
 EBUILD ffmpeg-9999.ebuild 7866 RMD160 642380fe3c344ae4d68cccf0a94515f71bbd1a3b SHA1 9735b1a7d292a41b5a866f1964157b0586c3c653 SHA256 64799f19c14a07d4dd806103a7b7edff86caa453ee8be5b7c0c1008798d4b29b
-MISC ChangeLog 63970 RMD160 a5b573b608f9d445b1d7f09d4ed31fad90d32cf0 SHA1 4602863b311f4f74e90537df9d6f3026b0c69079 SHA256 198bfd9cd55482ee7fa90407c2d0831ce542c22a54691ee9a1433c0d09015d07
+MISC ChangeLog 64089 RMD160 6e0f88acce2b80819eb196d6020ca9e37fe23eb9 SHA1 3da0f796f61952affc28570157cb9d33c85fb4f3 SHA256 fb0108a101cefb8571691b5e81ba513b89e4e03719660e8ec81e1326febdc06e
 MISC metadata.xml 2392 RMD160 d6b9637517d92d0e5cf3cfbaae03e8943ec18b5a SHA1 be7d39f5b5b055d55402001be15fdb62ac7cc7bc SHA256 1aaf56f994f078d196f64233f1fba25c5736ad4ab4459a38eb39c77c7b7c9575
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk40UhIACgkQvFcC4BYPU0okIgCeJgmrfkUZHvfXSp7PfUT3sJbk
-v4IAoKqmXa9KtCWTXkmEADQ2hActN42S
-=3R0F
+iEYEARECAAYFAk40VgIACgkQvFcC4BYPU0rUUgCeMc+WJN9r9r71UnQaywOutqlx
+Y9cAoIwccu/92M3ItdWdX9DgsU3RJH2M
+=+H9y
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.8.1.ebuild b/media-video/ffmpeg/ffmpeg-0.8.1.ebuild
new file mode 100644
index 000000000000..8b59af601a40
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.8.1.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.8.1.ebuild,v 1.1 2011/07/30 19:05:32 aballier Exp $
+
+EAPI="4"
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-2"
+	EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
+fi
+
+inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec."
+HOMEPAGE="http://ffmpeg.org/"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+else # Release
+	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
+fi
+FFMPEG_REVISION="${PV#*_p}"
+
+LICENSE="GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )"
+SLOT="0"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+fi
+IUSE="
+	aac alsa amr bindist +bzip2 celt cpudetection debug dirac doc +encode faac
+	frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k mp3 network openal oss pic
+	qt-faststart rtmp schroedinger sdl speex static-libs test theora threads
+	truetype v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib
+	"
+
+# String for CPU features in the useflag[:configure_option] form
+# if :configure_option isn't set, it will use 'useflag' as configure option
+CPU_FEATURES="3dnow:amd3dnow 3dnowext:amd3dnowext altivec avx mmx mmxext:mmx2 ssse3"
+
+for i in ${CPU_FEATURES}; do
+	IUSE="${IUSE} ${i%:*}"
+done
+
+RDEPEND="
+	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/opencore-amr )
+	bzip2? ( app-arch/bzip2 )
+	celt? ( >=media-libs/celt-0.11.1 )
+	dirac? ( media-video/dirac )
+	encode? (
+		aac? ( media-libs/vo-aacenc )
+		amr? ( media-libs/vo-amrwbenc )
+		faac? ( media-libs/faac )
+		mp3? ( >=media-sound/lame-3.98.3 )
+		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
+		vorbis? ( media-libs/libvorbis media-libs/libogg )
+		x264? ( >=media-libs/x264-0.0.20110426 )
+		xvid? ( >=media-libs/xvid-1.1.0 )
+	)
+	frei0r? ( media-plugins/frei0r-plugins )
+	gsm? ( >=media-sound/gsm-1.0.12-r1 )
+	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
+	openal? ( >=media-libs/openal-1.1 )
+	rtmp? ( >=media-video/rtmpdump-2.2f )
+	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
+	schroedinger? ( media-libs/schroedinger )
+	speex? ( >=media-libs/speex-1.2_beta3 )
+	truetype? ( media-libs/freetype:2 )
+	vaapi? ( >=x11-libs/libva-0.32 )
+	vdpau? ( x11-libs/libvdpau )
+	vpx? ( >=media-libs/libvpx-0.9.6 )
+	X? ( x11-libs/libX11 x11-libs/libXext )
+	zlib? ( sys-libs/zlib )
+	!media-video/qt-faststart
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	dirac? ( dev-util/pkgconfig )
+	doc? ( app-text/texi2html )
+	mmx? ( dev-lang/yasm )
+	rtmp? ( dev-util/pkgconfig )
+	schroedinger? ( dev-util/pkgconfig )
+	test? ( net-misc/wget )
+	v4l? ( sys-kernel/linux-headers )
+	v4l2? ( sys-kernel/linux-headers )
+"
+# faac is license-incompatible with ffmpeg
+REQUIRED_USE="bindist? ( encode? ( !faac ) )"
+
+S=${WORKDIR}/${P/_/-}
+
+src_prepare() {
+	if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+}
+
+src_configure() {
+	local myconf="${EXTRA_FFMPEG_CONF}"
+	# Set to --enable-version3 if (L)GPL-3 is required
+	local version3=""
+
+	# enabled by default
+	for i in debug doc network vaapi vdpau zlib; do
+		use ${i} || myconf="${myconf} --disable-${i}"
+	done
+	use bzip2 || myconf="${myconf} --disable-bzlib"
+	use sdl || myconf="${myconf} --disable-ffplay"
+
+	use cpudetection && myconf="${myconf} --enable-runtime-cpudetect"
+
+	# Encoders
+	if use encode
+	then
+		use mp3 && myconf="${myconf} --enable-libmp3lame"
+		use aac && { myconf="${myconf} --enable-libvo-aacenc" ; version3=" --enable-version3" ; }
+		use amr && { myconf="${myconf} --enable-libvo-amrwbenc" ; version3=" --enable-version3" ; }
+		for i in theora vorbis x264 xvid; do
+			use ${i} && myconf="${myconf} --enable-lib${i}"
+		done
+		use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
+	else
+		myconf="${myconf} --disable-encoders"
+	fi
+
+	# libavdevice options
+	use ieee1394 && myconf="${myconf} --enable-libdc1394"
+	use openal && myconf="${myconf} --enable-openal"
+	# Indevs
+	for i in v4l v4l2 alsa oss jack ; do
+		use ${i} || myconf="${myconf} --disable-indev=${i}"
+	done
+	use X && myconf="${myconf} --enable-x11grab"
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf="${myconf} --disable-outdev=${i}"
+	done
+	# libavfilter options
+	use frei0r && myconf="${myconf} --enable-frei0r"
+	use truetype && myconf="${myconf} --enable-libfreetype"
+
+	# Threads; we only support pthread for now but ffmpeg supports more
+	use threads && myconf="${myconf} --enable-pthreads"
+
+	# Decoders
+	use amr && { myconf="${myconf} --enable-libopencore-amrwb --enable-libopencore-amrnb" ; version3=" --enable-version3" ; }
+	for i in celt gsm dirac rtmp schroedinger speex vpx; do
+		use ${i} && myconf="${myconf} --enable-lib${i}"
+	done
+	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf="${myconf} --disable-${i#*:}"
+	done
+	# disable mmx accelerated code if PIC is required
+	# as the provided asm decidedly is not PIC for x86.
+	if use pic && use x86 ; then
+		myconf="${myconf} --disable-mmx --disable-mmx2"
+	fi
+
+	# Option to force building pic
+	use pic && myconf="${myconf} --enable-pic"
+
+	# Try to get cpu type based on CFLAGS.
+	# Bug #172723
+	# We need to do this so that features of that CPU will be better used
+	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
+	# will just ignore it.
+	for i in $(get-flag march) $(get-flag mcpu) $(get-flag mtune) ; do
+		[ "${i}" = "native" ] && i="host" # bug #273421
+		myconf="${myconf} --cpu=${i}"
+		break
+	done
+
+	# Mandatory configuration
+	myconf="
+		--enable-gpl
+		${version3}
+		--enable-postproc
+		--enable-avfilter
+		--disable-stripping
+		${myconf}"
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf="${myconf} --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
+		case ${CHOST} in
+			*freebsd*)
+				myconf="${myconf} --target-os=freebsd"
+				;;
+			mingw32*)
+				myconf="${myconf} --target-os=mingw32"
+				;;
+			*linux*)
+				myconf="${myconf} --target-os=linux"
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ $(tc-arch) == "x86" ]]; then
+		filter-flags -fforce-addr -momit-leaf-frame-pointer
+		append-flags -fomit-frame-pointer
+		is-flag -O? || append-flags -O2
+		if (use debug); then
+			# no need to warn about debug if not using debug flag
+			ewarn ""
+			ewarn "Debug information will be almost useless as the frame pointer is omitted."
+			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+			ewarn "difficult to fix. Please have that in mind."
+			ewarn ""
+		fi
+	fi
+
+	cd "${S}"
+	./configure \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--enable-shared \
+		--cc="$(tc-getCC)" \
+		--disable-optimizations \
+		$(use_enable static-libs static) \
+		${myconf} || die
+}
+
+src_compile() {
+	#252269
+	emake version.h
+	emake
+
+	if use qt-faststart; then
+		tc-export CC
+		emake -C tools qt-faststart
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-man
+
+	dodoc README INSTALL
+	dodoc -r doc/*
+
+	if use qt-faststart; then
+		dobin tools/qt-faststart
+	fi
+}
+
+src_test() {
+	if use encode ; then
+		LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
+			emake test
+	else
+		ewarn "Tests fail without USE=encode, skipping"
+	fi
+}