<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d7a27c537c8d0e89e36aa24ccb0e5e0d015dd551">https://github.com/macports/macports-ports/commit/d7a27c537c8d0e89e36aa24ccb0e5e0d015dd551</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 d7a27c537c8 opencv4*: contrib: prevent opporunistic use of tesseract - Also regen stale protobuf files, if necessary - Cleanup See: https://trac.macports.org/ticket/63786
</span>d7a27c537c8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d7a27c537c8d0e89e36aa24ccb0e5e0d015dd551
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue Sep 6 18:05:01 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> opencv4*: contrib: prevent opporunistic use of tesseract
</span><span style='display:block; white-space:pre;color:#404040;'> - Also regen stale protobuf files, if necessary
</span><span style='display:block; white-space:pre;color:#404040;'> - Cleanup
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/63786
</span>---
graphics/opencv4-devel/Portfile | 15 ++++++++++-----
graphics/opencv4/Portfile | 15 ++++++++++-----
2 files changed, 20 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv4-devel/Portfile b/graphics/opencv4-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d1d71b959bb..7205dff32ef 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv4-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv4-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -116,9 +116,11 @@ patchfiles-append patch-dylib_suffix.diff
</span>
# Claims to only need c++11 but actually uses c++14 features
# core/cvstd_wrapper.hpp:45:40: warning: variable templates are a C++14 extension [-Wc++14-extensions]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set cxx_standard 14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set cxx_standard 2014
</span> compiler.cxx_standard \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 20${cxx_standard}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${cxx_standard}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.set_cxx_standard \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yes
</span>
compiler.blacklist-append \
*gcc* \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,8 +173,6 @@ cmake.install_rpath \
</span> ${opencv_install_lib}
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_CXX_STANDARD=${cxx_standard} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \
</span> -DENABLE_CONFIG_VERIFICATION:BOOL=OFF \
\
-DOPENCV_CONFIG_INSTALL_PATH=${opencv_install_cmake} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -476,7 +476,12 @@ if {${name} eq ${subport}} {
</span> -DWITH_PROTOBUF:BOOL=OFF
configure.args-append \
-DBUILD_PROTOBUF:BOOL=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_PROTOBUF:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_PROTOBUF:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_TESSERACT:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Regenerate protobuf files, if stale
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPROTOBUF_UPDATE_FILES:BOOL=ON
</span>
depends_lib-append \
port:double-conversion \
<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 0ee2d773ec6..03e422de7f1 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;'>@@ -116,9 +116,11 @@ patchfiles-append patch-dylib_suffix.diff
</span>
# Claims to only need c++11 but actually uses c++14 features
# core/cvstd_wrapper.hpp:45:40: warning: variable templates are a C++14 extension [-Wc++14-extensions]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set cxx_standard 14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set cxx_standard 2014
</span> compiler.cxx_standard \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 20${cxx_standard}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${cxx_standard}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.set_cxx_standard \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yes
</span>
compiler.blacklist-append \
*gcc* \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,8 +173,6 @@ cmake.install_rpath \
</span> ${opencv_install_lib}
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_CXX_STANDARD=${cxx_standard} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- \
</span> -DENABLE_CONFIG_VERIFICATION:BOOL=OFF \
\
-DOPENCV_CONFIG_INSTALL_PATH=${opencv_install_cmake} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -477,7 +477,12 @@ if {${name} eq ${subport}} {
</span> -DWITH_PROTOBUF:BOOL=OFF
configure.args-append \
-DBUILD_PROTOBUF:BOOL=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_PROTOBUF:BOOL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_PROTOBUF:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_TESSERACT:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Regenerate protobuf files, if stale
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPROTOBUF_UPDATE_FILES:BOOL=ON
</span>
depends_lib-append \
port:double-conversion \
</pre><pre style='margin:0'>
</pre>