version bump

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

3 files changed, 314 insertions, 5 deletions

diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index 4ee8a06a0dbb..2ec7bdb592c1 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.592 2013/01/13 19:23:29 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.593 2013/01/13 19:37:46 aballier Exp $
+
+*ffmpeg-1.1 (13 Jan 2013)
+
+  13 Jan 2013; Alexis Ballier <aballier@gentoo.org> +ffmpeg-1.1.ebuild:
+  version bump
 
   13 Jan 2013; Alexis Ballier <aballier@gentoo.org> ffmpeg-9999.ebuild:
   Improve documentation installation and add an examples useflag
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index b83aa71c4cbf..257f0f16604f 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.3.tar.bz2 5855494 SHA256 7d1ca0abc80e2f6161e2a48878b62a2e6d0301c231f91e7677b889ef048b931f SHA512 41509b736b3158f3b77620bddee509c07d16d239feb881644a1cdbd97a0ea5e2a8cb469c47b2f19c03518dbed8388ab20684f095e023c97f1a6d0b4765f73e64 WHIRLPOOL 7cb9ebf16ec0ee4680876db86a4aa579819055451d546a7dfadf0b8b18c7930036d8670446c75ef2fa51c6ba2a1ed8e7dd1351459caf0023f72825900d901fb2
 DIST ffmpeg-0.10.6.tar.bz2 5778721 SHA256 8c67c0be9dc568a857d5542247aa4e3c1c6538fa3643b47c9deb7ff004a97626 SHA512 f563bd8aa0daa982a7f63560b7c1ed5d630976aac2efb9b37031923d078bb7111fa96f7a05f241743eb0eafb071d439e90a87c9377cd6db70ad0df7599a0a0c8 WHIRLPOOL fef0f748276250e47e6ac30aad31f2a50ebb222aa989b48f82408eb9ab3cba77a07fecd9a67f05ae32dbe8fe95b65a6156cade2cd477e14c0d827087887cbc91
 DIST ffmpeg-1.0.1.tar.bz2 6446587 SHA256 758840dcfc94eb7fd6263718d26408658a59422e5fb8ac4de8e7ecf0cbed6e76 SHA512 845699f1524eb2576acf043a285969f9b28d7eb81a88aecf84388bf9830507add29670384e6caaf6651e35e83698897dac2597503f256efee537d764723160d0 WHIRLPOOL 9ff2df542298ce24cd0796e4aeea328d4436ec5440ebcb0c5526d4aae52b8623d0f46b324c41887b3db3af9a3e884604fecdb873570c2b527d72be98e532d179
+DIST ffmpeg-1.1.tar.bz2 5808278 SHA256 12d4f6268fc181987a55eb4c444d8b9cffcdcc3a8e61ce9f7ce6969faffe410f SHA512 669501f1f6a35806d98c40f7e5375cbc3195b325fe2c77582d1bb772b2b4f4445a59c14827beb8d0f93f20db3a3e5dd5dba5fd9867e727c67c3ae97cd342bcb3 WHIRLPOOL 636c2fd01b59035d9cfddc74e7bd9d2ade47aefe4545d17ae8b0f867349cc82b70f3056e8d51f1d392f374f39689ad326ad9675b29c8d66ad7f29bc210af37a2
 EBUILD ffmpeg-0.10.3.ebuild 8635 SHA256 7a93b57018947a7c57d3829c092aac4ee8e3b554c1116fd2fc41f4b4582bc7c3 SHA512 0a64ec7ef72af03d3997bc48191a4b8cf34ecc79d8cc4648a46e0ea303c38ba0bfe5877937328e7eec32950a6371288c7d4613eb14914bbe0f26f961cbda2d25 WHIRLPOOL 1e65a3790fa9c111c2266d5a2c5f6333ed3b37518dbd2a96d0ac7f6d969feb793430c7a79ee79de485d4c2e3d1b6da103936f22125ec87b061f319ab7bed4fc0
 EBUILD ffmpeg-0.10.6.ebuild 8683 SHA256 1e050fd8dcc1b56bc6b9fa7eaeeff0a859ec7345958974c38304202c473db4f9 SHA512 ca505e9600edec8b829556997836f44fa2689c722966ec25921dc7175e45e9e5fdbde885272c492f2cdbf1f80ec4419f1dd6704f27efc41810ce415d6f400763 WHIRLPOOL 9b1a35247a6744ecf8c44eba0948bf7658bb6e1cd288193b9d878e9954e64aab75d0e24e97a04c916030382228d81b40376c8a5e85259cc41af89e8461eb3365
 EBUILD ffmpeg-1.0.1.ebuild 9137 SHA256 b75c28b00740862528278f2479af7261e66847f59aa9d099565a15f2c1a167e0 SHA512 c8964a3073d72d3b585254d74079afe940a9cf07e32909fd529cd1c983391e34322d1da58d63413e289e1025f7582845ec3e536d124bd7dd5ac1889c467d1889 WHIRLPOOL a201eb71c8e4ad9981325b4e9fca2a890ecce064f4be379c08026b144bf3044e205861eb3245ed9dfd18bb68781f398ebf9a26489f069b234bf3e49624391c93
