<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d98d7d7369a9f350c609082d8e1147c47831edc1">https://github.com/macports/macports-ports/commit/d98d7d7369a9f350c609082d8e1147c47831edc1</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 d98d7d7 opencv: update to 3.4.10
</span>d98d7d7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d98d7d7369a9f350c609082d8e1147c47831edc1
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sun Apr 26 16:33:12 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> opencv: update to 3.4.10
</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/56349
</span>---
graphics/opencv/Portfile | 24 +++++++++---------
graphics/opencv/files/patch-find-openexr.diff | 35 ++++++++++-----------------
2 files changed, 25 insertions(+), 34 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/Portfile b/graphics/opencv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e9dfded..c98c563 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup legacysupport 1.0
name opencv
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.4.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.4.10
</span> revision 0
categories graphics science
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,9 +33,9 @@ distfiles ${distname}${extract.suffix}:opencv
</span>
# don't forget to also update the checksums under the contrib variant.
checksums ${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 40652271f410d9d48904a7df428465296f71d874 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f0901648a1db3dc3af30e65082665921dbe998673137380450bdd91e8251b567 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 87343996
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 a5b32f3d6ebeedb34d32a9f397d5b00d36c5162a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1ed6f5b02a7baf14daca04817566e7c98ec668cec381e0edf534fa49f10f58a2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 87430332
</span>
worksrcdir opencv-${version}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,7 +66,7 @@ patchfiles-append patch-dylib_suffix.diff
</span>
# do not find protobuf3-cpp header files if installed
configure.cppflags-replace -I${prefix}/include -isystem${prefix}/include
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-local_protobuf.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-local_protobuf.diff
</span>
post-patch {
reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/cmake/OpenCVFindOpenEXR.cmake
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -275,8 +275,8 @@ variant qt5 conflicts qt4 description {Build with Qt5 Backend support.} {
</span>
variant java description {Add Java bindings.} {
PortGroup java 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- java.version 1.6+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- java.fallback openjdk11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ java.version 12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ java.fallback openjdk12
</span> depends_build-append port:apache-ant
configure.args-replace -DBUILD_opencv_java=OFF \
-DBUILD_opencv_java=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -362,12 +362,12 @@ variant contrib description {Build OpenCV with extra modules.} {
</span> master_sites-append https://github.com/opencv/opencv_contrib/archive:opencv_contrib
distfiles-append ${version}.zip:opencv_contrib
checksums-append ${version}.zip \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 eec28fffea419e401751e2de69901c926c3442d6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e36b4927cfb0dd0d257067866e413728733699b14c1d88dba7d9c3e009ecf88d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 58507290
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b26d738708eb37b3e7f755a3905c9c032bb1ef71 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e08e4cfee65790a06f6c734b915bb02e8b7bcfa8252db7dedb9a33575406a6c9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 57358180
</span> configure.args-append -DOPENCV_EXTRA_MODULES_PATH=${workpath}/opencv_contrib-${version}/modules \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_PROTOBUF=NO
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:${prefix}/lib/libprotobuf.dylib:protobuf-cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_PROTOBUF=YES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:protobuf3-cpp
</span>
post-extract {
# gunzip cannot handle multi-member .zip archives
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/files/patch-find-openexr.diff b/graphics/opencv/files/patch-find-openexr.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 20da604..4facc77 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv/files/patch-find-openexr.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv/files/patch-find-openexr.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +1,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- cmake/OpenCVFindOpenEXR.cmake.orig 2017-12-16 18:52:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ cmake/OpenCVFindOpenEXR.cmake 2017-12-16 18:53:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,24 +21,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/OpenCVFindOpenEXR.cmake.orig 2020-04-02 14:59:58.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/OpenCVFindOpenEXR.cmake 2020-04-25 13:31:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,15 +21,11 @@
</span> SET(OPENEXR_LIBSEARCH_SUFFIXES Win32/Release Win32 Win32/Debug)
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OPENEXR_ROOT "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif(UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- SET(OPENEXR_LIBSEARCH_SUFFIXES ${CMAKE_LIBRARY_ARCHITECTURE})
</span> + set(OPENEXR_ROOT "@PREFIX@")
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(LIBRARY_PATHS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /sw/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /opt/local/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${ProgramFiles_ENV_PATH}/OpenEXR/lib/static"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${OPENEXR_ROOT}/lib")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FIND_PATH(OPENEXR_INCLUDE_PATH ImfRgbaFile.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH_SUFFIXES OpenEXR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATHS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /usr/local/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /sw/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /opt/local/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${ProgramFiles_ENV_PATH}/OpenEXR/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${OPENEXR_ROOT}/include")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(SEARCH_PATHS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${OPENEXR_ROOT}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /sw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /opt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${ProgramFiles_ENV_PATH}/OpenEXR")
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACRO(FIND_OPENEXR_LIBRARY LIBRARY_NAME LIBRARY_SUFFIX)
</span></pre><pre style='margin:0'>
</pre>