Accepting request 315257 from home:garloff:branches:graphics

- Fix build of gmic with older 2.6 GIMP (SLE11). - Update to gmic-1.6.5.0: * https://www.flickr.com/groups/gmic/discuss/72157653514140862/ * New commands: -label3d, -head, -files * Improvements -repeat, -axes, -warn, -displacement, -files2video, -apply_files * Math parser now supports sqr() * Bugfixes: Iain Fergusson denoising with selections and new layers, video stream, -display garbage, -graph, -display_graph, -plot with plot_type=3, 3d rendering, -camera with specified resolution. - Update to gmic-1.6.3.1: * https://www.flickr.com/groups/gmic/discuss/72157652079823575/ * New commands: -pack, -x_landscape * Improvements for 3d object rendering with z-buffer * Shared gmicrc resource directory * Math parser supporrts isfile(path), isdir(path) and fdate() now. * libgmic now uses libpng, libtiff, libjpeg, libcurl, libfftw. * Added some tooltips (gimp plugin) * Bugfixes: Possible buffer overflows in plugins - Update to gmic-1.6.2.0: * https://www.flickr.com/groups/gmic/discuss/72157651409869115/ * New commands -apply_timeout, -boxfilter, -serialize, -unserialize, -fps, -transition. * New filters Sequences / Spatial transition, Colors / Transfer colors [advanced] * Improved error message line numbers in -if .. -endif block. * Improved -blur, -displacement, - input, -warp * Compressed storage of custom commands OBS-URL: https://build.opensuse.org/request/show/315257 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=5
2015-07-07 15:18:59 +00:00 · 2015-07-07 15:18:59 +00:00 · 662b013d9c
commit 662b013d9c
parent 3f4d6eef0a
16 changed files with 272 additions and 2552 deletions
--- a/gmic-cflags.diff
+++ b/gmic-cflags.diff
@ -1,22 +1,18 @@
-Index: gmic-1.6.0.3/src/Makefile
+Index: gmic-1.6.5.0/src/Makefile
 ===================================================================
--- gmic-1.6.0.3.orig/src/Makefile
-+++ gmic-1.6.0.3/src/Makefile
-@@ -80,11 +80,11 @@ INCLUDE=include
- IS_BETA_CFLAGS = 
+--- gmic-1.6.5.0.orig/src/Makefile
+++ gmic-1.6.5.0/src/Makefile
+@@ -80,8 +80,9 @@ INCLUDE=include
+ NO_PRERELEASE_CFLAGS = -Dgmic_prerelease="\\\"`date +%m%d%y`\\\""
 
 # Flags that are mandatory to compile 'gmic'.
+ MANDATORY_CFLAGS = -Dgmic_build -Dcimg_use_zlib -I$(USR)/$(INCLUDE) $(PRERELEASE_CFLAGS)
+MANDATORY_CFLAGS += $(CFLAGS)
+ MANDATORY_LIBS = -lz
 ifndef NO_STDLIB
-MANDATORY_CFLAGS += -std=c++11 -Dgmic_build -I$(USR)/$(INCLUDE)
-+MANDATORY_CFLAGS += $(CFLAGS) -std=c++11 -Dgmic_build -I$(USR)/$(INCLUDE)
- else
-MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/$(INCLUDE)
-+MANDATORY_CFLAGS += $(CFLAGS) -Dgmic_build -I$(USR)/$(INCLUDE)
+ MANDATORY_CFLAGS += -std=c++11
 endif
- MANDATORY_LIBS += -L$(USR)/$(LIB)
- ifeq ($(notdir $(CC)),g++)
- MANDATORY_CFLAGS += -Wall -W
-@@ -108,11 +108,11 @@ DEBUG_CFLAGS = -Dcimg_verbosity=3 -g
+@@ -107,11 +108,11 @@ DEBUG_CFLAGS = -ansi -pedantic -Dcimg_ve
 
 # Flags to enable optimizations.
 ifeq ($(notdir $(CC)),g++)
@ -28,9 +24,9 @@ Index: gmic-1.6.0.3/src/Makefile
 +OPT_CFLAGS = -O2 # -fno-ipa-sra # -mtune=generic
 endif
 else
- ifeq ($(CC),icpc)
+ ifeq ($(notdir $(CC)),icpc)
 OPT_CFLAGS = -fast
-@@ -142,15 +142,15 @@ OPENMP_LIBS = -lgomp
+@@ -139,15 +140,15 @@ OPENMP_LIBS = -lgomp
 # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
 # This requires the presence of the X11 include and library files.
 # (package 'libx11-dev' on Debian).
@ -48,53 +44,26 @@ Index: gmic-1.6.0.3/src/Makefile
 # Flags to enable image display, using GDI32.
 # This requires the presence of the GDI32 include and library files.
 GDI32_CFLAGS = -Dcimg_display=2 -Dcimg_appname=\\\"gmic\\\"
