<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/56add885cf436dd4483741ece67635c88ccc5f07">https://github.com/macports/macports-ports/commit/56add885cf436dd4483741ece67635c88ccc5f07</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 56add885cf4 opencv4{,-devel}: py subports: use correct python for build
</span>56add885cf4 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 56add885cf436dd4483741ece67635c88ccc5f07
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sun Jan 5 10:16:46 2025 -0500

<span style='display:block; white-space:pre;color:#404040;'>    opencv4{,-devel}: py subports: use correct python for build
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/69617
</span>---
 graphics/opencv4-devel/Portfile | 25 ++++++++++++++++++-------
 graphics/opencv4/Portfile       | 21 ++++++++++++++++-----
 2 files changed, 34 insertions(+), 12 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 0caeaf992c1..9e10387f3b9 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;'>@@ -119,7 +119,7 @@ platform darwin {
</span> 
 # Claims to only need c++11 but actually uses c++14 features
 # core/cvstd_wrapper.hpp:45:40: warning: variable templates are a C++14 extension [-Wc++14-extensions]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set cxx_standard 2014
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set cxx_standard    2014
</span> compiler.cxx_standard \
                     ${cxx_standard}
 cmake.set_cxx_standard \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,7 +133,7 @@ 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;'>+                    path:bin/pkg-config:pkgconfig \
</span>                     port:python${default_python_version}
 
 depends_lib-append  \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -351,7 +351,10 @@ platform darwin {
</span> # Python Bindings
 set python_branches {3.9 3.10 3.11 3.12}
 foreach python_branch ${python_branches} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set python_version [join [lrange [split ${python_branch} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_version   [join [lrange [split ${python_branch} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_path      ${prefix}/bin/python${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_framework ${frameworks_dir}/Python.framework/Versions/${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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:#e0e0e0;'>@@ -371,6 +374,7 @@ foreach python_branch ${python_branches} {
</span>                     port:${name} \
                     port:py${python_version}-numpy \
                     port:python${python_version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         configure.args-replace \
                     -DBUILD_opencv_python3:BOOL=OFF \
                     -DBUILD_opencv_python3:BOOL=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -380,11 +384,18 @@ foreach python_branch ${python_branches} {
</span>         configure.args-replace \
                     -DBUILD_opencv_aruco:BOOL=ON \
                     -DBUILD_opencv_aruco:BOOL=OFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON_EXECUTABLE:FILEPATH=${default_python_path} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON_EXECUTABLE:FILEPATH=${python_path}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON_DEFAULT_EXECUTABLE:FILEPATH=${default_python_path} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON_DEFAULT_EXECUTABLE:FILEPATH=${python_path}
</span>         configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DPYTHON3_EXECUTABLE=${prefix}/bin/python${python_branch} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DPYTHON3_LIBRARY=${frameworks_dir}/Python.framework/Versions/${python_branch}/lib/libpython${python_branch}.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DPYTHON3_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/${python_branch}/Headers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DPYTHON3_PACKAGES_PATH=${frameworks_dir}/Python.framework/Versions/${python_branch}/lib/python${python_branch}/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON3_EXECUTABLE=${python_path} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON3_LIBRARY=${python_framework}/lib/libpython${python_branch}.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON3_INCLUDE_DIR=${python_framework}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON3_PACKAGES_PATH=${python_framework}/lib/python${python_branch}/site-packages
</span> 
         # Deconflict with parent port contents
         post-destroot {
<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 9a4498f27ab..e12b4601b39 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;'>@@ -400,7 +400,10 @@ platform darwin {
</span> # Python Bindings
 set python_branches {3.9 3.10 3.11 3.12}
 foreach python_branch ${python_branches} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set python_version [join [lrange [split ${python_branch} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_version   [join [lrange [split ${python_branch} .] 0 1] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_path      ${prefix}/bin/python${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set python_framework ${frameworks_dir}/Python.framework/Versions/${python_branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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:#e0e0e0;'>@@ -420,6 +423,7 @@ foreach python_branch ${python_branches} {
</span>                     port:${name} \
                     port:py${python_version}-numpy \
                     port:python${python_version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>         configure.args-replace \
                     -DBUILD_opencv_python3:BOOL=OFF \
                     -DBUILD_opencv_python3:BOOL=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -429,11 +433,18 @@ foreach python_branch ${python_branches} {
</span>         configure.args-replace \
                     -DBUILD_opencv_aruco:BOOL=ON \
                     -DBUILD_opencv_aruco:BOOL=OFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON_EXECUTABLE:FILEPATH=${default_python_path} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON_EXECUTABLE:FILEPATH=${python_path}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON_DEFAULT_EXECUTABLE:FILEPATH=${default_python_path} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON_DEFAULT_EXECUTABLE:FILEPATH=${python_path}
</span>         configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DPYTHON3_EXECUTABLE=${prefix}/bin/python${python_branch} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DPYTHON3_LIBRARY=${frameworks_dir}/Python.framework/Versions/${python_branch}/lib/libpython${python_branch}.dylib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DPYTHON3_INCLUDE_DIR=${frameworks_dir}/Python.framework/Versions/${python_branch}/Headers \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    -DPYTHON3_PACKAGES_PATH=${frameworks_dir}/Python.framework/Versions/${python_branch}/lib/python${python_branch}/site-packages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON3_EXECUTABLE=${python_path} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON3_LIBRARY=${python_framework}/lib/libpython${python_branch}.dylib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON3_INCLUDE_DIR=${python_framework}/Headers \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    -DPYTHON3_PACKAGES_PATH=${python_framework}/lib/python${python_branch}/site-packages
</span> 
         # Deconflict with parent port contents
         post-destroot {
</pre><pre style='margin:0'>

</pre>