<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6bca08704bcff37d3a7a67654eaec2d693865d51">https://github.com/macports/macports-ports/commit/6bca08704bcff37d3a7a67654eaec2d693865d51</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 6bca08704bc objectmarker: Fix build with opencv3
</span>6bca08704bc is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 6bca08704bcff37d3a7a67654eaec2d693865d51
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Nov 21 07:41:52 2021 -0600

<span style='display:block; white-space:pre;color:#404040;'>    objectmarker: Fix build with opencv3
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/58094
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Also use MacPorts CXXFLAGS and LDFLAGS and disable livecheck since the
</span><span style='display:block; white-space:pre;color:#404040;'>    homepage is gone.
</span>---
 graphics/objectmarker/Portfile                        |  9 ++++-----
 .../objectmarker/files/patch-ObjectMarker.cpp.diff    | 19 ++++++++++++++++---
 2 files changed, 20 insertions(+), 8 deletions(-)

<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 96ad6c06c7c..5424a8cbde4 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;'>@@ -4,7 +4,7 @@ PortSystem          1.0
</span> 
 name                objectmarker
 version             20070501
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            4
</span> checksums           rmd160  32946c7a8950ed505150f716c77576438ebe7494 \
                     sha256  ddb00c8b4e2406247c5c20e1b83a14277b9c6ab6f83f4a9a282df257dededbbd \
                     size    4790
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,12 +44,11 @@ patchfiles          patch-ObjectMarker.cpp.diff
</span> use_configure       no
 
 build {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system -W ${worksrcpath} "${configure.cxx} [get_canonical_archflags] ObjectMarker.cpp `pkg-config --cflags ${opencv_pc}` -o objectmarker `pkg-config --libs ${opencv_pc}`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    system -W ${worksrcpath} "${configure.cxx} ${configure.cxxflags} ${configure.ldflags} [get_canonical_archflags] ObjectMarker.cpp `pkg-config --cflags ${opencv_pc}` -o objectmarker `pkg-config --libs ${opencv_pc}`"
</span> }
 
 destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -m 755 ${worksrcpath}/${name} ${destroot}${prefix}/bin/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xinstall -m 0755 ${worksrcpath}/${name} ${destroot}${prefix}/bin/
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type      moddate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url       [lindex ${master_sites} 0]${distfiles}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.type      none
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/objectmarker/files/patch-ObjectMarker.cpp.diff b/graphics/objectmarker/files/patch-ObjectMarker.cpp.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b271fb91421..30f85fd2461 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/objectmarker/files/patch-ObjectMarker.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/objectmarker/files/patch-ObjectMarker.cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ObjectMarker.cpp.orig  2007-05-01 18:18:30.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ObjectMarker.cpp       2011-05-10 07:27:33.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,7 +4,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ObjectMarker.cpp.orig  2021-11-21 07:01:09.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ObjectMarker.cpp       2021-11-21 07:30:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,10 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <opencv/cv.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <opencv/cvaux.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <opencv/highgui.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <opencv2/imgproc.hpp>
</span>  
  // for filelisting
  #include <stdio.h>
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,3 +13,12 @@
</span>  // for fileoutput
  #include <string>
  #include <fstream>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,7 +57,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           //redraw ROI selection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           image2=cvCloneImage(image);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-          cvRectangle(image2,cvPoint(roi_x0,roi_y0),cvPoint(x,y),CV_RGB(255,0,255),1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          cvRectangle(image2,cvPoint(roi_x0,roi_y0),cvPoint(x,y),cvScalar(CV_RGB(255,0,255)),1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           cvShowImage(window_name,image2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           cvReleaseImage(&image2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     }
</span></pre><pre style='margin:0'>

</pre>