<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/bed79e26ac5a2438559d6577e773e0a18d59f700">https://github.com/macports/macports-ports/commit/bed79e26ac5a2438559d6577e773e0a18d59f700</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new bed79e2 gnome/gstreamer1-gst-plugins-base: enable cocoa xor x11, prefer x11.
</span>bed79e2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bed79e26ac5a2438559d6577e773e0a18d59f700
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Sat Jul 7 09:53:24 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> gnome/gstreamer1-gst-plugins-base: enable cocoa xor x11, prefer x11.
</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/56778
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This employs a horrible hack to forcefully deactivate the conflicting
</span><span style='display:block; white-space:pre;color:#404040;'> variant in case it's not compatible with the system or other variants.
</span>---
gnome/gstreamer1-gst-plugins-base/Portfile | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
<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 16faa54..09d6780 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;'>@@ -10,7 +10,7 @@ name gstreamer1-gst-plugins-base
</span> set my_name gst-plugins-base
# please only commit stable updates (even numbered releases)
version 1.14.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</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;'>@@ -111,10 +111,20 @@ variant cocoa conflicts universal x11 description {Add support for the OpenGL Co
</span> --enable-opengl
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# base has variant_set, but no variant_unset, so emulate it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+global variations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Prefer x11 variant, only enable cocoa by default if supported.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# We disable the other conflicting variant explicitly for a smooth upgrade path.
</span> if {${os.major} >= 13 && ![variant_isset universal] && ![variant_isset x11] && ${build_arch} eq "x86_64"} {
default_variants +cocoa
<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;'>+ set variations(x11) -
</span> } else {
default_variants +x11
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants -cocoa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set variations(cocoa) -
</span> }
variant ogg description {Build with support for libogg, libvorbis, libtheora} {
</pre><pre style='margin:0'>
</pre>