-@@ -247,9 +247,10 @@ MINIMAL_UNIX_CFLAGS = $(MANDATORY_CFLAGS
- MINIMAL_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) \
- 	               ${TIFF_LIBS} ${PNG_LIBS} $(ZLIB_LIBS) $(FFTW_LIBS) $(OPENCV_LIBS)
- 
- # Unix : Static build.
-STATIC_PATH = $(USR)/${LIB}/x86_64-linux-gnu
-+#STATIC_PATH = $(USR)/${LIB}/x86_64-linux-gnu
-+STATIC_PATH=$(USR)/$(LIB)
- STATIC_EXTRA =
- STATIC_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) -Dcimg_display=0
- STATIC_UNIX_LIBS = $(PARALLEL_LIBS) \
- 	              $(STATIC_PATH)/libpng.a \
-@@ -316,14 +317,13 @@ STD_LIB_CFLAGS = $(MANDATORY_CFLAGS) $(P
- STD_LIB_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(OPENMP_LIBS) $(FFTW_LIBS) $(ZLIB_LIBS)
+@@ -248,9 +249,10 @@ endif
 endif
- # GMICol : Standard build.
- GMICOL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) -Dcimg_display=0
-GMICOL_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) /usr/lib/x86_64-linux-gnu/libfftw3.a /usr/lib/x86_64-linux-gnu/libfftw3_threads.a
-+GMICOL_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) /usr/$(LIB)/libfftw3.a /usr/$(LIB)/libfftw3_threads.a
+ 
+ # CLI interface: Static build.
+ #-----------------------------
+-STATIC_CLI_PATH = $(USR)/${LIB}/x86_64-linux-gnu
+#STATIC_CLI_PATH = $(USR)/${LIB}/x86_64-linux-gnu
+STATIC_CLI_PATH = $(USR)/${LIB}
+ STATIC_CLI_EXTRA =
+ STATIC_CLI_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) -Dcimg_display=0
+ STATIC_CLI_LIBS = $(PARALLEL_LIBS) \
+ 	          $(STATIC_CLI_PATH)/libpng.a \
+@@ -295,9 +297,9 @@ endif
+ 
+ # G'MIC Online interface: Standard build.
+ #----------------------------------------
+ STD_GMICOL_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) -Dcimg_display=0
+-STD_GMICOL_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) /usr/lib/x86_64-linux-gnu/libfftw3.a /usr/lib/x86_64-linux-gnu/libfftw3_threads.a
+STD_GMICOL_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) $(USR)/$(LIB)/libfftw3.a $(USR)/$(LIB)/libfftw3_threads.a
 
 #--------------------------
 # Define Makefile entries.
 #--------------------------
-
- # Main entries
- all:
- ifeq ($(OS),Unix)
- 	@echo "**"
-@@ -344,9 +344,9 @@ else
- endif
- endif
- 
- gimp:
-	$(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS) $(OPT_LIBS)" "STRIP_EXE=1" gmic_gimp
-+	$(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS) $(OPT_LIBS)" gmic_gimp
- 
- lib:
- 	$(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_LIB_LIBS) $(OPT_LIBS)" gmic_lib
- 
-@@ -358,9 +358,9 @@ else
- endif
- 
- # Entries for other configurations.
- linux:
-	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS)" "STRIP_EXE=1" gmic
-+	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS)" gmic
- 
- solaris:
- 	$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic
- 
--- a/gmic-docdir.diff
+++ b/gmic-docdir.diff
@ -1,20 +1,20 @@
-Index: gmic-1.6.0.3/src/Makefile
+Index: gmic-1.6.5.0/src/Makefile
 ===================================================================
--- gmic-1.6.0.3.orig/src/Makefile
-+++ gmic-1.6.0.3/src/Makefile
+--- gmic-1.6.5.0.orig/src/Makefile
+++ gmic-1.6.5.0/src/Makefile
@@ -70,8 +70,9 @@ EXE = .exe
 endif
 LIB=lib
 BIN=bin
 INCLUDE=include
-+DOCDIR = $(USR)/share/doc
+DOCDIR=$(USR)/share/doc
 
- #------------------------------------------------
- # Set compilation flags for build customization.
- #------------------------------------------------
-@@ -458,9 +459,9 @@ uninstall:
+ #----------------------------------
+ # Define flags to customize builds.
+ #----------------------------------
+@@ -438,9 +439,9 @@ uninstall:
 	rm -f $(DESTDIR)$(USR)/$(INCLUDE)/gmic.h
- 	rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.6.0
+ 	rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.6.5
 	rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
 	rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so
 -	rm -rf $(DESTDIR)$(USR)/share/doc/gmic/
