<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/da9e00f296aeb71315bb75165a1e8a608f68b812">https://github.com/macports/macports-ports/commit/da9e00f296aeb71315bb75165a1e8a608f68b812</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit da9e00f296aeb71315bb75165a1e8a608f68b812
</span>Author: Mihai Moldovan <ionic@ionic.de>
AuthorDate: Wed Jul 4 12:10:31 2018 +0200
<span style='display:block; white-space:pre;color:#404040;'> gnome/gstreamer1-gst-plugins-base: move cocoa variant around.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No functional change (yet).
</span>---
gnome/gstreamer1-gst-plugins-base/Portfile | 41 +++++++++++++++---------------
1 file changed, 21 insertions(+), 20 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 514e505..b86befa 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;'>@@ -89,6 +89,27 @@ variant x11 {
</span>
default_variants +x11
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant cocoa conflicts universal description {Add support for native Cocoa output. Only supported for pure x86_64 builds.} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${build_arch} ne "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "The variant cocoa is not supported on architectures other than x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Cocoa output only supported on x86_64 architecture"
</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;'>+ if {${os.major} < 13} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "The variant cocoa is not supported on platforms older than 10.9"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "Platform too old to support Cocoa output"
</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;'>+ 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:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.major} >= 13 && ![variant_isset universal] && ${build_arch} eq "x86_64"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +cocoa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant ogg description {Build with support for libogg, libvorbis, libtheora} {
depends_lib-append port:libogg port:libvorbis port:libtheora
configure.args-replace --disable-ogg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -113,26 +134,6 @@ variant cdparanoia description {Enable (currently broken) cdparanoia plugin} {
</span> --enable-cdparanoia
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant cocoa conflicts universal description {Add support for native Cocoa output. 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:#ffe0e0;'>- }
</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;'>-if {${os.major} >= 13 && ![variant_isset universal] && ${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>
#-fgcse (from -O2) causes build failures, but -O2 -fno-gcse doesn't seem to work
if {[string match "*gcc-4.2" ${configure.compiler}]} {
</pre><pre style='margin:0'>
</pre>