version bump

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

3 files changed, 320 insertions, 5 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 53c8f51c917d..6c57a6eb2155 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.647 2013/05/10 09:58:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.648 2013/05/14 07:48:33 aballier Exp $
+
+*ffmpeg-1.0.7 (14 May 2013)
+
+  14 May 2013; Alexis Ballier <aballier@gentoo.org> +ffmpeg-1.0.7.ebuild:
+  version bump
 
   10 May 2013; Alexis Ballier <aballier@gentoo.org> -ffmpeg-0.10.6.ebuild,
   -ffmpeg-1.1.4.ebuild, -ffmpeg-1.2.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index f5850e886971..024b9451953e 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -5,17 +5,19 @@ AUX flashtest.patch 2343 SHA256 fcd05d4ad3f8cc6dd64a55c83279bd5738002100f1cfdf2f
 AUX freiordl.patch 611 SHA256 4857bbf856e2014f41d89d0ed0744f7bb3277e5600a877f2b84e0aae571f3dcf SHA512 1d7491e65fec247d9cb6b14e9a494f55e3a88ca9ce0962b7874e3f3e5c087ca7672bda5949637f4493c49a388070addb9db909c2e384f8a4349609ec02e7dd3f WHIRLPOOL dc2bbc9c95dff14998ef8f7f15c55b9cdc9464e01e036c3b67935d9505596360d103aafb9a50b43e6d2e78950664c4b6f214a874fc6aa29727397130a98e6511
 DIST ffmpeg-0.10.7.tar.bz2 5782181 SHA256 f5f3fc43e0f7789a3cf8f4f379851a5a838dd652144e5d2ad4fc727387678422 SHA512 d84cc9e678ee23b3ce2e0854c0907914042ad15ff0bdf4c62ddee71ec66fb23a2be89a4553c367eb79f6652a134bb33cf3c5e89a169dc1200fdb6f182aea4968 WHIRLPOOL a4fd815da627f20cfa2ea867129286f6016f2b54ca81fc3444edda5f224063173b789b92d1ce3812c3af6449f3652f9972365f63d20acfdb1beadf4bc2a1b6ba
 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
 EBUILD ffmpeg-0.10.7.ebuild 8936 SHA256 3905bf8402fc0999a61953c678c524706294e5316e47d377694c74be002fc02d SHA512 caac02eda5090f82224c2a2474caa44643f6a47a7ecfd56800e6c7a012469bdf755aeb9c22dbc37811cceb0e82224d58c19d8647228b7ca28bdd8391b2dfec03 WHIRLPOOL 71544d6741a06bd5e053e6a021597137af9a6c333a588ee459f3b652e4b016fdf2301cbf9703a7201bc5237bd4fc422ff608fca3f7c705b1f44b385de33d963b
 EBUILD ffmpeg-1.0.6.ebuild 9542 SHA256 5388e118e1ceada39dd368a49ad589bf692ff5864d3a7a7776392f7aa8952d36 SHA512 3e6f9c41d603684f626c80e923a11053ce67057673f26e27e99db57d82d27d96c1a907dcecab6d4892d4d5e43a669bc9783c50d2369bcaf40fa419bde89a6680 WHIRLPOOL 74049d0475ba36550b732cc2a3babd398bc74a191409b615a4a95140db93ff3d41236d55cef537bed08a68efec9042070b1b95b9657a8fa41a17b7dbefda85a3
+EBUILD ffmpeg-1.0.7.ebuild 9544 SHA256 3abf9de69b0aff803acd3440f8dbe4dd96a4d0242524d62fbd070cc6f736fd76 SHA512 68a541822e1d8e08243502f2206a7d6452ed0a199af798bb56fc544b720f9ed462f788d569b6fc6d586566828e88ef3fee896d13f054c1feae1b379d0e47d4f9 WHIRLPOOL 5614050cd529ffe8cc33310863d27c2fb04e002a198ade3fb1750428a2b8b06448e277f8b7902bc277eb3b2a3e02c57a1c79532b98ca81fa7261d5394c2bb250
 EBUILD ffmpeg-1.2.1.ebuild 8924 SHA256 46fab2cfe8f695219a0b5a31824ff7ac38d38cb166cb85f73009ed9cdc805875 SHA512 2dcfee07ca560d9dd046e03362a39d037c577246db0ebb396e29f67f469fd8e39660d77f0cdf5b43c6ba10dfb650748a349bd60b9783fca5c4b38e4c4418d8f0 WHIRLPOOL c4a60f22af160f23595e3aebcc91552e52f3e3a3801094240051ceeec332c649b6253fb5ebb21b8460648844f5ac618bfe172b58f95ee99ffd75823cd13cca60
 EBUILD ffmpeg-9999.ebuild 8925 SHA256 da1854518b168ba0ddc4a745231578da865a4fadfe39d933d07d91b18815fa2d SHA512 84bb1bb001b6b75d36927ee62d77fc47aeefe70d7cfe569463fb0d5261aa501d51d2600f0c486e2fbe30b03600f2cd79eab3b45423bdb372284fa8df1b712a3e WHIRLPOOL 04aaa4220a4ab85984680ba2e4c0ab202f9aa460196b94c2dd2f451cde0c216b6c26cdf50f31fd59557ee760794711a2d8407bd7f9534a9aadbf228078968dea