--- a/gmic-make-zart.diff
+++ b/gmic-make-zart.diff
@ -1,8 +1,8 @@
-Index: gmic-1.6.0.3/src/Makefile
+Index: gmic-1.6.5.0/src/Makefile
 ===================================================================
--- gmic-1.6.0.3.orig/src/Makefile
-+++ gmic-1.6.0.3/src/Makefile
-@@ -457,8 +457,12 @@ endif
+--- gmic-1.6.5.0.orig/src/Makefile
+++ gmic-1.6.5.0/src/Makefile
+@@ -436,8 +436,12 @@ endif
 	cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
 	if [ -d /etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi
 	if [ -d /opt/local/etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi
@ -13,5 +13,5 @@ Index: gmic-1.6.0.3/src/Makefile
 +
 uninstall:
 	rm -f $(DESTDIR)$(USR)/$(BIN)/gmic
+ 	rm -f $(DESTDIR)$(USR)/$(BIN)/zart
 	rm -f $(DESTDIR)$(USR)/$(INCLUDE)/gmic.h
- 	rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.6.0
--- a/gmic-oldgimp.diff
+++ b/gmic-oldgimp.diff
@ -0,0 +1,14 @@
+--- gmic_newgimp/src/gmic_gimp.cpp	2015-06-24 14:20:53.000000000 +0200
+++ gmic-1.6.5.0/src/gmic_gimp.cpp	2015-07-06 17:41:59.842681265 +0200
+@@ -60,6 +60,11 @@
+ #define gmic_pixel_type float
+ #endif
+ 
+#if GIMP_MINOR_VERSION<=6
+#define gimp_item_get_name gimp_drawable_get_name
+#define gimp_item_set_name gimp_drawable_set_name
+#endif
+
+ using namespace cimg_library;
+ 
+ // Define plug-in global variables.
--- a/gmic-opencv.diff
+++ b/gmic-opencv.diff
@ -1,19 +0,0 @@
-Index: gmic-1.6.0.3/src/Makefile
-===================================================================
--- gmic-1.6.0.3.orig/src/Makefile
-+++ gmic-1.6.0.3/src/Makefile
-@@ -238,12 +238,12 @@ BOARD_LIBS = -lboard
- 
- # Unix : Standard build.
- STD_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
-                   $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \
-	  	  $(EXR_CFLAGS) $(FFTW_CFLAGS) # $(OPENCV_CFLAGS) $(MAGICK_CFLAGS)
-+	  	  $(EXR_CFLAGS) $(FFTW_CFLAGS) $(OPENCV_CFLAGS) # $(MAGICK_CFLAGS)
- STD_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(XSHM_LIBS) $(PNG_LIBS) \
- 		   $(JPEG_LIBS) $(TIFF_LIBS) $(ZLIB_LIBS) \
-	           $(EXR_LIBS) $(FFTW_LIBS) # $(OPENCV_LIBS) # $(MAGICK_LIBS)
-+	           $(EXR_LIBS) $(FFTW_LIBS) $(OPENCV_LIBS) # $(MAGICK_LIBS)
- 
- # Unix : Minimal build.
- MINIMAL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) \
- 	              ${TIFF_CFLAGS} ${PNG_CFLAGS} $(ZLIB_CFLAGS) $(FFTW_CFLAGS) $(CHECKIMAGE_CFLAGS) # $(OPENCV_CFLAGS)
--- a/gmic-openmp-gcc43.diff
+++ b/gmic-openmp-gcc43.diff
--- a/gmic-openmp.diff
+++ b/gmic-openmp.diff
@ -1,8 +1,8 @@
-Index: gmic-1.6.0.3/src/Makefile
+Index: gmic-1.6.5.0/src/Makefile
 ===================================================================
--- gmic-1.6.0.3.orig/src/Makefile
-+++ gmic-1.6.0.3/src/Makefile
-@@ -134,11 +134,13 @@ endif
+--- gmic-1.6.5.0.orig/src/Makefile
+++ gmic-1.6.5.0/src/Makefile
+@@ -132,11 +132,13 @@ endif
 ifneq ($(OS),Darwin)
 CHECKIMAGE_CFLAGS = -Dgmic_check_image
 endif
--- a/gmic-overflow.diff
+++ b/gmic-overflow.diff
@ -1,15 +1,26 @@
-Index: gmic-1.6.0.3/src/CImg.h
+Index: gmic-1.6.5.0/src/CImg.h
 ===================================================================
--- gmic-1.6.0.3.orig/src/CImg.h
-+++ gmic-1.6.0.3/src/CImg.h
-@@ -48684,9 +48684,9 @@ namespace cimg_library_suffixed {
+--- gmic-1.6.5.0.orig/src/CImg.h
+++ gmic-1.6.5.0/src/CImg.h
+@@ -49065,9 +49065,9 @@ namespace cimg_library_suffixed {
                    filename?filename:"(FILE*)");
 #endif
       std::FILE *const nfile = file?file:cimg::fopen(filename,"wb");
       const char *const ptype = pixel_type(), *const etype = cimg::endianness()?"big":"little";
-      if (std::strstr(ptype,"unsigned")==ptype) std::fprintf(nfile,"%u unsigned_%s %s_endian\n",_width,ptype+9,etype);
-+      if (std::strlen(ptype)>9 && std::strstr(ptype,"unsigned")==ptype) std::fprintf(nfile,"%u unsigned_%s %s_endian\n",_width,ptype+9,etype);
+-      if (std::strstr(ptype,"unsigned")==ptype) std::fprintf(nfile,"%u unsigned_%s %s_endian\n",_width,ptype + 9,etype);
+      if (std::strlen(ptype) > 9 && std::strstr(ptype,"unsigned")==ptype) std::fprintf(nfile,"%u unsigned_%s %s_endian\n",_width,ptype + 9,etype);
       else std::fprintf(nfile,"%u %s %s_endian\n",_width,ptype,etype);
       cimglist_for(*this,l) {
         const CImg<T>& img = _data[l];
         std::fprintf(nfile,"%u %u %u %u",img._width,img._height,img._depth,img._spectrum);
+@@ -49615,9 +49615,9 @@ namespace cimg_library_suffixed {
+ #endif
+       CImgList<ucharT> stream;
+       CImg<charT> tmpstr(128);
+       const char *const ptype = pixel_type(), *const etype = cimg::endianness()?"big":"little";
+-      if (std::strstr(ptype,"unsigned")==ptype)
+      if (std::strlen(ptype) > 9 && std::strstr(ptype,"unsigned")==ptype)
+         cimg_snprintf(tmpstr,tmpstr._width,"%u unsigned_%s %s_endian\n",_width,ptype + 9,etype);
+       else
+         cimg_snprintf(tmpstr,tmpstr._width,"%u %s %s_endian\n",_width,ptype,etype);
+       CImg<ucharT>::string(tmpstr,false).move_to(stream);
--- a/gmic-unstrip.diff
+++ b/gmic-unstrip.diff
@ -1,26 +1,53 @@
-Index: gmic-1.6.0.3/src/Makefile
+Index: gmic-1.6.5.0/src/Makefile
 ===================================================================
--- gmic-1.6.0.3.orig/src/Makefile
-+++ gmic-1.6.0.3/src/Makefile
-@@ -356,9 +356,9 @@ lib:
- QMAKE = qmake
- 
- zart: lib
- ifneq ($(OS),Darwin)
-	cd ../zart && $(QMAKE) zart.pro && $(MAKE) && strip zart
-+	cd ../zart && $(QMAKE) zart.pro && $(MAKE) && strip -S zart
- else
- 	cd ../zart && $(QMAKE) zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "SUBLIBS=$(STD_MACOSX_LIBS) $(OPT_LIBS)"
+--- gmic-1.6.5.0.orig/src/Makefile
+++ gmic-1.6.5.0/src/Makefile
+@@ -329,9 +329,9 @@ endif
 endif
 
-@@ -408,9 +408,9 @@ endif
- gmic_gimp.o: gmic.cpp CImg.h
- 	$(CC) -o gmic_gimp.o -c gmic.cpp $(CFLAGS) -Dgmic_gimp
+ cli:
+ 	$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
+-	strip gmic$(EXE)
+	strip -S gmic$(EXE)
+ 
+ gimp:
+ 	$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS)" gmic_gimp
+ 
+@@ -339,13 +339,13 @@ lib:
+ 	$(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_LIB_LIBS)" libgmic
+ 
+ gmicol:
+ 	$(MAKE) "CFLAGS+=$(STD_GMICOL_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GMICOL_LIBS)" gmic
+-	strip gmic$(EXE)
+	strip -S gmic$(EXE)
+ 
+ static:
+ 	$(MAKE) "CFLAGS+=$(STATIC_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STATIC_CLI_LIBS)" gmic
+-	strip gmic$(EXE)
+	strip -S gmic$(EXE)
+ 
+ debug:
+ 	$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(DEBUG_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
+ 
+@@ -354,9 +354,9 @@ QMAKE = qmake
+ zart: lib
+ ifeq ($(OS),Darwin)
+ 	cd ../zart && $(QMAKE) zart.pro && $(MAKE) "CFLAGS=$(OPT_CFLAGS)" "SUBLIBS=$(OPT_LIBS)" && strip zart.app/Contents/MacOS/zart
+ else
+-	cd ../zart && $(QMAKE) zart.pro && $(MAKE) && strip zart
+	cd ../zart && $(QMAKE) zart.pro && $(MAKE) && strip -S zart
+ endif
+ 
+ # Internal rules to build compilation modules.
+ libgmic.o: gmic.cpp gmic.h gmic_def.h CImg.h
+@@ -375,9 +375,9 @@ gmic_gimp.o: gmic.cpp gmic.h gmic_def.h
+ 	$(CC) -o gmic_gimp.o -c gmic.cpp -Dgmic_gimp $(CFLAGS)
+ 
 gmic_gimp : gmic_gimp.o gmic_gimp.cpp
- 	$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS)
+ 	$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS)
 -	strip gmic_gimp$(EXE)
 +	strip -S gmic_gimp$(EXE)
 
- gmic: gmic.cpp gmic.h CImg.h
- 	$(CC) -o gmic gmic.cpp $(CFLAGS) -Dgmic_main $(LIBS)
+ gmic: gmic.cpp gmic.h gmic_def.h CImg.h
+ 	$(CC) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LIBS)
 
--- a/gmic-x11opts.diff
+++ b/gmic-x11opts.diff
@ -1,8 +1,8 @@
-Index: gmic-1.6.0.3/src/Makefile
+Index: gmic-1.6.5.0/src/Makefile
 ===================================================================
--- gmic-1.6.0.3.orig/src/Makefile
-+++ gmic-1.6.0.3/src/Makefile
-@@ -142,10 +142,10 @@ OPENMP_LIBS = -lgomp
+--- gmic-1.6.5.0.orig/src/Makefile
+++ gmic-1.6.5.0/src/Makefile
+@@ -140,10 +140,10 @@ OPENMP_LIBS = -lgomp
 # Flags to enable image display, using X11
 # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
 # This requires the presence of the X11 include and library files.
@ -15,32 +15,29 @@ Index: gmic-1.6.0.3/src/Makefile
 # Flags to enable fast display, using XShm.
 # This requires the presence of the X11 extension include and library files.
 # (package 'libx11-dev' on Debian).
-@@ -234,20 +234,20 @@ BOARD_LIBS = -lboard
- # Predefined sets of flags for different default configurations.
- #----------------------------------------------------------------
- 
- # Unix : Standard build.
-STD_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) $(PNG_CFLAGS) \
-+STD_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
-                   $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \
-	  	  $(EXR_CFLAGS) $(FFTW_CFLAGS) $(OPENCV_CFLAGS) # $(XSHM_CFLAGS) $(MAGICK_CFLAGS)
-STD_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(PNG_LIBS) \
-+	  	  $(EXR_CFLAGS) $(FFTW_CFLAGS) # $(OPENCV_CFLAGS) $(MAGICK_CFLAGS)
-+STD_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(XSHM_LIBS) $(PNG_LIBS) \
- 		   $(JPEG_LIBS) $(TIFF_LIBS) $(ZLIB_LIBS) \
-	           $(EXR_LIBS) $(FFTW_LIBS) $(OPENCV_LIBS) # $(XSHM_LIBS) # $(MAGICK_LIBS)
-+	           $(EXR_LIBS) $(FFTW_LIBS) # $(OPENCV_LIBS) # $(MAGICK_LIBS)
- 
- # Unix : Minimal build.
-MINIMAL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) \
-	              ${TIFF_CFLAGS} ${PNG_CFLAGS} $(ZLIB_CFLAGS) $(FFTW_CFLAGS) $(CHECKIMAGE_CFLAGS) $(OPENCV_CFLAGS)
-MINIMAL_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) \
-	               ${TIFF_LIBS} ${PNG_LIBS} $(ZLIB_LIBS) $(FFTW_LIBS) $(OPENCV_LIBS)
-+MINIMAL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) \
-+	              ${TIFF_CFLAGS} ${PNG_CFLAGS} $(ZLIB_CFLAGS) $(FFTW_CFLAGS) $(CHECKIMAGE_CFLAGS) # $(OPENCV_CFLAGS)
-+MINIMAL_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(XSHM_LIBS) \
-+	               ${TIFF_LIBS} ${PNG_LIBS} $(ZLIB_LIBS) $(FFTW_LIBS) # $(OPENCV_LIBS)
- 
- # Unix : Static build.
- #STATIC_PATH = $(USR)/${LIB}/x86_64-linux-gnu
- STATIC_PATH=$(USR)/$(LIB)
+@@ -236,10 +236,10 @@ BOARD_LIBS = -lboard
+ #-------------------------------
+ STD_CLI_CFLAGS = $(MANDATORY_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(CURL_CFLAGS) $(FFTW_CFLAGS)
+ STD_CLI_LIBS = $(MANDATORY_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS) $(CURL_LIBS) $(FFTW_LIBS)
+ ifeq ($(OS),Unix) # Unix.
+-STD_CLI_CFLAGS += $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) $(EXR_CFLAGS) $(OPENCV_CFLAGS) # $(XSHM_CFLAGS) $(MAGICK_CFLAGS)
+-STD_CLI_LIBS += $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(EXR_LIBS) $(OPENCV_LIBS) # $(XSHM_LIBS) # $(MAGICK_LIBS)
+STD_CLI_CFLAGS += $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(EXR_CFLAGS) $(OPENCV_CFLAGS) # $(MAGICK_CFLAGS)
+STD_CLI_LIBS += $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(XSHM_LIBS) $(EXR_LIBS) $(OPENCV_LIBS) # $(MAGICK_LIBS)
+ else
+ ifeq ($(OS),Darwin) # MacOSX.
+ STD_CLI_CFLAGS += $(X11_CFLAGS) $(EXR_CFLAGS)
+ STD_CLI_LIBS += $(X11_LIBS) $(EXR_LIBS) $(OPT_LIBS)
+@@ -266,10 +266,10 @@ STATIC_CLI_LIBS = $(PARALLEL_LIBS) \
+ #--------------------------------
+ STD_GIMP_CFLAGS = $(MANDATORY_CFLAGS) $(PNG_CFLAGS) $(CURL_CFLAGS) $(FFTW_CFLAGS) -Dcimg_use_rng
+ STD_GIMP_LIBS = $(MANDATORY_LIBS) $(PNG_LIBS) $(CURL_LIBS) $(FFTW_LIBS)
+ ifeq ($(OS),Unix) # Unix.
+-STD_GIMP_CFLAGS += $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS)
+-STD_GIMP_LIBS += $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS)
+STD_GIMP_CFLAGS += $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS)
+STD_GIMP_LIBS += $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(XSHM_LIBS)
+ else
+ ifeq ($(OS),Darwin) # MaxOSX.
+ STD_GIMP_CFLAGS += $(X11_CFLAGS)
+ STD_GIMP_LIBS += $(X11_LIBS)
--- a/gmic-zart-qmake.diff
+++ b/gmic-zart-qmake.diff
@ -1,22 +1,43 @@
-Index: gmic-1.6.0.3/src/Makefile
+Index: gmic-1.6.5.0/src/Makefile
 ===================================================================
