version bump for the 0.11 branch

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

3 files changed, 300 insertions, 5 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 9996f3d0aa69..71bb471d9b59 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.577 2012/09/20 12:35:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.578 2012/09/20 12:48:51 aballier Exp $
+
+*ffmpeg-0.11.2 (20 Sep 2012)
+
+  20 Sep 2012; Alexis Ballier <aballier@gentoo.org> +ffmpeg-0.11.2.ebuild:
+  version bump for the 0.11 branch
 
 *ffmpeg-0.10.5 (20 Sep 2012)
 
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 6235b8a1eee8..c6376c483464 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -7,18 +7,20 @@ DIST ffmpeg-0.10.3.tar.bz2 5855494 SHA256 7d1ca0abc80e2f6161e2a48878b62a2e6d0301
 DIST ffmpeg-0.10.4.tar.bz2 5853766 SHA256 82932716a8c01a6840a2f20c1ee093e04b1d8a27c2d6318ddf21a5f95f3c581b SHA512 21d6e034009d2f976c6d25ee35c1a14a0ab5d28e3f9af4b45da6f2720c2be6a6472e4ff408304d14ecfee5096b33bafd8440fc80ee51100aa02bdbbd82eccb1a WHIRLPOOL f4641b3cf243a52743a2a3db9140ac2a10a59c8c9d55bb86fb16d725d76228cd1e70ac45faa0a12f7a6a28eb08fc2fedc57a31c14d20a86a6770c99c9ce08a4e
 DIST ffmpeg-0.10.5.tar.bz2 5774951 SHA256 47f26011e2d0d31641e91bb1fbcb907f4aa654d93732d5362711f38c2db4faa9 SHA512 a945b6f80ec3f036613e207aa4a87b11f7a1e8931d297a1fe83e66f742dbd8922c12ab45929fc497a7725082ee9d20ff0b9bc20fc0b12c0b5b4526470ea61520 WHIRLPOOL b883178bfb32f2fd068b6345fb0add948f9a550a9ad6ecfa62a83f9f2e9dcb94c3c5f05b56db90fbbddc69f6ce7787a5bcf385865bc0a1eb12182291e0922f66
 DIST ffmpeg-0.11.1.tar.bz2 6073253 SHA256 b01ddfb6352c84810879988f43172c5f7be555697edb929625845c7bb953fa96 SHA512 1a3c3cf6222f3273b091facffa52b9608e4f913fe0e53378011a29efef58c55032c878b4cc56357c435c7a552c5af7b74cf8651b25c8a1394f612ff2176fea40 WHIRLPOOL 7997f585408bf33492145c392038c472f5f3073fc53082484830a7860ced290e5e6115d89083ab31fa59fc89c96e4a10170c4dd7c0a06eacfb974c1676ef7829
+DIST ffmpeg-0.11.2.tar.bz2 5983283 SHA256 b7e58f5aa8e1657cec15f5da439b142e0cbf478a8d5e5be0304c203ecd27c893 SHA512 033332332bbcdd32c95905ce3ad67021e3730ab9171d07d111fd2b68e75fba090af05a85a361ba7225435c55948e5f98c5a0346f2656e3dff1a5d77a041b9742 WHIRLPOOL 5215f3a4a859f5fa2b7ba93e032f6aaf09a494fb61a71bb8a3c7c55ffde27d49a74d8ea573f49e0d44aca764ce3fa703b2eaa9f7c89f717a275c9c410e029cb9
 EBUILD ffmpeg-0.10.2.ebuild 8564 SHA256 0863c34956e6e78ffa4cc04d186635ef1668bf38d32cad7a19531992b7bd0c9f SHA512 164a6a5a4afe80fcd54a22c4bf6847fe35985a4c951d924a06dbcc12463d08439fb18e4477977484350f52c3c308a2c68cc9e44661401247dde9b17e99b9e305 WHIRLPOOL 4fd9d9f60ae98ca7ddb6217618d15775b5ed8642e6efe33ddc44968bf4f9692162b49cc6d77fce5bc3cb534f8e49e7585019db7c5954694ad6e8ef4d745edbe7
 EBUILD ffmpeg-0.10.3.ebuild 8580 SHA256 f26bd6eaea9f64f522c8672cea912f3bf9758424c1285a097ead96c30690b75f SHA512 c2e968784eee4b8f179dbbdc7191045404fe72a493454476d9a9536d36db57b67fd37422c5f143ee50d78c597e510d3e6d856dcf183df8620a76c9e197becb9e WHIRLPOOL 43ce24fc0be5575210e8fa8cc75aaa41c218497b50ed807c04a63dfcef8788a5e069c6e471a3b84e5c2dfe2fe37591803a01955cd97269b276168d2184a475ef
 EBUILD ffmpeg-0.10.4.ebuild 8586 SHA256 44cd16e5c668f749149f24c7222d3cf88d7022b21b4ede786310f7465ec37214 SHA512 47e2c8118ecaa9b8aab1b4bfe033804117778487716fbc44738ef9f16a8f1f5f5763add9ba4e6edda8304e6a82563c787f738334bb032d8284aa2482b6ca378c WHIRLPOOL 920f82558cb126741cf9ae1288b5293b37271529d593c20f6bd92733527636f1f1213409a8bc11d68ed1841fcfca2fd9b3f825e806b0f2ac9a3d5b1084f8dda6
 EBUILD ffmpeg-0.10.5.ebuild 8586 SHA256 c9864bfb8b115fd9b902b0c6422cbaa776aff0a6a785730fe9b271514b2b2119 SHA512 c2ce44461a1f27ffa26d7581c45c2855639721e61d39ffc6e7b225d1c6cd9e64a210601ed268549ba2c1f512526ef6bfd3084f3bc020f957a74cd53cb9d15f98 WHIRLPOOL 8c6e4b18ffcd52e704357fda928eea276b347317efb8173ef3854668fda53d370d8f318f3f262c13df3bbb622f3336f7cd3a56de75865d40ba45967b57ce362b
 EBUILD ffmpeg-0.11.1.ebuild 8724 SHA256 614bdb568952bac8c6444dbacb7a410ac6e30dfee9b86a8f14285265caf24082 SHA512 6f9b5ab5906775c64a2d7ee419a6d162f3958ee377ec0635d33e7bff5eedcc9d10a1da7257ef6d4dc410b1da0c233c317dfd3ca69940295ff3f830da693ed482 WHIRLPOOL 075dfa196700fad21a51e8470ab72e07051a936573c39b387614959c6123d5c3e06dda08e261024710aa491b9adaef759624047360898f4bea3a89978cdff5a5
