pool/gmic
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 280593 from home:garloff:branches:graphics

Browse Source 
- Update to gmic-1.6.0.3:
  * New GIMP filters Degradation/Dirty, Rendering/Lightning,
    Layers/Colors to Layers
  * New commands rgb2int and int2rgb
  * New preferred .gmz image list file format
  * New -nlmeans denoising algorithm
  * Improvements to -bilateral, -peronamalik_flow, -apply_parallel,
    (= -ap), -split, -discard, -colormap, -displacement, vanvliet,
    -belnd_median
  * Bugfixes around -output codec, -eigen, -center3d, -normalize3d,
    -split3d, -label
- Update to gmic-1.6.0.2:
  * New -peronamalik_flow (diffusion smoothing)
  * New -x_select_function1d and -x_color_curves
  * New --guided, -cumulate
  * New -apply_video, -video2files, -files2video, -average_video
  * New -dct and -idct
  * Improvements to -parallel 
  * Improving -fitscreen and tiff -output
  * Improvements for -snapshot3d, -text, -fft, -ifft, -blur
  * Major ZArt update
  * Bugfixes for -deconvolve_fft, -bilateral, -gaussian, -srand
- Update to gmic-1.6.0.1:
  * New: const(value) and button() typedefs to describe filters.
  * Filter return status can be a list now.
  * GIMP plug-in now has default capability to open display windows.
  * New -x_segment (Contours/Extract Foreground).
  * Double underscore vars are thread shared globals.
  * New -x_select_color, -x_select_palette, -input_gpl, -x_colorize
  * C++11 support in CImg, avoiding uneeded image copies

OBS-URL: https://build.opensuse.org/request/show/280593
OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=4
This commit is contained in:
Marcus Meissner 2015-01-09 15:02:09 +00:00 committed by Git OBS Bridge
parent 137607746c
commit 3f4d6eef0a
15 changed files with 463 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
gmic-cflags.diff
View File

