<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/7b270c277595d3218c8e5b6609d0f062776c4926">https://github.com/macports/macports-ports/commit/7b270c277595d3218c8e5b6609d0f062776c4926</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 7b270c2 gmic: update to 2.3.0
</span>7b270c2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7b270c277595d3218c8e5b6609d0f062776c4926
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Thu Jun 21 13:15:50 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> gmic: update to 2.3.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> replace gimp_gtk with gimp_qt based plug-in
</span><span style='display:block; white-space:pre;color:#404040;'> reorder dependencies
</span>---
science/gmic/Portfile | 22 +++++----
science/gmic/files/patch-gmic-qt-gmic_qt.pro.diff | 13 +++++
science/gmic/files/patch-src-Makefile.diff | 60 ++++++++++++-----------
3 files changed, 58 insertions(+), 37 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 4fe6e69..f94c410 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;'>@@ -2,9 +2,10 @@
</span>
PortSystem 1.0
PortGroup cxx11 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup qt5 1.0
</span>
name gmic
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.2.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.3.0
</span> license CeCILL
categories science
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,15 +30,16 @@ use_parallel_build no
</span>
distfiles ${name}_${version}${extract.suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 853ac30d6ca1ebb49a29ee44fcaeb0253ce93792 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 366e348ebfa85354e99b19eecf2e6b10d445901132eb73c84b18fb23af23f0e8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3709488
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 1502ce50c9001bdd96cdf49136bd9b42b71c3c55 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8864abe38aaa65520a0992ee9b3f2c1d3bece5fd8ce069e93c7567f452efc375 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3659117
</span>
depends_build-append \
port:pkgconfig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:fftw-3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:curl \
</span> path:lib/libavcodec.dylib:ffmpeg \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fftw-3 \
</span> port:gimp2 \
port:GraphicsMagick \
port:ilmbase \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,10 +49,10 @@ depends_lib port:fftw-3 \
</span> port:openexr \
port:tiff \
port:xorg-libXext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:curl \
</span> port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-gmic-qt-gmic_qt.pro.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-Makefile.diff
</span>
post-configure {
reinplace "s|%PREFIX%|${prefix}|" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,8 +64,8 @@ post-configure {
</span> reinplace "s|%OPT_CFLAGS%|${configure.optflags}|" \
${worksrcpath}/src/Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #cli lib gimp_gtk gimp_qt krita_qt gmic_qt libc zart
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set targets {cli lib gimp_gtk libc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #cli lib gimp krita gmic_qt libc zart
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set targets {cli lib gimp libc}
</span>
reinplace "s|%TARGETS%|${targets}|" \
${worksrcpath}/src/Makefile
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -72,6 +74,8 @@ post-configure {
</span> post-destroot {
xinstall -m 0644 ${worksrcpath}/src/libgmic.a ${destroot}${prefix}/lib
xinstall -m 0644 ${worksrcpath}/src/libcgmic.a ${destroot}${prefix}/lib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/gmic-qt/gmic_gimp_qt.app/Contents/MacOS/gmic_gimp_qt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/lib/gimp/2.0/plug-ins
</span> }
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmic/files/patch-gmic-qt-gmic_qt.pro.diff b/science/gmic/files/patch-gmic-qt-gmic_qt.pro.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ad06cb5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmic/files/patch-gmic-qt-gmic_qt.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gmic-qt/gmic_qt.pro.orig 2018-06-21 03:21:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gmic-qt/gmic_qt.pro 2018-06-21 08:25:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -148,6 +148,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message( Linux platform )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++macx {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PKGCONFIG += x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ equals( HOST, "gimp") {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET = gmic_gimp_qt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOURCES += src/Host/Gimp/host_gimp.cpp
</span><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 02fed3f..f52f99b 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,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.orig 2018-05-16 08:18:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile 2018-05-17 05:09:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -120,13 +120,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.orig 2018-06-21 03:21:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile 2018-06-21 07:45:15.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -119,13 +119,13 @@
</span> endif
ifeq ($(OS),Darwin)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,16 @@
</span> endif
ifeq ($(OS),Windows)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -167,25 +167,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -141,7 +141,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifndef 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><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #--------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -166,25 +166,25 @@
</span> ifeq ($(OS),Unix)
MANDATORY_CFLAGS += -Dcimg_use_vt100
endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,32 +70,27 @@
</span>
# Enable multi-threading support.
PARALLEL_CFLAGS = -Dgmic_is_parallel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -316,7 +316,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -213,8 +213,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Enable image display, using X11 (Unix).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (Keep /usr/ dirname here since X11 is located in /usr/ on Mac too)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifneq ($(OS),Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-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:#e0ffe0;'>+-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:#e0ffe0;'>++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:#e0ffe0;'>++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;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq (,$(wildcard /usr/X11))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ X11_CFLAGS = -Dcimg_display=0 #-Dcimg_use_xrandr
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -315,7 +315,7 @@
</span> endif
endif
@echo "**"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(MAKE) cli lib gimp_gtk gimp_qt krita_qt gmic_qt libc zart
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(MAKE) cli lib gimp krita gmic_qt libc zart
</span> + $(MAKE) %TARGETS%
native:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli gimp_gtk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -391,11 +391,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _gimp_gtk: gmic_gimp_gtk.o gmic_gimp_gtk.cpp gmic_gimp_gtk.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(OS),Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq (,$(wildcard /tmp/skl))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifeq (,$(wildcard /tmp/skl))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CXX) -o gmic_gimp_gtk gmic_gimp_gtk.cpp gmic_gimp_gtk.o `gimptool-2.0$(EXE) --cflags` `gimptool-2.0$(EXE) --libs` $(CFLAGS) $(LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CXX) -o gmic_gimp_gtk gmic_gimp_gtk.cpp gmic_gimp_gtk.o $(subst -I/opt/local/include/fribidi, ,$(shell gimptool-2.0$(EXE) --cflags)) $(subst -lfribidi, ,$(subst -L/opt/local,-L/tmp/skl/Gimp.app/Contents/Resources,$(shell gimptool-2.0$(EXE) --libs))) $(CFLAGS) $(LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# $(CXX) -o gmic_gimp_gtk gmic_gimp_gtk.cpp gmic_gimp_gtk.o $(subst -I/opt/local/include/fribidi, ,$(shell gimptool-2.0$(EXE) --cflags)) $(subst -lfribidi, ,$(subst -L/opt/local,-L/tmp/skl/Gimp.app/Contents/Resources,$(shell gimptool-2.0$(EXE) --libs))) $(CFLAGS) $(LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CXX) -o gmic_gimp_gtk gmic_gimp_gtk.cpp gmic_gimp_gtk.o `gimptool-2.0$(EXE) --cflags` `gimptool-2.0$(EXE) --libs` $(CFLAGS) $(LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -427,7 +427,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -387,7 +387,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;'>@@ -95,7 +99,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;'>-@@ -459,7 +459,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -419,7 +419,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;'>@@ -104,7 +108,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;'>-@@ -467,7 +467,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -427,7 +427,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;'>@@ -113,7 +117,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;'>-@@ -802,19 +802,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -695,19 +695,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;'>@@ -142,7 +146,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;'>-@@ -823,13 +823,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -716,13 +716,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>