| 1 |
commit: 68480c1bb080501481136cb207c576543bf41ea4 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 1 19:45:27 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 2 08:56:53 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68480c1b |
| 7 |
|
| 8 |
media-video/vlc: Merge USE=microdns into chromecast |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 11 |
|
| 12 |
media-video/vlc/vlc-3.0.3-r1.ebuild | 17 ++++++----------- |
| 13 |
media-video/vlc/vlc-3.0.9999.ebuild | 15 +++++---------- |
| 14 |
media-video/vlc/vlc-9999.ebuild | 15 +++++---------- |
| 15 |
3 files changed, 16 insertions(+), 31 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-video/vlc/vlc-3.0.3-r1.ebuild b/media-video/vlc/vlc-3.0.3-r1.ebuild |
| 18 |
index 848949599d6..23f9b8241fc 100644 |
| 19 |
--- a/media-video/vlc/vlc-3.0.3-r1.ebuild |
| 20 |
+++ b/media-video/vlc/vlc-3.0.3-r1.ebuild |
| 21 |
@@ -33,7 +33,7 @@ IUSE="a52 alsa altivec aom archive bidi bluray cddb chromaprint chromecast dbus |
| 22 |
debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig |
| 23 |
+gcrypt gme gnome-keyring gstreamer ieee1394 jack jpeg kate libass libav libcaca |
| 24 |
libnotify +libsamplerate libtar libtiger linsys lirc live lua macosx-notifications |
| 25 |
- macosx-qtkit matroska microdns modplug mp3 mpeg mtp musepack ncurses neon nfs ogg |
| 26 |
+ macosx-qtkit matroska modplug mp3 mpeg mtp musepack ncurses neon nfs ogg |
| 27 |
omxil opencv optimisememory opus png postproc projectm pulseaudio +qt5 rdp rtsp |
| 28 |
run-as-root samba schroedinger sdl-image sftp shout sid skins soxr speex srt ssl svg |
| 29 |
taglib theora tremor truetype twolame udev upnp vaapi v4l vdpau vnc vorbis vpx |
| 30 |
@@ -70,7 +70,10 @@ RDEPEND=" |
| 31 |
bluray? ( media-libs/libbluray:0= ) |
| 32 |
cddb? ( media-libs/libcddb:0 ) |
| 33 |
chromaprint? ( media-libs/chromaprint:0= ) |
| 34 |
- chromecast? ( >=dev-libs/protobuf-2.5.0:= ) |
| 35 |
+ chromecast? ( |
| 36 |
+ >=dev-libs/protobuf-2.5.0:= |
| 37 |
+ >=net-libs/libmicrodns-0.0.9:= |
| 38 |
+ ) |
| 39 |
dbus? ( sys-apps/dbus:0 ) |
| 40 |
dc1394? ( |
| 41 |
media-libs/libdc1394:2 |
| 42 |
@@ -130,7 +133,6 @@ RDEPEND=" |
| 43 |
dev-libs/libebml:0= |
| 44 |
media-libs/libmatroska:0= |
| 45 |
) |
| 46 |
- microdns? ( >=net-libs/libmicrodns-0.0.9:= ) |
| 47 |
modplug? ( media-libs/libmodplug:0 ) |
| 48 |
mp3? ( media-libs/libmad:0 ) |
| 49 |
mpeg? ( media-libs/libmpeg2:0 ) |
| 50 |
@@ -234,13 +236,6 @@ DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) |
| 51 |
|
| 52 |
S="${WORKDIR}/${MY_P}" |
| 53 |
|
| 54 |
-pkg_pretend() { |
| 55 |
- # https://bugs.gentoo.org/647668 |
| 56 |
- if use chromecast && ! use microdns; then |
| 57 |
- einfo "USE=microdns is required for Chromecast autodetection support" |
| 58 |
- fi |
| 59 |
-} |
| 60 |
- |
| 61 |
src_prepare() { |
| 62 |
default |
| 63 |
|
| 64 |
@@ -294,6 +289,7 @@ src_configure() { |
| 65 |
$(use_enable cddb libcddb) |
| 66 |
$(use_enable chromaprint) |
| 67 |
$(use_enable chromecast) |
| 68 |
+ $(use_enable chromecast microdns) |
| 69 |
$(use_enable cpu_flags_x86_mmx mmx) |
| 70 |
$(use_enable cpu_flags_x86_sse sse) |
| 71 |
$(use_enable dbus) |
| 72 |
@@ -338,7 +334,6 @@ src_configure() { |
| 73 |
$(use_enable macosx-notifications osx-notifications) |
| 74 |
$(use_enable macosx-qtkit) |
| 75 |
$(use_enable matroska) |
| 76 |
- $(use_enable microdns) |
| 77 |
$(use_enable modplug mod) |
| 78 |
$(use_enable mp3 mad) |
| 79 |
$(use_enable mpeg libmpeg2) |
| 80 |
|
| 81 |
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild |
| 82 |
index a80409c4a81..eb219aabf34 100644 |
| 83 |
--- a/media-video/vlc/vlc-3.0.9999.ebuild |
| 84 |
+++ b/media-video/vlc/vlc-3.0.9999.ebuild |
| 85 |
@@ -70,7 +70,10 @@ RDEPEND=" |
| 86 |
bluray? ( media-libs/libbluray:0= ) |
| 87 |
cddb? ( media-libs/libcddb:0 ) |
| 88 |
chromaprint? ( media-libs/chromaprint:0= ) |
| 89 |
- chromecast? ( >=dev-libs/protobuf-2.5.0:= ) |
| 90 |
+ chromecast? ( |
| 91 |
+ >=dev-libs/protobuf-2.5.0:= |
| 92 |
+ >=net-libs/libmicrodns-0.0.9:= |
| 93 |
+ ) |
| 94 |
dbus? ( sys-apps/dbus:0 ) |
| 95 |
dc1394? ( |
| 96 |
media-libs/libdc1394:2 |
| 97 |
@@ -130,7 +133,6 @@ RDEPEND=" |
| 98 |
dev-libs/libebml:0= |
| 99 |
media-libs/libmatroska:0= |
| 100 |
) |
| 101 |
- microdns? ( >=net-libs/libmicrodns-0.0.9:= ) |
| 102 |
modplug? ( media-libs/libmodplug:0 ) |
| 103 |
mp3? ( media-libs/libmad:0 ) |
| 104 |
mpeg? ( media-libs/libmpeg2:0 ) |
| 105 |
@@ -233,13 +235,6 @@ DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) |
| 106 |
|
| 107 |
S="${WORKDIR}/${MY_P}" |
| 108 |
|
| 109 |
-pkg_pretend() { |
| 110 |
- # https://bugs.gentoo.org/647668 |
| 111 |
- if use chromecast && ! use microdns; then |
| 112 |
- einfo "USE=microdns is required for Chromecast autodetection support" |
| 113 |
- fi |
| 114 |
-} |
| 115 |
- |
| 116 |
src_prepare() { |
| 117 |
default |
| 118 |
|
| 119 |
@@ -293,6 +288,7 @@ src_configure() { |
| 120 |
$(use_enable cddb libcddb) |
| 121 |
$(use_enable chromaprint) |
| 122 |
$(use_enable chromecast) |
| 123 |
+ $(use_enable chromecast microdns) |
| 124 |
$(use_enable cpu_flags_x86_mmx mmx) |
| 125 |
$(use_enable cpu_flags_x86_sse sse) |
| 126 |
$(use_enable dbus) |
| 127 |
@@ -337,7 +333,6 @@ src_configure() { |
| 128 |
$(use_enable macosx-notifications osx-notifications) |
| 129 |
$(use_enable macosx-qtkit) |
| 130 |
$(use_enable matroska) |
| 131 |
- $(use_enable microdns) |
| 132 |
$(use_enable modplug mod) |
| 133 |
$(use_enable mp3 mad) |
| 134 |
$(use_enable mpeg libmpeg2) |
| 135 |
|
| 136 |
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild |
| 137 |
index 2ee5c30ef9c..464b5d02584 100644 |
| 138 |
--- a/media-video/vlc/vlc-9999.ebuild |
| 139 |
+++ b/media-video/vlc/vlc-9999.ebuild |
| 140 |
@@ -70,7 +70,10 @@ RDEPEND=" |
| 141 |
bluray? ( media-libs/libbluray:0= ) |
| 142 |
cddb? ( media-libs/libcddb:0 ) |
| 143 |
chromaprint? ( media-libs/chromaprint:0= ) |
| 144 |
- chromecast? ( >=dev-libs/protobuf-2.5.0:= ) |
| 145 |
+ chromecast? ( |
| 146 |
+ >=dev-libs/protobuf-2.5.0:= |
| 147 |
+ >=net-libs/libmicrodns-0.0.9:= |
| 148 |
+ ) |
| 149 |
dbus? ( sys-apps/dbus:0 ) |
| 150 |
dc1394? ( |
| 151 |
media-libs/libdc1394:2 |
| 152 |
@@ -130,7 +133,6 @@ RDEPEND=" |
| 153 |
dev-libs/libebml:0= |
| 154 |
media-libs/libmatroska:0= |
| 155 |
) |
| 156 |
- microdns? ( >=net-libs/libmicrodns-0.0.9:= ) |
| 157 |
modplug? ( media-libs/libmodplug:0 ) |
| 158 |
mp3? ( media-libs/libmad:0 ) |
| 159 |
mpeg? ( media-libs/libmpeg2:0 ) |
| 160 |
@@ -233,13 +235,6 @@ DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) |
| 161 |
|
| 162 |
S="${WORKDIR}/${MY_P}" |
| 163 |
|
| 164 |
-pkg_pretend() { |
| 165 |
- # https://bugs.gentoo.org/647668 |
| 166 |
- if use chromecast && ! use microdns; then |
| 167 |
- einfo "USE=microdns is required for Chromecast autodetection support" |
| 168 |
- fi |
| 169 |
-} |
| 170 |
- |
| 171 |
src_prepare() { |
| 172 |
default |
| 173 |
|
| 174 |
@@ -292,6 +287,7 @@ src_configure() { |
| 175 |
$(use_enable cddb libcddb) |
| 176 |
$(use_enable chromaprint) |
| 177 |
$(use_enable chromecast) |
| 178 |
+ $(use_enable chromecast microdns) |
| 179 |
$(use_enable cpu_flags_x86_mmx mmx) |
| 180 |
$(use_enable cpu_flags_x86_sse sse) |
| 181 |
$(use_enable dbus) |
| 182 |
@@ -336,7 +332,6 @@ src_configure() { |
| 183 |
$(use_enable macosx-notifications osx-notifications) |
| 184 |
$(use_enable macosx-qtkit) |
| 185 |
$(use_enable matroska) |
| 186 |
- $(use_enable microdns) |
| 187 |
$(use_enable modplug mod) |
| 188 |
$(use_enable mp3 mad) |
| 189 |
$(use_enable mpeg libmpeg2) |
Archives