Patch by hal to control more visualizers #536610.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 29 insertions, 23 deletions

diff --git a/media-tv/kodi/ChangeLog b/media-tv/kodi/ChangeLog
index f75e32003eba..376a99686447 100644
--- a/media-tv/kodi/ChangeLog
+++ b/media-tv/kodi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/kodi
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/ChangeLog,v 1.15 2015/04/11 20:46:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/ChangeLog,v 1.16 2015/04/20 20:59:03 vapier Exp $
+
+  20 Apr 2015; Mike Frysinger <vapier@gentoo.org> kodi-9999.ebuild,
+  metadata.xml:
+  Patch by hal to control more visualizers #536610.
 
   11 Apr 2015; Mike Frysinger <vapier@gentoo.org> kodi-9999.ebuild:
   Drop sdl deps for USE=texturepacker as upstream no longer needs it #546052 by
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index ab7523e29d92..ff4d9df1218e 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -10,23 +10,23 @@ AUX kodi-9999-texturepacker.patch 470 SHA256 0d60b8da26ce018641701bea14c91f2f5a3
 DIST kodi-14.1-generated-addons.tar.xz 71072 SHA256 0666eae88a3214f7577544975524b95a9f55b107cde5124d5d299351427c5d39 SHA512 a26889ba8af33316ac61bbf5a55ec6cd72cb867eac9b6d7c626ff890f3287de8704cf8372a5e2b72d6075ab8c31ba3d8465d1da0c9437065fe6e0171a560142f WHIRLPOOL 34a7067964febd71d5e07333a1ef90c14ad3d7d09e82aa4a3245b8174b068a1b2b31d0d6e5d20a449d11d34701b59611b725c8f37ce61702489c84bda16f227a
 DIST kodi-14.1.tar.gz 70832109 SHA256 a38059e292cf8523918834e49fcc2d688525ceb7951ddf7f5ee535f4147255d6 SHA512 05dccad279073fc804faf2f179ba370f612d53c823dd333fdd151e05de37eb8202cc981ba48afff695d475bafde9c8f05f562fe09883593a70299a2f098a9849 WHIRLPOOL 464ff2673c9e65466dff73d3c91b8754ee68d64b4a18ebb0b0c6e8efa2da1cc32ab22686530a8469a105bf7a089d8928db64c5c61d272462c13485006875b506
 EBUILD kodi-14.1.ebuild 7932 SHA256 dcb1d780ca112eeab27d6606c58f3334e42aa2ba4bec477bd1d4c3a608faa00d SHA512 641874ece5313a6889fbb323f0b3786a6584dbb26a5beab4a403f7df6a776dfd33f076f51be6efe60623ef3b4819b9ceda9e46156aab446a32e86433894a2ede WHIRLPOOL 657374a3a0207868eaaeee0dbbcbae17ac41131d743a47ae58345f8e8e0e4180e84a6f9bfb3b6f546df7e02faec6364722355cca038e45b9e64897d139a0f1af
