version bump

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x160F534A

3 files changed, 318 insertions, 5 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 5ee3bd194de4..67b18dd1e3d4 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.606 2013/02/22 19:08:22 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.607 2013/02/23 13:21:34 aballier Exp $
+
+*ffmpeg-1.1.3 (23 Feb 2013)
+
+  23 Feb 2013; Alexis Ballier <aballier@gentoo.org> +ffmpeg-1.1.3.ebuild:
+  version bump
 
   22 Feb 2013; Zac Medico <zmedico@gentoo.org> ffmpeg-0.10.6.ebuild,
   ffmpeg-1.0.4.ebuild, ffmpeg-1.1.2.ebuild, ffmpeg-9999.ebuild:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 55ab6637cb2b..db5165575d84 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -7,17 +7,19 @@ DIST ffmpeg-0.10.3.tar.bz2 5855494 SHA256 7d1ca0abc80e2f6161e2a48878b62a2e6d0301
 DIST ffmpeg-0.10.6.tar.bz2 5778721 SHA256 8c67c0be9dc568a857d5542247aa4e3c1c6538fa3643b47c9deb7ff004a97626 SHA512 f563bd8aa0daa982a7f63560b7c1ed5d630976aac2efb9b37031923d078bb7111fa96f7a05f241743eb0eafb071d439e90a87c9377cd6db70ad0df7599a0a0c8 WHIRLPOOL fef0f748276250e47e6ac30aad31f2a50ebb222aa989b48f82408eb9ab3cba77a07fecd9a67f05ae32dbe8fe95b65a6156cade2cd477e14c0d827087887cbc91
 DIST ffmpeg-1.0.4.tar.bz2 6448411 SHA256 15f46524195b2c88973585ab29416badd86a92040e96ec38b7df0b4536ba3e53 SHA512 dece791af5f9e99ed0f5697668646ea810105e5f1baa9f56245a1b794f7ae0c4f7c604b7146b44cd7e8ad9cef2751ed93677a112ef6dd9fca2118c2f34137ecc WHIRLPOOL 65e0769bdc8a6d90a837a7c1ae3956b2927cc87f2ef13f5e6ee2b82f79fe0d222a3e70db8bb41160cdcd8ccd98c07f3e03572b68807a0d8cd7f3b23a2a3b9010
 DIST ffmpeg-1.1.2.tar.bz2 5810976 SHA256 dc91e4a2499b05740cfddc2b679694e5c0f2ca20c94191de82d7eb200e8c48ce SHA512 b947d18c7ea7d371e772c97873b180c00b94025a8546eb4663e42f37fbf66d52b1ea8241219b6c4700bd8c12cfb6af12fb7d823f7632061c447e2d95e30f83aa WHIRLPOOL 41d49b5d7eb0667b48b8292b5cc89dabf3a52d6cfc7bb27137546efa41ccc9f6ccc0f2a0a53162d93cefdcc2cfd130c039b298f5c1eab113a8af0a36380ee04d
+DIST ffmpeg-1.1.3.tar.bz2 5812644 SHA256 a70057eba6256fab7342f863e7bb556d14cbed207b5b5b884a0879d3f16ca0a8 SHA512 56a4f1b77f55521e2e129155b10024d02a919b8429a24ef2103b2242e2782695e05e032bffa65b3a90326bee0c274dba5869d0cfbba3f13c11c0ae328ba4ef26 WHIRLPOOL 066b1d1e1eee7d96b32b4005760eff34c4d6878821ad5037e4d7b2068dcbf9bd94c83d123a033dcf0f1840c63a4e3e94d011bbde0ce47f2e020644edfe731f6a
 EBUILD ffmpeg-0.10.3.ebuild 8635 SHA256 7a93b57018947a7c57d3829c092aac4ee8e3b554c1116fd2fc41f4b4582bc7c3 SHA512 0a64ec7ef72af03d3997bc48191a4b8cf34ecc79d8cc4648a46e0ea303c38ba0bfe5877937328e7eec32950a6371288c7d4613eb14914bbe0f26f961cbda2d25 WHIRLPOOL 1e65a3790fa9c111c2266d5a2c5f6333ed3b37518dbd2a96d0ac7f6d969feb793430c7a79ee79de485d4c2e3d1b6da103936f22125ec87b061f319ab7bed4fc0
 EBUILD ffmpeg-0.10.6.ebuild 8948 SHA256 1875d99d03d01cec646e514432fe402717e5c5867fb40a69c8ca21f5b765d495 SHA512 abf9c5e826fd3a915cc7de84bb7e75cc4455d7cf94d4e630204e05dd9f82e0bebc0a9bbca599dcc0057e6836bf821b520f9b1f228acd4834675826166d87ffcb WHIRLPOOL 7a0d190140b3a6c8a797fcdda06d8ac854ddcb4b2b603bcce027fe75f191f63f87addb5fc06e90d134988824626170bbd9742201ce47ce077a97724d37e937e1
 EBUILD ffmpeg-1.0.4.ebuild 9591 SHA256 dcf5648ab2812b6559caecea13db26a701eabdc664231dd6d8cad7fe04a2c881 SHA512 5f43b5373cf3e57041622fcd387a21d381ff983ecec1e82a54a25f5d2b0864d43c3dc45f38585ac84e3eab128eae92c74fb00248504a0756f87e341390f32641 WHIRLPOOL c61254ca9916aec943ab0dc1936b570b9709c024f7208e6ca2e32604515cd63b36d1a21f31261d4e1036ff15a3e108c2322b2649df95c822865933b66f8d8629
 EBUILD ffmpeg-1.1.2.ebuild 9394 SHA256 76227105d08fc54bd343883e3cbdedc0572968b2c689e471624d18a6e7b14279 SHA512 243105ca15f283003e932426c79b96b68d1651d70a7b3178113f159a1e46fcb61c292de1d23b3b0a0757dce01219981139c54b773d57dc0df3dc2e6868f0dac5 WHIRLPOOL eff29265aaaa0a426bb5f482596563f5699ac2945cdb53965e7299a7865cf728fbae50c8d9c2910e14409539abd35beefee4a2c10b2a58b9681fb2aeef5e4fe6
