version bump

Package-Manager: portage-2.2.8-r1/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 5a3413d82fef..b2226d307600 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.714 2014/03/03 18:34:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.715 2014/03/06 19:11:25 aballier Exp $
+
+*ffmpeg-1.2.6 (06 Mar 2014)
+
+  06 Mar 2014; Alexis Ballier <aballier@gentoo.org> +ffmpeg-1.2.6.ebuild:
+  version bump
 
   03 Mar 2014; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild,
   metadata.xml:
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 4c139fe90902..b5eb3c6e67a7 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -8,18 +8,20 @@ AUX freiordl.patch 611 SHA256 4857bbf856e2014f41d89d0ed0744f7bb3277e5600a877f2b8
 DIST ffmpeg-0.10.11.tar.bz2 5786390 SHA256 99a81aa43325de9c670659c15496ef348b5c4c65306caa1ce0893ae5f4f636d0 SHA512 c013b1f9fce764302db924ec057e1cb8df132dc55173476e77cf254e43c10d13124a9ce5c063eb586146de92620b6b88cad8a5198a1d30a4a9c6611a83e515e6 WHIRLPOOL f1f1589328af7594025fe44ecdff7d7b1edb2c88584ab737e719a3e2fa5cc0f94b65e6c645a22f6c474041b6404acf37740d24101c8e2bd9912112171695d22b
 DIST ffmpeg-1.0.8.tar.bz2 6452144 SHA256 8580a317aa09fdabdcf5119c87f59fd3baa4df0f636aac4d3dfeb86c572277aa SHA512 5fc6caf20c016e9d8ff41175d3bb5bf6d4a2c25c65ea8630d45ef8d9a16ee53120d76e4bc220b4f4462618e5c731114182776d7193e9d085332cf087038f3488 WHIRLPOOL 6a6b80a5aa44ee1a1c0af61bdf95659eb319ae48b690c2c1b9dd5291ad3b6f5ab52884c835d925da88dd2467f49ec2198cb78c2ef78af4f2e372c6364c769f6e
 DIST ffmpeg-1.2.5.tar.bz2 5971768 SHA256 9cfcdfe1949f8781b1b473fe668b8f2ab6befc2cffefd159840c62273e3e41a9 SHA512 71fa01f1eb96cfdf5bf628f4c2999e0f157aae423316cdecdc3c81c36ca438996c5d4751871611ada9b31e6542ca08c0f5f61bee9170b1336ee5a8fe1db8eb06 WHIRLPOOL 386ef933a890b565ded79f1109c09aac7d553c8af4d927dc8d6585c77a63d396a2b7484810178552ec66e95e13a85942891ed0fcb947fd793dfe72bb8816ec21
+DIST ffmpeg-1.2.6.tar.bz2 5970714 SHA256 29d454de3458cf327df246cc2a2ef0fa09cb88af7880f733525de12bde70999c SHA512 bc3aa640549e7f17f3a24a7d866a89ab23e9920c2d655a1a03bb4b85b8bdc33500bce3ba6fb570376453c158291a6f4bd2953f258d5a3f989cbdcb30e9a25ee4 WHIRLPOOL 6959a0e72b98dfb56381010f06f98d387a6389037d214f8d600d868d41baddd73417b5df7b00c8b160f6a59778c20c27708d2cc115dde76d6c94dcfbf307b51e
 DIST ffmpeg-2.1.3.tar.bz2 6638987 SHA256 1d332e7fd35f87e1ffb6c9b0405cbfda085ef712ede0133a213793a4e66d13a3 SHA512 fcaf04089c6081e476c23220c33d67252f8eecacc67a79a23a658865cab896cf5f29f8825626c09151539aa35dcae64726bcb6f96fadf51bc8b9c4e5fa3c47a0 WHIRLPOOL 9c289ac74285c7394de8fb34ab65c25835ab1a56bec51dd888e3e6899a9680d0e4bba68d92f685a0b5439be5ca51b0799b15c0bdeab5105720c5fe558319dc38
 EBUILD ffmpeg-0.10.11.ebuild 9684 SHA256 c5fb97665f143665f995c1f4d44b2c25b95e38aea0a79bfa1f1302072b488ef9 SHA512 8db020d3d9c9078667d54754e1b4c95f02092dcee43d55e7e7ba91addb17fcb8700d796f6247b294b20af86921db9d471adb736a67a1e9bf67af1602ca5d431d WHIRLPOOL 782ac549898767907ad17518ad7cb62e5de90f829cb271bfc25ea61b3a01bedf0fd2f32c73fb2c7b415ef5e1179d1815fa4967ed9ccaa42cf318d052912a82be
 EBUILD ffmpeg-1.0.8.ebuild 9650 SHA256 84d1ef638cfe3c7fe5106e9c3d3ec7905cb5288b67261de32bc58eb1846af229 SHA512 15fd02e2944286676040fe747878fd4230a60a512abc9b97eda177fc8fbf853421d410b0b4a7a3a5e04842e96366f3e419748df00878803a2b17b3d0d71fbf90 WHIRLPOOL 3e9a4181f732c9441811413dc0fa3ac35b2733712ea6b0a97e67d815af4739d710c56d04bb0047466fd2989f0e7999c886ac778c77424e8d39c3078eeb340d68
 EBUILD ffmpeg-1.2.5.ebuild 8939 SHA256 4590d85089b5949a48d436cb643ed3ce9fe5ec20e98de67d67ce1c73ff930820 SHA512 68c5942601561b1bc0101aba6b5f28ce60a99274ef074f3fab7c334791762e90476a73136cd47724523e7b5123fef3bc88cfc1ddbb3d5b81024b5e371e160465 WHIRLPOOL cc331d5ef44ff36fc0ddbbb6810ee920f5eccc1432fcfeeebaa90c249a8dafa9e5da32224d37f925e9cc1ae64167b1cbab047167fb89ab9dd019b781c704d28b