+EBUILD ffmpeg-0.11.2.ebuild 8724 SHA256 4c600c056f52de8418db44378423fc92154b69c282e17e2a4d6f5e08e3ae9b54 SHA512 e748f4bbfc5b7236657e61952b194daabaf787f29798c5dc8a1b8791b4ddd1837e1a1191a85e9ce65bfb5c550b548ac9efa2796ca91ae241199c88d6912d4ac7 WHIRLPOOL aac74721a2590023937e12d0dd5d28af6837a19d882a5aa21832b2643fa025d2d31da32e3be7f26c3bc9cd9c86e5de9c8b469d7365db8a30194579bceb8affd9
 EBUILD ffmpeg-9999.ebuild 9120 SHA256 9a1744e9880f4a12ca78a1e03844946c81e9bff0ec7a04cba221d7b4549921d2 SHA512 9e61465a279d5946512e16cfa3b45ea60de524d5c7782fe54a97a43ffb28a99eb57698117d0c08ca9353c91f8ba2a0d94db73b31044cca5787a432b5629070b2 WHIRLPOOL 5278aded1b358d6052801c68a182e4cf11f410f9d97586c930356307885cdf0a49f77990f373d936d8d6dbc3d2cc26f3ae90f4738f26a6d57d9c28cb1c4505d3
-MISC ChangeLog 81674 SHA256 d0d0d287c3bad4e9495da150a6910cb7b385abf2eb99d6fe53b4da0c798208de SHA512 36196294359bfd9e824424cc30d206df11cec06856d8290eebbca553d57be57f857e7319991ba43219ac43dd62aa41d40688e0db39dbd96a0d2f0fd150368ad9 WHIRLPOOL e97ac22038fa95988e3eced05e1fbacc29ec731b0238e3e82c09a93ea5208e07243e085816f6829decc80c274d16e86f663e79375b51c39f509d84174bdef4c6
+MISC ChangeLog 81815 SHA256 93c42321f28144fc0a3fb65cb32b23760e2bd53ee0ff47e7b30faff8b964dd08 SHA512 4866c77daa0b3e7cfbc61da5d8296fc161be381879f4cc0442626d8eade8b1c0aa1c8a40c8203888aeaf81a0dd2cd2ce672695b60a5098adf19a79085d50441f WHIRLPOOL a0d733a7912a98172fa8e58c56ce7335a2b7c696d4f86a39b206760686c2b82fbb50a3ff69efe1fffa4ba82936ceccbbe0eadcc966fcdedb43746b3b07b35665
 MISC metadata.xml 3620 SHA256 9bb269f2a159087f59fa468dc963974d162a76b9886d3f0846bc1ed840c3a72b SHA512 f50ed1d593174df65ce6fefb9ad859c914f60a2c6bdbc88dacbb436938747b2c8da35ee7eae32e92a551963a552635cef9a74dbaf12de9d2a0946d9efd6ebfee WHIRLPOOL 9f8e2f50b9e4665bc66a1b694a0e7ad913df6eb26e639f84743d7d5605f751cdf18943848c5866b1535f7539da457ae053441fc07fd71cb7ec64833d319dde3a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBbDaEACgkQvFcC4BYPU0rY4wCgkVEkviUTGdiV5vbeuqVUeqbs