@ -1,26 +1,37 @@
Index: gmic-1.6.0.0/src/Makefile
Index: gmic-1.6.0.3/src/Makefile
===================================================================
--- gmic-1.6.0.0.orig/src/Makefile
+++ gmic-1.6.0.0/src/Makefile
@@ -80,7 +80,7 @@ INCLUDE=include
--- gmic-1.6.0.3.orig/src/Makefile
+++ gmic-1.6.0.3/src/Makefile
@@ -80,11 +80,11 @@ INCLUDE=include
IS_BETA_CFLAGS =
# Flags that are mandatory to compile 'gmic'.
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)
endif
MANDATORY_LIBS += -L$(USR)/$(LIB)
ifeq ($(CC),g++)
ifeq ($(notdir $(CC)),g++)
MANDATORY_CFLAGS += -Wall -W
@@ -99,7 +99,7 @@ DEBUG_CFLAGS = -Dcimg_verbosity=3 -g
@@ -108,11 +108,11 @@ DEBUG_CFLAGS = -Dcimg_verbosity=3 -g
# Flags to enable optimizations.
ifeq ($(CC),g++)
-OPT_CFLAGS = -O2 -fno-ipa-sra -mtune=generic # -fno-tree-pre # -ffast-math
+OPT_CFLAGS = -O2 # -mtune=generic # -fno-tree-pre # -ffast-math
ifeq ($(notdir $(CC)),g++)
ifeq ($(OS),Darwin)
-OPT_CFLAGS = -O2 -mtune=generic
+OPT_CFLAGS = -O2 # -mtune=generic
else
-OPT_CFLAGS = -O2 -fno-ipa-sra -mtune=generic
+OPT_CFLAGS = -O2 # -fno-ipa-sra # -mtune=generic
endif
ifeq ($(CC),clang++)
OPT_CFLAGS = -O2
@@ -130,13 +130,13 @@ OPENMP_LIBS = -lgomp
else
ifeq ($(CC),icpc)
OPT_CFLAGS = -fast
@@ -142,15 +142,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).
X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
@ -36,8 +47,10 @@ Index: gmic-1.6.0.0/src/Makefile
# Flags to enable image display, using GDI32.
# This requires the presence of the GDI32 include and library files.
@@ -241,7 +241,8 @@ MINIMAL_UNIX_LIBS = $(MANDATORY_LIBS) $(
${TIFF_LIBS} ${PNG_LIBS} $(ZLIB_LIBS) $(FFTW_LIBS) # $(OPENCV_LIBS)
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
@ -46,8 +59,10 @@ Index: gmic-1.6.0.0/src/Makefile
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) \
@@ -279,12 +280,11 @@ STD_LIB_LIBS = $(MANDATORY_LIBS) $(PARAL
$(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)
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
@ -60,7 +75,9 @@ Index: gmic-1.6.0.0/src/Makefile
# Main entries
all:
ifeq ($(OS),Unix)
@@ -307,7 +307,7 @@ endif
@echo "**"
@@ -344,9 +344,9 @@ else
endif
endif
gimp:
@ -69,7 +86,9 @@ Index: gmic-1.6.0.0/src/Makefile
lib:
$(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_LIB_LIBS) $(OPT_LIBS)" gmic_lib
@@ -321,7 +321,7 @@ endif
@@ -358,9 +358,9 @@ else
endif
# Entries for other configurations.
linux:
@ -78,3 +97,4 @@ Index: gmic-1.6.0.0/src/Makefile
solaris:
$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic

14
gmic-docdir.diff
View File

@ -1,8 +1,9 @@
Index: gmic-1.6.0.0/src/Makefile
Index: gmic-1.6.0.3/src/Makefile
===================================================================
--- gmic-1.6.0.0.orig/src/Makefile
+++ gmic-1.6.0.0/src/Makefile
@@ -71,6 +71,7 @@ endif
--- gmic-1.6.0.3.orig/src/Makefile
+++ gmic-1.6.0.3/src/Makefile
@@ -70,8 +70,9 @@ EXE = .exe
endif
LIB=lib
BIN=bin
INCLUDE=include
@ -10,7 +11,9 @@ Index: gmic-1.6.0.0/src/Makefile
#------------------------------------------------
# Set compilation flags for build customization.
@@ -415,7 +416,7 @@ uninstall:
#------------------------------------------------
@@ -458,9 +459,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
rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so
@ -19,3 +22,4 @@ Index: gmic-1.6.0.0/src/Makefile
rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
distclean: clean

10
gmic-make-zart.diff
View File

@ -1,8 +1,9 @@
Index: gmic-1.6.0.0/src/Makefile
Index: gmic-1.6.0.3/src/Makefile
===================================================================
--- gmic-1.6.0.0.orig/src/Makefile
+++ gmic-1.6.0.0/src/Makefile
@@ -412,6 +412,10 @@ endif
--- gmic-1.6.0.3.orig/src/Makefile
+++ gmic-1.6.0.3/src/Makefile
@@ -457,8 +457,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,3 +14,4 @@ Index: gmic-1.6.0.0/src/Makefile
uninstall:
rm -f $(DESTDIR)$(USR)/$(BIN)/gmic
rm -f $(DESTDIR)$(USR)/$(INCLUDE)/gmic.h
rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.6.0

18
gmic-opencv.diff
View File

@ -1,17 +1,19 @@
Index: gmic-1.6.0.0/src/Makefile
Index: gmic-1.6.0.3/src/Makefile
===================================================================
--- gmic-1.6.0.0.orig/src/Makefile
+++ gmic-1.6.0.0/src/Makefile
@@ -230,10 +230,10 @@ BOARD_LIBS = -lboard
--- 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) $(FFMPEG_CFLAGS) # $(MAGICK_CFLAGS)
+ $(EXR_CFLAGS) $(FFTW_CFLAGS) $(OPENCV_CFLAGS) # $(FFMPEG_CFLAGS) # $(MAGICK_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) $(FFMPEG_LIBS) # $(MAGICK_LIBS)
+ $(EXR_LIBS) $(FFTW_LIBS) $(OPENCV_LIBS) # $(FFMPEG_LIBS) # $(MAGICK_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)

480
gmic-openmp-gcc43.diff
View File

File diff suppressed because it is too large Load Diff

8
gmic-openmp.diff
View File

