New version

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x1191738E

3 files changed, 345 insertions, 5 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 0f21ba647d09..c4a384d928e3 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.141 2013/02/17 11:42:02 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.142 2013/02/25 06:57:04 lu_zero Exp $
+
+*libav-9.2 (25 Feb 2013)
+
+  25 Feb 2013; Luca Barbato <lu_zero@gentoo.org> +libav-9.2.ebuild:
+  New version
 
   17 Feb 2013; Luca Barbato <lu_zero@gentoo.org>
   +files/0001-build-The-libopencore-amrnb-encoder-depends-on-audio.patch,
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index e917fac69229..95022046665c 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -10,18 +10,20 @@ DIST fate-9.tar.xz 467671500 SHA256 27d10fd49267452ac787c3f43501a4a21d0ccaccc5dd
 DIST libav-0.8.4.tar.xz 3797112 SHA256 a4a53410ed864848063628277eb94f1921a7edfef7cf2e8bc9ab69f4f659c754 SHA512 67f0a78c2cfa88c98a5d9b3a528a6190eb3b2e0c1885010fced6d46bcf1337bddc7473e2b078ebe656c32897603fd908cbb938e663cb1f2a4fa8d7b1db129bb8 WHIRLPOOL e4252c391454f8e70fed7aa5ba10a4ff8d92297d2966c9921f6360760e9749ded4f5f7fe71a9acbec47b557d1290314ca4aba7b62a75ac33a816132ba8043724
 DIST libav-0.8.5.tar.xz 3761376 SHA256 d82cfbbca9825d8cf6cff4d830a57d094d359d23da7179a2d2811300cdcac57f SHA512 88e28b27f4a1f5dd856210b32527bc6c631e3c8470eedcdf303368cb2ff848407d6eb4359279eb8bf6d21375c0e5ac6860db8e1e96c4030990a643f9a365061c WHIRLPOOL a4ba175d9b40c5c1969be74fdae31c1bc67abf308e38c2baf429aecd16f5f7cd34df33e4f18661b5214d4c768011b2b742dc646ef5ceed51278b4ee04736546e
 DIST libav-9.1.tar.xz 4062784 SHA256 549969acacd8b341644ef027a058c2499b2ef2f088f7bf23a49f21d747458741 SHA512 35672cbb338847a929674f3d3ff7a265f0b4ad2701ac42bb1c8d4792b930bd5471b494d535e498347c4cf135cfc20a7c252f68ca776a9127cdb884b78593c743 WHIRLPOOL cf64de1c600f723ff7b220936f3d5f087d30fb03267a2f865e26a3910061e251affdc1b8cad913ce4c02b82895d8333d9e6604a16be22c20354f736ce280a630
