<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/65180b611dad2da7fff14cdde33d54b07660065d">https://github.com/macports/macports-ports/commit/65180b611dad2da7fff14cdde33d54b07660065d</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 65180b6 simage: Error early for +quicktime if incompatible
</span>65180b6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 65180b611dad2da7fff14cdde33d54b07660065d
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jan 28 01:52:23 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> simage: Error early for +quicktime if incompatible
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/59962
</span>---
graphics/simage/Portfile | 30 ++++++++++++++++++++++++++----
1 file changed, 26 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/simage/Portfile b/graphics/simage/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1793391..ca3c323 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/simage/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/simage/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,6 @@ depends_lib port:jpeg \
</span> port:tiff \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure yes
</span> configure.args --disable-quicktime \
--with-jpeg=${prefix} \
--with-png=${prefix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,11 +47,34 @@ variant quicktime description {Use QuickTime instead of the many smaller librari
</span> port:giflib \
port:tiff \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-quicktime \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-jpeg=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --with-jpeg=${prefix} \
</span> --with-png=${prefix} \
--with-ungif=${prefix} \
--with-tiff=${prefix} \
--with-zlib=${prefix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-quicktime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-quicktime \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-quicktime
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch [get_canonical_archs] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${arch} in {ppc64 x86_64}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "The +quicktime variant cannot be used when building 64-bit"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible arch"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ break
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[vercmp ${macosx_sdk_version} 10.11] > 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ known_fail yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "The +quicktime variant cannot be used with a macOS SDK later than 10.11"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "incompatible macOS SDK"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
</pre><pre style='margin:0'>
</pre>