-MISC ChangeLog 90874 SHA256 3432b711b9b1b547a9bb0f9f76f9b6365b2146ca39bdc62e70ef0855ed06d08e SHA512 2bc8097e4b8d1794518160ccab0d93446e98db8a401ca7b3f63742bbab190e817b7057cea593d7f31d4b445fabd2438564c958449b4b98f7ef81a023abe5021c WHIRLPOOL 5afcb6b134476d1a5d6ed32d859259319735214a3d5fc150a0d9c76382e010cdc697219934780604a2a53707a16f53af9cb8a35fbbf07d1d54eafd0a6bed1487
+MISC ChangeLog 90993 SHA256 0eaf3d6c6e1e562f515fb9822a3d1d16f765dba2f60a89f226790c3282e3a830 SHA512 f942d3830b12f6785b5ce1ad1597aa824af602840a5ae6dadf8bdb8602a589c0a283f3a67b34ee4216324bc132044b6587612599953c246c3e2e6a41ce73c997 WHIRLPOOL 66e53fe250d6ccdb249bbffc75edb88b4be210c78c5f2de1fd5d389ea9d74852a3d4a5460a8407728ef7983ff65e6f675387474f757b848144e2d4be173ed720
 MISC metadata.xml 3506 SHA256 87175b36b5ab9e0d0ab24c7a758835671361a73d70c5008d596e5d2ff8486493 SHA512 445fc69245aaab198611ffcb110d81eba90df93c37c1dbc1e7ce63e53fd72533d28f60f8150461d23af5ee4d3537324f48b0f7f05120f46273a8451ce934ebe0 WHIRLPOOL f3771586966dfe434d7e9703b380b426bcd175a0b30e2b50815903f7480c24db2f1f9b9ba8145a14b63647460966768a5def329f91708dee2d19b2d241d5eaf7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGMxLwACgkQvFcC4BYPU0qjsQCfSnSN3ggbeZOfpEpQ9VEXMG5t
-Jf4AnRGX9B5N2xqsiy+Yu9lsm9leq6nM
-=L16F
+iEYEAREIAAYFAlGR7FIACgkQvFcC4BYPU0rB0QCfSGYfaxLEiy8+I520LyIdcc/p
+0dAAn0BXeUn+rgWGPzbnnCpwbKgGB119
+=DvFi
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-1.0.7.ebuild b/media-video/ffmpeg/ffmpeg-1.0.7.ebuild
new file mode 100644
index 000000000000..dbbe18753721
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-1.0.7.ebuild
@@ -0,0 +1,308 @@
+# 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-1.0.7.ebuild,v 1.1 2013/05/14 07:48:33 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="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+fi
+IUSE="
+	aac aacplus alsa amr bindist bluray +bzip2 cdio celt
+	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
+	gnutls gsm +hardcoded-tables iec61883 ieee1394 jack jpeg2k libass libcaca
+	libv4l modplug mp3 network openal openssl opus oss pic pulseaudio rtmp
+	schroedinger sdl speex static-libs test theora threads truetype twolame 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 ssse3 vis neon"
+
+for i in ${CPU_FEATURES}; do
+	IUSE="${IUSE} ${i%:*}"
+done
+
+FFTOOLS="aviocat cws2fws ffeval 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 )
+		amr? ( 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 )
+		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 )
+	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 )
+	libass? ( media-libs/libass )
+	libcaca? ( media-libs/libcaca )
+	libv4l? ( media-libs/libv4l )
+	modplug? ( media-libs/libmodplug )
+	openal? ( >=media-libs/openal-1.1 )
+	opus? ( media-libs/opus )
+	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 )"
+
+S=${WORKDIR}/${P/_/-}
+
+src_prepare() {
+	if [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
+		export revision=git-N-${FFMPEG_REVISION}
+	fi
+
+	if has_version dev-libs/libcdio-paranoia; then
+		sed -i \
+			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
+			-e 's:cdio/paranoia.h:cdio/paranoia/paranoia.h:' \
+			configure libavdevice/libcdio.c || die
+	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} --disable-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 twolame 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"
+		use fdk && myconf="${myconf} --enable-libfdk-aac --enable-nonfree"
+	else
+		myconf="${myconf} --disable-encoders"
+	fi
+
+	# libavdevice options
+	for i in cdio iec61883 ; do
+		use ${i} && myconf="${myconf} --enable-lib${i}"
+	done
+	use ieee1394 && myconf="${myconf} --enable-libdc1394"
+	use libcaca && myconf="${myconf} --enable-libcaca"
+	use openal && myconf="${myconf} --enable-openal"
+	# Indevs
+	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"
+	use flite    && myconf="${myconf} --enable-libflite"
+
+	# 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 opus 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
+	[[ ${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
+		${version3}
+		--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
+
+	# 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 V=1
+
+	for i in ${FFTOOLS} ; do
+		if use fftools_$i ; then
+			emake V=1 tools/$i
+		fi
+	done
+}
+
+src_install() {
+	emake V=1 DESTDIR="${D}" install install-man
+
+	dodoc Changelog README CREDITS doc/*.txt doc/APIchanges doc/RELEASE_NOTES
+	use doc && dohtml -r doc/*
+	if use examples ; then
+		insinto "/usr/share/doc/${PF}/examples"
+		doins -r doc/examples/*
+	fi
+
+	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 V=1 fate
+}