<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/650b04a1ac0c959b8d5ac7e3ac2630dce0c1a72f">https://github.com/macports/macports-ports/commit/650b04a1ac0c959b8d5ac7e3ac2630dce0c1a72f</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 650b04a1ac0c959b8d5ac7e3ac2630dce0c1a72f
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Dec 17 13:05:39 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> opencv: fix pkgconfig file
</span>---
graphics/opencv/Portfile | 17 ++++++++---------
graphics/opencv/files/patch-dylib_suffix.diff | 11 +++++++++++
2 files changed, 19 insertions(+), 9 deletions(-)
<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 63927b5..be31831 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;'>@@ -6,7 +6,7 @@ PortGroup compiler_blacklist_versions 1.0
</span>
name opencv
version 3.3.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories graphics science
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,6 +55,9 @@ depends_lib-append port:zlib \
</span> # only search for openexr in ${prefix}
patchfiles-append patch-find-openexr.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# recognize dylib as a valid library suffix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-dylib_suffix.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # recognize AppleClang as well as Clang as a Clang compiler
patchfiles-append patch-appleclang.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -366,14 +369,10 @@ pre-configure {
</span>
post-destroot {
# http://trac.macports.org/ticket/42702
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {/Libs: /s:\${exec_prefix}/lib/libopencv_:-lopencv_:g} ${destroot}${prefix}/lib/pkgconfig/opencv.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {/Libs: /s:\.a::g} ${destroot}${prefix}/lib/pkgconfig/opencv.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {/Libs: /s:\.dylib::g} ${destroot}${prefix}/lib/pkgconfig/opencv.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|Libs: |Libs: -L\${exec_prefix}/lib |g} ${destroot}${prefix}/lib/pkgconfig/opencv.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s:-l-framework|-framework::g} ${destroot}${prefix}/lib/pkgconfig/opencv.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset qt4]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-lAGL|-framework AGL|g" ${destroot}${prefix}/lib/pkgconfig/opencv.pc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-lOpenGL|-framework OpenGL|g" ${destroot}${prefix}/lib/pkgconfig/opencv.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset qt4] || [variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|-L//System/Library/Frameworks ||g" ${destroot}${prefix}/lib/pkgconfig/opencv.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|-lAGL.framework|-framework AGL|g" ${destroot}${prefix}/lib/pkgconfig/opencv.pc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|-lOpenGL.framework|-framework OpenGL|g" ${destroot}${prefix}/lib/pkgconfig/opencv.pc
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/opencv/files/patch-dylib_suffix.diff b/graphics/opencv/files/patch-dylib_suffix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7f9aa3e
</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-dylib_suffix.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;'>+--- cmake/OpenCVUtils.cmake.orig 2017-12-17 09:16:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/OpenCVUtils.cmake 2017-10-23 08:41:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1025,7 +1025,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macro(ocv_get_libname var_name)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ get_filename_component(__libname "${ARGN}" NAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- string(REGEX REPLACE "^lib(.+).(a|so)(.[.0-9]+)?$" "\\1" __libname "${__libname}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ string(REGEX REPLACE "^lib(.+).(a|so|dylib)(.[.0-9]+)?$" "\\1" __libname "${__libname}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(${var_name} "${__libname}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endmacro()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>