-EBUILD kodi-9999.ebuild 7660 SHA256 11e810fa55773f2574d69aff34f388bd9d76f9fd89e2d4403e97f3e6719ea20f SHA512 06e35f75f522911938a36830db5238461957441455c63967c77df5cc1024214794e774e946d3e9e39f26c1ef520ae0ec576c85341470f38c5644e69d6d9f4eb1 WHIRLPOOL 5ea509a48a0177cd2092656aae52c138ef63dc6436449e9ae3bacbec07a4d7fdc4183e3b49e8d1088859ccc50ff895b6a9c156ddade1a2fcc2367e9c91fc42fc
-MISC ChangeLog 2811 SHA256 2b2a78199495136bda4cdacd6eed2693a2abea71fbcd33b2506ae4e051cc0940 SHA512 1b13caba03dcf67a77a487fa95c8f10bcde245d3a32da3a7a6eb0626fd2508283d2ff649e2a0167ef6b6f560e0763cee576d1665a06140b90b64774ddfa881c9 WHIRLPOOL 1b223b197d0b95235816775ced7fd2cbf06dd1035c3ef98333abfb69b72b37ca8b753c2b038ad499ea00594680789ff1d3d597137c1f0cb3eabcd526269d2bd9
-MISC metadata.xml 1229 SHA256 b3703e5dbd91ef067a88a7412d0ebe32bbd4b75e3d2d43483204946fc0026288 SHA512 6c553910ad081e97fc43c02d8653976148b30f1b177a0b31a92b47845197c42c2d959bf97de6bdd0224714222c3226969618fb340a94ebf2ce7516f245cf4749 WHIRLPOOL 445ca04944870546dcd27b48486935ae4228cf4be4aeceb36ff4eb4ef421a5f27bb8adaa2aa77bcffc772b6f88734c500b7144b58f65876bd1f0f4b710b28838
+EBUILD kodi-9999.ebuild 7516 SHA256 0a40ef834c6161b432da7a72acb3d64511066aec4472ad4395eda64c728d8256 SHA512 5357d9ac888b9cdb9e0def5168d1f1970f00d387fa745bb000ad8f8f908b33def2b0fa9523c2930b4c0e71f636f541ca50df97f6281211549b623d39f0e0f5c6 WHIRLPOOL cf875afe1df6ae07a0740f4aafae6f9b431a2c6830dcfbdab0b1bcd7750822e18d4be2031ec1f0aa78cf1dac2c25eb24d9541f4a585e4cabf487c0d38f408d3a
+MISC ChangeLog 2948 SHA256 7a49739309dab15f3ad2f082f21612f5aeeaac0e30df22201c2fa3d67fc72dab SHA512 01c6d795362469fcdab9b56705ba915336af069b5386db7978479618b7c5ad03462e6020eea73aa0aa7f3bb36968f4b495975908d7224b754fcf22421b79698f WHIRLPOOL 2e5463e5017631cb7d76bb29f54a98c42d945ad8523cd69d6a50e6b1e2c697927d2c49305f32cc7d9ea1d109d954fe6ff87d8ce30feac5a9493627c27d4ddadf
+MISC metadata.xml 1363 SHA256 7a84053a0098a072ad36501caa9510eb4ae1ccd452044fe12a35f25308db7975 SHA512 f15de59f24fc15b6f4449f868f62151ebef3a90c4640072c3e19ce527825006f105a1eda2fb16f4341f228505adc2e3a3d2b582ad43784355e565f4435f61309 WHIRLPOOL c1f9d69ff1a2a2ae4155b725bdc1706a46abedf78c973859ef85aa84fc0afc5b0e0a6bc70799c1224b7cd70c1a95028701aa44aa77178ae39b586ad8dc2049a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVKYgoAAoJEPGu1DbS6WIAgGAP/RVeDkPNr7AUO/tkileyXbXg
-Ohaelm4IFbITjQtdCZrMogcDOVtjEgevd0V5MfYtK1mY627ZMu03l+c7Me+Zbbfu
-c4dM63wPL6F+cmDKucFB72QFlmsc73lcmni6C35CIUMBhiDhaeDn54wiUz1ufuhW
-X1biKw2ALabxWXTR5c1kZBm7Hamgzw/iWAZGjBnkMgfI+s90tiKoH86b1l+dZ01o
-4X2xi/s4QF9B5HmhVpi8o/LNQRAYd0iW1cii+Fm2eCuaEXDEp+HG6f/uhxvnwzpz
-UMB9jg87ZXJl8kEYP9sspzzENTblr4PT95Hn80/1A0dqOh91WKu6Ty5XwDWmsNtk
-sdkRBcxcaELCO8iczmkMMBVGjXw7tQM3AA8Cmw/1LI7t1cuunKdVhfaYL6L/7/Nq
-Vo9hSA9vDKowR323GnPyl1CPl0vxLBy62wd0lcMLyWMnYm/suXRojhIxmjb77KuJ
-PiPC+VHXEYXSH+PvC5ylFzGUVpe//BvY/864dvxRR2GynMrsPD7jXqL314yGJbcw
-R4WGjqmvMAgUR3vTkz4XUvkqT6O6jkH7EWVQsjCK7BKQ/aXBjLNw8+gy3iiPGUQ5
-/imeomb/f1lGcEzJUw5WU4/jhmn6i1J9lkIHNLCOSpLEvOdX833BszkZ1FBXnVoK
-5+sclj/1X2Yoi/HjI288
-=hrzg
+iQIcBAEBCAAGBQJVNWiYAAoJEPGu1DbS6WIAlMIP/2KFdK97d+ckOvvyrC8eI5Sc
+KIAxLgAbipjEOogp5Qjr6MxCoYCVDZix22TG5xqlRGCjpmS9dNahuVosg+l/Ab/B
+GH/uTEHjvxhYN6Ro+8TEOm2PqUw/V41nVUir4q6C8V7XgEnQi9LomVT1dnpZev7o
+e/kfun/bLGNIhot0FS7u2OrBsfftjob7tEsbJMDGNqZyw+Mtv7uXV+6VrFuOtnqm
+aruTwUefPSE6RXs4lLrDDKyzMgyXuM4E1+klLn6soXS0J4znjAIAVxKaUUCvo+45
+IB4tzl9gAwDSoQVQmPQjK6Au+UCWTB1gbTp9S5CpVgvTXbfU7wBnBgpTYwfMmjrE
+e8VFCrwCZ6aPjLSGlg/1sdRvjAnjWp51DAfgx3z7wo4BE/nUAn0TjIZE/gcwV2F+
+c0dUiN2cIzHTju6YS5a2iRNnBjSwJgqnAFVVGr2lgDDjRMDzzcwQ5Z+PBU6XXj5t
+P3gcGV3bCSmx0u/kEZAB2cv8H/SmKGrNoaDPCasEBd3UqokSh26HWQjjtQqjazvg
+P4o4GJ37Q82ZV0ajnEzDWuRXjQ5qlbgVIq+J+TZH/WeWKOvegYchzFfMVHyfiJtE
+Nn6XikKJYpoBfh6VOsus5CswbYV4niF724YM/rdl1tubHV5EAKK8cYdq4BsgcCcD
+D/UDc0/hptKUuoWD+1Bd
+=cOS3
 -----END PGP SIGNATURE-----
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 0401297c7ee5..1643231d4023 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/kodi-9999.ebuild,v 1.15 2015/04/11 20:46:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/kodi-9999.ebuild,v 1.16 2015/04/20 20:59:03 vapier Exp $
 
 EAPI="5"
 
