version bump

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

3 files changed, 312 insertions, 5 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 19e8623aa498..be2110966d27 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.628 2013/03/15 10:21:09 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.629 2013/03/15 10:46:06 aballier Exp $
+
+*ffmpeg-1.2 (15 Mar 2013)
+
+  15 Mar 2013; Alexis Ballier <aballier@gentoo.org> +ffmpeg-1.2.ebuild:
+  version bump
 
   15 Mar 2013; Alexis Ballier <aballier@gentoo.org> -ffmpeg-0.10.3.ebuild:
   remove old
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 57914ad0140b..1da227cd99cd 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -6,16 +6,18 @@ AUX freiordl.patch 611 SHA256 4857bbf856e2014f41d89d0ed0744f7bb3277e5600a877f2b8
 DIST ffmpeg-0.10.6.tar.bz2 5778721 SHA256 8c67c0be9dc568a857d5542247aa4e3c1c6538fa3643b47c9deb7ff004a97626 SHA512 f563bd8aa0daa982a7f63560b7c1ed5d630976aac2efb9b37031923d078bb7111fa96f7a05f241743eb0eafb071d439e90a87c9377cd6db70ad0df7599a0a0c8 WHIRLPOOL fef0f748276250e47e6ac30aad31f2a50ebb222aa989b48f82408eb9ab3cba77a07fecd9a67f05ae32dbe8fe95b65a6156cade2cd477e14c0d827087887cbc91
 DIST ffmpeg-1.0.5.tar.bz2 6449133 SHA256 1f1af23112e2da8403abce605749db9111d45d2e4e28910831e778c6e2cbdcce SHA512 0d380fc547e83f49df54313f23d31aea4d617d5cced067c392e997d7bc5d89e230522174977f68a826d17eab07d5f4be3886aa6df6d634c24dae8000dd5b3172 WHIRLPOOL a60a72cf55c603803629c83c247474fa98ffe2f7632e3df18dbf5875b3d69b61f228d4bb9499218f18e010c8b77d6ee768e7877ca05c145fe46f51e6a39c3553
 DIST ffmpeg-1.1.3.tar.bz2 5812644 SHA256 a70057eba6256fab7342f863e7bb556d14cbed207b5b5b884a0879d3f16ca0a8 SHA512 56a4f1b77f55521e2e129155b10024d02a919b8429a24ef2103b2242e2782695e05e032bffa65b3a90326bee0c274dba5869d0cfbba3f13c11c0ae328ba4ef26 WHIRLPOOL 066b1d1e1eee7d96b32b4005760eff34c4d6878821ad5037e4d7b2068dcbf9bd94c83d123a033dcf0f1840c63a4e3e94d011bbde0ce47f2e020644edfe731f6a
+DIST ffmpeg-1.2.tar.bz2 5969590 SHA256 9a39fbc07dae0c893059e07491bcfb1e2409cc220f72b41eed23a04becea5aaf SHA512 e46cd47cd6cba2820165ac2464fda6d9442675339eea8cdc6b023bfa174f1b2b3e2e6fae85cff03671ed385c49b508c3bae966160418ddb0b1afdd3fee7780ae WHIRLPOOL 0001248edaf74cac27079620dd3dbf05a494039be7f6e6e411959d7a69f27be9ddcecdf030e5835f225409031ffe174470474f7fb6b52aa046481356ae055e24
 EBUILD ffmpeg-0.10.6.ebuild 8936 SHA256 4d92f9aafbf1a67467dd7af29254ece197512a988d8e3671cba4e5890c2157ce SHA512 be31d275c5a98f20ceb4cc69472717e8fffeef24093f2df5fdd01b22f57bb48bd27acc6808c8c7a8267c148476455c4b8ab5bd55d566c7845cb2685abc87ddc8 WHIRLPOOL b5f0a2a9660874f41f16151a065facd6cfb0589a22b880ad1676890e2d31fda310919454a67744950076321ca1c777a85528b0870251ff594d3c7355a0ac1a2c
 EBUILD ffmpeg-1.0.5.ebuild 9631 SHA256 2198a0e22f18b7d9e35816bb9943e1dde6ed68d8e28336b80625ef976689c54f SHA512 14338567ea037d25fc2e0e578c6dc259328ffcbaa48b8923382b74ab49d18eb9b574d9a3ab19f1eb9acfe1dc62c20d3e3dc706a00ea58bf64420fc98cbb66b90 WHIRLPOOL 3aee8d49d2f03bf778d14553a5d35f866a5a45dd4dbe8b31b8b8604e2477faceaf41e842379647acf02fdd55fbe4b894e1c3f8d91138803ea4f653b49f327e8d
 EBUILD ffmpeg-1.1.3.ebuild 9599 SHA256 d0cd93008372c19aaad92610ded98d8da6b7232345b8152b6197c905a5c12763 SHA512 ab5a56efbf41957f63db90a92f248c26187ad8348c9488ac063b7e9537a5c6ac42ecfd0ab5e7ddd4c134b6204cdea822237e275080929f8114e7380051a90289 WHIRLPOOL 3043efc270bc20c0797682300041919609f0b68c0717503a62f755020e946b372f7feb1d16331ffdec141956369439e1c50a297a73e5d643b7fc23104dcb670b
