<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/0cb61a44a180f3e28349d103d9dadb3a4df212f6">https://github.com/macports/macports-ports/commit/0cb61a44a180f3e28349d103d9dadb3a4df212f6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0cb61a44a180f3e28349d103d9dadb3a4df212f6
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri May 20 15:27:35 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> opencv3/opencv3-devel: python is a build dep, not lib, for base ports
</span>---
graphics/opencv3-devel/Portfile | 20 ++++++++++----------
graphics/opencv3/Portfile | 20 ++++++++++----------
2 files changed, 20 insertions(+), 20 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 486623b29b7..c8662e841b1 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 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> categories graphics science
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,7 +108,8 @@ compiler.blacklist-append \
</span> macports-clang-4.0
depends_build-append \
<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;'>@@ -120,8 +121,7 @@ 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:#ffe0e0;'>- port:python${default_python_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openexr
</span>
# only search for openexr in ${prefix}
patchfiles-append patch-find-openexr.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -360,11 +360,11 @@ if {${universal_possible} && [variant_isset universal]} {
</span> foreach python_branch {2.7} {
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_python2=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -396,11 +396,11 @@ 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=OFF \
<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 1bd1bb72ee9..d2a1ebbaadc 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;'>@@ -26,7 +26,7 @@ name opencv3
</span> conflicts opencv3-devel
set my_name opencv3
version 3.4.16
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> categories graphics science
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,7 +108,8 @@ compiler.blacklist-append \
</span> macports-clang-4.0
depends_build-append \
<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;'>@@ -120,8 +121,7 @@ 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:#ffe0e0;'>- port:python${default_python_version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:openexr
</span>
# only search for openexr in ${prefix}
patchfiles-append patch-find-openexr.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -360,11 +360,11 @@ if {${universal_possible} && [variant_isset universal]} {
</span> foreach python_branch {2.7} {
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_python2=OFF \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -396,11 +396,11 @@ 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=OFF \
</pre><pre style='margin:0'>
</pre>