New point release

Package-Manager: portage-2.2.14/cvs/Linux x86_64

4 files changed, 345 insertions, 10 deletions

diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index b2876f14ee8e..1b10ae3aa2aa 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.225 2014/10/27 12:34:05 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.226 2014/12/02 13:36:00 lu_zero Exp $
+
+*libav-11.1 (02 Dec 2014)
+
+  02 Dec 2014; Luca Barbato <lu_zero@gentoo.org> +libav-11.1.ebuild,
+  libav-9999.ebuild:
+  New point release
 
   27 Oct 2014; Luca Barbato <lu_zero@gentoo.org> libav-10.5.ebuild:
   Fix bug #526180
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index d9650ad99785..3f0fa48ae66b 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -1,15 +1,17 @@
 DIST fate-10.tar.xz 558524508 SHA256 65779319ff75a5d93f20132a7c348db2ff6f0f0275fb64a23f81fbda6e44c1cb SHA512 5e569b899961d82c579d974eb13b8a5263ae7a83dc788119d6abf923c9c133029fd861960a85c316e0b0a0bd61722cc3bcb393a65d9d2c551084c0b1103cc582 WHIRLPOOL d9e0bb01ae809ca57a566ae804b9e30ff0239e43047a7f93d07ab0d31e95c7f06cadd651dd3badc2b906f34ffa12669cff87910ffe115f34c3279615f8afaddb
 DIST fate-9.tar.xz 467671500 SHA256 27d10fd49267452ac787c3f43501a4a21d0ccaccc5ddd6d79d8a6150ee276532 SHA512 8e45539f2512ef915b37c857226c0243940259f269b8f99393b9defa3352d7b8c1fcc5078f4f0d40dc0509737f0c915e179cedcc77f71fe5d96b1b956169a202 WHIRLPOOL d280ac32c6d84f121be8d733774e72a4df3f2e84d71051aea509ef5ca3289c94fd548bf03ff12215e045bf20c83426c547e6b5eb446429d167f38af7c7aa9803
 DIST libav-10.5.tar.xz 4650900 SHA256 c7a57042a5e4720152d27a0beea961ae52a3ae1d916a88c78c1e192e9e0d5f86 SHA512 fa4837daa3bf40f05902ac2d849179d104b1f9881b63b460363e577849cd55b0795e6e41aadec817eac89d1eaca88ce4a9ad0eb2dbf1dd789496dd9cd2637c59 WHIRLPOOL 03ba4cb4dbe8da4dee4a242dc14333ed6b1a2198783f687d143d65cd9c25a5f05aa7b30e49b784309af04045d4726ee3a702159da72ed00d76eaa1be01b7c4d3