@ -1,8 +1,8 @@
Index: gmic-1.6.0.0/src/Makefile
Index: gmic-1.6.0.3/src/Makefile
===================================================================
--- gmic-1.6.0.0.orig/src/Makefile
+++ gmic-1.6.0.0/src/Makefile
@@ -121,11 +121,13 @@ endif
--- gmic-1.6.0.3.orig/src/Makefile
+++ gmic-1.6.0.3/src/Makefile
@@ -134,11 +134,13 @@ endif
ifneq ($(OS),Darwin)
CHECKIMAGE_CFLAGS = -Dgmic_check_image
endif

10
gmic-overflow.diff
View File

@ -1,8 +1,9 @@
Index: gmic-1.6.0.0/src/CImg.h
Index: gmic-1.6.0.3/src/CImg.h
===================================================================
--- gmic-1.6.0.0.orig/src/CImg.h
+++ gmic-1.6.0.0/src/CImg.h
@@ -48529,7 +48529,7 @@ namespace cimg_library_suffixed {
--- 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 {
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";
@ -11,3 +12,4 @@ Index: gmic-1.6.0.0/src/CImg.h
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);

14
gmic-unstrip.diff
View File

@ -1,8 +1,9 @@
Index: gmic-1.6.0.0/src/Makefile
Index: gmic-1.6.0.3/src/Makefile
===================================================================
--- gmic-1.6.0.0.orig/src/Makefile
+++ gmic-1.6.0.0/src/Makefile
@@ -317,7 +317,7 @@ QMAKE = qmake
--- 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)
@ -11,7 +12,9 @@ Index: gmic-1.6.0.0/src/Makefile
else
cd ../zart && $(QMAKE) zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "SUBLIBS=$(STD_MACOSX_LIBS) $(OPT_LIBS)"
endif
@@ -363,7 +363,7 @@ gmic_gimp.o: gmic.cpp CImg.h
@@ -408,9 +408,9 @@ endif
gmic_gimp.o: gmic.cpp CImg.h
$(CC) -o gmic_gimp.o -c gmic.cpp $(CFLAGS) -Dgmic_gimp
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)
@ -20,3 +23,4 @@ Index: gmic-1.6.0.0/src/Makefile
gmic: gmic.cpp gmic.h CImg.h
$(CC) -o gmic gmic.cpp $(CFLAGS) -Dgmic_main $(LIBS)

31
gmic-x11opts.diff
View File

@ -1,8 +1,9 @@
Index: gmic-1.6.0.0/src/Makefile
Index: gmic-1.6.0.3/src/Makefile
===================================================================
--- gmic-1.6.0.0.orig/src/Makefile
+++ gmic-1.6.0.0/src/Makefile
@@ -130,8 +130,8 @@ OPENMP_LIBS = -lgomp
--- gmic-1.6.0.3.orig/src/Makefile
+++ gmic-1.6.0.3/src/Makefile
@@ -142,10 +142,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.
# (package 'libx11-dev' on Debian).
@ -13,27 +14,33 @@ Index: gmic-1.6.0.0/src/Makefile
# Flags to enable fast display, using XShm.
# This requires the presence of the X11 extension include and library files.
@@ -228,17 +228,17 @@ BOARD_LIBS = -lboard
# (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) # $(XSHM_CFLAGS) $(OPENCV_CFLAGS) $(FFMPEG_CFLAGS) # $(MAGICK_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) $(FFMPEG_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) # $(XSHM_LIBS) $(OPENCV_LIBS) $(FFMPEG_LIBS) # $(MAGICK_LIBS)
+ $(EXR_LIBS) $(FFTW_LIBS) # $(OPENCV_LIBS) $(FFMPEG_LIBS) # $(MAGICK_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) \
+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)
- ${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)
+ ${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)

10
gmic-zart-qmake.diff
View File