+EBUILD ffmpeg-1.1.ebuild 9310 SHA256 343e7c6167e3c1c43951336431b12966136a2a853c4176e7ea8253a990d51f92 SHA512 9bf2d941041008f771aee0bf33c12277eb68d1060b0e8aa54aac6b55140bae2bd412ba3ac0f603aa34240ab3828b6c80ae2d4e3282afcef61a25fb0b4872a4af WHIRLPOOL d82486c3f64cc704d50c1e7e70a94061d4720894e16ff9624547998239a7999627768e90053e99ef623babda92379f0c142e133d99ea113b757298fed961af42
 EBUILD ffmpeg-9999.ebuild 9313 SHA256 165f0c58e531d6c578bbd52a3cb6354f83f49eba5c3d8ceed2b68769a12349d4 SHA512 8a64bb4d2401d2a9bbcb6e679a9de576ec9ca9e4989abce0fb7bcb9e00b95e674c32f57dfad907c27e6f9a7f081fcc389cc4798d0975e294c4ecd05e120ef219 WHIRLPOOL 213670b37d339a72b793825f584a7d5dd13cfe1eb7780f3c16645f4bd1c64f1fca495f53522d00292e440531624af87350d8fa243deeda4a2b28219cead4a032
-MISC ChangeLog 83788 SHA256 12bc1a2550aab88fcda322659db75aa4161a387c728976e220b93be7cdaa1d23 SHA512 8f08e0b0abbf5a07cb41685ae737f582c45b2383888b61a134a3f424332866f1aa261e6f42838e11d09df7ea8393190a49ef7aa65214f2d4a46d166481ca5e0c WHIRLPOOL 02a4274d12824baaea13e09d3bdbf0c428989a886613f44d76491aae3c24ca92c596af83105c089fd8449bc92cb969b2226e824952ad252ac88119c990dba078
+MISC ChangeLog 83903 SHA256 8670e8a709082189808ad7709fcffe3faa7c0bdf39dcdabc9540fdea8ea4d6c9 SHA512 e74704b7ad55beb47e854e1aaa9283533ce25c5f44e4ba7ad8ce628f9e0d9987ee2a72866ad5b1b98dcaa33b313ae3a24add868f8b2c37f8c0ed9114bc43a5a4 WHIRLPOOL 9a6ae07706d9d8edf1c294c69fe32a10a9283358c801c90972333d50a99681847075fea8f53755b8042675e91e437b29fe9bd7b8a15f6d4957e07e1b8285c193
 MISC metadata.xml 3545 SHA256 71ea800494ce0b5c59dd2407f322e16d9416bf089ac3f9a45f2e70626a51de77 SHA512 e6f525b1b1a9ce95b9695b7b8ab42cb72f7cbf24633b061fe52e8a8b7570ba44f721ede5e1017b236ba26bbb21e7d9f6db6ed3f7b078a239dd15a828ba917e96 WHIRLPOOL e95c57c55d99cf57ac8e25bd4bee4e9fd4e6d2a027e2c29f1dc9b86195bf2c102fb32605415baf5201d315493966c30ea7f5b7a55f538629dc74d810080991fc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDzCbMACgkQvFcC4BYPU0of8ACfZg0Lr1jZ9NZC4KcRsJ1Dz6sh
-/UwAoLHWxauYquYA/pkkMxOI3UB37KEV
-=n0x8
+iEYEAREIAAYFAlDzDQwACgkQvFcC4BYPU0p1mQCgvrWW+VfwvevJB3Jl18AtiZix
+/OMAn0/l6kviEJA5GiDyc5EWbb1VnVcH
+=I/m5
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-1.1.ebuild b/media-video/ffmpeg/ffmpeg-1.1.ebuild
new file mode 100644
index 000000000000..43ea6caee828
--- /dev/null
+++ b/media-video/ffmpeg/ffmpeg-1.1.ebuild
@@ -0,0 +1,302 @@
+# 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.ebuild,v 1.1 2013/01/13 19:37:46 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 ~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
+	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 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 )
+	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
+}
+
+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
+
+	# 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" \
+		emake V=1 fate
+}