<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/0ead1def921afb33b1126f3246730e18849ccd68">https://github.com/macports/macports-ports/commit/0ead1def921afb33b1126f3246730e18849ccd68</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 0ead1def921 opencv4: update to 4.5.2 * remove check_macro patch, no longer needed for 4.5.2 * revise comment for gmic update, as version no longer hard-coded in that port * add newline after PortGroup inclusions in variants, to eliminate lint warnings
</span>0ead1def921 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0ead1def921afb33b1126f3246730e18849ccd68
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed Apr 21 17:22:24 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> opencv4: update to 4.5.2
</span><span style='display:block; white-space:pre;color:#404040;'> * remove check_macro patch, no longer needed for 4.5.2
</span><span style='display:block; white-space:pre;color:#404040;'> * revise comment for gmic update, as version no longer hard-coded in that port
</span><span style='display:block; white-space:pre;color:#404040;'> * add newline after PortGroup inclusions in variants, to eliminate lint warnings
</span>---
graphics/opencv4/Portfile | 29 +++++++++++-----------
graphics/opencv4/files/check_macro_clash_fix.patch | 24 ------------------
2 files changed, 15 insertions(+), 38 deletions(-)
<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 67ad4184b45..f9720c8d60e 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;'>@@ -5,9 +5,8 @@ PortGroup cmake 1.1
</span> PortGroup compiler_blacklist_versions 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# currently the opencv4 version has to be manually updated in gmic,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# along with a revsion bump
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup opencv opencv 4.5.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Note: Dependent ports, like gmic, may need a rev-bump when updating opencv4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup opencv opencv 4.5.2
</span> name opencv4
revision 0
categories graphics science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,10 +35,13 @@ master_sites ${github.master_sites}:${github.project}
</span>
distfiles [lindex ${distfiles} 0]:${github.project}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 7da33a993fe663c1dc418393cb19bd9947047233 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 38074910863fdcdf38b4c7205ea926ae0776d2faa52e101b7ca8ee7b4052101e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 88249775
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${distname}${extract.suffix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 bd0cdb07ef5fe5c16c31cdd448b3286c3e28ff5a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 926387dff78bed95997baa9378b62151c34b86e6dfd3e8136b3e4e1fdb075114 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 88931021
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #------------------------------------------------------------------------------
# Subport name used for staging files, etc.
#
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,10 +57,6 @@ 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:#ffe0e0;'>-# 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:#ffe0e0;'>-# :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:#ffe0e0;'>-patchfiles-append check_macro_clash_fix.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;background:#e0e0e0;'>@@ -400,9 +398,9 @@ if {${name} eq ${subport}} {
</span> ${github.project}_contrib-${version}${extract.suffix}:${github.project}_contrib
checksums-append \
${github.project}_contrib-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 93552a948ff67151b7d1b00f60333d870d4c2e8f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2cb2f0529611b863ea87202252b47f7c11cdddb5b9d8ff9cbb1efbf19732abe6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 60605129
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 0570fcc9877360657254358864852ea009090a64 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2005a3accacb01b672fee5666cd9033de7bbe8909eedc3704b9e9892434de613 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 60801888
</span>
depends_lib-append \
port:protobuf3-cpp \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -426,6 +424,7 @@ if {${name} eq ${subport}} {
</span>
variant qt4 conflicts qt5 description {Build with Qt4 Backend support} {
PortGroup qt4 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-replace \
-DWITH_QT:BOOL=OFF \
-DWITH_QT=4
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -433,6 +432,7 @@ if {${name} eq ${subport}} {
</span>
variant qt5 conflicts qt4 description {Build with Qt5 Backend support} {
PortGroup qt5 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-replace \
-DWITH_QT:BOOL=OFF \
-DWITH_QT=5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -440,6 +440,7 @@ if {${name} eq ${subport}} {
</span>
variant java description {Add Java bindings} {
PortGroup java 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # OpenCV appears to support older Java versions,
# and MacPorts users have requested Java 8 support:
# see https://trac.macports.org/ticket/60193
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c0c69a3a19b..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv4/files/check_macro_clash_fix.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/modules/imgcodecs/src/apple_conversions.mm b/modules/imgcodecs/src/apple_conversions.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6126039ce0..8aa6e54059 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/imgcodecs/src/apple_conversions.mm.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/imgcodecs/src/apple_conversions.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,6 +2,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // 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:#ffe0e0;'>- // of this distribution and at http://opencv.org/license.html.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "opencv2/core/utility.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "apple_conversions.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "precomp.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/modules/imgcodecs/src/macosx_conversions.mm b/modules/imgcodecs/src/macosx_conversions.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index c1827e71f1..4fab740fac 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- modules/imgcodecs/src/macosx_conversions.mm.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ modules/imgcodecs/src/macosx_conversions.mm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,6 +2,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // 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:#ffe0e0;'>- // of this distribution and at http://opencv.org/license.html.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "opencv2/core/utility.hpp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #import <AppKit/AppKit.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "apple_conversions.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>