<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/e600fda8d9e2ba46361dee3461eec3806ad02d69">https://github.com/macports/macports-ports/commit/e600fda8d9e2ba46361dee3461eec3806ad02d69</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e600fda8d9e2ba46361dee3461eec3806ad02d69
</span>Author: Julien Salort <julien.salort@ens-lyon.fr>
AuthorDate: Wed May 18 21:14:25 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> opencv3: use Macports Python 3.10 as default python
</span>---
graphics/opencv3/Portfile | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv3/Portfile b/graphics/opencv3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7b913a4dc23..b721794855b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,7 +110,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:python310
</span>
# only search for openexr in ${prefix}
patchfiles-append patch-find-openexr.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -272,8 +273,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/python3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DPYTHON_DEFAULT_EXECUTABLE=/usr/bin/python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${prefix}/bin/python3.10 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_DEFAULT_EXECUTABLE=${prefix}/bin/python3.10
</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;'>@@ -360,7 +361,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/python3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${prefix}/bin/python3.10 \
</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;'>@@ -513,7 +514,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/python3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPYTHON_EXECUTABLE=${prefix}/bin/python3.10
</span> configure.args-delete \
-DBUILD_opencv_python2=OFF
}
</pre><pre style='margin:0'>
</pre>