@ -1,8 +1,9 @@
Index: gmic-1.6.0.0/src/Makefile
Index: gmic-1.6.0.3/src/Makefile
===================================================================
--- gmic-1.6.0.0.orig/src/Makefile
+++ gmic-1.6.0.0/src/Makefile
@@ -313,11 +313,13 @@ gimp:
--- gmic-1.6.0.3.orig/src/Makefile
+++ gmic-1.6.0.3/src/Makefile
@@ -352,13 +352,15 @@ gimp:
lib:
$(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_LIB_LIBS) $(OPT_LIBS)" gmic_lib
@ -18,3 +19,4 @@ Index: gmic-1.6.0.0/src/Makefile
endif
# Entries for other configurations.
linux:

38
gmic.changes
View File

@ -1,3 +1,41 @@
-------------------------------------------------------------------
Thu Jan 8 14:57:41 CET 2015 - kurt@garloff.de
- Update to gmic-1.6.0.3:
* New GIMP filters Degradation/Dirty, Rendering/Lightning,
Layers/Colors to Layers
* New commands rgb2int and int2rgb
* New preferred .gmz image list file format
* New -nlmeans denoising algorithm
* Improvements to -bilateral, -peronamalik_flow, -apply_parallel,
(= -ap), -split, -discard, -colormap, -displacement, vanvliet,
-belnd_median
* Bugfixes around -output codec, -eigen, -center3d, -normalize3d,
-split3d, -label
- Update to gmic-1.6.0.2:
* New -peronamalik_flow (diffusion smoothing)
* New -x_select_function1d and -x_color_curves
* New --guided, -cumulate
* New -apply_video, -video2files, -files2video, -average_video
* New -dct and -idct
* Improvements to -parallel
* Improving -fitscreen and tiff -output
* Improvements for -snapshot3d, -text, -fft, -ifft, -blur
* Major ZArt update
* Bugfixes for -deconvolve_fft, -bilateral, -gaussian, -srand
- Update to gmic-1.6.0.1:
* New: const(value) and button() typedefs to describe filters.
* Filter return status can be a list now.
* GIMP plug-in now has default capability to open display windows.
* New -x_segment (Contours/Extract Foreground).
* Double underscore vars are thread shared globals.
* New -x_select_color, -x_select_palette, -input_gpl, -x_colorize
* C++11 support in CImg, avoiding uneeded image copies
* Removed bool option for -endian
* Command --reverse now only reverses the selected images
* Bug fixes around -pass, -parallel, -quit, -equalize and
buffer overflow avoidance for plug-in code.
-------------------------------------------------------------------
Sun Sep 7 12:08:18 CEST 2014 - kurt@garloff.de

59
gmic.spec
View File

