<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/4a00273708d3ffcd626f6fc2dcaa310bdfc55bca">https://github.com/macports/macports-ports/commit/4a00273708d3ffcd626f6fc2dcaa310bdfc55bca</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4a00273708d3ffcd626f6fc2dcaa310bdfc55bca
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri May 20 15:28:22 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> opencv4/opencv4-devel: add python 3.10; remove python 3.5 and 3.6
</span><span style='display:block; white-space:pre;color:#404040;'> * cleanup: python is a build dep, not lib, for base ports
</span>---
graphics/opencv4-devel/Portfile | 18 +++++++++---------
graphics/opencv4/Portfile | 18 +++++++++---------
2 files changed, 18 insertions(+), 18 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 d538bab4092..8141c4105e1 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;'>@@ -57,7 +57,7 @@ if {${os.major} > 12} {
</span>
if {${opencv_latest}} {
github.setup opencv opencv 4.5.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 4
</span> epoch 1
checksums-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +71,7 @@ if {${opencv_latest}} {
</span> 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 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 5
</span>
checksums-append \
${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,7 +128,8 @@ compiler.blacklist-append \
</span>
depends_build-append \
port:cctools \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${default_python_version}
</span>
depends_lib-append \
path:lib/libavcodec.dylib:ffmpeg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,8 +141,7 @@ depends_lib-append \
</span> port:webp \
port:openexr \
port:ilmbase \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ade \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python${default_python_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ade
</span>
#------------------------------------------------------------------------------
# CMake Variables
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -347,15 +347,15 @@ platform darwin {
</span> # Name consistency with ${python.branch} and ${python.version} in
# ${prefix}/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/_resources/port1.0/group/python-1.0.tcl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_branches {3.5 3.6 3.7 3.8 3.9}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_branches {3.7 3.8 3.9 3.10}
</span> foreach python_branch ${python_branches} {
set python_version [join [lrange [split ${python_branch} .] 0 1] ""]
subport py${python_version}-${name} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${default_python_version}
</span> depends_lib-append \
port:${name} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python_version}-numpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python${default_python_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-numpy \
</span> port:python${python_version}
configure.args-replace \
-DBUILD_opencv_python3:BOOL=OFF \
<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 c56d02b075b..40d0a534d00 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,7 +57,7 @@ if {${os.major} > 12} {
</span>
if {${opencv_latest}} {
github.setup opencv opencv 4.5.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> epoch 1
checksums-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +71,7 @@ if {${opencv_latest}} {
</span> 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 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 11
</span>
checksums-append \
${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -128,7 +128,8 @@ compiler.blacklist-append \
</span>
depends_build-append \
port:cctools \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${default_python_version}
</span>
depends_lib-append \
path:lib/libavcodec.dylib:ffmpeg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,8 +141,7 @@ depends_lib-append \
</span> port:webp \
port:openexr \
port:ilmbase \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ade \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python${default_python_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ade
</span>
#------------------------------------------------------------------------------
# CMake Variables
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -347,15 +347,15 @@ platform darwin {
</span> # Name consistency with ${python.branch} and ${python.version} in
# ${prefix}/var/macports/sources/rsync.macports.org/macports/release/tarballs/ports/_resources/port1.0/group/python-1.0.tcl
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_branches {3.5 3.6 3.7 3.8 3.9}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_branches {3.7 3.8 3.9 3.10}
</span> foreach python_branch ${python_branches} {
set python_version [join [lrange [split ${python_branch} .] 0 1] ""]
subport py${python_version}-${name} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${default_python_version}
</span> depends_lib-append \
port:${name} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python_version}-numpy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python${default_python_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python_version}-numpy \
</span> port:python${python_version}
configure.args-replace \
-DBUILD_opencv_python3:BOOL=OFF \
</pre><pre style='margin:0'>
</pre>