-5WEAn3Ykj7g3V2ex+J/jcy5LExzW046v
-=InWA
+iEYEAREIAAYFAlBbELkACgkQvFcC4BYPU0rDTgCfUHHqgez9ZsqK09dl1j+76GQH
+sWUAn2zz58ARrBIGyMAWBKBE+0CYTMfS
+=VuNg
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.11.2.ebuild b/media-video/ffmpeg/ffmpeg-0.11.2.ebuild
new file mode 100644
index 000000000000..5c31c68e17ea
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.11.2.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-0.11.2.ebuild,v 1.1 2012/09/20 12:48:51 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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+IUSE="
+	aac aacplus alsa amr avresample bindist bluray +bzip2 cdio celt
+	cpudetection debug doc +encode faac fontconfig frei0r gnutls gsm
+	+hardcoded-tables ieee1394 jack jpeg2k libass libv4l modplug mp3 network
+	openal openssl oss pic pulseaudio rtmp schroedinger sdl speex static-libs
+	test theora threads truetype v4l 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 vis neon"
+
+for i in ${CPU_FEATURES}; do
+	IUSE="${IUSE} ${i%:*}"
+done
+
+FFTOOLS="aviocat cws2fws ffeval 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 )
+	celt? ( >=media-libs/celt-0.11.1 )
+	encode? (
+		aac? ( media-libs/vo-aacenc )
+		aacplus? ( media-libs/libaacplus )
+		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 )
+		x264? ( >=media-libs/x264-0.0.20111017 )
+		xvid? ( >=media-libs/xvid-1.1.0 )
+	)
+	fontconfig? ( media-libs/fontconfig )
+	frei0r? ( media-plugins/frei0r-plugins )
+	gnutls? ( >=net-libs/gnutls-2.12.16 )
+	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 )
+	libass? ( media-libs/libass )
+	libv4l? ( media-libs/libv4l )
+	modplug? ( media-libs/libmodplug )
+	openal? ( >=media-libs/openal-1.1 )
+	pulseaudio? ( media-sound/pulseaudio )
+	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 zlib )"
+
+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"
+	use openssl && myconf="${myconf} --enable-openssl --enable-nonfree"
+	for i in gnutls ; do
+		use $i && myconf="${myconf} --enable-$i"
+	done
+
+	# 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 x264 xvid; do
+			use ${i} && myconf="${myconf} --enable-lib${i}"
+		done
+		use aacplus && myconf="${myconf} --enable-libaacplus --enable-nonfree"
+		use faac && myconf="${myconf} --enable-libfaac --enable-nonfree"
+	else
+		myconf="${myconf} --disable-encoders"
+	fi
+
+	# libavdevice options
+	use cdio && myconf="${myconf} --enable-libcdio"
+	use ieee1394 && myconf="${myconf} --enable-libdc1394"
+	use openal && myconf="${myconf} --enable-openal"
+	# Indevs
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf="${myconf} --disable-indev=v4l"
+	use v4l || myconf="${myconf} --disable-indev=v4l2"
+	for i in alsa oss jack ; do
+		use ${i} || myconf="${myconf} --disable-indev=${i}"
+	done
+	use X && myconf="${myconf} --enable-x11grab"
+	use pulseaudio && myconf="${myconf} --enable-libpulse"
+	use libv4l && myconf="${myconf} --enable-libv4l2"
+	# Outdevs
+	for i in alsa oss sdl ; do
+		use ${i} || myconf="${myconf} --disable-outdev=${i}"
+	done
+	# libavfilter options
+	for i in frei0r fontconfig libass ; do
+		use ${i} && myconf="${myconf} --enable-${i}"
+	done
+	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 bluray celt gsm modplug rtmp schroedinger speex vorbis 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
+	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
+
+	# 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
+
+	# avresample support for libav compatibility
+	use avresample && myconf="${myconf} --enable-avresample"
+
+	# Misc stuff
+	use hardcoded-tables && myconf="${myconf} --enable-hardcoded-tables"
+
+	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)" \
+		--cxx="$(tc-getCXX)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		--extra-cxxflags="${CXXFLAGS}" \
+		$(use_enable static-libs static) \
+		${myconf} || die
+}
+
+src_compile() {
+	emake
+
+	for i in ${FFTOOLS} ; do
+		if use fftools_$i ; then
+			emake tools/$i
+		fi
+	done
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install-man
+
+	dodoc Changelog README INSTALL
+	dodoc -r doc/*
+
+	for i in ${FFTOOLS} ; do
+		if use fftools_$i ; then
+			dobin tools/$i
+		fi
+	done
+}
+
+src_test() {
+	LD_LIBRARY_PATH="${S}/libpostproc:${S}/libswscale:${S}/libswresample:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavutil" \
+		emake fate
+}