+EBUILD ffmpeg-1.2.6.ebuild 8939 SHA256 0eb74cc40aab27a0b9031957e59fcddba75190ead03d00987d828dffcf4b32fa SHA512 614c8f588e6be9cc081225b3e05313273ec1e6394f05126e5ef8d2f0f0d3970f2f5e4b1d57f4ea868954a29428137611e13a29e1bca8bafb78f71fd68d8dafe6 WHIRLPOOL 8705bd3dd8cb6095b8970f0bae98f73c9b0243ea2c5b3cc8139c12410b7a0298412a821015461a401abaee0f79279ac3f572237c8468732e826fc876b4f49f0e
 EBUILD ffmpeg-2.1.3.ebuild 10244 SHA256 80499a96b74defa8e8c1b3419611e53edd7167087e8f643241e949c159f30aa9 SHA512 0e8df2fdd50106263460d3b296299ab4ab2a0ed933c835a7fb9d8352dc15fe4f2fbb0868b6b2185d84739afed6ca499088594e11232c534f87ac446bb82a1f3a WHIRLPOOL e8081be3cde6d33d9252434d8a5e14cabd80b796ea084acd31f46b9f4beb766827f08273517cce3856e13ff23a3e33656a16348c6e60e894d6d52429e30bffa8
 EBUILD ffmpeg-9999.ebuild 10300 SHA256 1d1afb2d56b7954926c46ad81f5e18fd6520bc9566b58929ed5d0b3d3d6dce7d SHA512 119ce4d7c5ee747a9284ccb6636cd5342ddfef43273dd44236e126734533c8b59889f8a180ce8a04bdc9af8ecabf399f32815bad4b9d7b21e995c832f2e5d599 WHIRLPOOL c17233582b286d797d7393e870d984ea201b0732877ca305b110fad2cdb98efd9a1b1c20909cce29f3a82ecc1a60eca2bd1cf237bd682d6329f5fc23ce0f0aad
-MISC ChangeLog 99587 SHA256 ee30edb2baed49edb76d0ca182a27eab90ea8a5646502685d78835b1440b1996 SHA512 cc75f45016db428aadd9bbf2e7f1516fd3106ec94b034aec019a0693233a2fa6fcb4bf7541f56141b1068e95b7740bc4154dbca97dfb43ef605f7ab9efe8e2f8 WHIRLPOOL 2aa613a81e057c76e714e162e712c8d7034660d91f06945c460f8c8499381ad5198c85740933bf3d256da349de2afc2ff9bfe399df8b0732a52b390ade9f61aa
+MISC ChangeLog 99706 SHA256 6070219a8eda78c10d687391f22c5a4a0536fba374d861cf5156d69fff47b3a5 SHA512 00258d0a0396d040d6e684f49dcd098546674f41738c5cedfdd7868a2f09b3d1ea1f38e0a919ea2933464d117b964ef480fd3040c2b36648c75f6c0710626d98 WHIRLPOOL aba358a2915d515d56439ccb8b8b084f68f874402200fc7f9ed6e6b0ebe8825209b473c930e5f4aa551420731ebd21ca3ab7d279756eef244dcb8f5b2a1ceda6
 MISC metadata.xml 5175 SHA256 272f5c0872fdb00bf4c99e43fc01a2bdf3d62a5f1110ab8c684bee01087f2327 SHA512 40f072741d089598f010813021f89e62a9fd2ccebe0a0e48e43314ac3601568b75cc533cad0c3f139a02a4a70391cbf33bb7ddf1d50088a131acad394c007f71 WHIRLPOOL 998ee505287b62d225fdc3b9a255d18c9ef37d59ada1eefa7af2be96179bcfc6f5d7dfa9465e54a263310a2e6fb2a211cd1f087d6b8b0b7aa97b6f7e2855d1fd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMUyzMACgkQvFcC4BYPU0oCagCgjR7hwu9KVfzSG58l8YqRxGww
-KzYAnim9ylV3J6fZMo6GkQnnhLsZcSCH
-=D8Pf
+iEYEAREIAAYFAlMYyF4ACgkQvFcC4BYPU0p0sgCdFKm5UjjtuecWO8MZ+doK8K8O
+MvsAni33HWWnAQo3aFBYgXlEoF/YI60M
+=bAlq
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-1.2.6.ebuild b/media-video/ffmpeg/ffmpeg-1.2.6.ebuild
new file mode 100644
index 000000000000..117ff2eb69b9
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-1.2.6.ebuild
@@ -0,0 +1,303 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-1.2.6.ebuild,v 1.1 2014/03/06 19:11:25 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 ~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 +iconv 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 )
+	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 )
+	openssl? ( dev-libs/openssl )
+	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/_/-}
+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 amr:libvo-amrwbenc mp3:libmp3lame fdk:libfdk-aac"
+		for i in aacplus faac theora twolame x264 xvid; do
+			ffuse="${ffuse} ${i}:lib${i}"
+		done
+
+		# Licensing.
+		if use aac || use amr ; 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"
+	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 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
+}