version bump

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 315 insertions, 5 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 6e17f82878c3..1d8a9b44e902 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.662 2013/07/02 12:10:52 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.663 2013/07/11 00:39:58 aballier Exp $
+
+*ffmpeg-2.0 (11 Jul 2013)
+
+  11 Jul 2013; Alexis Ballier <aballier@gentoo.org> +ffmpeg-2.0.ebuild:
+  version bump
 
   02 Jul 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
   Add missing wavpack dep
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 77eb4e2a0178..654a47caf8ad 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -7,17 +7,19 @@ DIST ffmpeg-0.10.7.tar.bz2 5782181 SHA256 f5f3fc43e0f7789a3cf8f4f379851a5a838dd6
 DIST ffmpeg-1.0.6.tar.bz2 6450599 SHA256 650db1d500a52ebb67fe30ffc83dd475d5e70b45eb3b081f566bfec69ee2f900 SHA512 d5df9e40abfb7c0f757ef861a86b83035f2b9421c66baf5a902b86ed878d15b29715d16fe5c3f84c371cf3ef9eaf761cbe456dcb80b7a071904233517b1d7254 WHIRLPOOL ccd2675a47ceca1046084e0af015445d89dd7f18b34f76b0a46ef7bf3f8b55007710a1ca2f5531f73a793b01a6ff5c3d307be68977b60f6081548d4cca6a03f9
 DIST ffmpeg-1.0.7.tar.bz2 6451535 SHA256 f7e52bd5e0de064e36ecb04adf155c31dd30366a13168fabe61fd135f24d5c11 SHA512 a3a756fe50773551de58113de7b848f6ccb21ed2cf5c5f04387694937152ae978639aa92e4207cc09f384f34093ad2e6ddf7dfb334097f20f1326e13748f57d5 WHIRLPOOL ba2cc60a7bd7de1dca7f6c9ed02874db0f711c273d9616c5eeda0ee2b33fa9e36f55eb812d75e24583f81098505635ccff018b7aea67dbe9b3fd18583042fb73
 DIST ffmpeg-1.2.1.tar.bz2 5968378 SHA256 0302375c3a64e9c2facfa7cbeb1aa333a39fdf6bbacda228cd48e04bf9ee32ca SHA512 71f7318744533938f179b261b888144a19de533c77e0cfbb888a90258508462c84a95d4436727513a4f42af810a84e3e27d965a9c8d6b58c8d56aeeddb834f6c WHIRLPOOL 2ad9d81e9bbaadc0ccafc77c29478b2042dafd4cca71b65805b5b90b03248cda99c49000a80ae62cfb9ccde4fcafbddcab6d99547e2c2824498a893be40cbbb4
+DIST ffmpeg-2.0.tar.bz2 6188516 SHA256 940e1bc4f3e185364099b4ba60d4b952615a4232c5641baa3e9f45d4d748130c SHA512 0cf1284d091d593ff7cb93647baa7227e0d1aef5eac30843a198a9f12a42db7e5d66f15df162d57ac51d07cd78e17d1e577fff425f0e04bd36f414100209d032 WHIRLPOOL f7b305680569d1fc314afc7c23604620612e87cbe6842cbec3c0f469bd0fbb6b2dbf55bded118c57b168940367f8d19a6a6cc5f58cf3545ce582652b86820124
 EBUILD ffmpeg-0.10.7.ebuild 8938 SHA256 f5e01fac8854398bf96c3200c57556e8888138dcda36e8aa9b9578fa62ce4e2c SHA512 91ca4ed62938bc3af03ab5a2030840bbb0f1025f6d5ee2bbb463fe1a9cb7891af3d7beb443b974977360ddf979b35c0a012dc13a5bb837c20aaf0139481b935e WHIRLPOOL a05c7f31aea2d685df8cd5fe6ce36182cbaf48cd9cb7e5c2dfaad34d2637cebe377dae7a46644b3f886e27ac81db98d43f62362da48697a5b978a1ff1ea769d0
 EBUILD ffmpeg-1.0.6.ebuild 9541 SHA256 bc6c3ccb7bd57c636c045e3ce628b1f83c26a474e2e86f052457f5c0d261a1a3 SHA512 257cef9216df82c42adcbebcd9b0ee7e5bca132d0e78c83f7ad4220c23a80e7db67d67da902f90027b518ff05821c7a3f24f9077785b4143dce1df3aba96900b WHIRLPOOL fa2a6c6f4ee164d14acfc2f3cedb742e7d58b8c247c0ec7c55176ba8d82d7041bb215cbb3561ba243de651057115d0acb7fb7501254e143965a3337cc805c30b
 EBUILD ffmpeg-1.0.7.ebuild 9554 SHA256 3be00e1063491d9ca4a9449c912129f895458b84faf73cbb8dd81600e970da37 SHA512 c8304fa9a8b0393cb8b28bfac786600177a608f8d9cbf2c8fbf2e84f0883206dcd3955c1548b961d75d0af15504f1cc80b035f9996070d698e081c860ab23857 WHIRLPOOL 52b88400559fdc94f5c67ae7a24d67efc3cc1ac4030f0246035a3c67f3a2d11ef19f714e5031cc24c721e434de7288d6deac944ac37290c311ed9b6690cf28cb
 EBUILD ffmpeg-1.2.1.ebuild 8921 SHA256 06defa9cf89b0125b2e856e527859f518f6f32a5e3fd61334103eacf0d6afedd SHA512 3e2903acf805b1a7b1364c2f0d2e7e0670781a624ecbbd73a4f629241d089ec7cb376306af180c6af9661c4a0e732210b2e63a5225362ced5fec9bc1575798f3 WHIRLPOOL 8e1e752196151fa33b9d1093e779f85734e1844eb40a35392b7debcdb73bfeb70165613bc15729e0328456c55d8e61d2fffa57656af5e360802e2ca5045a9628