+DIST libav-11.1.tar.xz 4855320 SHA256 4198c657ff4dcb209f6852aa4809a7cfb1eedfec95a4748cbe0b6639443f7000 SHA512 cb1783c98185fd9bbbeff07b72252cb1844b4d717f7beaeaaf78da39dc0175a8e96de572adb5649351f00228761002262019d068ee6952afd45e3026b8f9eb75 WHIRLPOOL 3294852b00fafd9b0a6348537f56f654d13be0c73b4fef66971859f4abf30c57fb89824292a05992cfa5a5bc32ebb81b6f67f232be3d550976a83f6553fc33eb
 DIST libav-11.tar.xz 4871572 SHA256 1f920f057f93752f44e8ed3b497129ffca249d462721bed8270726023b6a8835 SHA512 d40d245fbbe19713f75d52da61866cb59de0bd649fd3c91af2e6675efb2c81778240eaeee441fe823c4ffa8ade85dbe74883fec259d8a7d6b260724eedbf055f WHIRLPOOL b907547a9e5e9e03f99352089c5be7889197b4ff4e7e40c151e1be8a3fac056fffbe5e03a498e8f98f459011568c1596bdd8f53afe754e4361cb42d8397df3b5
 DIST libav-9.14.tar.xz 4077424 SHA256 e4baf0c2adbd941a827854794dd6af9c29cd2042b23501c5828e9b8e1725f61d SHA512 fa8e83cb92a5a565cd23c63467c64972a69a4cbd652b946c7891b73180b609890f67a6f89f009ed263fb9e2c769236f3a8f7f70b0fce4c4373fa93a49470c04d WHIRLPOOL 178ba6c6ad0ecd8ad59eb3bf7a0d4289a3c253d82981cf3ad454e3b222848ae4f875e37cfd280be43faa25a9614c445106555c9f3b5ee4497aec9d71f39ac1af
 DIST libav-9.17.tar.xz 4080028 SHA256 e32d5f152bce1de283c002a35eb6e71f265877633dee8a40db4d16381dd5d17c SHA512 20af83d4b6a23c159c2386b6592ba6a6acf3f2c54e8aeb16dd0c8a64d637fbde24f37b864698b1143c6802b64a7b5e8ddfe0e7601b35c35686a789e2b3232f5a WHIRLPOOL ec07b5dd116e87416a9841044e09a6ef9b124fe4882f53e88711a32813d3d3a1d71f5067854bbd553ecdadec401dbbb8b504bfc1c6966bfd5e2db79459fb9995
 EBUILD libav-10.5.ebuild 10219 SHA256 93d139e88aa8612a0d369e40f0332b0bb85d3c8a7ee128bac128e9f6c8788055 SHA512 a9ed061c9f2a2fbce51f07b6335b18f5118ebe45bec3e6f4fd066b8f0108dd466addf8192e6639c2833314b5ef21cdaba602104266c119df2c1108b0a61edba2 WHIRLPOOL 15f2a293960eaa38e901e0d5bf110b78d137ddc070b921bef04a966d206f6d05dbd52debaed4614ece491330d630bbe7f0b105e744a32211fb392fa916f7b525
 EBUILD libav-10.9999.ebuild 10238 SHA256 b6d7496a7c706f0e5b8771f7451b6e5e7801e0a30e62e5a29f24f092ef453b31 SHA512 96c69fbc93e81e4a8155fe59e512239617c068f4cde2a2b3c8bd2f27ffa5ca65363d28d32f3dffbfe2d9de2f34d684fa968aa56b6f5d4ff5ca28b1437f993957 WHIRLPOOL f507677255e0f239cd5626a8855c183304e4bdea6208cfedbf457a1bdef9fabf5af6192500c0daefdeabd8dbc80bd01f1038b5e81dc6d822e70f2ba8b433780c
