Drop pmount depend now #293108 by hal. Switch back to external faad2 #294059 by Michael Lawrence. Add USE="avahi css aac midi xrandr" and add missing deps for USE="pulseaudio vdpau" #293968 by Craig Andrews.

Package-Manager: portage-2.2_rc51/cvs/Linux x86_64

4 files changed, 32 insertions, 20 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 4500960b6e99..bcb1edfe560f 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.33 2009/11/08 14:34:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.34 2009/11/22 20:24:50 vapier Exp $
+
+  22 Nov 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
+  Drop pmount depend now #293108 by hal. Switch back to external faad2
+  #294059 by Michael Lawrence. Add USE="avahi css aac midi xrandr" and add
+  missing deps for USE="pulseaudio vdpau" #293968 by Craig Andrews.
 
   08 Nov 2009; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
   Control squish altivec/sse support via USE #290564 by Francisco González.
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index fedecaab2625..be8f29432ba4 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -6,13 +6,13 @@ DIST 9.04.1_Babylon-linux-osx-win32-repack.tar.gz 171093731 RMD160 143f42f6eef82
 DIST XBMC_9.04_Babylon-linux-osx-win32.tar.bz2 111993901 RMD160 7b108c0d22ca31895008d056e3f681e3c98386e2 SHA1 097db32fa4ae4ced0c8d101195d040a81a6ca105 SHA256 2a477b51578e345112859ea06d20abea03a7e6d079ac4012670b1b1b82b3faed
 EBUILD xbmc-9.04.1.ebuild 3647 RMD160 2032e33b5445797fd2c3eb5bead9ac5129449b9d SHA1 22e90400103e21030a94918d52472d9d8f9db864 SHA256 4ea25a3ea6d5f8335266d6d6740d0ba1f91902403e505244c246ac5f950438bf
 EBUILD xbmc-9.04.ebuild 3511 RMD160 f295863fe5fbbd6eda9e1f291eb67caeb0cd8ae2 SHA1 e4a4dfb232ec4991c8e3e06660ae7739fcff8d90 SHA256 e2b095c1e303bb669f934fccd3cb69bbde3deeff8eec7908b933774bfe9207c4
-EBUILD xbmc-9999.ebuild 4007 RMD160 7a98872e6dfddbb89cf3fb56fe3e85e38b8db2d4 SHA1 675f6f7acdaffbff5e886e372cc70dc09636a94e SHA256 ddade07efe268b3bb5848f15e1ee2fbe54e9e40029ca66c3bb2ce6f2de1831c2
-MISC ChangeLog 5118 RMD160 e854fefed75da68da0f31d3b82b0ee3534ce53f7 SHA1 dfff59142ab5600e44bde9bbce65817875673527 SHA256 8723b4478eb70c0e862cf59e499acd0f4034b881a050c322469c18de98104016
-MISC metadata.xml 259 RMD160 1451e37fea39b948f3e6f0c0eb20c8d9e41801f0 SHA1 73240b8832bc707628304061d6980bdf7d6baa28 SHA256 31764ed43ab7fbf241987d089733cd337e410b53f3135ff020a13ed24793af64
+EBUILD xbmc-9999.ebuild 4154 RMD160 9bb46d16fcf4892f836badfcf849494f66aec822 SHA1 de137b993690c5ffddf8aed12484fd75fc6f9175 SHA256 fd54d953ac0dbd8efd8414546507f7fab9c201c97daf413cf6cb3208e7343f25
+MISC ChangeLog 5401 RMD160 c844b9981262ea38c92aa030537868e5767c578c SHA1 ade69b4f6f509adff248feaadb1145a4bf05b594 SHA256 e2d1998f1934eca1e7cbd736a83959e8d608c1950aca30400ff85f1304e4232a
+MISC metadata.xml 358 RMD160 8354f40b2d941f8ebc0db2cd8b99b6c16b2dafa8 SHA1 0eebcbd3433e90ea0d4ae42a3bcb4eb03cbd3482 SHA256 a0f7b8cfe098a2c32ef837e1cda5e5417b4d470472b19c92ac3c8ecb4b653aae
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAkr214AACgkQlPl3HsVfCDrtPwCfb+aiZJkPOm9hGjSP5+GffWYT
-HIsAnjRgRJyK+BE2/1hGjAiVog4rCNq1
-=IS57
+iEYEARECAAYFAksJnvUACgkQlPl3HsVfCDpSawCdFQgAXE+Hf7P2Pj4iu19931/u
+CIUAn0p8+lqv2VWVoxUWrCrPIhILMwmJ
+=TKcb
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/metadata.xml b/media-tv/xbmc/metadata.xml
index 04763c7d05de..ed11ef8fb163 100644
--- a/media-tv/xbmc/metadata.xml
+++ b/media-tv/xbmc/metadata.xml
@@ -3,6 +3,8 @@
 <pkgmetadata>
 <herd>xbox</herd>
 <use>