+EBUILD ffmpeg-2.0.ebuild 9060 SHA256 ddf19cad7f1e65d5cdf188dfcf015c85cf9f1171a24a1cec67f0ddd39f7351f9 SHA512 78a7504948e3eab6748c8903be9fe2e153244b1de52344593f33a1702204a6ebb44eb529b52cde58a0c4e799b65e09f7d12e0882ff162fbdaf4907d06c61470c WHIRLPOOL 8fecef56bf69e494f5f4c5c056225478396c9422aad78f146d2da6f5b959af318c693bc366d4b3b3b2e0e6266c01935cbc54212bc9f4a4cb2c6002a442550d14
 EBUILD ffmpeg-9999.ebuild 9063 SHA256 e45155266544047e062a20492909f3b1224591433f5333510dc10ab62c53d09c SHA512 3217f58060b75f2345bf79624b3720a57a3273fab1967e922ba7d7cb1520f739b38c13db944898b16b37f9d2c2e1832483d5f3414aa88bad15fc8ffb20c8c44a WHIRLPOOL f4d4d304711a02b45ae004aa310101158c706107973d7014c1c91dfde11e7ab4436a4934e6aac94b3aab332b6f606a4b4150a1347802823350a404def38714cd
-MISC ChangeLog 92631 SHA256 7f6336ab773f33f51883e5f7d4383a948b51b868bbed34096b4228a9f996e207 SHA512 96d8873ec3057e8944cbeb87413f9890c1f1199a08cb0d6b862b603a5156d69eeac2c012768e7a92c819dafd91cb5a0b9a2b6b0318930e36f2197498ffc1a0e7 WHIRLPOOL f9ab1852e7eda6c9b178688be8d2b2db310038d5b838dcd46fa938d17e1c72579922287d43ed0c3ee917de9b954d047608d172c2aee7c4aace59b464d7acd182
+MISC ChangeLog 92746 SHA256 e68613ea195dcf3cc77ad897d36dc69db9af25512bd8fefe7e69e6a3cd02afbc SHA512 50e9f4625b4ab24310882593e0069bfbdce28dc762fbd22dce18a2e40fff6ff3517e075ad28f6f03efa8c8064bafbf35cff4ca86c831443bd3f74a4e74f449d5 WHIRLPOOL 6e76d3148c174d452875c71f5fb167e07d9d525074c642d0051a76cb36385d26d053bb51cb34f3d707e0b6e7c96b8f14105a9323c4cf3766c106fc376b9d4757
 MISC metadata.xml 3729 SHA256 03ae8a9384e018a3938893e4e54d12f550a3cfad2bd9efd4b46fa09574086e76 SHA512 ef9d011517cea7a9cbb1b43c8868ac1da4db5ea691754f8e2cb42c98039f6d844bf3c7ebae3990391093a0b56f9e85431216e2d56033e97afb22427247c7b088 WHIRLPOOL 1b6cca8c033e218a5c3e9a4c6cd2fde8395c1829dcbf6d31f393d42a06b76a6237faa5a113d3a08eab1fe0b6275503b2c241e10cdcb20ed4126a10cd5b3b992d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHSw04ACgkQvFcC4BYPU0pi5gCgxTTE25lR1EeaU5lF94fcvkrz
