diff --git a/packages/gmic/Makefile.patch b/packages/gmic/Makefile.patch index 151da3054..d6d42bc12 100644 --- a/packages/gmic/Makefile.patch +++ b/packages/gmic/Makefile.patch @@ -1,8 +1,7 @@ -diff --git a/src/Makefile~ b/src/Makefile -index 4df1c97..4d2659a 100644 ---- a/src/Makefile~ -+++ b/src/Makefile -@@ -199,7 +199,7 @@ endif +diff -u -r ../gmic-2.7.4/src/Makefile ./src/Makefile +--- ../gmic-2.7.4/src/Makefile 2019-10-10 06:24:59.000000000 +0000 ++++ ./src/Makefile 2019-10-23 07:19:39.327118798 +0000 +@@ -202,7 +202,7 @@ # Enable multi-threading support. PARALLEL_CFLAGS = -Dgmic_is_parallel ifneq ($(OS),Windows) @@ -11,18 +10,18 @@ index 4df1c97..4d2659a 100644 endif # Enable parallelization in CImg, using OpenMP. -@@ -339,8 +339,8 @@ native: +@@ -342,8 +342,8 @@ GMIC_CLI_CFLAGS = $(MANDATORY_CFLAGS) $(ABORT_CFLAGS) $(PARALLEL_CFLAGS) $(EIGEN_CFLAGS) $(FFTW_CFLAGS) $(CURL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS) GMIC_CLI_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(EIGEN_LIBS) $(FFTW_LIBS) $(CURL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS) ifeq ($(OS),Unix) # Unix. --GMIC_CLI_CFLAGS += $(OPENMP_CFLAGS) $(X11_CFLAGS) $(OPENEXR_CFLAGS) $(OPENCV_CFLAGS) # $(XSHM_CFLAGS) $(MAGICK_CFLAGS) +-GMIC_CLI_CFLAGS += $(OPENMP_CFLAGS) $(X11_CFLAGS) $(OPENEXR_CFLAGS) $(OPENCV_CFLAGS) # $(XSHM_CFLAGS) # $(MAGICK_CFLAGS) -GMIC_CLI_LIBS += $(OPENMP_LIBS) $(X11_LIBS) $(OPENEXR_LIBS) $(OPENCV_LIBS) # $(XSHM_LIBS) # $(MAGICK_LIBS) -+#GMIC_CLI_CFLAGS += $(OPENMP_CFLAGS) $(X11_CFLAGS) $(OPENEXR_CFLAGS) $(OPENCV_CFLAGS) # $(XSHM_CFLAGS) $(MAGICK_CFLAGS) ++#GMIC_CLI_CFLAGS += $(OPENMP_CFLAGS) $(X11_CFLAGS) $(OPENEXR_CFLAGS) $(OPENCV_CFLAGS) # $(XSHM_CFLAGS) # $(MAGICK_CFLAGS) +#GMIC_CLI_LIBS += $(OPENMP_LIBS) $(X11_LIBS) $(OPENEXR_LIBS) $(OPENCV_LIBS) # $(XSHM_LIBS) # $(MAGICK_LIBS) else ifeq ($(OS),Darwin) # MacOSX. GMIC_CLI_CFLAGS += $(X11_CFLAGS) $(OPENEXR_CFLAGS) $(OPENCV_CFLAGS) -@@ -353,7 +353,7 @@ endif +@@ -356,7 +356,7 @@ cli: $(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(GMIC_CLI_LIBS)" _cli @@ -31,8 +30,8 @@ index 4df1c97..4d2659a 100644 debug: $(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) $(DEBUG_CFLAGS)" "LIBS+=$(GMIC_CLI_LIBS)" _cli -@@ -361,6 +361,8 @@ debug: - _cli: check_versions gmic.cpp gmic.h gmic_stdlib.h CImg.h +@@ -364,6 +364,8 @@ + _cli: gmic.cpp gmic.h gmic_stdlib.h CImg.h $(CXX) -o gmic_cli.o -c gmic.cpp $(CFLAGS) $(CXX) -o gmic gmic_cli.cpp gmic_cli.o $(CFLAGS) $(LIBS) + $(CXX) -o gmic_cli_gm.o -c gmic.cpp $(CFLAGS) $(MAGICK_CFLAGS) diff --git a/packages/gmic/build.sh b/packages/gmic/build.sh index 23906ae57..42c65d508 100644 --- a/packages/gmic/build.sh +++ b/packages/gmic/build.sh @@ -1,9 +1,9 @@ TERMUX_PKG_HOMEPAGE=https://gmic.eu TERMUX_PKG_DESCRIPTION="Full-featured framework for image processing" TERMUX_PKG_LICENSE="CeCILL-2.1" -TERMUX_PKG_VERSION=2.7.2 +TERMUX_PKG_VERSION=2.7.4 TERMUX_PKG_SRCURL=https://gmic.eu/files/source/gmic_$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=f8438bceb337d596aa91383acb7beb4df477f0d07b267c4f6806e0e55268bef3 +TERMUX_PKG_SHA256=cd9b40fa8df8a0bb47388071096c768a9d4908af574f0e98cc8515410d0b2c40 TERMUX_PKG_DEPENDS="libc++, libcurl, fftw, libpng, libjpeg-turbo, libtiff, zlib" TERMUX_PKG_BUILD_DEPENDS="graphicsmagick" TERMUX_PKG_BUILD_IN_SRC=true