<pre style='margin:0'>
Jeremy Huddleston Sequoia (jeremyhu) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ec9f8c24d60e40a78794c93dc9434b8774ef5d59">https://github.com/macports/macports-ports/commit/ec9f8c24d60e40a78794c93dc9434b8774ef5d59</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 ec9f8c2  gstreamer1-gst-plugins-bad: Further tighten --disable-cocoa to apply to +universal builds
</span>ec9f8c2 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit ec9f8c24d60e40a78794c93dc9434b8774ef5d59
</span>Author: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
AuthorDate: Fri Jul 21 20:12:04 2017 -0700

<span style='display:block; white-space:pre;color:#404040;'>    gstreamer1-gst-plugins-bad: Further tighten --disable-cocoa to apply to +universal builds
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    The resulting pkg-config files do not merge and it's incorrect behavior to
</span><span style='display:block; white-space:pre;color:#404040;'>    just pick one.  This is a conservative change to favor correctness.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@macports.org>
</span>---
 gnome/gstreamer1-gst-plugins-bad/Portfile | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 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 35bbd5d..cf428e4 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;'>@@ -193,14 +193,13 @@ if {[variant_isset universal]} {
</span>     set merger_host(x86_64) x86_64-apple-${os.platform}${os.major}
     set merger_host(i386) i686-apple-${os.platform}${os.major}
     set merger_configure_args(x86_64) --build=x86_64-apple-${os.platform}${os.major}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set merger_configure_args(i386) --build=i686-apple-${os.platform}${os.major} --disable-cocoa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set merger_configure_args(i386) --build=i686-apple-${os.platform}${os.major}
</span> } else {
 
     if {${build_arch} eq "i386"} {
         configure.args-append \
             --host=i686-apple-${os.platform}${os.major} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            --build=i686-apple-${os.platform}${os.major} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            --disable-cocoa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            --build=i686-apple-${os.platform}${os.major}
</span>     } elseif {${build_arch} eq "x86_64"} {
         configure.args-append \
             --host=${build_arch}-apple-${os.platform}${os.major} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -208,6 +207,14 @@ if {[variant_isset universal]} {
</span>     }
 }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# In 1.12.1, --enable-cocoa enables ARC code, so we cannot enable it for i386.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Remove this in the future if that requirement is removed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[variant_isset universal] || ${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-append --disable-cocoa
</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> livecheck.type      regex
 livecheck.url       ${master_sites}
 livecheck.regex     "${my_name}-(\\d+\\\.\\d*\[02468\](?:\\.\\d+)*)${extract.suffix}"
</pre><pre style='margin:0'>

</pre>