summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-07-11 19:35:11 +0000
committerMike Frysinger <vapier@gentoo.org>2010-07-11 19:35:11 +0000
commit250fc9525fd804c5ba088780646cd3d99122e830 (patch)
tree2ef8cc500d006b279dfad1fe8f5bf71222cd16ad /media-tv/xbmc
parentppc64 stable wrt #325425 (diff)
downloadgentoo-2-250fc9525fd804c5ba088780646cd3d99122e830.tar.gz
gentoo-2-250fc9525fd804c5ba088780646cd3d99122e830.tar.bz2
gentoo-2-250fc9525fd804c5ba088780646cd3d99122e830.zip
Only require libsdl[alsa] when xbmc is being built with USE=alsa #327727 by Džen.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-tv/xbmc')
-rw-r--r--media-tv/xbmc/ChangeLog7
-rw-r--r--media-tv/xbmc/xbmc-9.11-r4.ebuild5
-rw-r--r--media-tv/xbmc/xbmc-9999.ebuild5
3 files changed, 12 insertions, 5 deletions
diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index caf19f7cd2db..c423e64f917f 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.60 2010/06/21 20:01:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.61 2010/07/11 19:35:11 vapier Exp $
+
+ 11 Jul 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9.11-r4.ebuild,
+ xbmc-9999.ebuild:
+ Only require libsdl[alsa] when xbmc is being built with USE=alsa #327727
+ by Džen.
21 Jun 2010; Mike Frysinger <vapier@gentoo.org> xbmc-9.11-r4.ebuild:
Fix building with ffmpeg-0.6 #324293 by Alexis Ballier.
diff --git a/media-tv/xbmc/xbmc-9.11-r4.ebuild b/media-tv/xbmc/xbmc-9.11-r4.ebuild
index d0b6d0367ff5..e8eac86c0c44 100644
--- a/media-tv/xbmc/xbmc-9.11-r4.ebuild
+++ b/media-tv/xbmc/xbmc-9.11-r4.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-9.11-r4.ebuild,v 1.3 2010/06/21 20:01:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9.11-r4.ebuild,v 1.4 2010/07/11 19:35:11 vapier Exp $
EAPI="2"
@@ -60,7 +60,8 @@ RDEPEND="virtual/opengl
media-libs/libmpeg2
media-libs/libogg
media-libs/libsamplerate
- media-libs/libsdl[alsa,audio,opengl,video,X]
+ media-libs/libsdl[audio,opengl,video,X]
+ alsa? ( media-libs/libsdl[alsa] )
media-libs/libvorbis
media-libs/sdl-gfx
media-libs/sdl-image[gif,jpeg,png]
diff --git a/media-tv/xbmc/xbmc-9999.ebuild b/media-tv/xbmc/xbmc-9999.ebuild
index 10191bc88ee0..0a6615cfed4e 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.57 2010/06/19 00:57:39 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-9999.ebuild,v 1.58 2010/07/11 19:35:11 vapier Exp $
EAPI="2"
@@ -61,7 +61,8 @@ RDEPEND="virtual/opengl
media-libs/libmpeg2
media-libs/libogg
media-libs/libsamplerate
- media-libs/libsdl[alsa,audio,opengl,video,X]
+ media-libs/libsdl[audio,opengl,video,X]
+ alsa? ( media-libs/libsdl[alsa] )
media-libs/libvorbis
media-libs/sdl-gfx
media-libs/sdl-image[gif,jpeg,png]