+ <flag name='midi'>Support MIDI files</flag>
+ <flag name='xrandr'>Support X randr extension</flag>
  <flag name='vdpau'>enable support for Video Decode and Presentation API for Unix</flag>
 </use>
 </pkgmetadata>
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 72313ef688a2..8ff70c639578 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.38 2009/11/08 14:34:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.39 2009/11/22 20:24:50 vapier Exp $
 
 # XXX: be nice to split out packages that come bundled and use the
 #      system libraries ...
@@ -26,7 +26,7 @@ HOMEPAGE="http://xbmc.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa altivec debug joystick opengl profile pulseaudio sse sse2 vdpau"
+IUSE="aac alsa altivec css debug joystick midi opengl profile pulseaudio sse sse2 vdpau xrandr"
 
 RDEPEND="opengl? ( virtual/opengl )
 	app-arch/bzip2
@@ -43,15 +43,18 @@ RDEPEND="opengl? ( virtual/opengl )
 	>=dev-python/pysqlite-2
 	media-libs/a52dec
 	media-libs/alsa-lib
-	media-libs/faac
+	aac? ( media-libs/faac )
+	media-libs/faad2
 	media-libs/flac
 	media-libs/fontconfig
 	media-libs/freetype
 	media-libs/glew
 	media-libs/jasper
 	media-libs/jbigkit
+	media-libs/jpeg
 	>=media-libs/libass-0.9.7
 	media-libs/libdca
+	css? ( media-libs/libdvdcss )
 	media-libs/libmad
 	media-libs/libmms
 	media-libs/libmpeg2
@@ -64,20 +67,22 @@ RDEPEND="opengl? ( virtual/opengl )
 	media-libs/sdl-mixer
 	media-libs/sdl-sound
 	media-libs/tiff
+	pulseaudio? ( media-sound/pulseaudio )
 	media-sound/wavpack
 	media-video/ffmpeg
+	avahi? ( net-dns/avahi )
 	net-misc/curl
 	net-fs/samba
 	sys-apps/dbus
 	sys-apps/hal
-	sys-apps/pmount
+	sys-libs/zlib
 	virtual/mysql
 	x11-apps/xdpyinfo
 	x11-apps/mesa-progs
+	vdpau? ( >=x11-drivers/nvidia-drivers-180.51 )
 	x11-libs/libXinerama
-	x11-libs/libXrandr
+	xrandr? ( x11-libs/libXrandr )
 	x11-libs/libXrender"
-# media-libs/faad2 we use internal one for now
 DEPEND="${RDEPEND}
 	x11-proto/xineramaproto
 	dev-util/cmake
@@ -111,12 +116,6 @@ src_prepare() {
 	# Tweak autotool timestamps to avoid regeneration
 	find . -type f -print0 | xargs -0 touch -r configure
 
-	# use internal faad2 as mp4ff is dead and xbmc hasnt
-	# switched to libmp4v2 yet
-	sed -i \
-		-e '/use_external_libfaad/s:use_external_libraries:FOOOO:' \
-		configure || die
-
 	# Fix XBMC's final version string showing as "exported"
 	# instead of the SVN revision number.
 	export SVN_REV=${ESVN_WC_REVISION:-exported}
@@ -140,12 +139,18 @@ src_configure() {
 		--disable-ccache \
 		--disable-optimizations \
 		--enable-external-libraries \
+		--enable-goom \
+		$(use_enable avahi) \
+		$(use_enable css dvdcss) \
 		$(use_enable debug) \
+		$(use_enable aac faac) \
 		$(use_enable joystick) \
+		$(use_enable midi mid) \
 		$(use_enable opengl gl) \
 		$(use_enable profile profiling) \
 		$(use_enable pulseaudio pulse) \
-		$(use_enable vdpau)
+		$(use_enable vdpau) \
+		$(use_enable xrandr)
 }
 
 src_install() {