+DIST libav-9.2.tar.xz 4065332 SHA256 70c02a413dc4dfe774c2a1a162a74daf875e347619d9ad774706debdf9dc0f6c SHA512 3f2d7d8a36c633366a1d54bef02128662a4fef8d43a7ea49ac79023454d152cadd056fe6f5b0d20d9a4fc26efd9c01378125b55a3cf80abe3a4d438966b6c61f WHIRLPOOL 6279f13f3db4507c0553d5f8c78858cf196a5e196c5908e90022cd687f3558bcacaf22cd7d81ad8238535891a8b8ad35dae299b0d562b959043df65e33e0974f
 EBUILD libav-0.8.4.ebuild 9093 SHA256 392473a04603b5f3f71a016fd142a92b4c773c83a70ba27462967d0e8abc962b SHA512 49f54eb912d315c761b3ddfe86528a9db89bfbe1e8b9e5088bf6b06f562ccb38e3ea3cecd122e1f867f690c2f551dbb48c14bbb2b70e123b543c5f5e3853bf12 WHIRLPOOL 17f3fa472cf1469de5c1b562b6d01184dbba68d07517884f3de8d94f69ec627260d0ea1f48356edc378c6d5b34a5c2c18a361c6560fa60b29db2b1ecd8f45891
 EBUILD libav-0.8.5.ebuild 9150 SHA256 9da77bb30ebd50fef110b3c3024a09c81a28ced9daaf6576e02d0d3741451674 SHA512 10b04e57ad78906773e98748b78b12643167655fd6d81069ed9c93c9d4164a2979b9007922f1e54fbe442f1f6d0525194aa18128da63f396a7e5103670ba5c8f WHIRLPOOL f554fcd8653ad28dfeffed25a3525e4f776061d42dccec61a6b49055451f107a6651a1c13daee1101f97565c9796b2ce3b5767ca59131a011372fbd496b58a0b
 EBUILD libav-0.8.9999.ebuild 9110 SHA256 596fc2c01d57af2f3af6af4b45139eb766b9d43503f8874ed82bbff6a099d0e1 SHA512 1717f9cf91ab218e302c685e7f3ab0231ce731fc79c45fb5b797ce7243125317d51fd788d151742407164b49f54528408382f9672e053a09438de44132bc7ef0 WHIRLPOOL a1c93c43997b327982e24dea09a4c64189133e270528a499e8cfb9ce64dd7c86598ef212264d6f52e30dcaa1ee3ce8f60725e225aaa8f9eedc0f34832f3a4d1b
 EBUILD libav-9.1.ebuild 9365 SHA256 7ca0d143f9e54c99b7d4b87f5899dfe1c58b8cf751be00556cd25c5f6be94ac7 SHA512 a8eef70183f79d28da22988234963fd5c4790691f65744b9afade977da38071ef9f79aef782d6f99765887d1d22f0395f0f14da9d008ef5fbe43519b0e3d148f WHIRLPOOL 182b2b9a47ce3ad6e49d90f4d331716703c833e61d6d1149b062170b0fe6595bba294115af0ce682df41b39c07b16d6e1e0bb7ac4cfa48b7ab68ee2cd8f2f4ca
+EBUILD libav-9.2.ebuild 9209 SHA256 2de366b1be468d37fdf1aba55daa4c601c974fe071887ce10e848fb4951b3cca SHA512 20082081a4c66fc6442953dc276e9fafdf137b868b63383bab5d105ecccaf27582b8fc3fcd67f4c232c4f0323757ceca4b1aabeff080ab84b56d3ccc76fe7ed1 WHIRLPOOL 33baa32b5670c75d361cd33900a4f85de27849c60321885be1f86007e168bd68466afa4f2c1f864976f0fb5212432152058cc31526d007d6e4bdb051d5bca56e
 EBUILD libav-9.9999.ebuild 9221 SHA256 28622def870362de2b79f9f40d3b7c14457b2b54c3f474545847cc4bf48830a0 SHA512 aa9b5a136b133f9c435a394939e013d3f5fff9d8b7343ddef4e66abf14fa9c7dceb59821522ebaf391211a840cd79672fc58e159115761c0fbd3989b13f4deed WHIRLPOOL 165abbbc8c03560cec32dcbe715ad14cc1550bc576a3e0a2ccdab4db6069e0cc3071a7338395aba4791d2bdc800832c3c7b02c0aa98487975fcfbea714c5b9e6
 EBUILD libav-9999.ebuild 9098 SHA256 8b440cc6669897456f79d326b62d514ca694590c0d906807616a659dd81a5618 SHA512 fec355fe239b2bb88839487918f35ac3634fbe4ed7c48ea5c46995d767c711a74d35bc7414fe2f21b587a0d71fd269dfb1b29321fe51728d9935923321f233cc WHIRLPOOL b31b3b5e53cda3e403ec51d3a09e3f47a278eb136d32c0bfed04cf36f627e606d0ea9e7570a9739e1dee7ffa87f7ee0d58ef8441bf3cf5cdf85acb7d5ad87489