+EBUILD ffmpeg-1.2.ebuild 8922 SHA256 004c774b9ec6e8dfbc032ab309ea34bec39a50a2f408e7c0e96665bfb0ab5112 SHA512 5bf74e9f7353154d3af8dc62dd07192ec6c89db2e730760187e70fc302ee43405a1fe15b5807dce47df4d003af3d22bc0aae4ef516960e161b4a85d84a9ce5fe WHIRLPOOL 7ceeac5aa865381f1ac1e9d6fdc9abd87f3d84e43f44b4e869e00406767e78bd4dc7ed279bdc9d50ef257deb09be527d8a16a5006546cb54084aba0457c94a05
 EBUILD ffmpeg-9999.ebuild 8923 SHA256 0aadda4e7ca69b51f4c6f1e7adbe6d501aea64cbf6a1245af71ea0e537e3755f SHA512 7647bee2b1a97c08807d999b0fc58bed2b5fb70aa2c765839f77f165b33be07dc4839e7f6256447fa1964f10f8d976fc705a50e077b22b47b169039e847a4d82 WHIRLPOOL 9e90569439712fd71d2bcd534b431e99cf476b7f5a79577828825e9f61f3c43d9c46a8fb53d472adcf5b48f6df91b53be67b89c0d660dc22e18a2e72b0150d96
-MISC ChangeLog 88377 SHA256 ccda5abffb3837007a334773ed3b3b7b56e5e105ee99840fd4785355ca4eed48 SHA512 903954f55ead2dcdf69aa445966fe1e3a1cb5fc9a703413c2a7250a4002a35c8bf3b4664376263fa6ebac437f81db04f46b10a3a376c8e2cbf8b34e1b9ceccef WHIRLPOOL a774ee6ed7e83bc8c994ce5a0399a8c8fef4855124113dbd374469cb441b07060b5ad723027657d1746918ead1bb51f6515a15b3dfaadc76bbb14effeb8b86bf
+MISC ChangeLog 88492 SHA256 81efd68de79fd0e7d1b94570b3016d3ce6333131475d0ae400c90b40b8fd9b85 SHA512 40d6e8a0404b4e7f1b36314b022ad587e510d29da29e6ed58ec36b2c72799990d195d3a44a802db9049f565ccbd54daa2501c486e43584474d16a7eba21dd566 WHIRLPOOL ce3ef1198956788b0be5bdbdcad725e054176e7954eb78a7b583b537948818e23fa649943c99a5b2a94e44715ee68ba03cfad58ac5d618518fb11b908f83b2e0
 MISC metadata.xml 3725 SHA256 b0eee9c78de338fc58bc8295e5da8079fe450229703dce3bf1221d711c00a6fe SHA512 88dfc6d61f50ea554ae3189f3138ecce3dbc07f4abdb786a4b77bee43c4057c4530bd313697e82b280301ab58bf71fd0eb0db5670392f8336f67681ae50c1389 WHIRLPOOL a4d9468f66d5d2835289fd7aab1d83b07ee34f864717254531f741445db12ef1fa35f28ecef583a887e3e6e8ed3ba7499d7189490ce61f10c1b34bf7915aa829
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFC9hYACgkQvFcC4BYPU0pkDACgvGrobB+kRbhwHEQ6HvU52MN2
-Oo4AnRgr8hLD/bV75xjR70WatkMgK0RK
-=cA+8
+iEYEAREIAAYFAlFC++8ACgkQvFcC4BYPU0oL1wCfRfr2dxrm2eqrdLwaxLDVXkmy
+pwwAni8efKJgPlEcWQrGOFltfHMZ5xho
+=CSlL
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-1.2.ebuild b/media-video/ffmpeg/ffmpeg-1.2.ebuild
new file mode 100644
index 000000000000..53ff3766ad5e
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-1.2.ebuild
@@ -0,0 +1,300 @@
+# 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.2.ebuild,v 1.1 2013/03/15 10:46:06 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 +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 )
+	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/_/-}
+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="avresample 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
+		--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
+}