<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/7dc764e1aa65504b335596b4b4dffa027b9ec817">https://github.com/macports/macports-ports/commit/7dc764e1aa65504b335596b4b4dffa027b9ec817</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 7dc764e1aa6 gmic: update to 2.9.6, build against opencv4
</span>7dc764e1aa6 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7dc764e1aa65504b335596b4b4dffa027b9ec817
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Thu Feb 11 14:56:59 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> gmic: update to 2.9.6, build against opencv4
</span>---
science/gmic/Portfile | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 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 dc4900c1b7b..818b24e0181 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;'>@@ -1,6 +1,8 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup conflicts_build 1.0
</span> if {${subport} eq "gmic-clib"} {
PortGroup makefile 1.0
} else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +14,7 @@ if {${subport} ne "gmic" && ${subport} ne "gmic-clib"} {
</span> }
name gmic
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.9.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.9.6
</span> revision 0
license CeCILL
categories science graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,13 +35,16 @@ long_description G'MIC stands for GREYC's Magic Image Converter. It is \
</span> homepage https://gmic.eu
master_sites https://gmic.eu/files/source/
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# gmic will pick up include files from opencv, opencv3 dods not conflict
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts_build opencv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_parallel_build no
distfiles ${name}_${version}${extract.suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 229e4401ace4a6a3e63c84833384254130de80df \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 295fd38ba98f5be1404a3ba0eaaf107e0adaf0bfd323297f63a27000dcd0ade1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7304367
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6ab8fa61a3c3bfc36104a84848edacb91e258bc0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d22fe8515af16dcd050d09a0bc7127ec29f4795ce732a0c6c3eaf839356bc11a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7304588
</span>
depends_lib port:curl \
path:lib/libavcodec.dylib:ffmpeg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +53,7 @@ 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:opencv \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:opencv4 \
</span> port:openexr \
port:tiff \
port:zlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,12 +95,20 @@ if {${subport} eq ${name}} {
</span> -DENABLE_OPENMP=OFF \
-DENABLE_X=OFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # insert path to opencv4 libraries, as cmake fails to do so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|-lopencv_gapi.4.5.0|-L${prefix}/lib/opencv4 -lopencv_gapi.4.5.0|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${build.dir}/CMakeFiles/gmic.dir/link.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${build.dir}/CMakeFiles/libgmic.dir/link.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant x11 {
configure.args-replace -DENABLE_X=OFF \
-DENABLE_X=ON
depends_lib-append port:xorg-libX11 \
port:xorg-libXext \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libXcursor \
</span> port:xorg-libice \
port:xorg-libsm
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -157,6 +170,7 @@ if {${subport} eq ${name}} {
</span> cmake.source_dir ${worksrcpath}/gmic-qt
configure.args-append -DENABLE_DYNAMIC_LINKING=ON \
-DENABLE_LTO=OFF \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_OPENMP=OFF \
</span> -DGMIC_PATH=${worksrcpath}/src
qt5.depends_build_component qttools
</pre><pre style='margin:0'>
</pre>