Add USE=goom to control GOOM support #385447 by BT. Run autotools in new goom subdir #386471 by BT.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

4 files changed, 22 insertions, 11 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index 2fb647ee62c7..e51394fbd8c8 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.102 2011/10/09 17:42:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.103 2011/10/09 17:46:43 vapier Exp $
+
+  09 Oct 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
+  metadata.xml:
+  Add USE=goom to control GOOM support #385447 by BT. Run autotools in new goom
+  subdir #386471 by BT.
 
   09 Oct 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild,
   metadata.xml:
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index dd43c4ddf0d0..cc3b6505cdc9 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -7,13 +7,13 @@ AUX xbmc-10.1-headers.patch 294 RMD160 74536be4a5e3b939c6360bbc715f30e08226af46
 AUX xbmc-10.1-libpng-1.5.patch 19253 RMD160 1488504816e668fceb1c3f762738864ea81fa940 SHA1 06e90834bc665eabc3f4e587d551b93af87c1ba5 SHA256 1a0985b91ee9862a538a43689d005dc88d49bf5a70d917896fb69ee416369ff7
 DIST xbmc-10.1.tar.gz 130187822 RMD160 a4ddb06b396b8ae437bf30bea5b44396b54ebc5b SHA1 7a9f4e2c18a23d687ecfc744f2e051e4f88ef01a SHA256 3403195b7eb1d076523f2394793b7f050df00743892b031f6fea86b998559d8a
 EBUILD xbmc-10.1.ebuild 5463 RMD160 571dac42271ecd8bbd48ff3b384110e2fe73a13c SHA1 a878f814b6ce4a166a763382baf5c4ee7be33899 SHA256 b840faf7b9a81148474c2584985f85592756217bd839259c23481519c2f82fba
-EBUILD xbmc-9999.ebuild 5045 RMD160 5822e558c25f6fb3aa92d1ceb310aac5aa583d56 SHA1 91239f429ac7ae1173df0fa627e4910412f5c7f4 SHA256 5aea255ff520f28f843152c47925fce1275197ee54cdb89a3cbab386cd03a843
-MISC ChangeLog 15995 RMD160 49195acb73596edd5fd6c04601474f8889480dea SHA1 88f3c1bc22ab82dadb9a901f9d05b2a659d62a09 SHA256 86f8ec9e4c3c9a331d287fa1d7c2ed34362be484a6e9de93cb2c27a4607a8e11
-MISC metadata.xml 759 RMD160 f15a3145a7454e7854e0008b084fd6b7dde561be SHA1 cb9ec527c7845b8d1730c0be22efe9017b51d0e9 SHA256 211d407e0f3e3dcb91fa5ac223051fccf022fc3e060e8b0da293204ddb907d13
+EBUILD xbmc-9999.ebuild 5180 RMD160 a768ab5ba0eaa4dfae4d5a7faa4c8a1d0ea870ea SHA1 1f7c35729da7868f3a24361e08c203d00643c8e9 SHA256 79b304e06b3ca6321e84a1eecd2efe7239d695980df0623caeeecd0a6e21bf88
+MISC ChangeLog 16335 RMD160 1aa602b5226613d3758488fa46919c1f883216c3 SHA1 935ef6bb9e3883cda6c6b1fad6b67a3079ed2551 SHA256 6aa2887ee60b78c1d197a4d2f399c4430a911592bb7219272ed641c4a063bfdf
+MISC metadata.xml 885 RMD160 67687f56afd352af492d990c0d1f0b35e08c16bc SHA1 6e4782708b211b5b45d039c633e14b324f0d3805 SHA256 8a5abffe9692e42653163891290a3f48c1ae68d73597b56e3fcc8ee60ee22c2b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk6HXksACgkQaC/OocHi7JYmBwD+M61vKYXTd1FU9WPNC4V64XEY
-gLToe4O4nAak63mML0kBAIX67vd81N8llhbTkeQKItodsBLEfIiIyvGonedFOaEN
-=8nDr
+iF4EAREIAAYFAk6R3gkACgkQaC/OocHi7JaIzAD/QaAoKeECuwmSYWpNwQk2i1De
+Tqk0O5hmw5hnpIhr+xEA/RMDXO8Rz17Ib44XdCS4izI0hWTYPtVE3nbbwRQBELo5
+=wITr
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/metadata.xml b/media-tv/xbmc/metadata.xml
index 67ca3a8724f2..035500e5d94d 100644
--- a/media-tv/xbmc/metadata.xml
+++ b/media-tv/xbmc/metadata.xml
@@ -5,6 +5,7 @@
 <use>
  <flag name='airplay'>enable AirPlay support</flag>
  <flag name='bluray'>Enable playback of Blu-ray filesystems</flag>
+ <flag name='goom'>Enable GOOM visualization plugin</flag>
  <flag name='midi'>Support MIDI files</flag>
  <flag name='projectm'>Enable projectM visualization plugin</flag>
  <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag>
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index ee6c1f07b83c..f62f9dcf6e28 100644
--- a/media-tv/xbmc/xbmc-9999.ebuild
+++ b/media-tv/xbmc/xbmc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.91 2011/10/09 17:42:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.92 2011/10/09 17:46:43 vapier Exp $
 
 EAPI="2"
 
@@ -22,7 +22,7 @@ HOMEPAGE="http://xbmc.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="airplay alsa altivec avahi bluray css debug joystick midi profile +projectm pulseaudio +rsxs rtmp +samba sse sse2 udev vaapi vdpau webserver +xrandr"
+IUSE="airplay alsa altivec avahi bluray css debug goom joystick midi profile +projectm pulseaudio +rsxs rtmp +samba sse sse2 udev vaapi vdpau webserver +xrandr"
 
 COMMON_DEPEND="virtual/opengl
 	app-arch/bzip2
@@ -113,7 +113,12 @@ src_unpack() {
 src_prepare() {
 	# some dirs ship generated autotools, some dont
 	local d
-	for d in . lib/{libdvd/lib*/,cpluff,libapetag,libid3tag/libid3tag} xbmc/screensavers/rsxs-* ; do
+	for d in \
+		. \
+		lib/{libdvd/lib*/,cpluff,libapetag,libid3tag/libid3tag} \
+		xbmc/screensavers/rsxs-* \
+		xbmc/visualizations/Goom/goom2k4-0
+	do
 		[[ -e ${d}/configure ]] && continue
 		pushd ${d} >/dev/null
 		einfo "Generating autotools in ${d}"
@@ -161,13 +166,13 @@ src_configure() {
 		--disable-ccache \
 		--disable-optimizations \
 		--enable-external-libraries \
-		--enable-goom \
 		--enable-gl \
 		$(use_enable airplay) \
 		$(use_enable avahi) \
 		$(use_enable bluray libbluray) \
 		$(use_enable css dvdcss) \
 		$(use_enable debug) \
+		$(use_enable goom) \
 		--disable-hal \
 		$(use_enable joystick) \
 		$(use_enable midi mid) \