<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/736d5ec19931c41a073229bab4b0f1358106e38f">https://github.com/macports/macports-ports/commit/736d5ec19931c41a073229bab4b0f1358106e38f</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 736d5ec1993 opencv3/opencv4 dependents: switch to path-style dep
</span>736d5ec1993 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 736d5ec19931c41a073229bab4b0f1358106e38f
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue Nov 2 09:27:22 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> opencv3/opencv4 dependents: switch to path-style dep
</span>---
aqua/nomacs/Portfile | 2 +-
gis/orfeotoolbox/Portfile | 2 +-
gnome/gstreamer1-gst-plugins-bad/Portfile | 2 +-
graphics/objectmarker/Portfile | 2 +-
graphics/openimageio/Portfile | 2 +-
kde/digikam/Portfile | 2 +-
math/caffe/Portfile | 2 +-
multimedia/mlt/Portfile | 2 +-
python/py-gmic/Portfile | 2 +-
python/py-pytorch/Portfile | 2 +-
science/SDRangel/Portfile | 2 +-
science/gerbil/Portfile | 2 +-
science/gmic/Portfile | 2 +-
x11/auto-multiple-choice/Portfile | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/nomacs/Portfile b/aqua/nomacs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d651f268095..ae592e722c5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/nomacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/nomacs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@ depends_lib-append port:exiv2 \
</span> port:libraw \
port:zlib \
port:tiff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:opencv${opencv_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/${opencv_ver}/libopencv_core.dylib:opencv${opencv_ver}
</span> qt5.depends_component qtsvg qttools
worksrcdir ${worksrcdir}/ImageLounge
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/orfeotoolbox/Portfile b/gis/orfeotoolbox/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9e74eef3293..cdd14c10a3a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/orfeotoolbox/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/orfeotoolbox/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,7 +46,7 @@ depends_lib-append port:tiff \
</span> port:libkml \
port:tinyxml \
port:muparser \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:opencv${opencv_ver} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/${opencv_ver}/libopencv_core.dylib:opencv${opencv_ver} \
</span> port:fftw-3
conflicts_build libsvm \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gstreamer1-gst-plugins-bad/Portfile b/gnome/gstreamer1-gst-plugins-bad/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d7c505d737c..4566f4cce19 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gstreamer1-gst-plugins-bad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gstreamer1-gst-plugins-bad/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,7 +89,7 @@ platform darwin 8 {
</span> # port:faac has a restrictive license, disable faac plugin by default
# port:libfdk-aac has a restrictive license, disable fdkaac plugin by default
# plugin frei0r (no dependency, seqfaults on load)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# port:opencv (opencv plugin fails to configure with opencv 3.0.0+, can't find opencv2/bgsegm.hpp, now opencv2/video/background_segm.hpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# path:lib/opencv3/libopencv_core.dylib:opencv3 (opencv plugin fails to configure with opencv 3.0.0+, can't find opencv2/bgsegm.hpp, now opencv2/video/background_segm.hpp)
</span> # plugin opus is now contained in gstreamer1-gst-plugins-base, disable this version
# plugin ipcpipeline fails to build
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/objectmarker/Portfile b/graphics/objectmarker/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 98d3280e723..1c10eb2f6c7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/objectmarker/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/objectmarker/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ depends_build port:pkgconfig
</span> set opencv_ver 3
set opencv_pc ${prefix}/lib/opencv${opencv_ver}/pkgconfig/opencv.pc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:opencv${opencv_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib path:lib/${opencv_ver}/libopencv_core.dylib:opencv${opencv_ver}
</span>
extract.only
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/openimageio/Portfile b/graphics/openimageio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 05b5f964fab..ce2415297fa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/openimageio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/openimageio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,7 +124,7 @@ depends_lib-append port:opencolorio
</span>
#configure.args-append -DUSE_OPENCV=OFF
set opencv_ver 4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:opencv${opencv_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/${opencv_ver}/libopencv_core.dylib:opencv${opencv_ver}
</span> configure.args-append -DOpenCV_INCLUDE_DIR=${prefix}/include/opencv${opencv_ver} \
-DOpenCV_ROOT=${prefix}/lib/opencv${opencv_ver}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/kde/digikam/Portfile b/kde/digikam/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 958c929d7b4..747eafa0a8f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/kde/digikam/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/kde/digikam/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,7 @@ depends_lib-append port:kdelibs4 \
</span> port:tiff \
path:include/turbojpeg.h:libjpeg-turbo \
port:libpng \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:opencv${opencv_ver} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/${opencv_ver}/libopencv_core.dylib:opencv${opencv_ver} \
</span> port:marble
depends_lib-append port:libpgf
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/caffe/Portfile b/math/caffe/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0d781ef3fa6..6397d6ab104 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/caffe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/caffe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@ depends_lib-append port:google-glog \
</span> port:snappy \
port:lmdb \
port:hdf5 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:opencv3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/opencv3/libopencv_core.dylib:opencv3 \
</span> port:szip
depends_run-append port:wget
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mlt/Portfile b/multimedia/mlt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index decdb4bbbe0..a1111dbac33 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mlt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mlt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -161,7 +161,7 @@ variant gpl3 description {enable GPLv3 components} {
</span> # another reason why opencv support is provided through a variant.
variant opencv description {enable OpenCV support} {
set opencv_ver 3
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:opencv${opencv_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:lib/${opencv_ver}/libopencv_core.dylib:opencv${opencv_ver}
</span> configure.env-append PKG_CONFIG_PATH=${prefix}/lib/opencv${opencv_ver}/pkgconfig
configure.args-replace --disable-opencv \
--enable-opencv
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gmic/Portfile b/python/py-gmic/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c5f2ef013da..626240aac37 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gmic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gmic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@ if {${name} ne ${subport}} {
</span> port:jpeg \
port:libpng \
port:libomp \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:opencv4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/opencv4/libopencv_core.dylib:opencv4 \
</span> port:py${python.version}-numpy \
port:py${python.version}-Pillow \
port:py${python.version}-psutil \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pytorch/Portfile b/python/py-pytorch/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 667d5fe1deb..f1da3632ac4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pytorch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pytorch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,7 +68,7 @@ if {${name} ne ${subport}} {
</span> port:gmp \
port:mpfr \
port:OpenBLAS \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:opencv4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/opencv4/libopencv_core.dylib:opencv4 \
</span> port:zmq \
port:zstd \
port:tbb \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/SDRangel/Portfile b/science/SDRangel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0cbb77c3c1f..c69ed9ae7cc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/SDRangel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/SDRangel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,7 +55,7 @@ depends_lib-append \
</span> path:lib/pkgconfig/libusb-1.0.pc:libusb \
port:libiconv \
port:libopus \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:opencv${opencv_ver} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/${opencv_ver}/libopencv_core.dylib:opencv${opencv_ver} \
</span> port:serialDV
qt5.depends_component \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gerbil/Portfile b/science/gerbil/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d7bcc8e8514..9af6299ce74 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gerbil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gerbil/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ long_description \
</span>
homepage http://gerbilvis.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:opencv4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib path:lib/opencv4/libopencv_core.dylib:opencv4 \
</span> port:gdal \
port:tbb
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmic/Portfile b/science/gmic/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 11857282b69..07eb901b45d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,7 +105,7 @@ if {${subport} eq ${name}} {
</span> configure.pkg_config_path-append \
${prefix}/lib/opencv4/pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:opencv4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:lib/opencv4/libopencv_core.dylib:opencv4
</span> }
variant x11 {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/auto-multiple-choice/Portfile b/x11/auto-multiple-choice/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3641ee5ebfe..88063330ce9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/auto-multiple-choice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/auto-multiple-choice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@ if {${subport} eq ${name}} {
</span> version ${amc.version.main}-${amc.version.secondary}
set opencv_ver 4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:opencv${opencv_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/${opencv_ver}/libopencv_core.dylib:opencv${opencv_ver}
</span> build.env-append PKG_CONFIG_PATH=${prefix}/lib/opencv${opencv_ver}/pkgconfig
master_sites https://download.auto-multiple-choice.net/precomp/
</pre><pre style='margin:0'>
</pre>