-MISC ChangeLog 20734 SHA256 e2a23c005ec009c6b9df9c2b898eed66e5688f7e05ef60128976ef8b0e27c7f1 SHA512 53541229e65ab0525bda03d72da0df4d04a526f07805041ad8475c20c2f1e2921c75a488fe7908725203d297ab65ac4980eb0f97301b41b49fff51d4385a11bb WHIRLPOOL d28b5ac70e31f4735208af1ef69101e0e1aa7c71ead096fe90830c692930c68eaf629f7bfebec37304c3c650042300340fde620a129c93bdf520610790de2ca5
+MISC ChangeLog 20843 SHA256 c527431886f42dba074ff90dc6c948081c6f4f96e4a7e1ae6c231c3bf1e85720 SHA512 55ad2ac83ade61f4085487866f9a55baed2c0841b0d7492025357342c7b805e81f99b2f9ccea784e4f757b9c6d580f635d0139def27abe340e2361b8eee3c7dd WHIRLPOOL fe918e1f43129c50cb49abc425c13a51202b0401f9cb24cbed3a35fa63f4d918e435eca8e8240f772947ebe7518907f61c788b8609c0cb0c7f82d76da13fcc54
 MISC metadata.xml 3023 SHA256 26380d1657785b484265cc5ce3112dfef63231857cd64f81300b30b806a2f8e8 SHA512 7eb1ea995315cf8caed89296b5fe1cdb9ebaceb8e0cb8e2e1bef22f59f0a518ce128d4e43d18550bdc711df9237790cdf91c775d28e016ea752a3abfa6faa533 WHIRLPOOL 45f87adcebdea041818809051ad67dbb3b880f46971dbab594b4b7dfe4d31a84d97dc5b6e45bb0c51b50b21142074490bd8d268d9b73bfb5ee839ee78e428b0d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAlEgxhQACgkQcXOrnRGRc47yogD/YcbkwXEMTJebasaNtj8ONJuF
-I52tZQb3KvnfUar/vqIA/0FmXm1ZCiEvbEuOTR9BJ6FettI0XaUfgMb78Msj/zFj
-=+0ca
+iF4EAREIAAYFAlErC1QACgkQcXOrnRGRc450ZAEAuNvikz18tuD1BDEFYROdFuLr
+KpRTFf/ORVPkAoMp1rwBALBGwMl+d5v+i1q06AOrJNHb1kiaOZ5Zq1UKGpMFSJ1O
+=qbBq
 -----END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-9.2.ebuild b/media-video/libav/libav-9.2.ebuild
