[gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/

["Pacho Ramos" <pacho@gentoo.org>]

commit:     39a6c7d9ea2d4f72bce64fc637526032b9bd83c4
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 19:26:37 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 20:03:41 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39a6c7d9

media-libs/xine-lib: Allow usage of directfb fusionsound and use the same name for the USE as the other consumer in the tree and the one upstream uses too.

Package-Manager: portage-2.3.2

 media-libs/xine-lib/metadata.xml             | 2 +-
 media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild | 6 +++---
 media-libs/xine-lib/xine-lib-1.2.9999.ebuild | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/media-libs/xine-lib/metadata.xml b/media-libs/xine-lib/metadata.xml
index 057fb63..9d10869 100644
--- a/media-libs/xine-lib/metadata.xml
+++ b/media-libs/xine-lib/metadata.xml
@@ -18,7 +18,7 @@
 			container (OggFLAC), but might have better support for exotic features like
 			24-bit samples or 96kHz sample rates.
 		</flag>
-		<flag name="fusion">
+		<flag name="fusionsound">
 			Enable support for the Fusion audio sub system
 		</flag>
 		<flag name="gtk">

diff --git a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
index 82c7e05..38f2b64 100644
--- a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="http://xine.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
 
 RDEPEND="${NLS_RDEPEND}
 	dev-libs/libxdg-basedir
@@ -47,7 +47,7 @@ RDEPEND="${NLS_RDEPEND}
 	dts? ( media-libs/libdca )
 	dxr3? ( media-libs/libfame )
 	flac? ( media-libs/flac )
-	fusion? ( media-libs/FusionSound )
+	fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 >=dev-libs/DirectFB-1.7.1[fusionsound] ) )
 	gtk? ( x11-libs/gdk-pixbuf:2 )
 	imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
@@ -191,7 +191,7 @@ src_configure() {
 		$(use_with X x) \
 		$(use_with alsa) \
 		--without-esound \
-		$(use_with fusion fusionsound) \
+		$(use_with fusionsound) \
 		$(use_with jack) \
 		$(use_with pulseaudio) \
 		$(use_with libcaca caca) \

diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index 415fe0a..eadba6e 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -25,7 +25,7 @@ HOMEPAGE="http://xine.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="1"
-IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusion gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
+IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
 
 RDEPEND="${NLS_RDEPEND}
 	dev-libs/libxdg-basedir
@@ -47,7 +47,7 @@ RDEPEND="${NLS_RDEPEND}
 	dts? ( media-libs/libdca )
 	dxr3? ( media-libs/libfame )
 	flac? ( media-libs/flac )
-	fusion? ( media-libs/FusionSound )
+	fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 >=dev-libs/DirectFB-1.7.1[fusionsound] ) )
 	gtk? ( x11-libs/gdk-pixbuf:2 )
 	imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
@@ -191,7 +191,7 @@ src_configure() {
 		$(use_with X x) \
 		$(use_with alsa) \
 		--without-esound \
-		$(use_with fusion fusionsound) \
+		$(use_with fusionsound) \
 		$(use_with jack) \
 		$(use_with pulseaudio) \
 		$(use_with libcaca caca) \