Add working libav support. It requires libav git master or 10. Add a warning when building against libav to reflect the state of such support. Add := deps on libav and ffmpeg.

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

3 files changed, 22 insertions, 9 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index f604d38e66b7..2e1a82e31770 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.193 2013/07/20 16:10:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.194 2013/08/07 18:58:58 aballier Exp $
+
+  07 Aug 2013; Alexis Ballier <aballier@gentoo.org> xbmc-9999.ebuild:
+  Add working libav support. It requires libav git master or 10. Add a warning
+  when building against libav to reflect the state of such support. Add := deps
+  on libav and ffmpeg.
 
   20 Jul 2013; Alexis Ballier <aballier@gentoo.org> xbmc-9999.ebuild:
   Fix vdpau deps again: It requires either ffmpeg-1.2.1 or a post-libav9
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 345a25d2e4b5..4e2397bba17e 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -20,13 +20,13 @@ DIST xbmc_backports-12-1.tar.bz2 5010 SHA256 a222c32f5a4a0a8690b1544674cfbfeddf8
 EBUILD xbmc-11.0.ebuild 6295 SHA256 5a700f39848da84db6e79eed1a316dbec2cea01252ae412f2219f63b653e8c71 SHA512 02fd0286655573965dc9204d1580d69dce5a9beef049a92ad10d619e39ef9ad07524b4172503626a442c8f4969200e4e9587b31e776fc5ca8a2b3f2596a11b12 WHIRLPOOL 1b03964b773587217dea06243a2c4b9f459e7deb3f6efbaed17ae8fa0b80e0f83e286b03d97a4ac2f19fce5df7bb609232a38f6c7366183c42165013ed7f08d6
 EBUILD xbmc-12.1-r1.ebuild 7107 SHA256 99e379a1e82034364056f3360e3fdaf34c2296062461b2337308441a0b9bac19 SHA512 1d05469a049f6e41543832bc7de98f718f50d9a6e9d9131634499131a726a386c4edf2120c23ff2d402866a89e5d92bb32ca3c1453edcf6e8c6cb13a4293ee21 WHIRLPOOL 699b7289fdfcdabef4dba77095915ef157b3a6640c3f73d3c0418e844b9c92688d531a6102a68c309e7a60dfc9c964b0757b9a45c647d536dfe8e8b5df1fca0b
 EBUILD xbmc-12.2-r1.ebuild 7068 SHA256 dd2345798b6b6438545e70f6d5a3f6ef4cedb7a3af48c1c6be894c86eee2f3a9 SHA512 26e894096eb932049ad34056af3d2e8890bc63dbb630c8991ee6f9578c6299e7f855afa2c7578374546bb9c293db35952bf79fce7044ac1048dd7b7f5304b7db WHIRLPOOL 62f3d6ca3d3e9d0dc78abb27ce019cb4ca6340f3da5c0d5ba39219c4dd0a9b5773eca8528e4f8acfcb03f41545e6b71b3ed25052ef07b9d60527b55fc71e4c8d