-d1sAn06+wMB9DSPk/IKFxV+TwrvfmtNr
-=OJsY
+iEYEAREIAAYFAlHd/uAACgkQvFcC4BYPU0qkWgCeJSz0coryBVwTVjbnJaGNSg2w
+QcYAn2Xs+fhvL2/DMeLfFKGmpwA2tbp6
+=u+Tw
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-2.0.ebuild b/media-video/ffmpeg/ffmpeg-2.0.ebuild
new file mode 100644
index 000000000000..04d0c4166d6c
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-2.0.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-2.0.ebuild,v 1.1 2013/07/11 00:39:58 aballier Exp $
+
+EAPI="4"
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-2"
+	EGIT_REPO_URI="git://source.ffmpeg.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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+fi
+IUSE="
+	aac aacplus alsa amr amrenc bindist bluray +bzip2 cdio celt
+	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
+	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k libass
+	libcaca libsoxr libv4l modplug mp3 network openal openssl opus oss pic
+	pulseaudio quvi rtmp schroedinger sdl speex static-libs test theora threads
+	truetype twolame v4l vaapi vdpau vorbis vpx wavpack 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 ssse3 vis neon"
+
+for i in ${CPU_FEATURES}; do
+	IUSE="${IUSE} ${i%:*}"
+done
+
+FFTOOLS="aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart trasher"
+
+for i in ${FFTOOLS}; do
+	IUSE="${IUSE} +fftools_$i"
+done
+
+RDEPEND="
+	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/opencore-amr )
+	bluray? ( media-libs/libbluray )
+	bzip2? ( app-arch/bzip2 )
+	cdio? ( || ( dev-libs/libcdio-paranoia <dev-libs/libcdio-0.90[-minimal] ) )
+	celt? ( >=media-libs/celt-0.11.1 )
+	encode? (
+		aac? ( media-libs/vo-aacenc )
+		aacplus? ( media-libs/libaacplus )
+		amrenc? ( media-libs/vo-amrwbenc )
+		faac? ( media-libs/faac )
+		fdk? ( media-libs/fdk-aac )
+		mp3? ( >=media-sound/lame-3.98.3 )
+		theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg )
+		twolame? ( media-sound/twolame )
+		wavpack? ( media-sound/wavpack )
+		x264? ( >=media-libs/x264-0.0.20111017 )
+		xvid? ( >=media-libs/xvid-1.1.0 )
+	)
+	flite? ( app-accessibility/flite )
+	fontconfig? ( media-libs/fontconfig )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gnutls? ( >=net-libs/gnutls-2.12.16 )
+	gsm? ( >=media-sound/gsm-1.0.12-r1 )
+	iconv? ( virtual/libiconv )
+	iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 )
+	ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg2k? ( >=media-libs/openjpeg-1.3-r2:0 )
+	libass? ( media-libs/libass )
+	libcaca? ( media-libs/libcaca )
+	libsoxr? ( media-libs/soxr )
+	libv4l? ( media-libs/libv4l )
+	modplug? ( media-libs/libmodplug )
+	openal? ( >=media-libs/openal-1.1 )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	quvi? ( media-libs/libquvi )
+	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 )
+	vorbis? ( media-libs/libvorbis media-libs/libogg )
+	vpx? ( >=media-libs/libvpx-0.9.6 )
+	X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes )
+	zlib? ( sys-libs/zlib )
+	!media-video/qt-faststart
+	!media-libs/libpostproc
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	fontconfig? ( virtual/pkgconfig )
+	gnutls? ( virtual/pkgconfig )
+	ieee1394? ( virtual/pkgconfig )
+	libv4l? ( virtual/pkgconfig )
+	mmx? ( dev-lang/yasm )
+	rtmp? ( virtual/pkgconfig )
+	schroedinger? ( virtual/pkgconfig )
+	test? ( net-misc/wget )
+	truetype? ( virtual/pkgconfig )
+	v4l? ( sys-kernel/linux-headers )
+"
+# faac is license-incompatible with ffmpeg
+REQUIRED_USE="bindist? ( encode? ( !faac !aacplus ) !openssl )
+	libv4l? ( v4l )
+	fftools_cws2fws? ( zlib )
+	test? ( encode )"
+
+S=${WORKDIR}/${P/_/-}
+BUILD_DIR=${S}_build
+
+src_prepare() {
+	if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+	epatch_user
+}
+
+src_configure() {
+	mkdir -p "${BUILD_DIR}"
+	cd "${BUILD_DIR}"
+
+	local myconf="${EXTRA_FFMPEG_CONF}"
+
+	# options to use as use_enable in the foo[:bar] form.
+	# This will feed configure with $(use_enable foo bar)
+	# or $(use_enable foo foo) if no :bar is set.
+	local ffuse="bzip2:bzlib cpudetection:runtime-cpudetect debug doc
+			     gnutls hardcoded-tables iconv network openssl sdl:ffplay vaapi vdpau zlib"
+	use openssl && myconf="${myconf} --enable-nonfree"
+
+	# Encoders
+	if use encode
+	then
+		ffuse="${ffuse} aac:libvo-aacenc amrenc:libvo-amrwbenc mp3:libmp3lame fdk:libfdk-aac"
+		for i in aacplus faac theora twolame wavpack x264 xvid; do
+			ffuse="${ffuse} ${i}:lib${i}"
+		done
+
+		# Licensing.
+		if use aac || use amrenc ; then
+			myconf="${myconf} --enable-version3"
+		fi
+		if use aacplus || use faac || use fdk ; then
+			myconf="${myconf} --enable-nonfree"
+		fi
+	else
+		myconf="${myconf} --disable-encoders"
+	fi
+
+	# libavdevice options
+	ffuse="${ffuse}	cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal"
+
+	# Indevs
+	use v4l || myconf="${myconf} --disable-indev=v4l2 --disable-outdev=v4l2"
+	for i in alsa oss jack ; do
+		use ${i} || myconf="${myconf} --disable-indev=${i}"
+	done
+	ffuse="${ffuse}	libv4l:libv4l2 pulseaudio:libpulse X:x11grab"
+
+	# Outdevs
+	for i in alsa oss sdl ; do
+		use ${i} || myconf="${myconf} --disable-outdev=${i}"
+	done
+
+	# libavfilter options
+	ffuse="${ffuse} flite:libflite frei0r fontconfig libass truetype:libfreetype"
+
+	# libswresample options
+	ffuse="${ffuse} libsoxr"
+
+	# Threads; we only support pthread for now but ffmpeg supports more
+	ffuse="${ffuse} threads:pthreads"
+
+	# Decoders
+	ffuse="${ffuse} amr:libopencore-amrwb amr:libopencore-amrnb	jpeg2k:libopenjpeg"
+	use amr && myconf="${myconf} --enable-version3"
+	for i in bluray celt gsm modplug opus quvi rtmp schroedinger speex vorbis vpx; do
+		ffuse="${ffuse} ${i}:lib${i}"
+	done
+
+	for i in ${ffuse} ; do
+		myconf="${myconf} $(use_enable ${i%:*} ${i#*:})"
+	done
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf="${myconf} --disable-${i#*:}"
+	done
+	if use pic ; then
+		myconf="${myconf} --enable-pic"
+		# disable asm code if PIC is required
+		# as the provided asm decidedly is not PIC for x86.
+		use x86 && myconf="${myconf} --disable-asm"
+	fi
+	[[ ${ABI} == "x32" ]] && myconf+=" --disable-asm" #427004
+
+	# 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
+		--enable-postproc
+		--enable-avfilter
+		--enable-avresample
+		--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
+
+	"${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)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-cxxflags="${CXXFLAGS}" \
+		$(use_enable static-libs static) \
+		${myconf} || die
+}
+
+src_compile() {
+	cd "${BUILD_DIR}"
+	emake V=1
+
+	for i in ${FFTOOLS} ; do
+		if use fftools_$i ; then
+			emake V=1 tools/$i
+		fi
+	done
+}
+
+src_install() {
+	cd "${BUILD_DIR}"
+	emake V=1 DESTDIR="${D}" install install-man
+
+	for i in ${FFTOOLS} ; do
+		if use fftools_$i ; then
+			dobin tools/$i
+		fi
+	done
+
+	cd "${S}"
+	dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES
+	use doc && dohtml -r doc/*
+	if use examples ; then
+		dodoc -r doc/examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+src_test() {
+	cd "${BUILD_DIR}"
+	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
+		emake V=1 fate
+}