commit: cae898423cca6b1b396888ea309cc1e19624881e
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 2 11:37:34 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Oct 2 12:36:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cae89842
media-video/vlc: Use zeroconf instead of avahi USE flag (#477620)
Package-Manager: portage-2.3.1
media-video/vlc/vlc-2.2.9999.ebuild | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild
b/media-video/vlc/vlc-2.2.9999.ebuild
index 4602766..4593b11 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.9999.ebuild
@@ -38,7 +38,7 @@ if [[ ${PV} != *9999 ]] ; then
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd"
fi
-IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
+IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec
+avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug
directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk
fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls
@@ -50,7 +50,7 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
png +postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse
svg +swscale
taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
- vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zvbi"
+ vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zvbi zeroconf"
RDEPEND="
!<media-video/ffmpeg-1.2:0
@@ -61,7 +61,6 @@ RDEPEND="
a52? ( >=media-libs/a52dec-0.7.4-r3:0 )
aalib? ( media-libs/aalib:0 )
alsa? ( >=media-libs/alsa-lib-1.0.24:0 )
- avahi? ( >=net-dns/avahi-0.6:0[dbus] )
avcodec? (
!libav? ( media-video/ffmpeg:0= )
libav? ( media-video/libav:0= )
@@ -154,7 +153,9 @@ RDEPEND="
!libav? ( media-video/ffmpeg:0=[vaapi] )
libav? ( media-video/libav:0=[vaapi] )
)
- vcdx? ( >=dev-libs/libcdio-0.78.2:0
>=media-video/vcdimager-0.7.22:0 )"
+ vcdx? ( >=dev-libs/libcdio-0.78.2:0
>=media-video/vcdimager-0.7.22:0 )
+ zeroconf? ( >=net-dns/avahi-0.6:0[dbus] )
+"
# Temporarily block non-live FFMPEG versions as they break vdpau, 9999 works;
# thus we'll have to wait for a new release there.
@@ -320,7 +321,6 @@ src_configure() {
$(use_enable altivec) \
$(use_enable atmo) \
$(use_enable audioqueue) \
- $(use_enable avahi bonjour) \
$(use_enable avcodec) \
$(use_enable avformat) \
$(use_enable bidi fribidi) \
@@ -428,6 +428,7 @@ src_configure() {
$(use_enable xcb) \
$(use_enable xml libxml2) \
$(use_enable xv xvideo) \
+ $(use_enable zeroconf bonjour) \
$(use_enable zvbi) $(use_enable !zvbi telx) \
--disable-asdcp \
--disable-coverage \