-EBUILD xbmc-9999.ebuild 8322 SHA256 afd5c19417af13f5e35814f0ce754aef7bdd68c7f0f07b80c437a9e238c3aeeb SHA512 bd3f6b160c89e38e7246ba0354bb2911959af2649e163e336828b426e3ac90de035a48055383192cddd3eef6b30365395b3cf838b0f085defd3b7c4f2071ddbb WHIRLPOOL 6e4c4cc210f43f8d675ad2206897f5eaa7eb34a5b27b1cc7d483dab271c2f2ebc0a31500fcb9edd8b5e9238b0f830a60f31c4895a516bcbd7e53bd4e85d9d51f
-MISC ChangeLog 32069 SHA256 8fc8cec7946c48cb34347d96edaeb70765b4adb835443f8d64b31f3f23263375 SHA512 71fff810497409d504de2e4fc9c02ae8996dd0fce7aa7b53a961b7b19a1f8d78b75b4401702eda1b2976393ac73116748c66fe221960a2a7eefbf7475234dd16 WHIRLPOOL b5d6fdf7f16a1c766a06b5b2303ea13e93d8d1484f7995b351500e9cd9e3a7d78b2b58a5ca832d1204743050ba3ce0054e5e838f750e54632ccfecf0d6a218b5
+EBUILD xbmc-9999.ebuild 8715 SHA256 02fa3555c7743723f680a81c22546800d72d0508613ee21e1083aff8920cfe70 SHA512 25e16a01f29280e5eadbd41664cd5f6ee356fc5ed70093fde5c93ed6ab8ff5a398344e05d8d2c86903eed48591462cd9c91d977981ed6427a64a1c0a91e0c9ba WHIRLPOOL ec5c60e662c50ba4688a73af24b710b3d1736465e95aee79e8ffa047fc4ca98a8539f6696db08bb5d403292c781fc61f57a661a6faec2ef71592a002b6cc58c0
+MISC ChangeLog 32322 SHA256 41f9c3547e2dd3ffa67989ecbd22c002d3030d6acc88b42d470c27c01b1219e3 SHA512 8e1923cca613f291c94076035d82fe26c5fda8da0e22c8d53f520694eeb2373520a56bc3d5fefccc4f74ccf09d552f5357e86419005d2d359adfd449f5b85582 WHIRLPOOL 9a25f888dab4a13b03045ff59c288fefdd38d84ae9e426026e190fb1ef25375421e6b3ebdd96d8875b3d44af012c3e148f7820a760e7131acc5b9ea268a762d8
 MISC metadata.xml 1140 SHA256 00929104e646c293b0ee5dc8a42701b940a0e908f7293c15a277ce138a56999a SHA512 e6a4b148543b613ffad57925310bc7562629e18f726cc958bf2de64020b0ec3d72cf82eb2e506a194c1c3610361d96ff41245d1e7a411be08f87719abbb80410 WHIRLPOOL 92f8748f2fedb7fe0bd34ed29e4e4ff25cb55b7ceacc15a9a4c561c3544530d216d5494de1862591156f3290e641a38aa91000c2b33e850d8a923e1818eb5ac1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHqtnIACgkQvFcC4BYPU0qg/QCfR8NHqPiMv3CE+Opj1kJ6CCtI
-MTUAoIftDi/tluUwae5OB9hlVdtewudg
-=N90S
+iEYEAREIAAYFAlICmPMACgkQvFcC4BYPU0roxgCgmwn0oDV44lnG7icoMbIGaCyX
+nEkAnAjZX/4QHaLQw96slZ31V0ZaoZaw
+=A0Ke
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 79ff6f744703..07cd82002ad4 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.148 2013/07/20 16:10:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.149 2013/08/07 18:58:58 aballier Exp $
 
 EAPI=5
 
@@ -91,7 +91,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	media-libs/tiff
 	pulseaudio? ( media-sound/pulseaudio )
 	media-sound/wavpack
-	|| ( >=media-video/ffmpeg-1.0[encode] ( media-libs/libpostproc >=media-video/libav-9[encode] ) )
+	|| ( >=media-video/ffmpeg-1.2.1:=[encode] ( media-libs/libpostproc >=media-video/libav-10_alpha:=[encode] ) )
 	rtmp? ( media-video/rtmpdump )
 	avahi? ( net-dns/avahi )
 	nfs? ( net-fs/libnfs )
@@ -114,7 +114,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	vaapi? ( x11-libs/libva[opengl] )
 	vdpau? (
 		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
-		|| ( >=media-video/ffmpeg-1.2.1[vdpau] >=media-video/libav-10_alpha[vdpau] )
+		|| ( >=media-video/ffmpeg-1.2.1:=[vdpau] >=media-video/libav-10_alpha:=[vdpau] )
 	)
 	X? (
 		x11-apps/xdpyinfo
@@ -138,6 +138,13 @@ S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
 	python-single-r1_pkg_setup
+
+	if has_version 'media-video/libav' ; then
+		ewarn "Building ${PN} against media-video/libav is not supported upstream."
+		ewarn "It requires building a (small) wrapper library with some code"
+		ewarn "from media-video/ffmpeg."
+		ewarn "If you experience issues, please try with media-video/ffmpeg."
+	fi
 }
 
 src_unpack() {
@@ -206,6 +213,7 @@ src_configure() {
 		--disable-ccache \
 		--disable-optimizations \
 		--enable-external-libraries \
+		$(has_version 'media-video/libav' && echo "--enable-libav-compat") \
 		--enable-gl \
 		$(use_enable airplay) \
 		$(use_enable avahi) \