<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/5c4afead0668b329bb9e01fa672e6b188c54bbdb">https://github.com/macports/macports-ports/commit/5c4afead0668b329bb9e01fa672e6b188c54bbdb</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 5c4afead066 py-gmic: use opencv4, enable libomp
</span>5c4afead066 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5c4afead0668b329bb9e01fa672e6b188c54bbdb
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Wed Feb 10 18:20:39 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> py-gmic: use opencv4, enable libomp
</span>---
python/py-gmic/Portfile | 4 ++--
python/py-gmic/files/patch-setup.py.diff | 18 +++++++++++++++---
2 files changed, 17 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gmic/Portfile b/python/py-gmic/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ef6be7772d0..402f6ba809b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gmic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gmic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup python 1.0
</span>
name py-gmic
version 2.9.4-alpha1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
# gmic and py-gmic should be the same version
set gmic_version 2.9.4
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@ if {${name} ne ${subport}} {
</span> port:jpeg \
port:libpng \
port:libomp \
<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:py${python.version}-numpy \
port:py${python.version}-Pillow \
port:py${python.version}-psutil \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gmic/files/patch-setup.py.diff b/python/py-gmic/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ea836eadee2..50a00c6cfa8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gmic/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gmic/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2020-12-21 15:07:23.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2021-01-25 15:01:00.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2021-02-10 08:43:57.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2021-02-10 08:46:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,9 +62,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extra_link_args += ["-lfftw3_threads"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Only compile with OpenCV if exists (nice for the 'camera' G'MIC command :-D )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if pkgconfig.exists("opencv"):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if pkgconfig.exists("opencv4"):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ define_macros += [("cimg_use_opencv", None)]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pkgconfig_list += ["opencv"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pkgconfig_list += ["opencv4"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ packages = pkgconfig.parse(" ".join(pkgconfig_list))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libraries = packages["libraries"] + [
</span> @@ -73,10 +73,10 @@
library_dirs = packages["library_dirs"] + [here, gmic_src_path]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +30,7 @@
</span>
if sys.platform == "darwin":
- extra_compile_args += ["-fopenmp", "-stdlib=libc++"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ extra_compile_args += ["-stdlib=libc++"]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ extra_compile_args += ["-Xpreprocessor", "-fopenmp", "-stdlib=libc++"]
</span> extra_link_args += [
"-lomp",
"-nodefaultlibs",
</pre><pre style='margin:0'>
</pre>