@@ -33,7 +33,7 @@ HOMEPAGE="http://kodi.tv/ http://kodi.wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="airplay alsa avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio +rsxs rtmp +samba sftp test +texturepacker udisks upnp upower +usb vaapi vdpau webserver +X +xrandr"
+IUSE="airplay alsa avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio +rsxs rtmp +samba sftp +spectrum test +texturepacker udisks upnp upower +usb vaapi vdpau +waveform webserver +X +xrandr"
 REQUIRED_USE="
 	rsxs? ( X )
 	xrandr? ( X )
@@ -217,12 +217,14 @@ src_configure() {
 		$(use_enable rtmp) \
 		$(use_enable samba) \
 		$(use_enable sftp ssh) \
+		$(use_enable spectrum) \
 		$(use_enable usb libusb) \
 		$(use_enable test gtest) \
 		$(use_enable texturepacker) \
 		$(use_enable upnp) \
 		$(use_enable vaapi) \
 		$(use_enable vdpau) \
+		$(use_enable waveform) \
 		$(use_enable webserver) \
 		$(use_enable X x11) \
 		$(use_enable xrandr)
@@ -239,14 +241,12 @@ src_install() {
 	domenu tools/Linux/kodi.desktop
 	newicon media/icon48x48.png kodi.png
 
-	# Remove optional addons (platform specific and disabled by USE flag).
+	# Remove optional addons (platform specific).
 	local disabled_addons=(
 		repository.pvr-{android,ios,osx{32,64},win32}.xbmc.org
 		visualization.dxspectrum
+		visualization.vortex
 	)
-	use fishbmc  || disabled_addons+=( visualization.fishbmc )
-	use projectm || disabled_addons+=( visualization.{milkdrop,projectm} )
-	use rsxs     || disabled_addons+=( screensaver.rsxs.{euphoria,plasma,solarwinds} )
 	rm -rf "${disabled_addons[@]/#/${ED}/usr/share/kodi/addons/}"
 
 	# Remove fonconfig settings that are used only on MacOSX.
diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml
index 1acb8151b5f5..eb0408586326 100644
--- a/media-tv/kodi/metadata.xml
+++ b/media-tv/kodi/metadata.xml
@@ -16,7 +16,9 @@
  <flag name='rtmp'>Enable Real Time Messaging Protocol using librtmp</flag>
  <flag name='rsxs'>Enable really slick X screensavers</flag>
  <flag name='sftp'>Support browsing files over SFTP</flag>
+ <flag name='spectrum'>Enable spectrum visualization plugin</flag>
  <flag name='texturepacker'>Support packing skin textures</flag>
+ <flag name='waveform'>Enable waveform visualization plugin</flag>
  <flag name='webserver'>Enable internal webserver</flag>
  <flag name='xrandr'>Support X randr extension</flag>
 </use>