version bump for the 0.10 branch

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

3 files changed, 298 insertions, 7 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 34a32ddd5344..2f9a08bbb499 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.568 2012/07/09 05:19:58 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.569 2012/07/23 12:33:48 aballier Exp $
+
+*ffmpeg-0.10.4 (23 Jul 2012)
+
+  23 Jul 2012; Alexis Ballier <aballier@gentoo.org> +ffmpeg-0.10.4.ebuild:
+  version bump for the 0.10 branch
 
   09 Jul 2012; Michael Weber <xmw@gentoo.org> ffmpeg-0.10.3.ebuild:
   ppc stable (bug 420305)
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 053c565fd3d0..5cc84c410e55 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -2,19 +2,21 @@
 Hash: SHA256
 
 AUX freiordl.patch 611 SHA256 4857bbf856e2014f41d89d0ed0744f7bb3277e5600a877f2b84e0aae571f3dcf SHA512 1d7491e65fec247d9cb6b14e9a494f55e3a88ca9ce0962b7874e3f3e5c087ca7672bda5949637f4493c49a388070addb9db909c2e384f8a4349609ec02e7dd3f WHIRLPOOL dc2bbc9c95dff14998ef8f7f15c55b9cdc9464e01e036c3b67935d9505596360d103aafb9a50b43e6d2e78950664c4b6f214a874fc6aa29727397130a98e6511
-DIST ffmpeg-0.10.2.tar.bz2 5780204 SHA256 2d990012091c07849843c456eb34ad015a00f45a66cba5be7c81a28e45fb6711
+DIST ffmpeg-0.10.2.tar.bz2 5780204 SHA256 2d990012091c07849843c456eb34ad015a00f45a66cba5be7c81a28e45fb6711 SHA512 d244931391b35b3aa531a623965cc7f6a1394eac4fd64c411bb12b7e17c2a837ee36d07914f46af87a9012b27dcb22eed09f567b39a142f6c91da692fae3776a WHIRLPOOL 093421f7d62eb567a1badccc2fe6461ff0724c471440e05ef96750ef8979585d5b159dad9a571e573fe99b517ecf30c3641d543b3a91de750460231aa79596a9
 DIST ffmpeg-0.10.3.tar.bz2 5855494 SHA256 7d1ca0abc80e2f6161e2a48878b62a2e6d0301c231f91e7677b889ef048b931f SHA512 41509b736b3158f3b77620bddee509c07d16d239feb881644a1cdbd97a0ea5e2a8cb469c47b2f19c03518dbed8388ab20684f095e023c97f1a6d0b4765f73e64 WHIRLPOOL 7cb9ebf16ec0ee4680876db86a4aa579819055451d546a7dfadf0b8b18c7930036d8670446c75ef2fa51c6ba2a1ed8e7dd1351459caf0023f72825900d901fb2
-DIST ffmpeg-0.11.1.tar.bz2 6073253 SHA256 b01ddfb6352c84810879988f43172c5f7be555697edb929625845c7bb953fa96
+DIST ffmpeg-0.10.4.tar.bz2 5853766 SHA256 82932716a8c01a6840a2f20c1ee093e04b1d8a27c2d6318ddf21a5f95f3c581b SHA512 21d6e034009d2f976c6d25ee35c1a14a0ab5d28e3f9af4b45da6f2720c2be6a6472e4ff408304d14ecfee5096b33bafd8440fc80ee51100aa02bdbbd82eccb1a WHIRLPOOL f4641b3cf243a52743a2a3db9140ac2a10a59c8c9d55bb86fb16d725d76228cd1e70ac45faa0a12f7a6a28eb08fc2fedc57a31c14d20a86a6770c99c9ce08a4e
+DIST ffmpeg-0.11.1.tar.bz2 6073253 SHA256 b01ddfb6352c84810879988f43172c5f7be555697edb929625845c7bb953fa96 SHA512 1a3c3cf6222f3273b091facffa52b9608e4f913fe0e53378011a29efef58c55032c878b4cc56357c435c7a552c5af7b74cf8651b25c8a1394f612ff2176fea40 WHIRLPOOL 7997f585408bf33492145c392038c472f5f3073fc53082484830a7860ced290e5e6115d89083ab31fa59fc89c96e4a10170c4dd7c0a06eacfb974c1676ef7829
 EBUILD ffmpeg-0.10.2.ebuild 8564 SHA256 0863c34956e6e78ffa4cc04d186635ef1668bf38d32cad7a19531992b7bd0c9f SHA512 164a6a5a4afe80fcd54a22c4bf6847fe35985a4c951d924a06dbcc12463d08439fb18e4477977484350f52c3c308a2c68cc9e44661401247dde9b17e99b9e305 WHIRLPOOL 4fd9d9f60ae98ca7ddb6217618d15775b5ed8642e6efe33ddc44968bf4f9692162b49cc6d77fce5bc3cb534f8e49e7585019db7c5954694ad6e8ef4d745edbe7
 EBUILD ffmpeg-0.10.3.ebuild 8574 SHA256 149ee0785dc224fe7e2a1c8d3a105455697a29a1179caf0e79260d236925d4ec SHA512 c5582c5b991f0251b27512a9c69965c81cc4b8f4791ad16fa0a74f1c48c97651cb5e1a116793a6a92da2f4e2881d7c9c465a1776050305600ef5f564a5661cc8 WHIRLPOOL d9c1a8a4c7e4e8e5c2683b36f5c0fd50f07794e2031e86358cc2986cc8305ac7237b8fb404366c2d157a00c209ae025787dafddc584d7aa069d2937ae886d20a
