<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/801cc2572343d77d26014041fd2a21d7e07770d7">https://github.com/macports/macports-ports/commit/801cc2572343d77d26014041fd2a21d7e07770d7</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 801cc257234 gmic: update to 3.0.1, only apply subport specific patches
</span>801cc257234 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 801cc2572343d77d26014041fd2a21d7e07770d7
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Fri Jan 14 21:01:57 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> gmic: update to 3.0.1, only apply subport specific patches
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> disable man page. See: https://github.com/dtschump/gmic/issues/360
</span>---
science/gmic/Portfile | 25 ++++++++++++++++---------
science/gmic/files/patch-src-Makefile.diff | 30 +++++++++++++++---------------
2 files changed, 31 insertions(+), 24 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 3e7cff28719..a1e4da9cdbd 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;'>@@ -14,8 +14,8 @@ if {${subport} ne "gmic" && ${subport} ne "gmic-clib"} {
</span> }
name gmic
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> license CeCILL
categories science graphics
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,9 +40,9 @@ conflicts_build opencv
</span>
distfiles ${name}_${version}${extract.suffix}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0f533924d0be5b936fad01b73aa9add2d3c4f61a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3f056bb9e6dbf0674af4c8dce59f4198172187662f7fbb36cc63ebc8c1b71120 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 10225122
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 81977505d1bbc126548a3a0ce509a05badc8edaf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6cc20a20e3ab53ce485ccf6e044a30141b3d62cf7743b83bb04906ff29453035 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 10457923
</span>
depends_lib port:curl \
path:lib/libavcodec.dylib:ffmpeg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,10 +56,6 @@ depends_lib port:curl \
</span> port:tiff \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-cmake-FindCImg.cmake.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-Makefile.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> compiler.cxx_standard 2011
# Uses more memory per compile process than we can accommodate on our
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,6 +77,13 @@ subport ${name}-gimp {
</span>
subport ${name}-clib {
description-append (C library).
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-src-Makefile.diff
</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;'>+if {${subport} ne "${name}-clib"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-cmake-FindCImg.cmake.diff
</span> }
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,6 +107,10 @@ if {${subport} eq ${name}} {
</span> -DENABLE_OPENMP=OFF \
-DENABLE_X=OFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # build script for man page is broken in 3.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://github.com/dtschump/gmic/issues/360
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DBUILD_MAN:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant opencv4 description {compile with OpenCV support} {
configure.args-append -DENABLE_OPENCV=ON
configure.ldflags-append \
<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 77dc547a366..2889c7650cc 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,20 +1,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.orig 2020-03-28 06:25:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile 2020-04-10 06:02:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -442,7 +442,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _libc: libcgmic_files libgmic.o libcgmic.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.orig 2022-01-13 12:01:53.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile 2022-01-14 20:25:56.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -431,7 +431,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libc:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(MAKE) "CFLAGS+=$(GMIC_STD_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(GMIC_STD_LIBS) $(OPT_LIBS)" _lib _libc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-_libc: libcgmic_files libcgmic.so use_libcgmic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++_libc: libcgmic.so use_libcgmic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcgmic_files:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo "> Retrieve G'MIC libcgmic files..."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -452,7 +452,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libcgmic.so: libcgmic.o
</span> ar rcs libcgmic.a libcgmic.o
ifeq ($(OS),Darwin)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CXX) -shared -o libcgmic.so libcgmic.o libgmic.o $(LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CXX) -shared -o libcgmic.so.$(VERSION) libcgmic.o libgmic.o $(LIBS)
</span> + $(CXX) -dynamiclib -o libcgmic.$(SOVERSION).dylib -install_name $(USR)/lib/libcgmic.$(SOVERSION).dylib -compatibility_version $(SOVERSION) -current_version $(SVERSION) $(MANDATORY_CFLAGS) libcgmic.o libgmic.o $(LIBS)
else
ifeq ($(OS),Windows)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- $(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><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -450,7 +450,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CXX) -shared -Wl,-soname,libcgmic.so.$(VERSION1) -o libcgmic$(SO) libcgmic.o libgmic.o $(LIBS)
</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:#ffe0e0;'>-- $(CC) -std=c99 -o use_libcgmic use_libcgmic.c -L. -lcgmic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# $(CC) -std=c99 -o use_libcgmic use_libcgmic.c libcgmic.$(SOVERSION).dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libcgmic.o: gmic.cpp gmic.h gmic_stdlib.h CImg.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CXX) -o libcgmic.o -c gmic_libc.cpp $(PIC) $(CFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CXX) -shared -o libcgmic.dll libcgmic.o libgmic.o -Wl,--output-def,libcgmic.def,--out-implib,libcgmic.a $(LIBS)
</span></pre><pre style='margin:0'>
</pre>