commit: 68480c1bb080501481136cb207c576543bf41ea4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 1 19:45:27 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 2 08:56:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68480c1b
media-video/vlc: Merge USE=microdns into chromecast
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-video/vlc/vlc-3.0.3-r1.ebuild | 17 ++++++-----------
media-video/vlc/vlc-3.0.9999.ebuild | 15 +++++----------
media-video/vlc/vlc-9999.ebuild | 15 +++++----------
3 files changed, 16 insertions(+), 31 deletions(-)
diff --git a/media-video/vlc/vlc-3.0.3-r1.ebuild
b/media-video/vlc/vlc-3.0.3-r1.ebuild
index 848949599d6..23f9b8241fc 100644
--- a/media-video/vlc/vlc-3.0.3-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.3-r1.ebuild
@@ -33,7 +33,7 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb
chromaprint chromecast dbus
debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth
fontconfig
+gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass
libav libcaca
libnotify +libsamplerate libtar libtiger linsys lirc live lua
macosx-notifications
- macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses
neon nfs ogg
+ macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg
omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5
rdp rtsp
run-as-root samba schroedinger sdl-image sftp shout sid skins soxr
speex srt ssl svg
taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc
vorbis vpx
@@ -70,7 +70,10 @@ RDEPEND="
bluray? ( media-libs/libbluray:0= )
cddb? ( media-libs/libcddb:0 )
chromaprint? ( media-libs/chromaprint:0= )
- chromecast? ( >=dev-libs/protobuf-2.5.0:= )
+ chromecast? (
+ >=dev-libs/protobuf-2.5.0:=
+ >=net-libs/libmicrodns-0.0.9:=
+ )
dbus? ( sys-apps/dbus:0 )
dc1394? (
media-libs/libdc1394:2
@@ -130,7 +133,6 @@ RDEPEND="
dev-libs/libebml:0=
media-libs/libmatroska:0=
)
- microdns? ( >=net-libs/libmicrodns-0.0.9:= )
modplug? ( media-libs/libmodplug:0 )
mp3? ( media-libs/libmad:0 )
mpeg? ( media-libs/libmpeg2:0 )
@@ -234,13 +236,6 @@ DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
S="${WORKDIR}/${MY_P}"
-pkg_pretend() {
- # https://bugs.gentoo.org/647668
- if use chromecast && ! use microdns; then
- einfo "USE=microdns is required for Chromecast autodetection
support"
- fi
-}
-
src_prepare() {
default
@@ -294,6 +289,7 @@ src_configure() {
$(use_enable cddb libcddb)
$(use_enable chromaprint)
$(use_enable chromecast)
+ $(use_enable chromecast microdns)
$(use_enable cpu_flags_x86_mmx mmx)
$(use_enable cpu_flags_x86_sse sse)
$(use_enable dbus)
@@ -338,7 +334,6 @@ src_configure() {
$(use_enable macosx-notifications osx-notifications)
$(use_enable macosx-qtkit)
$(use_enable matroska)
- $(use_enable microdns)
$(use_enable modplug mod)
$(use_enable mp3 mad)
$(use_enable mpeg libmpeg2)
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild
b/media-video/vlc/vlc-3.0.9999.ebuild
index a80409c4a81..eb219aabf34 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -70,7 +70,10 @@ RDEPEND="
bluray? ( media-libs/libbluray:0= )
cddb? ( media-libs/libcddb:0 )
chromaprint? ( media-libs/chromaprint:0= )
- chromecast? ( >=dev-libs/protobuf-2.5.0:= )
+ chromecast? (
+ >=dev-libs/protobuf-2.5.0:=
+ >=net-libs/libmicrodns-0.0.9:=
+ )
dbus? ( sys-apps/dbus:0 )
dc1394? (
media-libs/libdc1394:2
@@ -130,7 +133,6 @@ RDEPEND="
dev-libs/libebml:0=
media-libs/libmatroska:0=
)
- microdns? ( >=net-libs/libmicrodns-0.0.9:= )
modplug? ( media-libs/libmodplug:0 )
mp3? ( media-libs/libmad:0 )
mpeg? ( media-libs/libmpeg2:0 )
@@ -233,13 +235,6 @@ DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
S="${WORKDIR}/${MY_P}"
-pkg_pretend() {
- # https://bugs.gentoo.org/647668
- if use chromecast && ! use microdns; then
- einfo "USE=microdns is required for Chromecast autodetection
support"
- fi
-}
-
src_prepare() {
default
@@ -293,6 +288,7 @@ src_configure() {
$(use_enable cddb libcddb)
$(use_enable chromaprint)
$(use_enable chromecast)
+ $(use_enable chromecast microdns)
$(use_enable cpu_flags_x86_mmx mmx)
$(use_enable cpu_flags_x86_sse sse)
$(use_enable dbus)
@@ -337,7 +333,6 @@ src_configure() {
$(use_enable macosx-notifications osx-notifications)
$(use_enable macosx-qtkit)
$(use_enable matroska)
- $(use_enable microdns)
$(use_enable modplug mod)
$(use_enable mp3 mad)
$(use_enable mpeg libmpeg2)
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 2ee5c30ef9c..464b5d02584 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -70,7 +70,10 @@ RDEPEND="
bluray? ( media-libs/libbluray:0= )
cddb? ( media-libs/libcddb:0 )
chromaprint? ( media-libs/chromaprint:0= )
- chromecast? ( >=dev-libs/protobuf-2.5.0:= )
+ chromecast? (
+ >=dev-libs/protobuf-2.5.0:=
+ >=net-libs/libmicrodns-0.0.9:=
+ )
dbus? ( sys-apps/dbus:0 )
dc1394? (
media-libs/libdc1394:2
@@ -130,7 +133,6 @@ RDEPEND="
dev-libs/libebml:0=
media-libs/libmatroska:0=
)
- microdns? ( >=net-libs/libmicrodns-0.0.9:= )
modplug? ( media-libs/libmodplug:0 )
mp3? ( media-libs/libmad:0 )
mpeg? ( media-libs/libmpeg2:0 )
@@ -233,13 +235,6 @@ DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
S="${WORKDIR}/${MY_P}"
-pkg_pretend() {
- # https://bugs.gentoo.org/647668
- if use chromecast && ! use microdns; then
- einfo "USE=microdns is required for Chromecast autodetection
support"
- fi
-}
-
src_prepare() {
default
@@ -292,6 +287,7 @@ src_configure() {
$(use_enable cddb libcddb)
$(use_enable chromaprint)
$(use_enable chromecast)
+ $(use_enable chromecast microdns)
$(use_enable cpu_flags_x86_mmx mmx)
$(use_enable cpu_flags_x86_sse sse)
$(use_enable dbus)
@@ -336,7 +332,6 @@ src_configure() {
$(use_enable macosx-notifications osx-notifications)
$(use_enable macosx-qtkit)
$(use_enable matroska)
- $(use_enable microdns)
$(use_enable modplug mod)
$(use_enable mp3 mad)
$(use_enable mpeg libmpeg2)
