Stop installing web styles since they no longer exist #305969 by Thomas Andersson. Require opengl support in libsdl #311891 by Stijn Tintel, and require -minimal support in libcdio #311893 by Stijn Tintel. Update dodoc line #316081 by Diego E. Pettenò. Add USE=vaapi support #319701 by hal.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

2 files changed, 14 insertions, 9 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 09e643b953f5..dd5b8d349b44 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,9 +1,15 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.53 2010/05/23 18:38:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.54 2010/05/23 18:42:31 vapier Exp $
 
-  23 May 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9.11-r3.ebuild,
+  23 May 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
   metadata.xml:
+  Stop installing web styles since they no longer exist #305969 by Thomas
+  Andersson. Require opengl support in libsdl #311891 by Stijn Tintel, and
+  require -minimal support in libcdio #311893 by Stijn Tintel. Update dodoc
+  line #316081 by Diego E. Pettenò. Add USE=vaapi support #319701 by hal.
+
+  23 May 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9.11-r3.ebuild:
   Update dodoc line #316081 by Diego E. Pettenò.
 
   14 May 2010; Samuli Suominen <ssuominen@gentoo.org> xbmc-9.11-r3.ebuild:
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index bbc3a9c726b3..b46e4d2a957b 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 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.51 2010/04/07 20:39:16 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.52 2010/05/23 18:42:31 vapier Exp $
 
 EAPI="2"
 
@@ -37,7 +37,7 @@ RDEPEND="virtual/opengl
 	>=dev-lang/python-2.4
 	dev-libs/boost
 	dev-libs/fribidi
-	dev-libs/libcdio
+	dev-libs/libcdio[-minimal]
 	dev-libs/libpcre
 	dev-libs/lzo
 	>=dev-python/pysqlite-2
@@ -61,7 +61,7 @@ RDEPEND="virtual/opengl
 	media-libs/libmpeg2
 	media-libs/libogg
 	media-libs/libsamplerate
-	media-libs/libsdl[alsa,audio,video,X]
+	media-libs/libsdl[alsa,audio,opengl,video,X]
 	media-libs/libvorbis
 	media-libs/sdl-gfx
 	media-libs/sdl-image[gif,jpeg,png]
@@ -80,6 +80,7 @@ RDEPEND="virtual/opengl
 	virtual/mysql
 	x11-apps/xdpyinfo
 	x11-apps/mesa-progs
+	vaapi? ( x11-libs/libva )
 	vdpau? (
 		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
 		media-video/ffmpeg[vdpau]
@@ -170,6 +171,7 @@ src_configure() {
 		$(use_enable midi mid) \
 		$(use_enable profile profiling) \
 		$(use_enable pulseaudio pulse) \
+		$(use_enable vaapi) \
 		$(use_enable vdpau) \
 		$(use_enable xrandr)
 }
@@ -177,14 +179,11 @@ src_configure() {
 src_install() {
 	einstall || die "Install failed!"
 
-	insinto /usr/share/xbmc/web/styles/
-	doins -r "${S}"/web/*/styles/*/ || die
-
 	insinto /usr/share/applications
 	doins tools/Linux/xbmc.desktop
 	doicon tools/Linux/xbmc.png
 
-	dodoc README.linux known_issues.txt
+	dodoc README.linux
 	rm "${D}"/usr/share/xbmc/{README.linux,LICENSE.GPL,*.txt}
 }