<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/8d5533b0130aff88bc3bf0dfc6adaf0286cbc9b0">https://github.com/macports/macports-ports/commit/8d5533b0130aff88bc3bf0dfc6adaf0286cbc9b0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 8d5533b0130aff88bc3bf0dfc6adaf0286cbc9b0
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Thu Sep 8 16:56:50 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> opencv4: update to 4.6.0; add libquirc
</span><span style='display:block; white-space:pre;color:#404040;'> - Also add lib dep hdf5, for contrib
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/macports/macports-ports/pull/15993
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/63786
</span>---
graphics/opencv4/Portfile | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 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 01e57c1e9d6..4fee006d687 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;'>@@ -57,22 +57,22 @@ if {${os.major} > 12} {
</span>
# NOTE: Separate revisions maintained for Python subports, later in portfile
if {${opencv_latest}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup opencv opencv 4.5.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup opencv opencv 4.6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> epoch 1
checksums-append \
${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 db4c9342191d54ecf60bab5a7fb2ce7885da14e0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bb6285044f97bf0a392d4e45f27ecf4fefcd6bf7a94e81cae4314dd24bcf3103 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 89882813
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 4eccdc53879ae30df58d7181703957ae5ebc745f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c10593ef1ecdd6830628730044ea286e11c4a4913c328eb901d3a4ee00cad8fa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 90218202
</span>
livecheck.type regex
livecheck.url https://opencv.org/releases.html
livecheck.regex {/archive/([0-9.]+)[a-z]?\.[tz]}
} else {
github.setup opencv opencv 4.5.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 15
</span>
checksums-append \
${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,6 +140,7 @@ depends_lib-append \
</span> port:libpng \
path:include/turbojpeg.h:libjpeg-turbo \
port:openjpeg \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libquirc \
</span> port:tiff \
port:webp \
port:openexr \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -284,6 +285,7 @@ configure.args-append \
</span> -DWITH_IMGCODEC_PFM:BOOL=ON \
-DWITH_QUIRC:BOOL=OFF \
\
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DHAVE_QUIRC:BOOL=ON \
</span> -DHAVE_COCOA:BOOL=ON \
\
-DBUILD_opencv_aruco:BOOL=ON \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -351,9 +353,9 @@ foreach python_branch ${python_branches} {
</span> subport py${python_version}-${name} {
# NOTE: Only rev-bump subports, for major changes/additions
if {${opencv_latest}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 15
</span> }
conflicts-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -463,9 +465,9 @@ if {${name} eq ${subport}} {
</span> if {${opencv_latest}} {
checksums-append \
${github.project}_contrib-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 6ef9bfd367d221febb40de67b40ec599db3b16fa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 519b88933c59498648b22c56f41c272b3622252f07b9a80872e6fde55c095f55 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 60565191
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 cb343c90ca33fb22b5ab120e926cfde640ce8d7d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fb2c14c30739dd8e7f9cc357b81c0e7db4f0f28c1cec140200e736887a204e8c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 59669561
</span> } else {
checksums-append \
${github.project}_contrib-${version}${extract.suffix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -491,7 +493,8 @@ if {${name} eq ${subport}} {
</span> port:protobuf3-cpp \
port:google-glog \
port:gflags \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ceres-solver
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ceres-solver \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hdf5
</span>
extract.only \
${github.project}-${version}${extract.suffix} \
</pre><pre style='margin:0'>
</pre>