@ -15,9 +15,15 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# Detect SLES11 and SLES12
%if 0%{?suse_version} == 1110 || 0%{?suse_version} == 1315
%define no_opencv 1
%else
%define no_opencv 0
%endif
Name: gmic
Version: 1.6.0.0
Version: 1.6.0.3
Release: 0
Group: Productivity/Graphics/Bitmap Editors
URL: http://gmic.sourceforge.net/
@ -49,7 +55,7 @@ BuildRequires: libqt4-devel
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
BuildRequires: fftw3-threads-devel
%if 0%{?suse_version} >= 1120
%if 0%{?no_opencv} == 0
BuildRequires: opencv-devel
BuildRequires: libjasper1
%endif
@ -142,17 +148,7 @@ Group: Productivity/Graphics/Bitmap Editors
This is a plugin for gimp that exposes many of the nice gmic features
for interactive use in gimp.
%if 0%{?suse_version} == 0
%package zart
Summary: Real-time web cam video stream manipulation
Group: Productivity/Graphics/Bitmap editors
%description zart
This program allows you to capture video from a web cam and apply
(real time) gmic image manipulations on the video stream.
%else
%if 0%{?suse_version} >= 1120
%endif
%if 0%{?no_opencv} == 0
%package zart
Summary: Real-time web cam video stream manipulation
Group: Productivity/Graphics/Bitmap editors
@ -178,11 +174,7 @@ This is the reference documentation for G'MIC in .pdf format.
%patch11 -p1
%patch12 -p1
# More gmic features ... opencv
%if 0%{?suse_version} > 0
%if 0%{?suse_version} >= 1120
%patch15 -p1
%endif
%else
%if 0%{?no_opencv} == 0
%patch15 -p1
%endif
#%patch17 -p1
@ -215,6 +207,7 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -ffast-math"
GCCVER=`gcc -v 2>&1 | tail -n1 | sed -e 's/^gcc version \([^ ]*\) .*$/\1/' -e 's/\.//g'`
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
# Compile times are exorbitant as are, -funroll-loops makes it worse
#RPM_OPT_FLAGS="$RPM_OPT_FLAGS -funroll-loops"
%ifarch %{ix86} x86_64
@ -225,6 +218,9 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS -momit-leaf-frame-pointer"
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mmmx -msse -mfpmath=sse,387"
%endif
%endif
%if 0%{?fedora_version} > 19
RPM_OPT_FLAGS="`echo $RPM_OPT_FLAGS | sed 's/-strong//'`"
%endif
# gcc-4.3 needs -fno-tree-pre, see gcc bug 36439
GCCVER="`gcc --version | head -n1 | sed 's/^gcc[^0-9]*\([^ ]*\).*$/\1/'`"
#echo $GCCVER
@ -259,12 +255,8 @@ 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} gimp lib
%if 0%{?suse_version} == 0
%if 0%{?no_opencv} == 0
make $JOBS $MAKEFLAGS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} zart
%else
%if 0%{?suse_version} >= 1120
make $JOBS $MAKEFLAGS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} zart
%endif
%endif
%endif
#make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS" gimp
@ -278,12 +270,8 @@ make install DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_docdir} MANDIR=%{_mandir} LIB=%{_
%if 0%{?fedora_version} > 16
make install-zart DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_docdir} MANDIR=%{_mandir} LIB=%{_lib} QMAKE=qmake-qt4
%else
%if 0%{?suse_version} == 0
%if 0%{?no_opencv} == 0
make install-zart DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_docdir} MANDIR=%{_mandir} LIB=%{_lib}
%else
%if 0%{?suse_version} >= 1120
make install-zart DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_docdir} MANDIR=%{_mandir} LIB=%{_lib}
%endif
%endif
%endif
#mkdir -p $RPM_BUILD_ROOT%{_docdir}/gmic/html
@ -296,12 +284,8 @@ make install-zart DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_docdir} MANDIR=%{_mandir} LI
strip -S $RPM_BUILD_ROOT/usr/bin/gmic
strip -S $RPM_BUILD_ROOT/usr/%{_lib}/gimp/2.0/plug-ins/gmic_gimp
# ZART
%if 0%{?suse_version} == 0
%if 0%{?no_opencv} == 0
strip -S $RPM_BUILD_ROOT/usr/bin/zart
%else
%if 0%{?suse_version} >= 1120
strip -S $RPM_BUILD_ROOT/usr/bin/zart
%endif
%endif
# Duplicate man page ...
rm $RPM_BUILD_ROOT/%{_mandir}/fr/man1/gmic.1.gz
@ -330,18 +314,11 @@ rm $RPM_BUILD_ROOT/%{_mandir}/fr/man1/gmic.1.gz
%doc README COPYING index.html
%config %attr(0644,root,root) /etc/bash_completion.d/gmic
%if 0%{?suse_version} == 0
%if 0%{?no_opencv} == 0
%files zart
%defattr(-,root,root)
/usr/bin/zart
%doc zart/Licence_CeCILL_V2-en.html zart/README.zart
%else
%if 0%{?suse_version} >= 1120
%files zart
%defattr(-,root,root)
/usr/bin/zart
%doc zart/Licence_CeCILL_V2-en.html zart/README.zart
%endif
%endif
%files gimp

3
gmic_1.6.0.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:63b98c5b71c6ac41167416ff6c512d0fc7d39528bd864c1383d7e9bdc7ebd12a
size 1932765

3
gmic_1.6.0.3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2e568074f926a92f1d7512e3545934e79088d39f6cdc22075261024fabdb93c7
size 2070442

4
gmic_reference.pdf
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2c9c74fbeaf7f972205e0659608d76fcee761fa19935ad3c6934ac2f342af152
size 25373035
oid sha256:cdfae0c913dbf2122aba51a589bb4618ecaf87470a73d90f5668e7dd53979b90
size 25653521