<pre style='margin:0'>
Mihai Moldovan (Ionic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/56e069da28b1d28693e793581ad1a200108deb5c">https://github.com/macports/macports-ports/commit/56e069da28b1d28693e793581ad1a200108deb5c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 56e069da28b1d28693e793581ad1a200108deb5c
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Sun Aug 19 02:45:44 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> gnome/gstreamer1-gst-plugins-bad: disable Apple_Media by default, only enable if -x11 has been passed.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Sync up variants between -base and -bad.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/56781
</span>---
gnome/gstreamer1-gst-plugins-bad/Portfile | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gstreamer1-gst-plugins-bad/Portfile b/gnome/gstreamer1-gst-plugins-bad/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f7d3619..4c3ed74 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer1-gst-plugins-bad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer1-gst-plugins-bad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,11 +6,13 @@ PortSystem 1.0
</span> PortGroup muniversal 1.0
PortGroup compiler_blacklist_versions 1.0
PortGroup gobject_introspection 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span>
name gstreamer1-gst-plugins-bad
set my_name gst-plugins-bad
# please only commit stable updates (even numbered releases)
version 1.14.2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> description A set of plug-ins for GStreamer that need more quality.
long_description GStreamer Bad Plug-ins is a set of plug-ins that aren't up to par compared \
to the rest. They might be close to being good quality, but they're missing \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,7 +104,8 @@ configure.args --disable-silent-rules \
</span> --disable-opus \
--disable-srtp \
--enable-static \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-hls-crypto=nettle
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-hls-crypto=nettle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-apple_media
</span>
#
# port:soundtouch (fails on autoreconf on darwin 8 & 9, see #27533) disable soundtouch on these platforms
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,9 +118,6 @@ platform darwin {
</span> depends_lib-delete port:soundtouch port:x265
configure.args-append --disable-soundtouch --disable-x265
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 14} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-apple_media
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> if {${configure.cxx_stdlib} eq "libstdc++"} {
configure.args-append --disable-chromaprint
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,6 +141,22 @@ variant fdkaac description {Enable fdkaac AAC plugin} {
</span> notes-append "Use of the +fdkaac variant may affect licensing due to the restrictive license of port libfdk-aac itself."
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Window system is provided by gstreamer1-gst-plugins-base, so sync up.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants port:gstreamer1-gst-plugins-base x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants +x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform macosx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset x11] && ![variant_isset universal] && ${os.major} >= 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Apple_Media requires CGL, which can only be provided on newer platforms and without X11 enabled.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants port:gstreamer1-gst-plugins-base {} x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-apple_media \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-apple_media
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> if {[variant_isset universal]} {
set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
set merger_host(i386) i686-apple-${os.platform}${os.major}
</pre><pre style='margin:0'>
</pre>