From 0198b73d19f3f0d5077f8fcddc25b76c17d0754e Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sat, 19 May 2018 00:55:20 +0200
Subject: [PATCH] gmic: Update from 2.1.1 to 2.2.3

---
 packages/gmic/build.sh       |  4 ++--
 packages/gmic/makefile.patch | 33 +++++++++++++++++----------------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/packages/gmic/build.sh b/packages/gmic/build.sh
index 9cb21222d..5cf40dc54 100644
--- a/packages/gmic/build.sh
+++ b/packages/gmic/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://gmic.eu
 TERMUX_PKG_DESCRIPTION="Full-featured framework for image processing"
-TERMUX_PKG_VERSION=2.1.1
-TERMUX_PKG_SHA256=f65baf6b173ad0d25155c3993d97c0dac8ed15e79addb2a76178f9308852f5a3
+TERMUX_PKG_VERSION=2.2.3
+TERMUX_PKG_SHA256=366e348ebfa85354e99b19eecf2e6b10d445901132eb73c84b18fb23af23f0e8
 TERMUX_PKG_SRCURL=https://gmic.eu/files/source/gmic_$TERMUX_PKG_VERSION.tar.gz
 TERMUX_PKG_DEPENDS="graphicsmagick++, libcurl, fftw, libpng, libjpeg-turbo, libtiff"
 TERMUX_PKG_BUILD_DEPENDS="graphicsmagick-dev"
diff --git a/packages/gmic/makefile.patch b/packages/gmic/makefile.patch
index ecf2e0ccb..92b58c9e7 100644
--- a/packages/gmic/makefile.patch
+++ b/packages/gmic/makefile.patch
@@ -1,15 +1,16 @@
---- ../cache/gmic-2.0.2/src/Makefile	2017-06-22 12:41:18.000000000 +0000
-+++ ./src/Makefile	2017-07-25 05:12:48.923623739 +0000
-@@ -51,7 +51,7 @@
+diff -u -r ../gmic-2.2.3/src/Makefile ./src/Makefile
+--- ../gmic-2.2.3/src/Makefile	2018-05-16 13:18:08.000000000 +0000
++++ ./src/Makefile	2018-05-18 22:44:33.038378433 +0000
+@@ -61,7 +61,7 @@
  
  # Try to auto-detect target OS.
- OS := $(shell uname)
+ OS = $(shell uname)
 -USR = /usr
 +USR = $(PREFIX)
  LIB = lib
  BIN = bin
  INCLUDE = include
-@@ -122,9 +122,7 @@
+@@ -136,9 +136,7 @@
  endif
  
  ifdef NOSTRIP
@@ -19,17 +20,17 @@
 +STRIP = echo skip stripe
  endif
  
- #-------------------------------------------------
-@@ -175,7 +173,7 @@
- # Flags to enable parallel processing.
+ ifndef QMAKE
+@@ -190,7 +188,7 @@
+ # Enable multi-threading support.
  PARALLEL_CFLAGS = -Dgmic_is_parallel
  ifneq ($(OS),Windows)
 -PARALLEL_LIBS = -lpthread
 +PARALLEL_LIBS = #-lpthread
  endif
  
- # Flags to enable extra checking of image buffer pointers.
-@@ -288,8 +286,8 @@
+ # Enable parallelization in CImg, using OpenMP.
+@@ -326,8 +324,8 @@
  GMIC_CLI_CFLAGS = $(MANDATORY_CFLAGS) $(ABORT_CFLAGS) $(PARALLEL_CFLAGS) $(FFTW_CFLAGS) $(CURL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS)
  GMIC_CLI_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(FFTW_LIBS) $(CURL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS)
  ifeq ($(OS),Unix) # Unix.
@@ -39,14 +40,14 @@
 +GMIC_CLI_LIBS += $(MAGICK_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)
-@@ -415,8 +413,7 @@
+ GMIC_CLI_CFLAGS += $(X11_CFLAGS) $(OPENEXR_CFLAGS) $(OPENCV_CFLAGS)
+@@ -339,8 +337,7 @@
  endif
  
  cli:
--	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(GMIC_CLI_LIBS)" gmic
+-	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(GMIC_CLI_LIBS)" _cli
 -	$(STRIP) gmic$(EXE)
-+	$(MAKE) "CFLAGS+= $(CXXFLAGS) $(GMIC_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(GMIC_CLI_LIBS)" gmic
++	$(MAKE) "CFLAGS+= $(CXXFLAGS) $(GMIC_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(GMIC_CLI_LIBS)" _cli
  
- cli_s:
- ifeq ($(OS),Darwin)
+ debug:
+ 	$(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) $(DEBUG_CFLAGS)" "LIBS+=$(GMIC_CLI_LIBS)" _cli