--- gmic-1.6.0.3.orig/src/Makefile
-+++ gmic-1.6.0.3/src/Makefile
-@@ -352,13 +352,15 @@ gimp:
+--- gmic-1.6.5.0.orig/src/Makefile
+++ gmic-1.6.5.0/src/Makefile
+@@ -348,13 +348,15 @@ static:
 
- lib:
- 	$(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_LIB_LIBS) $(OPT_LIBS)" gmic_lib
+ debug:
+ 	$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(DEBUG_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
 
 +QMAKE = qmake
 +
 zart: lib
- ifneq ($(OS),Darwin)
-	cd ../zart && qmake-qt4 zart.pro && $(MAKE) && strip zart
-+	cd ../zart && $(QMAKE) zart.pro && $(MAKE) && strip zart
+ ifeq ($(OS),Darwin)
+-	cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(OPT_CFLAGS)" "SUBLIBS=$(OPT_LIBS)" && strip zart.app/Contents/MacOS/zart
+	cd ../zart && $(QMAKE) zart.pro && $(MAKE) "CFLAGS=$(OPT_CFLAGS)" "SUBLIBS=$(OPT_LIBS)" && strip zart.app/Contents/MacOS/zart
 else
-	cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "SUBLIBS=$(STD_MACOSX_LIBS) $(OPT_LIBS)"
-+	cd ../zart && $(QMAKE) zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "SUBLIBS=$(STD_MACOSX_LIBS) $(OPT_LIBS)"
+-	cd ../zart && qmake zart.pro && $(MAKE) && strip zart
+	cd ../zart && $(QMAKE) zart.pro && $(MAKE) && strip zart
 endif
 
- # Entries for other configurations.
- linux:
+ # Internal rules to build compilation modules.
+ libgmic.o: gmic.cpp gmic.h gmic_def.h CImg.h
+Index: gmic-1.6.5.0/zart/zart.pro
+===================================================================
+--- gmic-1.6.5.0.orig/zart/zart.pro
+++ gmic-1.6.5.0/zart/zart.pro
+@@ -83,14 +83,14 @@ system(pkg-config opencv --libs > /dev/n
+ # LIBS += -lX11 ../src/libgmic.a `pkg-config opencv --libs` -lfftw3 -lfftw3_threads
+  OPENCVLIBS = $$system(pkg-config opencv --libs)
+  OPENCVLIBS = $$replace( OPENCVLIBS, -lcvaux, )
+ # LIBS += -lX11 ../src/libgmic.a $$OPENCVLIBS -lfftw3 -lfftw3_threads -lz -Dcimg_use_openmp -fopenmp
+-LIBS += -lX11 ../src/libgmic.a $$OPENCVLIBS -lfftw3 -lfftw3_threads -lz -ljpeg -lpng -ltiff -lX11 -lcurl
+LIBS += -lX11 ../src/libgmic.a -lXrandr $$OPENCVLIBS -lfftw3 -lfftw3_threads -lz -ljpeg -lpng -ltiff -lX11 -lcurl
+ !macx {
+ LIBS += -Dcimg_use_openmp -fopenmp
+ }
+ } else {
+-  LIBS += -lX11 ../src/libgmic.a -lopencv_core -lopencv_highgui -lfftw3 -lfftw3_threads -lz -ljpeg -lpng -ltiff -lX11 -lcurl -lopencv_imgproc -lopencv_objdetect -Dcimg_use_openmp -fopenmp
+  LIBS += -lX11 ../src/libgmic.a -lXrandr -lopencv_core -lopencv_highgui -lfftw3 -lfftw3_threads -lz -ljpeg -lpng -ltiff -lX11 -lcurl -lopencv_imgproc -lopencv_objdetect -Dcimg_use_openmp -fopenmp
+ # LIBS += -lX11 ../src/libgmic.a -lcxcore -lcv -lml -lhighgui -lfftw3 -lfftw3_threads
+ }
+ 
+ PRE_TARGETDEPS +=
--- a/gmic.changes
+++ b/gmic.changes
@ -1,4 +1,66 @@
 -------------------------------------------------------------------
+Mon Jul  6 18:04:16 CEST 2015 - kurt@garloff.de
+
+- Fix build of gmic with older 2.6 GIMP (SLE11).
+
+-------------------------------------------------------------------
+Wed Jul  1 23:23:18 CEST 2015 - kurt@garloff.de
+
+- Update to gmic-1.6.5.0: 
+  * https://www.flickr.com/groups/gmic/discuss/72157653514140862/
+  * New commands: -label3d, -head, -files
+  * Improvements -repeat, -axes, -warn, -displacement, -files2video, 
+    -apply_files
+  * Math parser now supports sqr()
+  * Bugfixes: Iain Fergusson denoising with selections and new layers,
+    video stream, -display garbage, -graph, -display_graph, -plot with
+    plot_type=3, 3d rendering, -camera with specified resolution.
+- Update to gmic-1.6.3.1:
+  * https://www.flickr.com/groups/gmic/discuss/72157652079823575/
+  * New commands: -pack, -x_landscape
+  * Improvements for 3d object rendering with z-buffer
+  * Shared gmicrc resource directory
+  * Math parser supporrts isfile(path), isdir(path) and fdate() now.
+  * libgmic now uses libpng, libtiff, libjpeg, libcurl, libfftw.
+  * Added some tooltips (gimp plugin)
+  * Bugfixes: Possible buffer overflows in plugins
+
+-------------------------------------------------------------------
+Thu Apr 30 17:58:26 CEST 2015 - kurt@garloff.de
+
+- Update to gmic-1.6.2.0:
+  * https://www.flickr.com/groups/gmic/discuss/72157651409869115/
+  * New commands -apply_timeout, -boxfilter, -serialize, -unserialize,
+    -fps, -transition.
+  * New filters Sequences / Spatial transition, Colors / Transfer colors 
+    [advanced] 
+  * Improved error message line numbers in -if .. -endif block.
+  * Improved -blur, -displacement, - input, -warp
+  * Compressed storage of custom commands
+  * Automatic filter updates on startup (gimp).
+  * Better progress bar (gimp)
+  * Bugfixes -command, .cimgz enidanness, -noarg, -error.
+- Update to gmic-1.6.1.0:
+  * https://www.flickr.com/groups/gmic/discuss/72157650442201289/
+  * Cleanups, restulting in faster code and less memory usage
+  * Download network files with cURL
+  * New command -split_colors
+  * New filters B&W/Engrave, improved preview
+  * Improvements with string substitution
+  * valgrind, gprof and other code analyzer improvments
+  * -solve can also solve with a matrix on the RHS
+  * Various bugfixes.
+- Udpate to gmic-1.6.0.4:
+  * https://www.flickr.com/groups/gmic/discuss/72157649713920459/
+  * New commands -array3d, -size3d, -imagegrid_hexagonal
+  * New filters Arrays & tiles / Grid [hexagonal], Arrays & Tiles / 
+    Ministeck, Patterns / Crystal
+  * New command -delaunay3d, filter Artistic / Polygonize [delaunay]
+  * Improved -rgb2lab , -frame, -remove_pixels, -hostigram,
+    -equalize.
+  * Bugfixes for bbox with very very large images in -select and 
+    -display.
+-------------------------------------------------------------------
 Thu Jan  8 14:57:41 CET 2015 - kurt@garloff.de

 - Update to gmic-1.6.0.3:
--- a/gmic.spec
+++ b/gmic.spec
@ -15,28 +15,30 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #

-# Detect SLES11 and SLES12
-%if 0%{?suse_version} == 1110 || 0%{?suse_version} == 1315
+# Detect SLES12
+%if 0%{?suse_version} == 1315
+%define no_opencv 1
+%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1110
 %define no_opencv 1
 %else
 %define no_opencv 0
 %endif
+%endif

 Name:		gmic
-Version:	1.6.0.3
+Version:	1.6.5.0
 Release:	0
 Group:		Productivity/Graphics/Bitmap Editors
 URL:		http://gmic.sourceforge.net/
 Packager:	kurt@garloff.de
 Source:		%{name}_%{version}.tar.bz2
-Source1:	http://gmic.sourceforge.net/gmic_reference.pdf
+Source1:	http://gmic.eu/gmic_reference.pdf
 Patch1:		gmic-cflags.diff
 Patch2:		gmic-docdir.diff
 Patch3:		gmic-overflow.diff
 Patch10:	gmic-x11opts.diff
 Patch11:	gmic-openmp.diff	
-Patch12:	gmic-openmp-gcc43.diff	
-Patch15:	gmic-opencv.diff
+Patch15:	gmic-oldgimp.diff
 Patch20:	gmic-zart-qmake.diff
 Patch21:	gmic-make-zart.diff
 Patch31:	gmic-unstrip.diff
@ -51,6 +53,7 @@ BuildRequires:	libstdc++-devel
 BuildRequires:	dos2unix
 BuildRequires:	OpenEXR-devel
 BuildRequires:	libqt4-devel
+BuildRequires:	libcurl-devel
 %if 0%{?suse_version} >= 1110
 BuildRequires:	libjpeg-devel
 BuildRequires:	libtiff-devel
@ -161,6 +164,7 @@ This program allows you to capture video from a web cam and apply
 %package doc
 Summary:        GMIC reference documentation
 Group:          Productivity/Graphics/Bitmap editors
+License:	GFDL-v1.3

 %description doc
 This is the reference documentation for G'MIC in .pdf format.
@ -172,10 +176,12 @@ This is the reference documentation for G'MIC in .pdf format.
 %patch3 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
+%if 0%{?suse_version} <= 1120
+%patch15 -p1
+%endif
 # More gmic features ... opencv
 %if 0%{?no_opencv} == 0
-%patch15 -p1
+#%patch15 -p1
 %endif
 #%patch17 -p1
 %patch20 -p1
@ -208,6 +214,7 @@ GCCVER=`gcc -v 2>&1 | tail -n1 | sed -e 's/^gcc version \([^ ]*\) .*$/\1/' -e 's
 if test $GCCVER -ge 480; then RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-ipa-sra"; fi
 if test $GCCVER -ge 480 -a $GCCVER -le 482; then MAKEFLAGS="NO_OPENMP=1"; fi
 if test $GCCVER -le 445; then sed -i 's/\-std=c++11//' src/Makefile; fi
+if test $GCCVER -le 440; then MAKEFLAGS="NO_OPENMP=1"; fi
 # Compile times are exorbitant as are, -funroll-loops makes it worse
 #RPM_OPT_FLAGS="$RPM_OPT_FLAGS -funroll-loops"
 %ifarch %{ix86} x86_64
@ -249,11 +256,11 @@ fi
 #make CFLAGS="$RPM_OPT_FLAGS"
 cd src
 %if 0%{?fedora_version} > 16
-make $JOBS $MAKEFLAGS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} QMAKE=qmake-qt4 linux
+make $JOBS $MAKEFLAGS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} QMAKE=qmake-qt4 cli
 make $JOBS $MAKEFLAGS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} QMAKE=qmake-qt4 gimp lib
 make $JOBS $MAKEFLAGS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} QMAKE=qmake-qt4 zart
 %else
-make $JOBS $MAKEFLAGS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} linux
+make $JOBS $MAKEFLAGS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} cli
 make $JOBS $MAKEFLAGS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} gimp lib
 %if 0%{?no_opencv} == 0
 make $JOBS $MAKEFLAGS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} zart
--- a/gmic_1.6.0.3.tar.bz2
+++ b/gmic_1.6.0.3.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2e568074f926a92f1d7512e3545934e79088d39f6cdc22075261024fabdb93c7
-size 2070442
--- a/gmic_1.6.5.0.tar.bz2
+++ b/gmic_1.6.5.0.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:28476dbe04ffcf5566a6864fd5281425f4735b4b8b2a635c314b1c874a734920
+size 2475523
--- a/gmic_reference.pdf
+++ b/gmic_reference.pdf
@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cdfae0c913dbf2122aba51a589bb4618ecaf87470a73d90f5668e7dd53979b90
-size 25653521
+oid sha256:9e368d2491f050990b1c35169ef657812c43d3944f6220567f2434bd710963bf
+size 25661970