<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/70c8c88ec321823c87c1b8fa17219890210e7e89">https://github.com/macports/macports-ports/commit/70c8c88ec321823c87c1b8fa17219890210e7e89</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 70c8c88ec32 gmic: add opencv variant
</span>70c8c88ec32 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 70c8c88ec321823c87c1b8fa17219890210e7e89
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Fri Apr 23 14:24:50 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> gmic: add opencv variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> enable parallel builds
</span><span style='display:block; white-space:pre;color:#404040;'> use configure.ldflags-append rather than patch for opencv lib path
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62738
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://github.com/macports/macports-ports/pull/10771
</span>---
science/gmic/Portfile | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
<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 9fadac9309e..15550a23f76 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;'>@@ -15,7 +15,7 @@ if {${subport} ne "gmic" && ${subport} ne "gmic-clib"} {
</span>
name gmic
version 2.9.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license CeCILL
categories science graphics
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,8 +38,6 @@ master_sites https://gmic.eu/files/source/
</span> # gmic will pick up include files from opencv, opencv3 dods not conflict
conflicts_build opencv
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> distfiles ${name}_${version}${extract.suffix}
checksums rmd160 f37cf8628635466aac2dba0a5f7f5653f955629f \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +51,6 @@ depends_lib port:curl \
</span> port:ilmbase \
path:include/turbojpeg.h:libjpeg-turbo \
port:libpng \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:opencv4 \
</span> port:openexr \
port:tiff \
port:zlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -95,14 +92,13 @@ if {${subport} eq ${name}} {
</span> -DENABLE_OPENMP=OFF \
-DENABLE_X=OFF
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # insert path to opencv4 libraries, as cmake fails to do so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # update and revision bump to new version of opencv4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set opencv4_version 4.5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|-lopencv_gapi.${opencv4_version}|-L${prefix}/lib/opencv4 -lopencv_gapi.${opencv4_version}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/CMakeFiles/gmic.dir/link.txt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${build.dir}/CMakeFiles/libgmic.dir/link.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant opencv4 description {compile with OpenCV support} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:opencv4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DENABLE_OPENCV=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.ldflags-append -L${prefix}/lib/opencv4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
variant x11 {
configure.args-replace -DENABLE_X=OFF \
</pre><pre style='margin:0'>
</pre>