<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/d71e85f56f2337877a9c921cf6f0de424c6bc7d5">https://github.com/macports/macports-ports/commit/d71e85f56f2337877a9c921cf6f0de424c6bc7d5</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 d71e85f56f2 opencv: update to 3.4.13
</span>d71e85f56f2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d71e85f56f2337877a9c921cf6f0de424c6bc7d5
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Wed Dec 23 19:03:44 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> opencv: update to 3.4.13
</span>---
graphics/opencv/Portfile | 14 +++++++-------
graphics/opencv/files/patch-local_protobuf.diff | 10 +++++-----
2 files changed, 12 insertions(+), 12 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 e21ce3fd136..936a6c28422 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.12
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.4.13
</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 04821680bf8cfbda7eb5ad1755255fc726934927 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c8919dfb5ead6be67534bf794cb0925534311f1cd5c6680f8164ad1813c88d13 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 87510498
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 39f8733cb2f58d2a955e3c74e7a52f16b1b78d9c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 70230049194ae03ed8bfaab6cd1388569aa1b5c482d8b50d3af1cd2ae5a0b95d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 87573369
</span>
platform macosx {
if {${os.major} <= 10} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -382,9 +382,9 @@ 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 d8cfeb95c396030a1bd9c3694759e767858e1eca \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 997a4608e33cea347df9501dc1e74220cb076d3d88b7ae8b99928120966315fc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 56392036
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e3fe150fa131a4cf7cd9e0bf9f6a597df6e8f3f3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4412a8b1a9d55b4bac489d79c21c567e0bf69272e6fbc7f45a68a7b72fb59066 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 56393041
</span> configure.args-append -DOPENCV_EXTRA_MODULES_PATH=${workpath}/opencv_contrib-${version}/modules \
-DBUILD_PROTOBUF=YES
depends_lib-append port:protobuf3-cpp
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/files/patch-local_protobuf.diff b/graphics/opencv/files/patch-local_protobuf.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f8517d0ab5a..e636e461682 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv/files/patch-local_protobuf.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv/files/patch-local_protobuf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 3rdparty/protobuf/CMakeLists.txt.orig 2018-08-28 05:58:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ 3rdparty/protobuf/CMakeLists.txt 2018-10-25 09:41:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -140,7 +140,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 3rdparty/protobuf/CMakeLists.txt.orig 2020-12-20 16:15:49.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ 3rdparty/protobuf/CMakeLists.txt 2020-12-23 18:53:09.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -142,7 +142,7 @@
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- add_library(libprotobuf STATIC ${Protobuf_SRCS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include_directories(BEFORE "${PROTOBUF_ROOT}/src") # ensure using if own headers: https://github.com/opencv/opencv/issues/13328
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(libprotobuf STATIC ${OPENCV_3RDPARTY_EXCLUDE_FROM_ALL} ${Protobuf_SRCS})
</span> -target_include_directories(libprotobuf SYSTEM PUBLIC $<BUILD_INTERFACE:${PROTOBUF_ROOT}/src>)
+target_include_directories(libprotobuf PUBLIC $<BUILD_INTERFACE:${PROTOBUF_ROOT}/src>)
set_target_properties(libprotobuf
</pre><pre style='margin:0'>
</pre>