<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/65fc6495d82d65003877c1c21f9f13875114c8f1">https://github.com/macports/macports-ports/commit/65fc6495d82d65003877c1c21f9f13875114c8f1</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 65fc649 gmic: update to 2.4.2
</span>65fc649 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 65fc6495d82d65003877c1c21f9f13875114c8f1
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Mon Dec 3 06:21:27 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> gmic: update to 2.4.2
</span>---
science/gmic/Portfile | 9 ++--
science/gmic/files/patch-src-Makefile.diff | 84 ++++++++++++++----------------
2 files changed, 43 insertions(+), 50 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 717f8e1..a834ac3 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,8 +5,7 @@ PortGroup cxx11 1.1
</span> PortGroup qt5 1.0
name gmic
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.4.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.4.2
</span> license CeCILL
categories science
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +30,9 @@ use_parallel_build no
</span>
distfiles ${name}_${version}${extract.suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 185c8fb68fbfbd7a7eb8fa7473a3f48fe4b790ec \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 446b465d2ff7314add634115f6bffecd136ad96759eb92f76c03f231f44188d6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3809170
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ea31b6e17e44ff158580e2125f67862c7154a5f1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0fae452232501ed7e50bbe2eaa96900a5b6daa7fb1d4366d207311bdc27d0762 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3813264
</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 f52f99b..4f3656b 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-06-21 03:21:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile 2018-06-21 07:45:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.orig 2018-12-03 02:57:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile 2018-12-03 05:42:54.000000000 -0600
</span> @@ -119,13 +119,13 @@
endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,67 +21,62 @@
</span> endif
ifeq ($(OS),Windows)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -141,7 +141,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -151,7 +151,7 @@
</span> endif
ifndef QMAKE
<span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE=qmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE=%PREFIX%/libexec/qt5/bin/qmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-QMAKE = qmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++QMAKE = %PREFIX%/libexec/qt5/bin/qmake
</span> endif
#--------------------------------------------------------
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -166,25 +166,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -176,23 +176,23 @@
</span> ifeq ($(OS),Unix)
MANDATORY_CFLAGS += -Dcimg_use_vt100
endif
-ifeq ($(OS),Darwin)
-ifndef NO_STDLIB
<span style='display:block; white-space:pre;background:#ffe0e0;'>--MANDATORY_CFLAGS += -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ifeq ($(OS),Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ifndef NO_STDLIB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MANDATORY_CFLAGS += -stdlib=libc++
</span> -endif
-endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifeq ($(OS),Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef NO_STDLIB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+MANDATORY_CFLAGS += %MANDATORY_CFLAGS%
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span> ifeq ($(OS),Windows)
MANDATORY_LIBS += -Wl,--stack,16777216
endif
# Enable optimizations.
<span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq ($(notdir $(CXX)),g++)
</span><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:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq ($(notdir $(CXX)),icpc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--OPT_CFLAGS = -fast
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span> -OPT_CFLAGS = -Ofast
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifdef IS_GCC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-OPT_CFLAGS = -Ofast -mtune=generic # -fno-finite-math-only
</span> -endif
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-ifdef icpc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-OPT_CFLAGS = -fast
</span> -endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifeq ($(notdir $(CXX)),g++)
</span><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:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifeq ($(notdir $(CXX)),icpc)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#OPT_CFLAGS = -fast
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+OPT_CFLAGS = %OPT_CFLAGS%
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# OPT_CFLAGS = -Ofast
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ifdef IS_GCC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# OPT_CFLAGS = -Ofast -mtune=generic # -fno-finite-math-only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ifdef icpc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# OPT_CFLAGS = -fast
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# endif
</span>
# Enable multi-threading support.
PARALLEL_CFLAGS = -Dgmic_is_parallel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -213,8 +213,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -221,8 +221,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:#ffe0e0;'>--X11_CFLAGS = -Dcimg_display=1 `pkg-config --cflags x11 || echo -I/usr/X11R6/include` #-Dcimg_use_xrandr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--X11_LIBS = `pkg-config --libs x11 || echo -L/usr/X11R6/lib -lX11` -lpthread #`pkg-config --libs xrandr || echo -lXrandr`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+X11_CFLAGS = -Dcimg_display=1 `pkg-config --cflags x11 || echo -I%PREFIX%/include` #-Dcimg_use_xrandr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+X11_LIBS = `pkg-config --libs x11 || echo -L%PREFIX%/lib -lX11` -lpthread #`pkg-config --libs xrandr || echo -lXrandr`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-X11_CFLAGS = -Dcimg_display=1 $(shell pkg-config --cflags x11 || echo -I/usr/X11R6/include) #-Dcimg_use_xrandr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-X11_LIBS = $(shell pkg-config --libs x11 || echo -L/usr/X11R6/lib -lX11) -lpthread # $(shell pkg-config --libs xrandr || echo -lXrandr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++X11_CFLAGS = -Dcimg_display=1 $(shell pkg-config --cflags x11 || echo -I%PREFIX%/X11R6/include) #-Dcimg_use_xrandr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++X11_LIBS = $(shell pkg-config --libs x11 || echo -L%PREFIX%/X11R6/lib -lX11) -lpthread # $(shell pkg-config --libs xrandr || echo -lXrandr)
</span> else
ifeq (,$(wildcard /usr/X11))
X11_CFLAGS = -Dcimg_display=0 #-Dcimg_use_xrandr
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -315,7 +315,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -323,7 +323,7 @@
</span> endif
endif
@echo "**"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,7 +85,7 @@
</span>
native:
$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -387,7 +387,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -395,7 +395,7 @@
</span> _lib: libgmic.o use_libgmic.cpp
ar rcs libgmic.a libgmic.o
ifeq ($(OS),Darwin)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,7 +94,7 @@
</span> else
$(CXX) -shared -Wl,-soname,libgmic.so.$(VERSION1) -o libgmic.so libgmic.o $(LIBS)
$(CXX) -o use_libgmic use_libgmic.cpp -L. -lgmic $(LIBS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -419,7 +419,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -427,7 +427,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;'>@@ -108,7 +103,7 @@
</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;'>-@@ -427,7 +427,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -435,7 +435,7 @@
</span> $(CXX) -shared -Wl,-soname,libcgmic.so.$(VERSION1) -o libcgmic$(SO) libcgmic.o libgmic.o $(LIBS)
endif
endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -117,7 +112,7 @@
</span>
libcgmic.o: check_versions gmic.cpp gmic.h gmic_stdlib.h CImg.h
$(CXX) -o libcgmic.o -c gmic_libc.cpp $(PIC) $(CFLAGS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -695,19 +695,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -706,19 +706,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;'>@@ -146,21 +141,20 @@
</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;'>-@@ -716,13 +716,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -727,13 +727,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 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -d /etc/bash_completion.d/ ]; then \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if [ -d /usr/share/bash-completion/completions ]; then \
</span> + if false; then \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p $(DESTDIR)/etc/bash_completion.d/; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir -p $(DESTDIR)/usr/share/bash-completion/completions/; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/usr/share/bash-completion/completions/gmic; \
</span> fi; \
- if [ -d /opt/local/etc/bash_completion.d/ ]; then \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; \
</span> + if true; then \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mkdir -p $(DESTDIR)$(USR)/etc/bash_completion.d/; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)$(USR)/etc/bash_completion.d/gmic; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)%PREFIX%/etc/bash_completion.d/gmic; \
</span> fi; \
fi
</pre><pre style='margin:0'>
</pre>