<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/34b22cf14d97b17acd364006573b389d23411be3">https://github.com/macports/macports-ports/commit/34b22cf14d97b17acd364006573b389d23411be3</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 34b22cf14d9 opencv3-devel: reconcile with opencv3 python changes See: https://github.com/macports/macports-ports/pull/14877
</span>34b22cf14d9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 34b22cf14d97b17acd364006573b389d23411be3
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Thu May 19 10:12:17 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> opencv3-devel: reconcile with opencv3 python changes
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/macports/macports-ports/pull/14877
</span>---
graphics/opencv3-devel/Portfile | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv3-devel/Portfile b/graphics/opencv3-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 824b309cc8d..0553917c496 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ name opencv3-devel
</span> conflicts opencv3
set my_name opencv3
version 3.4.16
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> categories graphics science
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,6 +52,9 @@ distname ${version}
</span> distfiles ${distname}${extract.suffix}:opencv
dist_subdir ${my_name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set default_python_branch 3.10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set default_python_version [join [lrange [split ${default_python_branch} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # don't forget to also update the checksums under the contrib variant.
checksums-append \
${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,7 +113,8 @@ depends_lib-append \
</span> port:tiff \
port:webp \
port:ilmbase \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:openexr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openexr \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${default_python_version}
</span>
# only search for openexr in ${prefix}
patchfiles-append patch-find-openexr.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -272,8 +276,8 @@ configure.args-append \
</span> -DBUILD_opencv_python2=OFF \
-DBUILD_opencv_python3=OFF \
-DOPENCV_PYTHON_SKIP_DETECTION=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=/usr/bin/python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_DEFAULT_EXECUTABLE=/usr/bin/python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${prefix}/bin/python${default_python_branch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_DEFAULT_EXECUTABLE=${prefix}/bin/python${default_python_branch}
</span>
if {![info exists universal_possible]} {
set universal_possible [expr {${os.universal_supported} && [llength ${configure.universal_archs}] >= 2}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -351,8 +355,10 @@ foreach python_branch {2.7} {
</span> subport py${python_version}-${name} {
depends_lib-append \
port:${name} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python${python_version} \
</span> port:py${python_version}-numpy
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${default_python_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${python_version}
</span> configure.args-replace \
-DBUILD_opencv_python2=OFF \
-DBUILD_opencv_python2=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -360,7 +366,7 @@ foreach python_branch {2.7} {
</span> -DBUILD_opencv_apps=ON \
-DBUILD_opencv_apps=OFF
configure.args-replace \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=/usr/bin/python \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${prefix}/bin/python${default_python_branch} \
</span> -DPYTHON_EXECUTABLE=${prefix}/bin/python${python_branch}
configure.args-append \
-DPYTHON2_EXECUTABLE=${prefix}/bin/python${python_branch} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -379,14 +385,16 @@ foreach python_branch {2.7} {
</span> }
}
<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} {
depends_lib-append \
port:${name} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:python${python_version} \
</span> port:py${python_version}-numpy
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${default_python_version} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:python${python_version}
</span> configure.args-replace \
-DBUILD_opencv_python3=OFF \
-DBUILD_opencv_python3=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -513,7 +521,7 @@ if {${name} eq ${subport}} {
</span> if {[variant_isset java] && ![variant_isset python27]} {
configure.args-replace \
-DPYTHON_EXECUTABLE=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_EXECUTABLE=/usr/bin/python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${prefix}/bin/python${default_python_branch}
</span> configure.args-delete \
-DBUILD_opencv_python2=OFF
}
</pre><pre style='margin:0'>
</pre>