+EBUILD ffmpeg-1.1.3.ebuild 9542 SHA256 7aef1b9be818531a8cf69d7ffb8259195eef10dadb0da5b7381241f9d4a0d8a5 SHA512 27de8effad6bb2e1a117285c022149440b9dd13256c9a3a16b63ea961c95fe83b7c8d22f504b841fbbe3c90254bdd3e736c262365a307202370db4ba038cbf95 WHIRLPOOL 03340311eb88594185ab9f663f4049f47eb9d7838d1095d5051628918cb8c4698e405c82f29c6f8ab9c5fde28e0b52a1a18f64c32f0a322e39fc13362f7b82ea
 EBUILD ffmpeg-9999.ebuild 9542 SHA256 722e62121b3420e7287cc0adee640274265ff36e92012571d463d8cbc752fd24 SHA512 871458963a2e1601245993d29eb8a859bfc3f51d73b960238213b577860db15126ac0cfdb3d802c0776a26dea327d51606cebe7685b65e5a77f24ba452e6908a WHIRLPOOL 1b85baaade7040fbade64e0852930dd9837bbfcdd850d9416552478df4eede3cf0168b7745eda97a7da83c53283086529e388fd3e2371dd66e6b13bbf81e401c
-MISC ChangeLog 85649 SHA256 54a236a99b5cb3336a95699cbbb7d4089a704e2715b29a011e9a751e2948a270 SHA512 ba045d3d4bd8db410ed18be219aa83666061f645e0fcfabf1016644f49bdf06c53fde5b7c8f2c6b7aae49ad7d547ae5624032006ee6f773a0913dc37da394c7b WHIRLPOOL 1b19bcbfdf2a345bb5009f7571f3a60713d4b8eccb12531cf5665b8f6e17db58a4b262e62474890bd42d0a9899a42027c3b55c06e51c11f61bcef7a31cb402f0
+MISC ChangeLog 85769 SHA256 d92c8a2f10dae5c4ef3decb4577d5567e3addaad4b0ce01bcd622a02cdc144ee SHA512 09cd659abedb0175233bf70ed0b3ed3b5fd8e0c6eb5d44ce84581196eb901dcd45d851dbc94abe71c92bc99092cc5952ed810775c223213835476640436d2798 WHIRLPOOL ab1deae36cb6f311316742efd8b20523651cc6a59a2f9fc9df99eafa032fa0c099a495638ae1d5c29da32016ca61991b44991215e9fecab6e6041f0809bd0e70
 MISC metadata.xml 3725 SHA256 b0eee9c78de338fc58bc8295e5da8079fe450229703dce3bf1221d711c00a6fe SHA512 88dfc6d61f50ea554ae3189f3138ecce3dbc07f4abdb786a4b77bee43c4057c4530bd313697e82b280301ab58bf71fd0eb0db5670392f8336f67681ae50c1389 WHIRLPOOL a4d9468f66d5d2835289fd7aab1d83b07ee34f864717254531f741445db12ef1fa35f28ecef583a887e3e6e8ed3ba7499d7189490ce61f10c1b34bf7915aa829
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEnwikACgkQ/ejvha5XGaPd0gCghUDFe8eDGKyMdxHlX+vSvXqg
-jlEAn0I48008kXFZ1Z9iLgI5BBOiD1Z9
-=vOOK
+iEYEAREIAAYFAlEowmAACgkQvFcC4BYPU0qwxACfV37j9VEH2aInbNEPnl9x5UJO
+WYYAnjns43pV5XaxPTr/mFMKmKg5QuXq
+=I7LP
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-1.1.3.ebuild b/media-video/ffmpeg/ffmpeg-1.1.3.ebuild
new file mode 100644
index 000000000000..87c693e6790a
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-1.1.3.ebuild
@@ -0,0 +1,306 @@
+# 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.1.3.ebuild,v 1.1 2013/02/23 13:21:34 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 avresample 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
+	libsoxr 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 ffescape 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 )
+	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 )
+	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
+	epatch_user
+}
+
+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"
+	# libswresample options
+	use libsoxr && myconf="${myconf} --enable-libsoxr"
+
+	# 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
+
+	# 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 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:${S}/libavresample" \
+		emake V=1 fate
+}