new file mode 100644
index 000000000000..1bec83542ef8
--- /dev/null
+++ b/media-video/libav/libav-9.2.ebuild
@@ -0,0 +1,333 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9.2.ebuild,v 1.1 2013/02/25 06:57:04 lu_zero Exp $
+
+EAPI=5
+
+if [[ ${PV} == *9999 ]] ; then
+	SCM="git-2"
+	EGIT_REPO_URI="git://git.libav.org/libav.git"
+	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
+fi
+
+inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
+
+DESCRIPTION="Complete solution to record, convert and stream audio and video."
+HOMEPAGE="http://libav.org/"
+if [[ ${PV} == *9999 ]] ; then
+	SRC_URI=""
+elif [[ ${PV%_p*} != ${PV} ]] ; then # Gentoo snapshot
+	SRC_URI="http://dev.gentoo.org/~lu_zero/libav/${P}.tar.xz"
+else # Official release
+	SRC_URI="http://${PN}.org/releases/${P}.tar.xz"
+fi
+
+SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-9.tar.xz )"
+
+LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
+SLOT="0/9"
+
+# Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
+[[ ${PV} == *9999 ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="aac alsa amr bindist +bzip2 cdio cpudetection custom-cflags debug doc
+	+encode faac fdk frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k mp3
+	network openssl oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	static-libs test theora threads tools truetype 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 neon ssse3 vis"
+for i in ${CPU_FEATURES} ; do
+	IUSE+=" ${i%:*}"
+done
+
+TOOLS="aviocat graph2dot ismindex pktdumper qt-faststart trasher"
+
+RDEPEND="
+	!media-video/ffmpeg
+	alsa? ( media-libs/alsa-lib )
+	amr? ( media-libs/opencore-amr )
+	bzip2? ( app-arch/bzip2 )
+	cdio? ( || ( dev-libs/libcdio-paranoia
+				<dev-libs/libcdio-0.90[-minimal] ) )
+	encode? (
+		aac? ( media-libs/vo-aacenc )
+		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
+		)
+		vorbis? ( media-libs/libvorbis media-libs/libogg )
+		x264? ( >=media-libs/x264-0.0.20111017 )
+		xvid? ( >=media-libs/xvid-1.1.0 )
+	)
+	frei0r? ( media-plugins/frei0r-plugins )
+	gsm? ( >=media-sound/gsm-1.0.12-r1 )
+	ieee1394? (
+		media-libs/libdc1394
+		sys-libs/libraw1394
+	)
+	jack? ( media-sound/jack-audio-connection-kit )
+	jpeg2k? ( >=media-libs/openjpeg-1.3-r2 )
+	pulseaudio? ( media-sound/pulseaudio )
+	rtmp? ( >=media-video/rtmpdump-2.2f )
+	ssl? (
+		openssl? ( dev-libs/openssl )
+		!openssl? ( net-libs/gnutls )
+	)
+	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 )
+	vdpau? ( x11-libs/libvdpau )
+	vpx? ( >=media-libs/libvpx-0.9.6 )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXfixes
+	)
+	zlib? ( sys-libs/zlib )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	ieee1394? ( virtual/pkgconfig )
+	mmx? ( dev-lang/yasm )
+	rtmp? ( virtual/pkgconfig )
+	schroedinger? ( virtual/pkgconfig )
+	ssl? ( virtual/pkgconfig )
+	test? ( sys-devel/bc )
+	truetype? ( virtual/pkgconfig )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+# faac can't be binary distributed
+# openssl support marked as nonfree
+# faac and aac are concurent implementations
+# amr and aac require at least lgpl3
+# x264 requires gpl2
+REQUIRED_USE="bindist? ( !faac !openssl !fdk )
+	rtmp? ( network )
+	amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl )
+	test? ( encode zlib )
+"
+
+src_prepare() {
+	# if we have snapshot then we need to hardcode the version
+	if [[ ${PV%_p*} != ${PV} ]]; then
+		sed -i -e "s/UNKNOWN/DATE-${PV#*_pre}/" "${S}/version.sh" || die
+	fi
+}
+
+src_configure() {
+	local myconf="${EXTRA_LIBAV_CONF}"
+	local uses i
+
+	use zlib && TOOLS+=" cws2fws"
+
+	myconf+="
+		$(use_enable gpl)
+		$(use_enable gpl version3)
+		--enable-avfilter
+	"
+
+	# enabled by default
+	uses="debug doc network zlib"
+	for i in ${uses}; do
+		use ${i} || myconf+=" --disable-${i}"
+	done
+	use bzip2 || myconf+=" --disable-bzlib"
+	use sdl || myconf+=" --disable-avplay"
+
+	if use ssl; then
+		use openssl && myconf+=" --enable-openssl --enable-nonfree" \
+			|| myconf+=" --enable-gnutls"
+	fi
+
+	use custom-cflags && myconf+=" --disable-optimizations"
+	use cpudetection && myconf+=" --enable-runtime-cpudetect"
+
+	use vdpau || myconf+=" --disable-vdpau"
+
+	use vaapi && myconf+=" --enable-vaapi"
+
+	# Encoders
+	if use encode; then
+		use faac && myconf+=" --enable-nonfree"
+		use fdk && myconf+=" --enable-nonfree --enable-libfdk-aac"
+		use mp3 && myconf+=" --enable-libmp3lame"
+		use amr && myconf+=" --enable-libvo-amrwbenc"
+		use aac && myconf+=" --enable-libvo-aacenc"
+		uses="faac theora vorbis x264 xvid"
+		for i in ${uses}; do
+			use ${i} && myconf+=" --enable-lib${i}"
+		done
+	else
+		myconf+=" --disable-encoders"
+	fi
+
+	# libavdevice options
+	use cdio && myconf+=" --enable-libcdio"
+	use ieee1394 && myconf+=" --enable-libdc1394"
+	use pulseaudio && myconf+=" --enable-libpulse"
+
+	# Indevs
+	# v4l1 is gone since linux-headers-2.6.38
+	myconf+=" --disable-indev=v4l"
+	use v4l || myconf+=" --disable-indev=v4l2"
+	for i in alsa oss jack; do
+		use ${i} || myconf+=" --disable-indev=${i}"
+	done
+	use X && myconf+=" --enable-x11grab"
+	# Outdevs
+	for i in alsa oss ; do
+		use ${i} || myconf+=" --disable-outdev=${i}"
+	done
+	# libavfilter options
+	use frei0r && myconf+=" --enable-frei0r"
+	use truetype &&  myconf+=" --enable-libfreetype"
+
+	# Threads; we only support pthread for now but ffmpeg supports more
+	use threads && myconf+=" --enable-pthreads"
+
+	# Decoders
+	use amr && myconf+=" --enable-libopencore-amrwb --enable-libopencore-amrnb"
+	uses="gsm rtmp schroedinger speex vpx"
+	for i in ${uses}; do
+		use ${i} && myconf+=" --enable-lib${i}"
+	done
+	use jpeg2k && myconf+=" --enable-libopenjpeg"
+
+	# CPU features
+	for i in ${CPU_FEATURES}; do
+		use ${i%:*} || myconf+=" --disable-${i#*:}"
+	done
+
+	# pass the right -mfpu as extra
+	use neon && myconf+=" --extra-cflags=-mfpu=neon"
+
+	# disable mmx accelerated code if PIC is required
+	# as the provided asm decidedly is not PIC for x86.
+	if use pic && use x86 ; then
+		myconf+=" --disable-mmx --disable-mmxext"
+	fi
+
+	# Option to force building pic
+	use pic && myconf+=" --enable-pic"
+
+	# 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+=" --cpu=${i}"
+		break
+	done
+
+	# cross compile support
+	if tc-is-cross-compiler ; then
+		myconf+=" --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}-"
+		case ${CHOST} in
+			*freebsd*)
+				myconf+=" --target-os=freebsd"
+				;;
+			mingw32*)
+				myconf+=" --target-os=mingw32"
+				;;
+			*linux*)
+				myconf+=" --target-os=linux"
+				;;
+		esac
+	fi
+
+	# Misc stuff
+	use hardcoded-tables && myconf+=" --enable-hardcoded-tables"
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ $(tc-arch) == "x86" ]]; then
+		filter-flags -fforce-addr -momit-leaf-frame-pointer
+		append-flags -fomit-frame-pointer
+		is-flag -O? || append-flags -O2
+		if use debug; then
+			# no need to warn about debug if not using debug flag
+			ewarn ""
+			ewarn "Debug information will be almost useless as the frame pointer is omitted."
+			ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+			ewarn "difficult to fix. Please have that in mind."
+			ewarn ""
+		fi
+	fi
+
+	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)" \
+		--ar="$(tc-getAR)" \
+		--optflags="${CFLAGS}" \
+		--extra-cflags="${CFLAGS}" \
+		$(use_enable static-libs static) \
+		${myconf} || die
+
+	MAKEOPTS+=" V=1"
+}
+
+src_compile() {
+	local i
+
+	emake
+
+	if use tools; then
+		tc-export CC
+
+		for i in ${TOOLS}; do
+			emake tools/${i}
+		done
+	fi
+}
+
+src_install() {
+	local i
+
+	emake DESTDIR="${D}" install install-man
+
+	dodoc Changelog README INSTALL
+	dodoc doc/*.txt
+	use doc && dodoc doc/*.html
+
+	if use tools; then
+		for i in ${TOOLS}; do
+			dobin tools/${i}
+		done
+	fi
+
+	for i in $(usex sdl avplay "") $(usex network avserver "") avprobe; do
+		dosym  ${i} /usr/bin/${i/av/ff}
+	done
+}
+
+pkg_postinst() {
+	elog "Please note that the programs formerly known as ffplay, ffserver"
+	elog "and ffprobe are now called avplay, avserver and avprobe."
+	elog
+	elog "ffmpeg had been replaced by the feature incompatible avconv"
+}
+
+src_test() {
+	echo ${WORKDIR}/fate
+	LD_LIBRARY_PATH="${S}/libswscale:${S}/libavcodec:${S}/libavdevice:${S}/libavfilter:${S}/libavformat:${S}/libavresample:${S}/libavutil" \
+		emake -j1 fate SAMPLES="${WORKDIR}/fate"
+}