<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/f7b488117878b73df8a3cc40ff33c4416f5f6755">https://github.com/macports/macports-ports/commit/f7b488117878b73df8a3cc40ff33c4416f5f6755</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 f7b48811787 opencv4*: contrib: prevent opportunistic use of ogre Fixes: https://trac.macports.org/ticket/63786
</span>f7b48811787 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f7b488117878b73df8a3cc40ff33c4416f5f6755
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Wed Sep 7 09:51:11 2022 -0400
<span style='display:block; white-space:pre;color:#404040;'> opencv4*: contrib: prevent opportunistic use of ogre
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/63786
</span>---
graphics/opencv4-devel/Portfile | 7 ++++++-
.../opencv4-devel/files/patch-contrib-ovis-ogre.diff | 16 ++++++++++++++++
graphics/opencv4/Portfile | 7 ++++++-
graphics/opencv4/files/patch-contrib-ovis-ogre.diff | 16 ++++++++++++++++
4 files changed, 44 insertions(+), 2 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 7205dff32ef..ef9368ba9be 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;'>@@ -477,7 +477,8 @@ if {${name} eq ${subport}} {
</span> configure.args-append \
-DBUILD_PROTOBUF:BOOL=OFF \
-DWITH_PROTOBUF:BOOL=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_TESSERACT:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_TESSERACT:BOOL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_OGRE:BOOL=OFF
</span>
# Regenerate protobuf files, if stale
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -504,6 +505,10 @@ if {${name} eq ${subport}} {
</span> ln -s ${workpath}/${github.project}_contrib-${version} ${worksrcpath}/${github.project}_contrib
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Allow enabling/disabling Ogre, via CMake flag 'WITH_OGRE'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-contrib-ovis-ogre.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
-DOPENCV_EXTRA_MODULES_PATH=${worksrcpath}/${github.project}_contrib/modules
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv4-devel/files/patch-contrib-ovis-ogre.diff b/graphics/opencv4-devel/files/patch-contrib-ovis-ogre.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4dc9d233017
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv4-devel/files/patch-contrib-ovis-ogre.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- opencv_contrib/modules/ovis/CMakeLists.txt.orig 2022-09-06 17:53:02.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ opencv_contrib/modules/ovis/CMakeLists.txt 2022-09-06 17:54:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(the_description "OGRE 3D Visualiser.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(WITH_OGRE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(OGRE QUIET CONFIG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT OGRE_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,3 +30,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ocv_warnings_disable(CMAKE_CXX_FLAGS -Wunused-parameter)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ocv_target_link_libraries(${the_module} ${OGRE_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif(WITH_OGRE)
</span><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 03e422de7f1..ecdc86143f4 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;'>@@ -478,7 +478,8 @@ if {${name} eq ${subport}} {
</span> configure.args-append \
-DBUILD_PROTOBUF:BOOL=OFF \
-DWITH_PROTOBUF:BOOL=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_TESSERACT:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_TESSERACT:BOOL=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_OGRE:BOOL=OFF
</span>
# Regenerate protobuf files, if stale
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -505,6 +506,10 @@ if {${name} eq ${subport}} {
</span> ln -s ${workpath}/${github.project}_contrib-${version} ${worksrcpath}/${github.project}_contrib
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Allow enabling/disabling Ogre, via CMake flag 'WITH_OGRE'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-contrib-ovis-ogre.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
-DOPENCV_EXTRA_MODULES_PATH=${worksrcpath}/${github.project}_contrib/modules
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv4/files/patch-contrib-ovis-ogre.diff b/graphics/opencv4/files/patch-contrib-ovis-ogre.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4dc9d233017
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv4/files/patch-contrib-ovis-ogre.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- opencv_contrib/modules/ovis/CMakeLists.txt.orig 2022-09-06 17:53:02.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ opencv_contrib/modules/ovis/CMakeLists.txt 2022-09-06 17:54:01.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,5 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(the_description "OGRE 3D Visualiser.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(WITH_OGRE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(OGRE QUIET CONFIG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(NOT OGRE_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,3 +30,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ocv_warnings_disable(CMAKE_CXX_FLAGS -Wunused-parameter)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ocv_target_link_libraries(${the_module} ${OGRE_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif(WITH_OGRE)
</span></pre><pre style='margin:0'>
</pre>