<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/058c896818811e85419d4ae6a5b0be345d9b1bc6">https://github.com/macports/macports-ports/commit/058c896818811e85419d4ae6a5b0be345d9b1bc6</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 058c8968188 opencv4: Fix compilation on macOS10.12 and older due to macro clash
</span>058c8968188 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 058c896818811e85419d4ae6a5b0be345d9b1bc6
</span>Author: Chris Jones <jonesc@macports.org>
AuthorDate: Sat Mar 20 16:43:52 2021 +0000

<span style='display:block; white-space:pre;color:#404040;'>    opencv4: Fix compilation on macOS10.12 and older due to macro clash
</span>---
 graphics/opencv4/Portfile                          |  4 ++++
 graphics/opencv4/files/check_macro_clash_fix.patch | 10 ++++++++++
 2 files changed, 14 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv4/Portfile b/graphics/opencv4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 98b49ecb2da..487fc4d872b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,6 +53,10 @@ set parent_subport_name \
</span> # recognize dylib as a valid library suffix
 patchfiles-append   patch-dylib_suffix.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# include/opencv2/core/utility.hpp:53:4: warning: Detected Apple 'check' macro definition, it can cause build conflicts. Please, include this header before any Apple headers. [-W#warnings]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# :info:build #  warning Detected Apple 'check' macro definition, it can cause build conflicts. Please, include this header before any Apple headers.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   check_macro_clash_fix.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #worksrcdir          ${parent_subport_name}-${version}
 
 # Claims to only need c++11 but actually uses c++14 features
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv4/files/check_macro_clash_fix.patch b/graphics/opencv4/files/check_macro_clash_fix.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0ac7e574850
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv4/files/check_macro_clash_fix.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- modules/imgcodecs/src/macosx_conversions.mm.orig       2021-03-20 16:31:06.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ modules/imgcodecs/src/macosx_conversions.mm    2021-03-20 16:30:17.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,6 +2,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // It is subject to the license terms in the LICENSE file found in the top-level directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // of this distribution and at http://opencv.org/license.html.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "opencv2/core/utility.hpp"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #import <AppKit/AppKit.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "apple_conversions.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span></pre><pre style='margin:0'>

</pre>