<pre style='margin:0'>
Andrew Stromnov (stromnov) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/01d876201bc842841d49e9a259bc028b8680f31a">https://github.com/macports/macports-ports/commit/01d876201bc842841d49e9a259bc028b8680f31a</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 01d876201bc842841d49e9a259bc028b8680f31a
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Oct 25 16:38:48 2018 -0700

<span style='display:block; white-space:pre;color:#404040;'>    opencv: allow build when protobuf3-cpp in active
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    OpenCV uses a local copy of Protobuf, which is incompatible with
</span><span style='display:block; white-space:pre;color:#404040;'>    the MacPorts version.
</span>---
 graphics/opencv/Portfile                        |  4 ++++
 graphics/opencv/files/patch-local_protobuf.diff | 11 +++++++++++
 2 files changed, 15 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/Portfile b/graphics/opencv/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4c9ea68..609ff55 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/opencv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,6 +64,10 @@ patchfiles-append   patch-dylib_suffix.diff
</span> # recognize AppleClang as well as Clang as a Clang compiler
 patchfiles-append   patch-appleclang.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# do not find protobuf3-cpp header files if installed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cppflags-replace -I${prefix}/include -isystem${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append          patch-local_protobuf.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
     reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/cmake/OpenCVFindOpenEXR.cmake
 }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/files/patch-local_protobuf.diff b/graphics/opencv/files/patch-local_protobuf.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e172f8e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/opencv/files/patch-local_protobuf.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 3rdparty/protobuf/CMakeLists.txt.orig  2018-08-28 05:58:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ 3rdparty/protobuf/CMakeLists.txt       2018-10-25 09:41:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -135,7 +135,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_library(libprotobuf STATIC ${Protobuf_SRCS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_include_directories(libprotobuf SYSTEM PUBLIC $<BUILD_INTERFACE:${PROTOBUF_ROOT}/src>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++target_include_directories(libprotobuf PUBLIC $<BUILD_INTERFACE:${PROTOBUF_ROOT}/src>)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(libprotobuf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     FOLDER "3rdparty"
</span></pre><pre style='margin:0'>

</pre>