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.

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

3 files changed, 28 insertions, 14 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/Manifest b/media-tv/xbmc/Manifest
index 4ced107f143e..d48766262947 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -1,10 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX xbmc-9.11-jpeg-speedup.patch 804 RMD160 2aff1749ee8f4b85ce9199a78fcfb779c373d086 SHA1 ecef76650156b7fcba60f909496e43ae83bafd20 SHA256 3115b8668b60e307536a9314fc02c837d4f94f89571d403761b614a22447e2d8
 AUX xbmc-9.11-libpng14.patch 4263 RMD160 90a82d1783f2237416c0932c968347394f303bf9 SHA1 69407df931476df7fd20b30ddc42142d11602d8f SHA256 0516a466f2646867478781251d665e87f6f0697fcd9ce29b91c87194fafc7da6
 AUX xbmc-9.11-use-cdio-system-headers-on-non-win32.patch 3623 RMD160 d8b6d48a07265238bc1bd6425c53e7a52a679751 SHA1 1d4d41d00973c4199f866a7988a709a188683403 SHA256 ceb6952025c8baf5bb4eed18380c9bf6022893407f22a3e587eebd657863ab83
 AUX xbmc-9.11-wavpack.patch 2637 RMD160 35a7f5446aaef27ff563da4a8200616fffb66e00 SHA1 0f9a2845a5b9d0b554569f1379af0557b071ef69 SHA256 b09e9072f0a2d4451588c40b0b300611944ba7d4cefbae0c400389ed9f8485dc
 DIST xbmc-9.11.tar.gz 141420517 RMD160 0d0890ba373e05af95a66360aed8871b384849f2 SHA1 71956ed8630d46662e49de9d96304308078f10b5 SHA256 e810aaaf1c380bbe923d9e30e2e472577081b7b893e12a7ef4bb70a911c3db87
-EBUILD xbmc-9.11-r3.ebuild 5082 RMD160 0ad34972905c5bd13af3dee3a4e0ef748ecb9492 SHA1 4da442ca485c22986676a61babd1e25d745e2b71 SHA256 60d2dcc3f02136746ff6da63036125c1b2a1e7426f9c712dbee099b5a421132c
-EBUILD xbmc-9.11.ebuild 4870 RMD160 a1f738d3d5647f8f19e11b8c0485f8d0512db411 SHA1 aa3f3552a9525ef278d595e73afdd95dbdc8a491 SHA256 326c6107cc741ebc95078152bdb7504c8f9433ef1d14b3476f82caf97cd4171d
-EBUILD xbmc-9999.ebuild 4692 RMD160 0bfdc087511bc54aaa9c9cd614beb25fdcf363c3 SHA1 39ccb0837dd50829b52059f9266db1e6247300a1 SHA256 e9d6d0da73944ae8a6e5652f069b02d6c3f9fa40fd2ff3ccdd766e4c17137a82
-MISC ChangeLog 8426 RMD160 088367b22fedd1bff176363dad37355d53ef6555 SHA1 79dfa4f9504ba0fd175b32074719813513b753c3 SHA256 d93df57385745c79ff468a7beed80dd9748edf25834904114d274bc2f380d415
-MISC metadata.xml 358 RMD160 8354f40b2d941f8ebc0db2cd8b99b6c16b2dafa8 SHA1 0eebcbd3433e90ea0d4ae42a3bcb4eb03cbd3482 SHA256 a0f7b8cfe098a2c32ef837e1cda5e5417b4d470472b19c92ac3c8ecb4b653aae
+EBUILD xbmc-9.11-r3.ebuild 5062 RMD160 bd1d51bf0637833c8ea1e6a79a00bc0a5dbbeaa1 SHA1 bd451c1b37c11d800496d40a5657b2ac21d65ed8 SHA256 0f34e65defa5b970eb91e69d42ac1e37ab032797e2d98fc8b7386d736ab983ad
+EBUILD xbmc-9999.ebuild 4662 RMD160 f63c7edcdd88f7a7fd9f44172b2fb131b45ce318 SHA1 4996b6be88fd242d402f0f35e1ae210fd9a4688a SHA256 11ee06c04e64c14879a0b9f9e2915156e0849979b721f0d995c568e6b8d6183a
+MISC ChangeLog 8930 RMD160 154b5c73281a79d870e1a54fb10bd069f5c2eb49 SHA1 c8d54bfbc09ae839f8e77f09ce5389f2edd58bd0 SHA256 4e2ab53721284b66431efe1dc5663e39986d259247d7e62193bceea3ddec3540
+MISC metadata.xml 446 RMD160 8784194c0d5667ad0a7a662e090aaf2006a2dc9a SHA1 28161d5a31a40fb383431a1b069b45270938bcc2 SHA256 ef0d7c7d3311d8a7b2b534d8e0e5ae8216dbbc91bb1a808d7d427f828be5bad8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iF4EAREIAAYFAkv5dygACgkQTwhj9JtAlp6TRwEAld7mxetuwVp6dRQU+8dLCAvX
++4HT70qisLN1c+eZen0A/3+XxRLOMe1HrAJuuaG8VWrMJZQQcOcl8PsUwgxQSibw
+=jcE+
+-----END PGP SIGNATURE-----
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}
 }