<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/58cf2916f505c50abef6320350438ee2fd169929">https://github.com/macports/macports-ports/commit/58cf2916f505c50abef6320350438ee2fd169929</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 58cf291 gmic: update to 2.8.3
</span>58cf291 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 58cf2916f505c50abef6320350438ee2fd169929
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Fri Jan 24 07:08:28 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> gmic: update to 2.8.3
</span>---
science/gmic/Portfile | 8 ++++----
science/gmic/files/patch-src-Makefile.diff | 32 ++++++++++++++++--------------
2 files changed, 21 insertions(+), 19 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 4fa6688..82c6fbe 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;'>@@ -5,7 +5,7 @@ PortGroup cxx11 1.1
</span> PortGroup qt5 1.0
name gmic
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.8.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.8.3
</span> revision 0
license CeCILL
categories science
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +31,9 @@ use_parallel_build no
</span>
distfiles ${name}_${version}${extract.suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a58a2f9152dc437349a7f694a18dc0dec815b451 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 09173c157a248d4c2c40b6250ae1058f1518665eedfb9f971ed1045fe652daea \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6170087
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1e2c9a8144792312bb647963eed7e577413e572a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 573a4f7731ba506a397c8080e60ad30bd3d4b686c51ec3d22d7f5de9a901547c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6172645
</span>
depends_lib port:curl \
path:lib/libavcodec.dylib:ffmpeg \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmic/files/patch-src-Makefile.diff b/science/gmic/files/patch-src-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5e547ef..49ef4eb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmic/files/patch-src-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmic/files/patch-src-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.orig 2018-12-03 02:57:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile 2018-12-03 05:42:54.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.orig 2020-01-23 11:04:39.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile 2020-01-24 06:08:51.000000000 -0600
</span> @@ -119,13 +119,13 @@
endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,7 +30,7 @@
</span> endif
#--------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -176,23 +176,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -181,24 +181,24 @@
</span> ifeq ($(OS),Unix)
MANDATORY_CFLAGS += -Dcimg_use_vt100
endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,14 +50,16 @@
</span> # Enable optimizations.
-OPT_CFLAGS = -Ofast
-ifdef IS_GCC
<span style='display:block; white-space:pre;background:#ffe0e0;'>--OPT_CFLAGS = -Ofast -mtune=generic # -fno-finite-math-only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-OPT_CFLAGS = -Ofast -mtune=generic -flto # -fno-finite-math-only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-OPT_LIBS = -flto
</span> -endif
-ifdef icpc
-OPT_CFLAGS = -fast
-endif
+# OPT_CFLAGS = -Ofast
+# ifdef IS_GCC
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# OPT_CFLAGS = -Ofast -mtune=generic # -fno-finite-math-only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# OPT_CFLAGS = -Ofast -mtune=generic -flto # -fno-finite-math-only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# OPT_LIBS = -flto
</span> +# endif
+# ifdef icpc
+# OPT_CFLAGS = -fast
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,7 +67,7 @@
</span>
# Enable multi-threading support.
PARALLEL_CFLAGS = -Dgmic_is_parallel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -221,8 +221,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -231,8 +231,8 @@
</span> # Enable image display, using X11 (Unix).
# (Keep /usr/ dirname here since X11 is located in /usr/ on Mac too)
ifneq ($(OS),Darwin)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +78,7 @@
</span> else
ifeq (,$(wildcard /usr/X11))
X11_CFLAGS = -Dcimg_display=0 #-Dcimg_use_xrandr
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -323,7 +323,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -333,7 +333,7 @@
</span> endif
endif
@echo "**"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,16 +87,16 @@
</span>
native:
$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -395,7 +395,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -407,7 +407,7 @@
</span> _lib: libgmic.o use_libgmic.cpp
ar rcs libgmic.a libgmic.o
ifeq ($(OS),Darwin)
- $(CXX) -shared -std=c++11 -pedantic -o libgmic.so libgmic.o $(LIBS)
+ $(CXX) -dynamiclib -o libgmic.$(SVERSION).dylib -install_name $(USR)/lib/libgmic.$(VERSION1).dylib -compatibility_version $(VERSION1) -current_version $(SVERSION) $(MANDATORY_CFLAGS) libgmic.o $(LIBS)
else
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CXX) -shared -Wl,-soname,libgmic.so.$(VERSION1) -o libgmic.so libgmic.o $(LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CXX) -o use_libgmic use_libgmic.cpp -L. -lgmic $(LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -427,7 +427,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CXX) -shared -std=c++11 -pedantic -Wl,-soname,libgmic.so.$(VERSION1) -o libgmic.so libgmic.o $(LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CXX) -o use_libgmic use_libgmic.cpp -std=c++11 -pedantic -L. -lgmic $(LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -439,7 +439,7 @@
</span> _libc: libcgmic_files libgmic.o libcgmic.o
ar rcs libcgmic.a libcgmic.o
ifeq ($(OS),Darwin)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,16 +105,16 @@
</span> else
ifeq ($(OS),Windows)
$(CXX) -shared -Wl,-soname,libcgmic.so.$(VERSION1) -o libcgmic$(SO) libcgmic.o libgmic.o -Wl,--output-def,libcgmic.def,--out-implib,libcgmic.a $(LIBS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -435,7 +435,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -447,7 +447,7 @@
</span> $(CXX) -shared -Wl,-soname,libcgmic.so.$(VERSION1) -o libcgmic$(SO) libcgmic.o libgmic.o $(LIBS)
endif
endif
- $(CC) -std=c99 -o use_libcgmic use_libcgmic.c -L. -lcgmic
+ #$(CC) -std=c99 -o use_libcgmic use_libcgmic.c -L. -lcgmic
<span style='display:block; white-space:pre;background:#ffe0e0;'>- libcgmic.o: check_versions gmic.cpp gmic.h gmic_stdlib.h CImg.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcgmic.o: gmic.cpp gmic.h gmic_stdlib.h CImg.h
</span> $(CXX) -o libcgmic.o -c gmic_libc.cpp $(PIC) $(CFLAGS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -706,19 +706,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -711,19 +711,19 @@
</span> @if [ -f ../gmic-qt/gmic_gimp_qt ]; then cp -f ../gmic-qt/gmic_gimp_qt $(DESTDIR)$(PLUGINDIR)/; fi
@if [ -f ../gmic-qt/gmic_krita_qt ]; then cp -f ../gmic-qt/gmic_krita_qt $(DESTDIR)$(USR)/$(BIN)/; fi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -141,7 +143,7 @@
</span> mkdir -p $(DESTDIR)$(USR)/share/man/
mkdir -p $(DESTDIR)$(USR)/share/man/man1/
mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -727,13 +727,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -732,13 +732,13 @@
</span> cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz; \
fi
@if [ -f ../resources/gmic_bashcompletion.sh ]; then \
</pre><pre style='margin:0'>
</pre>