+EBUILD libav-11.1.ebuild 10468 SHA256 bc0e658e51514002ebe90fde40f99a4c6aff94ef0c32f1e25e92f3cf85187e23 SHA512 2d0a770a115d1f30c85ce1fc32b703433b8f5e4e3d1770b5123c37b779aff3acf74c9cc4202ec002c4604dc9b75c9b958ff94c8a9c90f4b8a3776efc38302cbe WHIRLPOOL 4eff859596f9159bf0a7bb931a3061f3568111491c09b0b97e60ac844f5fdf8dc066d08250a849d86235ababb3aa08f9581615f278bf099743c7e99f53ed3921
 EBUILD libav-11.9999.ebuild 10473 SHA256 2a8b854fbc5dff6ff3cddee2b17204f3404ac48ae94a946b8f35bddce1f16669 SHA512 c0642eba5489a2bc10e9988fd900471f9ef248568820da17e84795d9652d03847c534d5f9351128d1d102b7f6b890a40107ed3b522e2fbad7708c27ba1895833 WHIRLPOOL 7bba16577398622b67d0a1342efd7a46f37cd895833da818e920ada0eb0dae4fe768058afb84ebc3efb8aeacba9c95d0462ac533fe1c85657b07b024c49fbad4
 EBUILD libav-11.ebuild 10466 SHA256 3e9426005a95b4a572642a595927c123e82d21c1b5be9199f5dba04a9ee2c7c1 SHA512 91e7d3b3e6b3a66a1b478c98f09f3e9a4231606f74c99d8ea2d9722dc7d7eec5282acfe964780a3d2b8b042ad7411e270bc475279fdcc4cc9f49ce1af35d31ed WHIRLPOOL a011d30bc3b7ca67fbe46549c1afa2220ce7ed3ea6c4369b9de56714b2fb403c231eb5e6e90335eb34180a4c5eaa80909034b8a69f3757ebff6bb2500d692ae3
 EBUILD libav-9.14.ebuild 10157 SHA256 cb77e984a6ebba124a24673ef9948779023e0a1aa0ae618d0184e1ba1c08a6d9 SHA512 8c2bd51379ed4753d82a8cb738c1bbd2eb194218480839f96552666c7ed8a0bd2455f0a751a55fac242ec867c8d80ecba6bc07c935756b372f992f559e2cf07e WHIRLPOOL a92d9c03c8b083c54c2eecf4d9e90aedebb11ff8c82296339d9386384bb8ac66ff671faa2092c007e667aca7c915bf75e5345c5125cca2d6d9aac17b670f5ba6
 EBUILD libav-9.17.ebuild 10168 SHA256 bcbdcce44f894f0e76f4830b46ec4eccf0c0181817e69ea6c989733859755b42 SHA512 19950573c030ad5abbdb7aae3f760e712f47834b91c473c9ed19c762bcdb90a9a3c25f89eeb18722d6fc77c6aeca7ea75b37ce831c9eba99242d94fbec31ba0c WHIRLPOOL 8056bd3a703d896ca22fa39832f7b210303e58f1096f522c4c9db770dc37991f03b1b457a117fdb472f824837a07df476da484b76b37ef0c32cfe77a923499bd
-EBUILD libav-9999.ebuild 10469 SHA256 c209dd986d27b4a7dc54e9ea1de818450a0e14a67343b1070d4a12401bfda334 SHA512 aa8f4a5072484a217f31991aa57f37223dce259a6294a7784f446f816a1e14ccfad50c4f69bf982f0569db6eed9f86c0a8140aa1638f56a0298b1846f8e3aa46 WHIRLPOOL 9e211db0b7f9384e7b24ab7bf921ae01a9e540eee5376946384d2b87eab5b1d75cfc072b491ecf924e4202f2fc33ba407be84e2b387ed3aa9684dcf610c38915
-MISC ChangeLog 34669 SHA256 60bfc9d322e57829a100d293e18cab51b62a0c62d4d3a2d2d60fdd6d724cef57 SHA512 ac143f1bb755a13fc7003d603a8074f4c5c45acc06c86d8b1546659364678f2732b6e845637dc05208a9f8f8fab98d4e4d44af946c16144c3b9582d3e17b13f4 WHIRLPOOL fa5c9f0e2b39ec044941020f68d793b18f3772f4453f250a6a6b1ec328c6f506c0f8fd2f7e179534b75a0dfbe555d4a1322cdb1fd4eb87fa6e107b92035fab66
+EBUILD libav-9999.ebuild 10416 SHA256 f64f5ca660dfa9ee4d20a08c26c96fd70947beccb80d186f96f6e0a531f7021c SHA512 bb9120af16c8c845a142a8cda46c7f5a11948dbf68bb380b33d141a9e084b68085d4e76584cafc97e5ddb4ab70c455c4714c4c0d6e4cefc72ceb8d1ee2c69c6d WHIRLPOOL d4ec13940758e2bbb0d975fa9edaa37caea411bb3e2548d466555fb6005e29805f1391e9649675670c8fd96db02d10dd01ec693211d4b3d53e3d982750f512f1
+MISC ChangeLog 34807 SHA256 9709c894a02ca05c7b0a9f3e7ee8722310d4baefac6f88f1ad0234533f5e3d6d SHA512 a558a7c04e72d8a29a9ebb4ce9d9e271a2f7c86e99cab28db412085dcf516c38120a03bc18ec9e4993e7badce96ebccae0c451c2deb62930184c059f5c029995 WHIRLPOOL 2f1cbead7067417f009c0c0770b789fc59c2410412e39b2e5c54dfe9c7d9d019324b9aa0e9280fc53510f0d5641a547da923a8e227f8abbeb103534d2b261126
 MISC metadata.xml 3062 SHA256 63aeaae7b95e8df34cfc3de199206124db7fee93217af471549763188d9d1da6 SHA512 4725fb1fdd818fb8e669f1643077c1fd4e898783081bb44eea44680ce51a581ad20c9bac23664b4bdf6e7a79a9ef4bd82411d00f30ef0f0b9772aefda2414e5d WHIRLPOOL 89633c75e96fb3bc727c3418172efe932bbf296b46aa69ade59e4fc0d967b65a215dfd79a336b759a4085bfb1b310fa34f65d063014950e1c836bec17aaea127
