Update paths to run autotools in #330473 by hal. Add support for USE=rtmp #331983 by Daniel Marmander.

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

4 files changed, 20 insertions, 11 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 1ca67b743b3f..25273c3a63a3 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.62 2010/07/11 19:39:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.63 2010/08/12 05:12:04 vapier Exp $
+
+  12 Aug 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
+  metadata.xml:
+  Update paths to run autotools in #330473 by hal. Add support for USE=rtmp
+  #331983 by Daniel Marmander.
 
   11 Jul 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
   Update lsb_release sed to match latest svn #326949 by BT.
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index fb004c290d50..fb1613acbe92 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -9,13 +9,14 @@ AUX xbmc-9.11-use-cdio-system-headers-on-non-win32.patch 3623 RMD160 d8b6d48a072
 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-r4.ebuild 5704 RMD160 de3987bef34192292be9aa0cee35d014a2144335 SHA1 b2060e366457354533fe8b858ac6bd7a77ae09ee SHA256 5b396e1186d1bf500fff19605a2d384dd1440f1b75508434ca3a268ca0d7ed3f
-EBUILD xbmc-9999.ebuild 4976 RMD160 19848b4d1b0f41798750bde4f9437a9731217188 SHA1 71304af99dd587dd676b0e379aa1cbe94e1f656f SHA256 19a5ae47081fb49ea44a8ab517627bc83833e52b3f9360346ac6ab0de1c9ed23
-MISC ChangeLog 10331 RMD160 92a703e19f5d81b35e932e75c0634344c881502b SHA1 17d34e15f6c2f156d336bcf68e9e8632b921ee17 SHA256 5f20cd3447a964736792e39dff6a49c37e311f3a3d8e269ed8d3a98680429e69
-MISC metadata.xml 446 RMD160 8784194c0d5667ad0a7a662e090aaf2006a2dc9a SHA1 28161d5a31a40fb383431a1b069b45270938bcc2 SHA256 ef0d7c7d3311d8a7b2b534d8e0e5ae8216dbbc91bb1a808d7d427f828be5bad8
+EBUILD xbmc-9999.ebuild 5034 RMD160 1834edc556bba3369b2e58de7c4bd083920e35ea SHA1 b631fdb8fc8769e951f685c57751e69b59458f34 SHA256 187b79c0a7392db1a6b1843ea46f58ad5b48afc04b7c154cb7fed2d137ff95a7
+MISC ChangeLog 10523 RMD160 6c97e1ad473c8a17c88f2e8adade4cd445aeae67 SHA1 0da2545a2c85702ccd0534c344234e9e88b05b85 SHA256 96b11ee62696972115f743e9775a34a0362a539af6f0cc1d7bf93f272d1b561f
+MISC core 409600 RMD160 fdec4c2a93eed95d87f832bbabca79a631a28b64 SHA1 001f0b885d417140a249a277e501a9d5a11c066d SHA256 5a11622177c77344382f3898e16c13c36e10aeef3017254c3576b4f636f79c11
+MISC metadata.xml 522 RMD160 6dc317549d35bae6b928582e565ea4948558cc42 SHA1 34bdd9c580b2a9df1d29bddf5e3a828893fc48a2 SHA256 30a02a372519f68a4ff3aa47e17bf976a51583516bd8928550f9167989868af8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iF4EAREIAAYFAkw6HVwACgkQTwhj9JtAlp5EwwD8DEdlpURWen+CYKrf9lTAzKAq
-pKK4py90iKiE/u/cNXYBAIHhC/OEdpBGyr7NgVhDxThUNH3gz5/6XLAOA4i9lNiw
-=XYTa
+iF4EAREIAAYFAkxjgxMACgkQTwhj9JtAlp7C2QEAh0Cfgbxuyk7Y33Ja4aqGtj7G
+mau5htKz2TArBXLg8zYBAJ5S1AK5mJnqPLTrUP8UTKVIHcmcvZvb1OryMV2Vdib3
+=KqVx
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/metadata.xml b/media-tv/xbmc/metadata.xml
index f9a7e9b51417..e1eefaa00659 100644
--- a/media-tv/xbmc/metadata.xml
+++ b/media-tv/xbmc/metadata.xml
@@ -4,8 +4,9 @@
 <herd>xbox</herd>
 <use>
  <flag name='midi'>Support MIDI files</flag>
- <flag name='xrandr'>Support X randr extension</flag>
+ <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag>
  <flag name='vaapi'>Enables VAAPI (Video Acceleration API) for hardware decoding</flag>
  <flag name='vdpau'>enable support for Video Decode and Presentation API for Unix</flag>
+ <flag name='xrandr'>Support X randr extension</flag>
 </use>
 </pkgmetadata>
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index f151f5954592..ae1854f7ea90 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.59 2010/07/11 19:39:07 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.60 2010/08/12 05:12:04 vapier Exp $
 
 EAPI="2"
 
@@ -26,7 +26,7 @@ HOMEPAGE="http://xbmc.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac alsa altivec avahi css debug hal joystick midi profile pulseaudio sse sse2 vaapi vdpau xrandr"
+IUSE="aac alsa altivec avahi css debug hal joystick midi profile pulseaudio rtmp sse sse2 vaapi vdpau xrandr"
 
 RDEPEND="virtual/opengl
 	app-arch/bzip2
@@ -72,6 +72,7 @@ RDEPEND="virtual/opengl
 	pulseaudio? ( media-sound/pulseaudio )
 	media-sound/wavpack
 	media-video/ffmpeg
+	rtmp? ( media-video/rtmpdump )
 	avahi? ( net-dns/avahi )
 	net-misc/curl
 	|| ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.3 )
@@ -118,7 +119,7 @@ src_prepare() {
 
 	# some dirs ship generated autotools, some dont
 	local d
-	for d in . xbmc/cores/dvdplayer/Codecs/{libbdnav,libdvd/lib*/} lib/cpluff ; do
+	for d in . xbmc/cores/dvdplayer/Codecs/{libdts,libdvd/lib*/} lib/cpluff ; do
 		[[ -e ${d}/configure ]] && continue
 		pushd ${d} >/dev/null
 		einfo "Generating autotools in ${d}"
@@ -176,6 +177,7 @@ src_configure() {
 		$(use_enable midi mid) \
 		$(use_enable profile profiling) \
 		$(use_enable pulseaudio pulse) \
+		$(use_enable rtmp) \
 		$(use_enable vaapi) \
 		$(use_enable vdpau) \
 		$(use_enable xrandr)