<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/2d948aa8623f6080b211bd8fbf79e4a1a97ad942">https://github.com/macports/macports-ports/commit/2d948aa8623f6080b211bd8fbf79e4a1a97ad942</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2d948aa8623f6080b211bd8fbf79e4a1a97ad942
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Sun Aug 19 02:43:32 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> gnome/gstreamer1-gst-plugins-base: drop cocoa variant, make behavior available when -x11 has been selected.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Enable +x11 by default again to unbreak other ports.
</span>---
gnome/gstreamer1-gst-plugins-base/Portfile | 45 ++++++++++--------------------
1 file changed, 14 insertions(+), 31 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gstreamer1-gst-plugins-base/Portfile b/gnome/gstreamer1-gst-plugins-base/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c650415..68d988f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer1-gst-plugins-base/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer1-gst-plugins-base/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,6 +11,7 @@ name gstreamer1-gst-plugins-base
</span> set my_name gst-plugins-base
# 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 This is gst-plugins, a set of plug-ins for GStreamer.
long_description ${description}
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +79,7 @@ platform darwin {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant x11 conflicts cocoa {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant x11 {
</span> depends_lib-append \
port:mesa \
port:xorg-libX11 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,37 +98,19 @@ variant x11 conflicts cocoa {
</span> --enable-opengl
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant cocoa conflicts universal x11 description {Add support for the OpenGL Cocoa backend. Only supported for pure x86_64 builds.} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${build_arch} ne "x86_64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "The variant cocoa is not supported on architectures other than x86_64"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error "Cocoa output only supported on x86_64 architecture"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Prefer X11 implementation.
</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;'>+# Cocoa-GL implementation, not a variant because base reacts weirdly to such a setup.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Only enable on supported platforms and if neither the x11 or universal variants
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# have been passed.
</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] && ${build_arch} eq "x86_64" && ${os.major} >= 13 && ![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-cocoa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-cocoa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-opengl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-opengl
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "The variant cocoa is not supported on platforms older than 10.9"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error "Platform too old to support Cocoa output"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --disable-cocoa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-cocoa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-opengl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-opengl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# base has variant_set, but no variant_unset, so emulate it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-global variations
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Prefer x11 variant, only enable cocoa by default if supported.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# We disable the other conflicting variant explicitly for a smooth upgrade path.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} >= 13 && ![variant_isset universal] && ![variant_isset x11] && ${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +cocoa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants -x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set variations(x11) -
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants -cocoa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set variations(cocoa) -
</span> }
variant ogg description {Build with support for libogg, libvorbis, libtheora} {
</pre><pre style='margin:0'>
</pre>