+EBUILD ffmpeg-0.10.4.ebuild 8586 SHA256 44cd16e5c668f749149f24c7222d3cf88d7022b21b4ede786310f7465ec37214 SHA512 47e2c8118ecaa9b8aab1b4bfe033804117778487716fbc44738ef9f16a8f1f5f5763add9ba4e6edda8304e6a82563c787f738334bb032d8284aa2482b6ca378c WHIRLPOOL 920f82558cb126741cf9ae1288b5293b37271529d593c20f6bd92733527636f1f1213409a8bc11d68ed1841fcfca2fd9b3f825e806b0f2ac9a3d5b1084f8dda6
 EBUILD ffmpeg-0.11.1.ebuild 8716 SHA256 6f9178733e9bdb4b3646ff458908c1e6534448c5b18936d36d2366561b2fb4c9 SHA512 4c119409042a129b127cf68329f9db1de3ab52846d10d4109e0216cb7dcad8ebcae5f76ded359586f2935d47dfc9e6e70080018387840c97dfda14a6be8500cc WHIRLPOOL b77973499eef30a1a2745aff847ce12d4161dd97113b2835b1dd99919cc67162cf4b1036069b1afe17eb3913742c8912dfbcf4b1314157dc9b96038972d61a22
 EBUILD ffmpeg-9999.ebuild 8841 SHA256 5689bb4705a0c2c62456be6dfd13e7c7d58fe7de71dff07ee52e3bc96deffbbf SHA512 c37f78d16f2f55051cfd836e2b2bcd79a855a8b6e120d8c3d0fa7bc6160f22a5102890eae0221e9a0d399ba55edfc9165ff9566ae8c01ec4c91dc1ca68f5e7fe WHIRLPOOL 8dfbab0b612c1feb02a1208bf01cf027cff89a379db447742927cd4203a34bf1b069fc80381426433c52e9234304be22c234ba2cc1e3a2748716e36a0e42f934
-MISC ChangeLog 80634 SHA256 b33e2a7a3203628e05c5edf743e5379f124185c547a030ea4f68c6ff303f9fb4 SHA512 ca0d386889ec6d1854c604ce52245d46834b02df1e4ba7adeffdb17f80ba42ab4a0577523c18d38b326a4da5b18f557cc02ed5b5d3bd9023304e54d141e61c13 WHIRLPOOL 652f9a58042a8ecb8466b22944a798ac13f90e96106ecdd160dcfa043abb6eb2a21600d17e6e78cb2772c4f3768584fe5218bd486e1af53ff4799fb3015fb52f
+MISC ChangeLog 80780 SHA256 f0bb88661c7ab8e3a82736b0f9a942277bd76b8d0ea7c8a89a46750d578f3f8d SHA512 7cfa83518584d0e6d9d0c52a3fcdc71d77ac3df216ab9a62bf7849fce5c69815f6b39f2ad1a39356b8eed0cc37bdef74c0085a3aafd65f984135b99dbc7b4d9a WHIRLPOOL 04b6eb7e691c796189c59bdf8b8074997ce78dd629c83c96854d4655d3319d286691fbdd3aad5713dbde3e50b3a43df56aa6b130205840dbe17a2b3e2d0c788a
 MISC metadata.xml 3290 SHA256 3a4e779069b4c55e1e8b6177c45831682f943f16b1d58779d5a2ae664b81e8d3 SHA512 b344e8006a5ef2e946daa31d2c6465ca5b1900d5036e3f95d8e38c78d9952dc0d6570a38119113e9f7cb0ad1a28c3ae68870c540aa1695021348f98b7705ee90 WHIRLPOOL a664f4e47c8b6bbab3e27d282b1990194c447632fdc62fe4a0f60d0ee46becc4ef22b4aa4ea50fb5f9d0e31999dbc51a5d5634e5369f253b956e8cf2b1d8600a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/6acsACgkQknrdDGLu8JAORQD+NPEPC4S+YHUp6lXe7FPxOi8w
-tmqhS7ZFSD5UZC/D4+QBAIvg0vEFaEItrP45okaID8hvPgCsNmyJWf7rzCXGF3Ce
-=8pPB
+iEYEAREIAAYFAlANRLIACgkQvFcC4BYPU0pziwCgtYvgbgVjldqZPOgVq2DmrI/N
+654Ani79TyqJyGuRq5lziB+kaqldCiE7
+=cZxy
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-0.10.4.ebuild b/media-video/ffmpeg/ffmpeg-0.10.4.ebuild
new file mode 100644
index 000000000000..9241a73cfd43
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-0.10.4.ebuild
@@ -0,0 +1,284 @@
+# 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.10.4.ebuild,v 1.1 2012/07/23 12:33:48 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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
+IUSE="
+	aac aacplus alsa amr bindist +bzip2 cdio celt cpudetection debug
+	dirac doc +encode faac 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 )
+	bzip2? ( app-arch/bzip2 )
+	cdio? ( dev-libs/libcdio )
+	celt? ( >=media-libs/celt-0.11.1 )
+	dirac? ( media-video/dirac )
+	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 )
+		vorbis? ( media-libs/libvorbis media-libs/libogg )
+		x264? ( >=media-libs/x264-0.0.20111017 )
+		xvid? ( >=media-libs/xvid-1.1.0 )
+	)
+	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 )
+	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
+	dirac? ( virtual/pkgconfig )
+	doc? ( app-text/texi2html )
+	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
+	epatch "${FILESDIR}/freiordl.patch"
+}
+
+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 vorbis 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
+	use frei0r && myconf="${myconf} --enable-frei0r"
+	use truetype && myconf="${myconf} --enable-libfreetype"
+	use libass && myconf="${myconf} --enable-libass"
+
+	# 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 modplug 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
+	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
+
+	# 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
+}