diff --git a/media-video/libav/libav-11.1.ebuild b/media-video/libav/libav-11.1.ebuild
new file mode 100644
index 000000000000..a31aa54fd581
--- /dev/null
+++ b/media-video/libav/libav-11.1.ebuild
@@ -0,0 +1,330 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-11.1.ebuild,v 1.1 2014/12/02 13:36:00 lu_zero Exp $
+
+EAPI=5
+
+if [[ ${PV} == *9999 ]] ; then
+	SCM="git-2"
+	: ${EGIT_REPO_URI:="git://git.libav.org/libav.git"}
+	if [[ ${PV%9999} != "" ]] ; then
+		: ${EGIT_BRANCH:="release/${PV%.9999}"}
+	fi
+fi
+
+inherit eutils flag-o-matic multilib multilib-minimal 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
+
+LICENSE="LGPL-2.1  gpl? ( GPL-3 )"
+SLOT="0/10"
+[[ ${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 fontconfig +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k
+	mp3 +network openssl opus oss pic pulseaudio rtmp schroedinger sdl speex ssl
+	static-libs test theora threads tools truetype v4l vaapi vdpau vorbis vpx X
+	wavpack webp x264 x265 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 avx2"
+for i in ${CPU_FEATURES} ; do
+	IUSE+=" ${i%:*}"
+done
+
+RDEPEND="
+	!media-video/ffmpeg:0
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
+	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+	cdio? (
+		|| (
+			>=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}]
+			<dev-libs/libcdio-0.90[-minimal,${MULTILIB_USEDEP}]
+		)
+	)
+	encode? (
+		aac? ( >=media-libs/vo-aacenc-0.1.3[${MULTILIB_USEDEP}] )
+		amr? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
+		faac? ( >=media-libs/faac-1.28-r3[${MULTILIB_USEDEP}] )
+		fdk? ( >=media-libs/fdk-aac-0.1.2[${MULTILIB_USEDEP}] )
+		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
+		theora? (
+			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		vorbis? (
+			>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
+			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
+		)
+		webp? ( >=media-libs/libwebp-0.3.0[${MULTILIB_USEDEP}] )
+		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
+		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
+		x265? ( >=media-libs/x265-1.2:=[${MULTILIB_USEDEP}] )
+		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
+	)
+	frei0r? ( media-plugins/frei0r-plugins )
+	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
+	ieee1394? (
+		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
+		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
+	)
+	jack? ( >=media-sound/jack-audio-connection-kit-0.121.3-r1[${MULTILIB_USEDEP}] )
+	jpeg2k? ( >=media-libs/openjpeg-1.5.0:0[${MULTILIB_USEDEP}] )
+	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	rtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
+	ssl? (
+		openssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
+		!openssl? ( >=net-libs/gnutls-2.12.23-r6[${MULTILIB_USEDEP}] )
+	)
+	sdl? ( >=media-libs/libsdl-1.2.15-r4[sound,video,${MULTILIB_USEDEP}] )
+	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
+	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
+	truetype? (	>=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=media-libs/fontconfig-2.10[${MULTILIB_USEDEP}] )
+	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
+	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
+	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
+	X? (
+		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/make-3.81
+	doc? ( app-text/texi2html )
+	ieee1394? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	mmx? ( dev-lang/yasm )
+	rtmp? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	schroedinger? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	ssl? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	test? ( sys-devel/bc )
+	truetype? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	fontconfig? ( >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] )
+	v4l? ( sys-kernel/linux-headers )
+"
+
+RDEPEND="${RDEPEND}
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+
+# 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 ) x265? ( gpl )
+	test? ( encode zlib )
+	fontconfig? ( truetype )
+"
+
+# Test on live ebuild are not possible as they require trunk fate
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/libavutil/avconfig.h
+)
+
+src_prepare() {
+	epatch_user
+
+	# 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
+
+	TOOLS=( aviocat graph2dot ismindex pktdumper qt-faststart trasher )
+	use zlib && TOOLS+=( cws2fws )
+
+	MAKEOPTS+=" V=1"
+}
+
+multilib_src_configure() {
+	local myconf=( ${EXTRA_LIBAV_CONF} )
+	local uses i
+
+	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 wavpack webp x264 x265 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
+	multilib_is_native_abi && use frei0r && myconf+=( --enable-frei0r )
+	use truetype && myconf+=( --enable-libfreetype )
+	use fontconfig && myconf+=( --enable-libfontconfig )
+
+	# Threads; we only support pthread for now
+	use threads && myconf+=( --enable-pthreads )
+
+	# Decoders
+	use amr && myconf+=( --enable-libopencore-amrwb --enable-libopencore-amrnb )
+	uses="gsm opus 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 && [[ ${ABI} == x86 ]]; then
+		myconf+=( --disable-mmx --disable-mmxext )
+	fi
+
+	# Option to force building pic
+	use pic && myconf+=( --enable-pic )
+
+	# 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 [[ ${ABI} == x86 ]]; then
+		local CFLAGS=${CFLAGS} CXXFLAGS=${CXXFLAGS}
+		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
+
+	set -- "${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[@]}"
+	echo "${@}"
+	"${@}" || die
+}
+
+multilib_src_compile() {
+	emake
+
+	if use tools; then
+		tc-export CC
+
+		emake ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install install-man
+	use doc && dodoc doc/*.html
+
+	if use tools; then
+		dobin ${TOOLS[@]/#/tools/}
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc Changelog README INSTALL
+}
+
+multilib_src_test() {
+	LD_LIBRARY_PATH="${BUILD_DIR}/libavcore:${BUILD_DIR}/libswscale:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil" \
+		emake -j1 fate
+}
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index 5058ff992774..3ad7f272d3e5 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.74 2014/09/17 00:11:43 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.75 2014/12/02 13:36:00 lu_zero Exp $
 
 EAPI=5
 
@@ -96,11 +96,8 @@ RDEPEND="
 	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
 	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
 	vpx? ( >=media-libs/libvpx-1.2.0_pre20130625[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
-	)
+	X? ( >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+		 >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}] )
 	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
 "
 
@@ -212,7 +209,7 @@ multilib_src_configure() {
 	for i in alsa oss jack; do
 		use ${i} || myconf+=( --disable-indev=${i} )
 	done
-	use X && myconf+=( --enable-x11grab )
+	use X && myconf+=( --enable-libxcb )
 	# Outdevs
 	for i in alsa oss ; do
 		use ${i} || myconf+=( --disable-outdev=${i} )