Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/xine-lib/
Date: Sun, 27 Nov 2016 20:03:56
Message-Id: 1480277021.39a6c7d9ea2d4f72bce64fc637526032b9bd83c4.pacho@gentoo
1 commit: 39a6c7d9ea2d4f72bce64fc637526032b9bd83c4
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Sun Nov 27 19:26:37 2016 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Sun Nov 27 20:03:41 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39a6c7d9
7
8 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.
9
10 Package-Manager: portage-2.3.2
11
12 media-libs/xine-lib/metadata.xml | 2 +-
13 media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild | 6 +++---
14 media-libs/xine-lib/xine-lib-1.2.9999.ebuild | 6 +++---
15 3 files changed, 7 insertions(+), 7 deletions(-)
16
17 diff --git a/media-libs/xine-lib/metadata.xml b/media-libs/xine-lib/metadata.xml
18 index 057fb63..9d10869 100644
19 --- a/media-libs/xine-lib/metadata.xml
20 +++ b/media-libs/xine-lib/metadata.xml
21 @@ -18,7 +18,7 @@
22 container (OggFLAC), but might have better support for exotic features like
23 24-bit samples or 96kHz sample rates.
24 </flag>
25 - <flag name="fusion">
26 + <flag name="fusionsound">
27 Enable support for the Fusion audio sub system
28 </flag>
29 <flag name="gtk">
30
31 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
32 index 82c7e05..38f2b64 100644
33 --- a/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
34 +++ b/media-libs/xine-lib/xine-lib-1.2.6-r1.ebuild
35 @@ -25,7 +25,7 @@ HOMEPAGE="http://xine.sourceforge.net/"
36
37 LICENSE="GPL-2"
38 SLOT="1"
39 -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}"
40 +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}"
41
42 RDEPEND="${NLS_RDEPEND}
43 dev-libs/libxdg-basedir
44 @@ -47,7 +47,7 @@ RDEPEND="${NLS_RDEPEND}
45 dts? ( media-libs/libdca )
46 dxr3? ( media-libs/libfame )
47 flac? ( media-libs/flac )
48 - fusion? ( media-libs/FusionSound )
49 + fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 >=dev-libs/DirectFB-1.7.1[fusionsound] ) )
50 gtk? ( x11-libs/gdk-pixbuf:2 )
51 imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
52 jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
53 @@ -191,7 +191,7 @@ src_configure() {
54 $(use_with X x) \
55 $(use_with alsa) \
56 --without-esound \
57 - $(use_with fusion fusionsound) \
58 + $(use_with fusionsound) \
59 $(use_with jack) \
60 $(use_with pulseaudio) \
61 $(use_with libcaca caca) \
62
63 diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
64 index 415fe0a..eadba6e 100644
65 --- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
66 +++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
67 @@ -25,7 +25,7 @@ HOMEPAGE="http://xine.sourceforge.net/"
68
69 LICENSE="GPL-2"
70 SLOT="1"
71 -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}"
72 +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}"
73
74 RDEPEND="${NLS_RDEPEND}
75 dev-libs/libxdg-basedir
76 @@ -47,7 +47,7 @@ RDEPEND="${NLS_RDEPEND}
77 dts? ( media-libs/libdca )
78 dxr3? ( media-libs/libfame )
79 flac? ( media-libs/flac )
80 - fusion? ( media-libs/FusionSound )
81 + fusionsound? ( || ( >=media-libs/FusionSound-1.1.1 >=dev-libs/DirectFB-1.7.1[fusionsound] ) )
82 gtk? ( x11-libs/gdk-pixbuf:2 )
83 imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) )
84 jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
85 @@ -191,7 +191,7 @@ src_configure() {
86 $(use_with X x) \
87 $(use_with alsa) \
88 --without-esound \
89 - $(use_with fusion fusionsound) \
90 + $(use_with fusionsound) \
91 $(use_with jack) \
92 $(use_with pulseaudio) \
93 $(use_with libcaca caca) \