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

Accepting request 248864 from home:garloff:branches:graphics

Browse Source 
Upgrade to 1.6.0.0

OBS-URL: https://build.opensuse.org/request/show/248864
OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=3
This commit is contained in:
Kurt Garloff 2014-09-13 06:03:29 +00:00 committed by Git OBS Bridge
parent 3b35aca85c
commit 137607746c
18 changed files with 2637 additions and 478 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
gmic-cflags.diff
View File

@ -1,134 +1,80 @@
Index: gmic-1.5.8.4/src/Makefile Index: gmic-1.6.0.0/src/Makefile
=================================================================== ===================================================================
--- gmic-1.5.8.4.orig/src/Makefile --- gmic-1.6.0.0.orig/src/Makefile
+++ gmic-1.5.8.4/src/Makefile +++ gmic-1.6.0.0/src/Makefile
@@ -75,10 +75,10 @@ endif @@ -80,7 +80,7 @@ INCLUDE=include
# Flags to enable 'beta' version.
IS_BETA_CFLAGS = IS_BETA_CFLAGS =
# Flags that are mandatory to compile 'gmic'. # Flags that are mandatory to compile 'gmic'.
-MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/include -MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/$(INCLUDE)
-MANDATORY_LDFLAGS += -L$(USR)/lib +MANDATORY_CFLAGS += $(CFLAGS) -Dgmic_build -I$(USR)/$(INCLUDE)
+MANDATORY_CFLAGS += $(CFLAGS) -Dgmic_build -I$(USR)/include MANDATORY_LIBS += -L$(USR)/$(LIB)
+MANDATORY_LDFLAGS += -L$(USR)/$(LIB)
ifeq ($(CC),g++) ifeq ($(CC),g++)
MANDATORY_CFLAGS += -Wall -W MANDATORY_CFLAGS += -Wall -W
MANDATORY_LDFLAGS += -lm @@ -99,7 +99,7 @@ DEBUG_CFLAGS = -Dcimg_verbosity=3 -g
endif
@@ -94,9 +94,9 @@ endif
DEBUG_CFLAGS = -Dcimg_verbosity=3 -g
# Flags to enable optimizations. # Flags to enable optimizations.
ifeq ($(CC),g++) ifeq ($(CC),g++)
-OPT_CFLAGS = -O3 -mtune=generic # -fno-tree-pre # -ffast-math -OPT_CFLAGS = -O2 -fno-ipa-sra -mtune=generic # -fno-tree-pre # -ffast-math
+OPT_CFLAGS = -O3 # -mtune=generic # -fno-tree-pre # -ffast-math +OPT_CFLAGS = -O2 # -mtune=generic # -fno-tree-pre # -ffast-math
endif endif
ifeq ($(CC),clang++) ifeq ($(CC),clang++)
OPT_CFLAGS = -O1 OPT_CFLAGS = -O2
endif @@ -130,13 +130,13 @@ OPENMP_LIBS = -lgomp
@@ -121,15 +121,15 @@ endif
# (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
# This requires the presence of the X11 include and library files. # This requires the presence of the X11 include and library files.
# (package 'libx11-dev' on Debian). # (package 'libx11-dev' on Debian).
X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
-X11_LDFLAGS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr -X11_LIBS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr
+X11_LDFLAGS = -L/usr/X11R6/$(LIB) -lX11 -lpthread #-lXrandr +X11_LIBS = -L/usr/X11R6/$(LIB) -lX11 -lpthread #-lXrandr
# Flags to enable fast display, using XShm. # Flags to enable fast display, using XShm.
# This requires the presence of the X11 extension include and library files. # This requires the presence of the X11 extension include and library files.
# (package 'libx11-dev' on Debian). # (package 'libx11-dev' on Debian).
XSHM_CFLAGS = -Dcimg_use_xshm XSHM_CFLAGS = -Dcimg_use_xshm
-XSHM_LDFLAGS = -L$(USR)/X11R6/lib -lXext -XSHM_LIBS = -L$(USR)/X11R6/lib -lXext
+XSHM_LDFLAGS = -L$(USR)/X11R6/$(LIB) -lXext +XSHM_LIBS = -L$(USR)/X11R6/$(LIB) -lXext
# Flags to enable image display, using GDI32. # Flags to enable image display, using GDI32.
# This requires the presence of the GDI32 include and library files. # This requires the presence of the GDI32 include and library files.
GDI32_CFLAGS = -Dcimg_display=2 -Dcimg_appname=\\\"gmic\\\" @@ -241,7 +241,8 @@ MINIMAL_UNIX_LIBS = $(MANDATORY_LIBS) $(
@@ -232,9 +232,9 @@ MINIMAL_UNIX_CFLAGS = $(MANDATORY_CFLAGS ${TIFF_LIBS} ${PNG_LIBS} $(ZLIB_LIBS) $(FFTW_LIBS) # $(OPENCV_LIBS)
MINIMAL_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(X11_LDFLAGS) \
${TIFF_LDFLAGS} ${PNG_LDFLAGS} $(ZLIB_LDFLAGS) $(FFTW_LDFLAGS) # $(OPENCV_LDFLAGS)
# Unix : Static build. # Unix : Static build.
-STATIC_PATH = /usr/lib/ -STATIC_PATH = $(USR)/${LIB}/x86_64-linux-gnu
+STATIC_PATH = /usr/$(LIB)/ +#STATIC_PATH = $(USR)/${LIB}/x86_64-linux-gnu
+STATIC_PATH=$(USR)/$(LIB)
STATIC_EXTRA = STATIC_EXTRA =
STATIC_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(CHECKIMAGE_CFLAGS) $(PARALLEL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) -Dcimg_display=0 STATIC_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) -Dcimg_display=0
STATIC_UNIX_LDFLAGS = $(PARALLEL_LDFLAGS) \ STATIC_UNIX_LIBS = $(PARALLEL_LIBS) \
$(STATIC_PATH)/libpng.a \ @@ -279,12 +280,11 @@ STD_LIB_LIBS = $(MANDATORY_LIBS) $(PARAL
@@ -279,9 +279,9 @@ STD_LIB_CFLAGS = $(MANDATORY_CFLAGS) $(C
STD_LIB_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(FFTW_LDFLAGS)
# GMICol : Standard build. # GMICol : Standard build.
GMICOL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(CHECKIMAGE_CFLAGS) $(PARALLEL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) -Dcimg_display=0 GMICOL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) -Dcimg_display=0
-GMICOL_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(PNG_LDFLAGS) $(JPEG_LDFLAGS) $(ZLIB_LDFLAGS) /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/x86_64-linux-gnu/libfftw3.a /usr/lib/x86_64-linux-gnu/libfftw3_threads.a
+GMICOL_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(PNG_LDFLAGS) $(JPEG_LDFLAGS) $(ZLIB_LDFLAGS) /usr/$(LIB)/libfftw3.a /usr/$(LIB)/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
#-------------------------- #--------------------------
# Define Makefile entries. # Define Makefile entries.
#-------------------------- #--------------------------
@@ -307,9 +307,9 @@ else -
endif # Main entries
all:
ifeq ($(OS),Unix)
@@ -307,7 +307,7 @@ endif
endif endif
gimp: gimp:
- $(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" "STRIP_EXE=1" gmic_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)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" gmic_gimp + $(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS) $(OPT_LIBS)" gmic_gimp
lib: lib:
$(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib $(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_LIB_LIBS) $(OPT_LIBS)" gmic_lib
@@ -321,7 +321,7 @@ endif
@@ -330,15 +330,15 @@ static:
minimal:
$(MAKE) "CFLAGS+=$(MINIMAL_UNIX_CFLAGS)" "LDFLAGS+=$(MINIMAL_UNIX_LDFLAGS)" gmic_cli_standard
# Entries for other configurations.
linux: linux:
- $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_cli_standard - $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS)" "STRIP_EXE=1" gmic
+ $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" gmic_cli_standard + $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS)" gmic
linux_alltypes:
- $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_cli_alltypes
+ $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" gmic_cli_alltypes
custom:
- $(MAKE) "CFLAGS=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(CUST_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_cli_alltypes
+ $(MAKE) "CFLAGS=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(CUST_UNIX_LDFLAGS)" gmic_cli_alltypes
solaris: solaris:
$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic_cli_standard $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic
@@ -415,13 +415,13 @@ install:
ifneq ($(OS),Darwin)
mkdir -p $(DESTDIR)$(USR)/share
# mkdir -p $(DESTDIR)$(USR)/share/zart
# cp -f ../zart/zart $(DESTDIR)$(USR)/bin/zart
- mkdir -p $(DESTDIR)$(USR)/lib
- cp -f libgmic.so $(DESTDIR)$(USR)/lib/libgmic.so.1.5.8
- ln -s libgmic.so.1.5.8 $(DESTDIR)$(USR)/lib/libgmic.so.1
-# ln -s libgmic.so.1.5.8 $(DESTDIR)$(USR)/lib/libgmic.so.1
- ln -s libgmic.so.1 $(DESTDIR)$(USR)/lib/libgmic.so
+ mkdir -p $(DESTDIR)$(USR)/$(LIB)
+ cp -f libgmic.so $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.5.8
+ ln -s libgmic.so.1.5.8 $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
+# ln -s libgmic.so.1.5.8 $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
+ ln -s libgmic.so.1 $(DESTDIR)$(USR)/$(LIB)/libgmic.so
endif
mkdir -p $(DESTDIR)$(USR)/share/man/
mkdir -p $(DESTDIR)$(USR)/share/man/man1/
mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
@@ -432,12 +432,12 @@ endif
uninstall:
rm -f $(DESTDIR)$(USR)/bin/gmic
rm -f $(DESTDIR)$(USR)/include/gmic.h
- rm -f $(DESTDIR)$(USR)/lib/libgmic.so.1.5.8
-# rm -f $(DESTDIR)$(USR)/lib/libgmic.so.1.5
- rm -f $(DESTDIR)$(USR)/lib/libgmic.so.1
- rm -f $(DESTDIR)$(USR)/lib/libgmic.so
+ rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.5.8
+# rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.5
+ rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
+ rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so
rm -rf $(DESTDIR)$(USR)/share/doc/gmic/
rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
# rm -f $(DESTDIR)$(USR)/bin/zart

27
gmic-docdir.diff
View File

@ -1,26 +1,21 @@
Index: gmic-1.5.8.4/src/Makefile Index: gmic-1.6.0.0/src/Makefile
=================================================================== ===================================================================
--- gmic-1.5.8.4.orig/src/Makefile --- gmic-1.6.0.0.orig/src/Makefile
+++ gmic-1.5.8.4/src/Makefile +++ gmic-1.6.0.0/src/Makefile
@@ -67,8 +67,10 @@ endif @@ -71,6 +71,7 @@ endif
ifeq ($(OSTYPE),msys) LIB=lib
EXE = .exe BIN=bin
endif INCLUDE=include
+DOCDIR = $(USR)/share/doc +DOCDIR = $(USR)/share/doc
+
#------------------------------------------------ #------------------------------------------------
# Set compilation flags for build customization. # Set compilation flags for build customization.
#------------------------------------------------ @@ -415,7 +416,7 @@ uninstall:
rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.6.0
@@ -436,9 +438,9 @@ uninstall:
rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.5.8
# rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.5
rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1 rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so
- rm -rf $(DESTDIR)$(USR)/share/doc/gmic/ - rm -rf $(DESTDIR)$(USR)/share/doc/gmic/
+ rm -rf $(DESTDIR)$(DOCDIR)/gmic/ + rm -rf $(DESTDIR)$(DOCDIR)/gmic/
rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz
rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
# rm -f $(DESTDIR)$(USR)/bin/zart
# rm -rf $(DESTDIR)$(USR)/share/zart/

20
gmic-magick.diff
View File

@ -1,20 +0,0 @@
Index: gmic-1.5.5.2/src/Makefile
===================================================================
--- gmic-1.5.5.2.orig/src/Makefile
+++ gmic-1.5.5.2/src/Makefile
@@ -204,13 +204,13 @@ BOARD_LDFLAGS = -lboard
# Sets of flags for building different configurations.
STD_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
$(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \
$(EXR_CFLAGS) $(FFTW_CFLAGS) $(OPENMP_CFLAGS) \
- $(OPENCV_CFLAGS) # $(FFMPEG_CFLAGS) # $(XSHM_CFLAGS) # $(MAGICK_CFLAGS)
+ $(OPENCV_CFLAGS) $(MAGICK_CFLAGS) # $(FFMPEG_CFLAGS) # $(XSHM_CFLAGS)
STD_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(X11_LDFLAGS) $(XSHM_LDFLAGS) $(PNG_LDFLAGS) \
$(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(ZLIB_LDFLAGS) \
$(EXR_LDFLAGS) $(FFTW_LDFLAGS) $(OPENMP_LDFLAGS) \
- $(OPENCV_LDFLAGS) # $(FFMPEG_LDFLAGS) # $(XSHM_LDFLAGS) # $(MAGICK_LDFLAGS)
+ $(OPENCV_LDFLAGS) $(MAGICK_LDFLAGS) # $(FFMPEG_LDFLAGS) # $(XSHM_LDFLAGS)
CUST_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
$(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \
$(FFTW_CFLAGS) $(EXR_CFLAGS) $(FFMPEG_CFLAGS) # $(MAGICK_CFLAGS) $(BOARD_CFLAGS) $(MINC2_CFLAGS) $(OPENCV_CFLAGS)

29
gmic-make-zart.diff
View File

@ -1,28 +1,15 @@
Index: gmic-1.5.8.4/src/Makefile Index: gmic-1.6.0.0/src/Makefile
=================================================================== ===================================================================
--- gmic-1.5.8.4.orig/src/Makefile --- gmic-1.6.0.0.orig/src/Makefile
+++ gmic-1.5.8.4/src/Makefile +++ gmic-1.6.0.0/src/Makefile
@@ -422,10 +422,8 @@ install: @@ -412,6 +412,10 @@ endif
mkdir -p $(DESTDIR)$(USR)/include/ 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
cp -f gmic.h $(DESTDIR)$(USR)/include/ 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
ifneq ($(OS),Darwin)
mkdir -p $(DESTDIR)$(USR)/share
-# mkdir -p $(DESTDIR)$(USR)/share/zart
-# cp -f ../zart/zart $(DESTDIR)$(USR)/bin/zart
mkdir -p $(DESTDIR)$(USR)/$(LIB)
cp -f libgmic.so $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.5.8
ln -s libgmic.so.1.5.8 $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
# ln -s libgmic.so.1.5.8 $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1
@@ -438,8 +436,12 @@ endif
cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz
if test -d /etc/bash_completion.d/; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi
if test -d /opt/local/etc/bash_completion.d/; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi
+install-zart: zart +install-zart: zart
+ mkdir -p $(DESTDIR)$(USR)/share/zart + mkdir -p $(DESTDIR)$(USR)/share/zart
+ cp -f ../zart/zart $(DESTDIR)$(USR)/bin/zart + cp -f ../zart/zart $(DESTDIR)$(USR)/bin/zart
+ +
uninstall: uninstall:
rm -f $(DESTDIR)$(USR)/bin/gmic rm -f $(DESTDIR)$(USR)/$(BIN)/gmic
rm -f $(DESTDIR)$(USR)/include/gmic.h rm -f $(DESTDIR)$(USR)/$(INCLUDE)/gmic.h
rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.5.8

18
gmic-opencv-old.diff
View File

@ -1,18 +0,0 @@
Index: gmic-1.5.5.2/src/Makefile
===================================================================
--- gmic-1.5.5.2.orig/src/Makefile
+++ gmic-1.5.5.2/src/Makefile
@@ -159,10 +159,10 @@ ifeq ($(OS),Darwin)
OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv
OPENCV_LDFLAGS = `pkg-config opencv --libs` #-> Use this for OpenCV 2.2.0 !
else
OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv
-# OPENCV_LDFLAGS = -lcv -lhighgui
-OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui #-> Use this for OpenCV >= 2.2.0 !
+OPENCV_LDFLAGS = -lcv -lhighgui
+#OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui #-> Use this for OpenCV >= 2.2.0 !
endif
# Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library.
# This requires the presence of the GraphicsMagick++ include and library files.

27
gmic-opencv.diff
View File

@ -1,20 +1,17 @@
Index: gmic-1.5.8.4/src/Makefile Index: gmic-1.6.0.0/src/Makefile
=================================================================== ===================================================================
--- gmic-1.5.8.4.orig/src/Makefile --- gmic-1.6.0.0.orig/src/Makefile
+++ gmic-1.5.8.4/src/Makefile +++ gmic-1.6.0.0/src/Makefile
@@ -226,13 +226,13 @@ BOARD_LDFLAGS = -lboard @@ -230,10 +230,10 @@ BOARD_LIBS = -lboard
# Unix : Standard build. # Unix : Standard build.
STD_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(CHECKIMAGE_CFLAGS) $(PARALLEL_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \ STD_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
$(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \ $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \
$(EXR_CFLAGS) $(FFTW_CFLAGS) $(OPENMP_CFLAGS) \ - $(EXR_CFLAGS) $(FFTW_CFLAGS) # $(OPENCV_CFLAGS) $(FFMPEG_CFLAGS) # $(MAGICK_CFLAGS)
- # $(OPENCV_CFLAGS) $(FFMPEG_CFLAGS) # $(MAGICK_CFLAGS) + $(EXR_CFLAGS) $(FFTW_CFLAGS) $(OPENCV_CFLAGS) # $(FFMPEG_CFLAGS) # $(MAGICK_CFLAGS)
+ $(OPENCV_CFLAGS) # $(FFMPEG_CFLAGS) # $(MAGICK_CFLAGS) STD_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(XSHM_LIBS) $(PNG_LIBS) \
STD_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(X11_LDFLAGS) $(XSHM_LDFLAGS) $(PNG_LDFLAGS) \ $(JPEG_LIBS) $(TIFF_LIBS) $(ZLIB_LIBS) \
$(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(ZLIB_LDFLAGS) \ - $(EXR_LIBS) $(FFTW_LIBS) # $(OPENCV_LIBS) $(FFMPEG_LIBS) # $(MAGICK_LIBS)
$(EXR_LDFLAGS) $(FFTW_LDFLAGS) $(OPENMP_LDFLAGS) \ + $(EXR_LIBS) $(FFTW_LIBS) $(OPENCV_LIBS) # $(FFMPEG_LIBS) # $(MAGICK_LIBS)
- # $(OPENCV_LDFLAGS) $(FFMPEG_LDFLAGS) # $(MAGICK_LDFLAGS)
+ $(OPENCV_LDFLAGS) # $(FFMPEG_LDFLAGS) # $(MAGICK_LDFLAGS)
# Unix : Minimal build. # Unix : Minimal build.
MINIMAL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(CHECKIMAGE_CFLAGS) $(PARALLEL_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) \ MINIMAL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) \
${TIFF_CFLAGS} ${PNG_CFLAGS} $(ZLIB_CFLAGS) $(FFTW_CFLAGS) # $(OPENCV_CFLAGS)

2247
gmic-openmp-gcc43.diff
View File

File diff suppressed because it is too large Load Diff

43
gmic-openmp.diff
View File

@ -1,33 +1,18 @@
Index: gmic-1.5.8.4/src/Makefile Index: gmic-1.6.0.0/src/Makefile
=================================================================== ===================================================================
--- gmic-1.5.8.4.orig/src/Makefile --- gmic-1.6.0.0.orig/src/Makefile
+++ gmic-1.5.8.4/src/Makefile +++ gmic-1.6.0.0/src/Makefile
@@ -209,8 +209,11 @@ FFTW_LDFLAGS = -lfftw3 -lfftw3_threads @@ -121,11 +121,13 @@ endif
ifeq ($(OSTYPE),msys) ifneq ($(OS),Darwin)
FFTW_LDFLAGS = -lfftw3-3 CHECKIMAGE_CFLAGS = -Dgmic_check_image
endif endif
+OPENMP_CFLAGS = -fopenmp -Dcimg_use_openmp +ifndef NO_OPENMP
+OPENMP_LDFLAGS = -fopenmp # Flags to enable parallelization using OpenMP.
+ OPENMP_CFLAGS = -fopenmp -Dcimg_use_openmp
# Flags to enable the use of the BOARD library. OPENMP_LIBS = -lgomp
# This requires the presence of the BOARD include and library files. +endif
# (no packages exist for Debian at this time).
BOARD_CFLAGS = -Dcimg_use_board
@@ -222,12 +225,14 @@ BOARD_LDFLAGS = -lboard
# Unix : Standard build. # Flags to enable image display, using X11
STD_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(CHECKIMAGE_CFLAGS) $(PARALLEL_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \ # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
$(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \ # This requires the presence of the X11 include and library files.
- $(EXR_CFLAGS) $(FFTW_CFLAGS) # $(OPENCV_CFLAGS) $(FFMPEG_CFLAGS) # $(MAGICK_CFLAGS)
+ $(EXR_CFLAGS) $(FFTW_CFLAGS) $(OPENMP_CFLAGS) \
+ # $(OPENCV_CFLAGS) $(FFMPEG_CFLAGS) # $(MAGICK_CFLAGS)
STD_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(X11_LDFLAGS) $(XSHM_LDFLAGS) $(PNG_LDFLAGS) \
$(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(ZLIB_LDFLAGS) \
- $(EXR_LDFLAGS) $(FFTW_LDFLAGS) # $(OPENCV_LDFLAGS) $(FFMPEG_LDFLAGS) # $(MAGICK_LDFLAGS)
+ $(EXR_LDFLAGS) $(FFTW_LDFLAGS) $(OPENMP_LDFLAGS) \
+ # $(OPENCV_LDFLAGS) $(FFMPEG_LDFLAGS) # $(MAGICK_LDFLAGS)
# Unix : Minimal build.
MINIMAL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(CHECKIMAGE_CFLAGS) $(PARALLEL_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) \
${TIFF_CFLAGS} ${PNG_CFLAGS} $(ZLIB_CFLAGS) $(FFTW_CFLAGS) # $(OPENCV_CFLAGS)

15
gmic-opt-parallel-make.diff
View File

@ -1,15 +0,0 @@
Index: gmic-1.5.8.4/src/Makefile
===================================================================
--- gmic-1.5.8.4.orig/src/Makefile
+++ gmic-1.5.8.4/src/Makefile
@@ -395,9 +395,9 @@ gmic_int.o: gmic.cpp
gmic_float.o: gmic.cpp
$(CC) -o gmic_float.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_float -Dgmic_main
gmic_double.o: gmic.cpp
$(CC) -o gmic_double.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_double
-gmic_cli_alltypes: gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o gmic_def.h
+gmic_cli_alltypes: gmic_float.o gmic_uchar.o gmic_char.o gmic_uint.o gmic_int.o gmic_double.o gmic_bool.o gmic_ushort.o gmic_short.o gmic_def.h
$(CC) -o gmic gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o $(LDFLAGS)
strip gmic$(EXE)
gmic_cli_standard: gmic.cpp

10
gmic-overflow.diff
View File

@ -1,9 +1,8 @@
Index: gmic-1.5.8.4/src/CImg.h Index: gmic-1.6.0.0/src/CImg.h
=================================================================== ===================================================================
--- gmic-1.5.8.4.orig/src/CImg.h --- gmic-1.6.0.0.orig/src/CImg.h
+++ gmic-1.5.8.4/src/CImg.h +++ gmic-1.6.0.0/src/CImg.h
@@ -45929,9 +45929,9 @@ namespace cimg_library_suffixed { @@ -48529,7 +48529,7 @@ namespace cimg_library_suffixed {
filename?filename:"(FILE*)");
#endif #endif
std::FILE *const nfile = file?file:cimg::fopen(filename,"wb"); std::FILE *const nfile = file?file:cimg::fopen(filename,"wb");
const char *const ptype = pixel_type(), *const etype = cimg::endianness()?"big":"little"; const char *const ptype = pixel_type(), *const etype = cimg::endianness()?"big":"little";
@ -12,4 +11,3 @@ Index: gmic-1.5.8.4/src/CImg.h
else std::fprintf(nfile,"%u %s %s_endian\n",_width,ptype,etype); else std::fprintf(nfile,"%u %s %s_endian\n",_width,ptype,etype);
cimglist_for(*this,l) { cimglist_for(*this,l) {
const CImg<T>& img = _data[l]; const CImg<T>& img = _data[l];
std::fprintf(nfile,"%u %u %u %u",img._width,img._height,img._depth,img._spectrum);

35
gmic-unstrip.diff
View File

@ -1,37 +1,22 @@
Index: gmic-1.5.8.4/src/Makefile Index: gmic-1.6.0.0/src/Makefile
=================================================================== ===================================================================
--- gmic-1.5.8.4.orig/src/Makefile --- gmic-1.6.0.0.orig/src/Makefile
+++ gmic-1.5.8.4/src/Makefile +++ gmic-1.6.0.0/src/Makefile
@@ -323,9 +323,9 @@ lib: @@ -317,7 +317,7 @@ QMAKE = qmake
QMAKE = qmake
zart: lib zart: lib
ifneq ($(OS),Darwin) ifneq ($(OS),Darwin)
- cd ../zart && $(QMAKE) zart.pro && $(MAKE) && strip zart - cd ../zart && $(QMAKE) zart.pro && $(MAKE) && strip zart
+ cd ../zart && $(QMAKE) zart.pro && $(MAKE) && strip -S zart + cd ../zart && $(QMAKE) zart.pro && $(MAKE) && strip -S zart
else else
cd ../zart && $(QMAKE) zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)" cd ../zart && $(QMAKE) zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "SUBLIBS=$(STD_MACOSX_LIBS) $(OPT_LIBS)"
endif endif
@@ -363,7 +363,7 @@ gmic_gimp.o: gmic.cpp CImg.h
@@ -375,9 +375,9 @@ endif $(CC) -o gmic_gimp.o -c gmic.cpp $(CFLAGS) -Dgmic_gimp
gmic_gimp.o: gmic.cpp gmic_def.h
$(CC) -o gmic_gimp.o -c gmic.cpp $(CFLAGS) -Dgmic_gimp -Dgmic_float_only
gmic_gimp : gmic_gimp.o gmic_gimp.cpp 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` $(LDFLAGS) $(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS)
- strip gmic_gimp$(EXE) - strip gmic_gimp$(EXE)
+ strip -S gmic_gimp$(EXE) + strip -S gmic_gimp$(EXE)
gmic_bool.o: gmic.cpp gmic: gmic.cpp gmic.h CImg.h
$(CC) -o gmic_bool.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_bool $(CC) -o gmic gmic.cpp $(CFLAGS) -Dgmic_main $(LIBS)
gmic_uchar.o: gmic.cpp
@@ -397,9 +397,9 @@ gmic_float.o: gmic.cpp
gmic_double.o: gmic.cpp
$(CC) -o gmic_double.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_double
gmic_cli_alltypes: gmic_float.o gmic_uchar.o gmic_char.o gmic_uint.o gmic_int.o gmic_double.o gmic_bool.o gmic_ushort.o gmic_short.o gmic_def.h
$(CC) -o gmic gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o $(LDFLAGS)
- strip gmic$(EXE)
+ strip -S gmic$(EXE)
gmic_cli_standard: gmic.cpp
$(CC) -o gmic gmic.cpp $(CFLAGS) -Dgmic_float_only -Dgmic_main $(LDFLAGS)

44
gmic-x11opts.diff
View File

@ -1,43 +1,39 @@
Index: gmic-1.5.8.4/src/Makefile Index: gmic-1.6.0.0/src/Makefile
=================================================================== ===================================================================
--- gmic-1.5.8.4.orig/src/Makefile --- gmic-1.6.0.0.orig/src/Makefile
+++ gmic-1.5.8.4/src/Makefile +++ gmic-1.6.0.0/src/Makefile
@@ -122,10 +122,10 @@ endif @@ -130,8 +130,8 @@ OPENMP_LIBS = -lgomp
# Flags to enable image display, using X11
# (keep /usr/ dirname here since X11 is located in /usr/ on Mac too). # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
# This requires the presence of the X11 include and library files. # This requires the presence of the X11 include and library files.
# (package 'libx11-dev' on Debian). # (package 'libx11-dev' on Debian).
-X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr -X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr
-X11_LDFLAGS = -L/usr/X11R6/$(LIB) -lX11 -lpthread #-lXrandr -X11_LIBS = -L/usr/X11R6/$(LIB) -lX11 -lpthread #-lXrandr
+X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include -Dcimg_use_xrandr +X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include -Dcimg_use_xrandr
+X11_LDFLAGS = -L/usr/X11R6/$(LIB) -lX11 -lpthread -lXrandr +X11_LIBS = -L/usr/X11R6/$(LIB) -lX11 -lpthread -lXrandr
# Flags to enable fast display, using XShm. # Flags to enable fast display, using XShm.
# This requires the presence of the X11 extension include and library files. # This requires the presence of the X11 extension include and library files.
# (package 'libx11-dev' on Debian). @@ -228,17 +228,17 @@ BOARD_LIBS = -lboard
@@ -220,19 +220,19 @@ BOARD_LDFLAGS = -lboard
# Predefined sets of flags for different default configurations.
#---------------------------------------------------------------- #----------------------------------------------------------------
# Unix : Standard build. # Unix : Standard build.
-STD_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(CHECKIMAGE_CFLAGS) $(PARALLEL_CFLAGS) $(X11_CFLAGS) $(PNG_CFLAGS) \ -STD_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) $(PNG_CFLAGS) \
+STD_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(CHECKIMAGE_CFLAGS) $(PARALLEL_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \ +STD_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
$(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \ $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \
- $(EXR_CFLAGS) $(FFTW_CFLAGS) # $(XSHM_CFLAGS) $(OPENCV_CFLAGS) $(FFMPEG_CFLAGS) # $(MAGICK_CFLAGS) - $(EXR_CFLAGS) $(FFTW_CFLAGS) # $(XSHM_CFLAGS) $(OPENCV_CFLAGS) $(FFMPEG_CFLAGS) # $(MAGICK_CFLAGS)
-STD_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(X11_LDFLAGS) $(PNG_LDFLAGS) \ -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) $(FFMPEG_CFLAGS) # $(MAGICK_CFLAGS)
+STD_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(X11_LDFLAGS) $(XSHM_LDFLAGS) $(PNG_LDFLAGS) \ +STD_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(XSHM_LIBS) $(PNG_LIBS) \
$(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(ZLIB_LDFLAGS) \ $(JPEG_LIBS) $(TIFF_LIBS) $(ZLIB_LIBS) \
- $(EXR_LDFLAGS) $(FFTW_LDFLAGS) # $(XSHM_LDFLAGS) $(OPENCV_LDFLAGS) $(FFMPEG_LDFLAGS) # $(MAGICK_LDFLAGS) - $(EXR_LIBS) $(FFTW_LIBS) # $(XSHM_LIBS) $(OPENCV_LIBS) $(FFMPEG_LIBS) # $(MAGICK_LIBS)
+ $(EXR_LDFLAGS) $(FFTW_LDFLAGS) # $(OPENCV_LDFLAGS) $(FFMPEG_LDFLAGS) # $(MAGICK_LDFLAGS) + $(EXR_LIBS) $(FFTW_LIBS) # $(OPENCV_LIBS) $(FFMPEG_LIBS) # $(MAGICK_LIBS)
# Unix : Minimal build. # Unix : Minimal build.
-MINIMAL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(CHECKIMAGE_CFLAGS) $(PARALLEL_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) \ -MINIMAL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) \
+MINIMAL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(CHECKIMAGE_CFLAGS) $(PARALLEL_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) \ +MINIMAL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) \
${TIFF_CFLAGS} ${PNG_CFLAGS} $(ZLIB_CFLAGS) $(FFTW_CFLAGS) # $(OPENCV_CFLAGS) ${TIFF_CFLAGS} ${PNG_CFLAGS} $(ZLIB_CFLAGS) $(FFTW_CFLAGS) $(CHECKIMAGE_CFLAGS) # $(OPENCV_CFLAGS)
-MINIMAL_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(X11_LDFLAGS) \ -MINIMAL_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) \
+MINIMAL_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(PARALLEL_LDFLAGS) $(X11_LDFLAGS) $(XSHM_LDFLAGS) \ +MINIMAL_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(XSHM_LIBS) \
${TIFF_LDFLAGS} ${PNG_LDFLAGS} $(ZLIB_LDFLAGS) $(FFTW_LDFLAGS) # $(OPENCV_LDFLAGS) ${TIFF_LIBS} ${PNG_LIBS} $(ZLIB_LIBS) $(FFTW_LIBS) # $(OPENCV_LIBS)
# Unix : Static build. # Unix : Static build.
STATIC_PATH = /usr/$(LIB)/

16
gmic-zart-qmake.diff
View File

@ -1,11 +1,10 @@
Index: gmic-1.5.8.4/src/Makefile Index: gmic-1.6.0.0/src/Makefile
=================================================================== ===================================================================
--- gmic-1.5.8.4.orig/src/Makefile --- gmic-1.6.0.0.orig/src/Makefile
+++ gmic-1.5.8.4/src/Makefile +++ gmic-1.6.0.0/src/Makefile
@@ -319,13 +319,15 @@ gimp: @@ -313,11 +313,13 @@ gimp:
lib: lib:
$(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib $(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_LIB_LIBS) $(OPT_LIBS)" gmic_lib
+QMAKE = qmake +QMAKE = qmake
+ +
@ -14,9 +13,8 @@ Index: gmic-1.5.8.4/src/Makefile
- cd ../zart && qmake-qt4 zart.pro && $(MAKE) && strip zart - cd ../zart && qmake-qt4 zart.pro && $(MAKE) && strip zart
+ cd ../zart && $(QMAKE) zart.pro && $(MAKE) && strip zart + cd ../zart && $(QMAKE) zart.pro && $(MAKE) && strip zart
else else
- cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)" - 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)" "LDFLAGS=$(STD_MACOSX_LDFLAGS) $(OPT_LDFLAGS)" + cd ../zart && $(QMAKE) zart.pro && $(MAKE) "CFLAGS=$(STD_MACOSX_CFLAGS) $(OPT_CFLAGS)" "SUBLIBS=$(STD_MACOSX_LIBS) $(OPT_LIBS)"
endif endif
# Entries for other configurations. # Entries for other configurations.
gmicol:

79
gmic.changes
View File

@ -1,3 +1,82 @@
-------------------------------------------------------------------
Sun Sep 7 12:08:18 CEST 2014 - kurt@garloff.de
- Add more workarounds for limited openMP support in gcc-4.3.
- Disable openMP for gcc-4.8.1 (openSUSE-13.1, FC19/20); it produces
ICEs (see https://bugzilla.redhat.com/show_bug.cgi?id=1107972).
-------------------------------------------------------------------
Sat Sep 6 23:59:57 CEST 2014 - kurt@garloff.de
- Update to gmic-1.6.0.0:
* New commands -pass, -noargs, -is_image_arg, -gimp_error_preview,
-outputx (-ox), -names (-nms), -mul_channels. -oneminus.
* Source ~/.gmic on startup.
* Colors for gmic -h (with bash).
* New filters Film emulation / Various (color presets) and
Details / Mighty details.
* New filters for zart.
* Only support image datatypes with floats (thus remove -type),
but optionally do conversion in -input and -output.
* Supply boundary values in -map derived with
neumann/dirichlet/periodic.
* More -blend paramaters.
* -apply_pose3d renamed to -pose3d.
* Remove -background3d (use enahnced -display3d and -snapshot3d
to replace).
* Better exception handling (-onfail).
* gmic -h command suggests corrections for misspelled cmds.
* -median support thresholds.
* -threshold2 (-t2) renames to -inrange (-ir).
* Bugfixes for merging very large 3d objects, spurious EOF on
stdout with -output, maintaining shared state with -keep,
-erode and -dilate, line number of errors.
- Update to gmic-1.5.9.3:
* Official support for parallelization with OpenMP.
* New commands -variance_patch and -skeleton3d.
* New filter Artistic / Circle abstraction.
* Shortcuts for -and (-&) and -or (-|).
* Bugfix loading .tiff with 3 channels signed char.
- Update to gmic-1.5.9.2:
* New filter Artistic / Cutout.
* Speedup of complex math evaluations.
* Improvements on -circles3d and -primitives3d.
* Default window sizes (3d) now based on screen size.
* Adjust down GIMP preview size.
- Update to gmic-1.5.9.1:
* New command -seamcarve (Deformation / Seamcarve).
* New command -montage (Arrays & tiles / Montage).
* New command -inpaint_holes (Repair / Inpaint [holes]).
* -window now normalizes images individually.
* multipage TIFF output with is_multipage.
* remove slow image pointer check.
* -discard optimization.
* bug fix with -structuretensors (2d, scheme=1).
- Update to gmic-1.5.9.0:
* New command -blend_seamless (Layers / Blend [seamless]).
* New commands -sub_alpha and -montage.
* New filter Details / Split details [layers].
* Larger default preview in GIMP plugin.
* Fixes for -split, -histogram, -equalize, -graph, -display
- Update to gmic-1.5.8.6:
* New plugins Film emulation / Add grain.
* New command -syntexturize (Patterns / Resynthesize texture).
* New command -fractalize (Artistic / Fractalize).
* New command -img2ascii (Arrays & tiles / Ascii art).
* New command -periodize_poisson (Patterns / Make seamless).
* New command -x_2048 -- launches famour 2048 game.
* Bug fixes for -minimal_path and -test
* @{-1,t} now always returns a string
* Disable sharing global vars between threads
* -uncommand and -command improvements
- Update to gmic-1.5.8.5
* Support for PANDORE-5 (.pan) output files.
* Improve and optmize -replace-seq.
* Support for is_binary_data and maximum_sequence_length in
-compress-rle.
* Recoded and improved -text.
* Bugfixes for -output and math expressions starting with < or >.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Mar 8 19:47:38 CET 2014 - kurt@garloff.de Sat Mar 8 19:47:38 CET 2014 - kurt@garloff.de

157
gmic.spec
View File

@ -16,64 +16,64 @@
# #
Name: gmic Name: gmic
Version: 1.5.8.4 Version: 1.6.0.0
Release: 0 Release: 0
Url: http://gmic.sourceforge.net/ Group: Productivity/Graphics/Bitmap Editors
Source: %{name}_%{version}.tar.bz2 URL: http://gmic.sourceforge.net/
Source1: http://gmic.sourceforge.net/gmic_reference.pdf Packager: kurt@garloff.de
Patch1: gmic-cflags.diff Source: %{name}_%{version}.tar.bz2
Patch2: gmic-docdir.diff Source1: http://gmic.sourceforge.net/gmic_reference.pdf
Patch3: gmic-overflow.diff Patch1: gmic-cflags.diff
Patch10: gmic-x11opts.diff Patch2: gmic-docdir.diff
Patch11: gmic-openmp.diff Patch3: gmic-overflow.diff
Patch12: gmic-openmp-gcc43.diff Patch10: gmic-x11opts.diff
Patch15: gmic-opencv.diff Patch11: gmic-openmp.diff
Patch16: gmic-opencv-old.diff Patch12: gmic-openmp-gcc43.diff
Patch17: gmic-magick.diff Patch15: gmic-opencv.diff
Patch20: gmic-zart-qmake.diff Patch20: gmic-zart-qmake.diff
Patch21: gmic-make-zart.diff Patch21: gmic-make-zart.diff
Patch30: gmic-opt-parallel-make.diff Patch31: gmic-unstrip.diff
Patch31: gmic-unstrip.diff Summary: GREYC's Magick for Image Computing (denoise and others)
Summary: GREYC's Magick for Image Computing (denoise and others) License: CECILL v.2.0 (GPL compatible)
License: CECILL v.2.0 (GPL compatible) Prefix: /usr
Group: Productivity/Graphics/Bitmap Editors BuildRoot: %{_tmppath}/%{name}-%{version}-build
Prefix: /usr BuildRequires: procps
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fftw3-devel
BuildRequires: OpenEXR-devel BuildRequires: gcc-c++
BuildRequires: dos2unix BuildRequires: libstdc++-devel
BuildRequires: fftw3-devel BuildRequires: dos2unix
BuildRequires: gcc-c++ BuildRequires: OpenEXR-devel
BuildRequires: libqt4-devel BuildRequires: libqt4-devel
BuildRequires: libstdc++-devel
BuildRequires: procps
%if 0%{?suse_version} >= 1110 %if 0%{?suse_version} >= 1110
BuildRequires: fftw3-threads-devel BuildRequires: libjpeg-devel
BuildRequires: libjasper1 BuildRequires: libtiff-devel
BuildRequires: libjpeg-devel BuildRequires: fftw3-threads-devel
BuildRequires: libtiff-devel %if 0%{?suse_version} >= 1120
BuildRequires: opencv-devel BuildRequires: opencv-devel
#BuildRequires: GraphicsMagick-devel BuildRequires: libjasper1
%endif
#BuildRequires:cuGraphicsMagick-devel
%else %else
%if 0%{?fedora_version} > 16 %if 0%{?fedora_version} > 16
BuildRequires: jasper-libs BuildRequires: libjpeg-devel
BuildRequires: libjpeg-devel BuildRequires: libtiff-devel
BuildRequires: libtiff-devel BuildRequires: opencv-devel
BuildRequires: opencv-devel BuildRequires: jasper-libs
#BuildRequires: fftw-libs-threads #BuildRequires: fftw-libs-threads
%else %else
%if 0%{?mandriva_version} > 0 %if 0%{?mandriva_version} > 0
BuildRequires: libtiff-devel BuildRequires: libtiff-devel
%endif %endif
%endif %endif
%endif %endif
%if 0%{?suse_version} == 1030 %if 0%{?suse_version} == 1030
BuildRequires: gimp-unstable-devel BuildRequires: gimp-unstable-devel
%else %else
BuildRequires: gimp-devel BuildRequires: gimp-devel
%endif %endif
%if 0%{?sles_version} == 11 %if 0%{?sles_version} == 11
BuildRequires: glib2-branding-SLES BuildRequires: glib2-branding-SLES
%endif %endif
%define openSUSE_submit 1 %define openSUSE_submit 1
@ -142,6 +142,7 @@ Group: Productivity/Graphics/Bitmap Editors
This is a plugin for gimp that exposes many of the nice gmic features This is a plugin for gimp that exposes many of the nice gmic features
for interactive use in gimp. for interactive use in gimp.
%if 0%{?suse_version} == 0
%package zart %package zart
Summary: Real-time web cam video stream manipulation Summary: Real-time web cam video stream manipulation
Group: Productivity/Graphics/Bitmap editors Group: Productivity/Graphics/Bitmap editors
@ -149,6 +150,17 @@ Group: Productivity/Graphics/Bitmap editors
%description zart %description zart
This program allows you to capture video from a web cam and apply This program allows you to capture video from a web cam and apply
(real time) gmic image manipulations on the video stream. (real time) gmic image manipulations on the video stream.
%else
%if 0%{?suse_version} >= 1120
%endif
%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.
%endif
%package doc %package doc
Summary: GMIC reference documentation Summary: GMIC reference documentation
@ -165,19 +177,17 @@ This is the reference documentation for G'MIC in .pdf format.
%patch10 -p1 %patch10 -p1
%patch11 -p1 %patch11 -p1
%patch12 -p1 %patch12 -p1
# More gmic features ... # More gmic features ... opencv
%if 0%{?suse_version} > 0
%if 0%{?suse_version} >= 1120
%patch15 -p1 %patch15 -p1
%if 0%{?fedora_version} > 16
#nothing
%else
%if 0%{?suse_version} < 1100
%patch16 -p1
%endif %endif
%else
%patch15 -p1
%endif %endif
#%patch17 -p1 #%patch17 -p1
%patch20 -p1 %patch20 -p1
%patch21 -p1 %patch21 -p1
%patch30 -p1
%patch31 -p1 %patch31 -p1
# Remove build time references so build-compare can do its work # Remove build time references so build-compare can do its work
FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M') FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M')
@ -200,7 +210,11 @@ cp -p %{SOURCE1} .
%build %build
RPM_OPT_FLAGS="`echo $RPM_OPT_FLAGS | sed 's/-fstack-protector//'`" RPM_OPT_FLAGS="`echo $RPM_OPT_FLAGS | sed 's/-fstack-protector//'`"
RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O3 -ffast-math -ftree-vectorize" #RPM_OPT_FLAGS="$RPM_OPT_FLAGS -O3 -ffast-math -ftree-vectorize"
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
# Compile times are exorbitant as are, -funroll-loops makes it worse # Compile times are exorbitant as are, -funroll-loops makes it worse
#RPM_OPT_FLAGS="$RPM_OPT_FLAGS -funroll-loops" #RPM_OPT_FLAGS="$RPM_OPT_FLAGS -funroll-loops"
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
@ -239,17 +253,19 @@ fi
#make CFLAGS="$RPM_OPT_FLAGS" #make CFLAGS="$RPM_OPT_FLAGS"
cd src cd src
%if 0%{?fedora_version} > 16 %if 0%{?fedora_version} > 16
make $JOBS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} QMAKE=qmake-qt4 linux_alltypes make $JOBS $MAKEFLAGS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} QMAKE=qmake-qt4 linux
make $JOBS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} QMAKE=qmake-qt4 gimp lib make $JOBS $MAKEFLAGS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} QMAKE=qmake-qt4 gimp lib
make $JOBS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} QMAKE=qmake-qt4 zart make $JOBS $MAKEFLAGS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} QMAKE=qmake-qt4 zart
%else %else
%if 0%{?openSUSE_submit} == 0 make $JOBS $MAKEFLAGS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} linux
make $JOBS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} linux_alltypes make $JOBS $MAKEFLAGS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} gimp lib
%if 0%{?suse_version} == 0
make $JOBS $MAKEFLAGS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} zart
%else %else
make $JOBS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} linux %if 0%{?suse_version} >= 1120
make $JOBS $MAKEFLAGS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} zart
%endif
%endif %endif
make $JOBS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} gimp lib
make $JOBS CFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} zart
%endif %endif
#make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS" gimp #make %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS" gimp
free -m free -m
@ -262,7 +278,13 @@ make install DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_docdir} MANDIR=%{_mandir} LIB=%{_
%if 0%{?fedora_version} > 16 %if 0%{?fedora_version} > 16
make install-zart DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_docdir} MANDIR=%{_mandir} LIB=%{_lib} QMAKE=qmake-qt4 make install-zart DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_docdir} MANDIR=%{_mandir} LIB=%{_lib} QMAKE=qmake-qt4
%else %else
%if 0%{?suse_version} == 0
make install-zart DESTDIR=$RPM_BUILD_ROOT DOCDIR=%{_docdir} MANDIR=%{_mandir} LIB=%{_lib} 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 %endif
#mkdir -p $RPM_BUILD_ROOT%{_docdir}/gmic/html #mkdir -p $RPM_BUILD_ROOT%{_docdir}/gmic/html
#for name in images res js slides thumbs; do #for name in images res js slides thumbs; do
@ -274,7 +296,13 @@ 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/bin/gmic
strip -S $RPM_BUILD_ROOT/usr/%{_lib}/gimp/2.0/plug-ins/gmic_gimp strip -S $RPM_BUILD_ROOT/usr/%{_lib}/gimp/2.0/plug-ins/gmic_gimp
# ZART # ZART
%if 0%{?suse_version} == 0
strip -S $RPM_BUILD_ROOT/usr/bin/zart 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 ... # Duplicate man page ...
rm $RPM_BUILD_ROOT/%{_mandir}/fr/man1/gmic.1.gz rm $RPM_BUILD_ROOT/%{_mandir}/fr/man1/gmic.1.gz
# Reference manual # Reference manual
@ -302,10 +330,19 @@ rm $RPM_BUILD_ROOT/%{_mandir}/fr/man1/gmic.1.gz
%doc README COPYING index.html %doc README COPYING index.html
%config %attr(0644,root,root) /etc/bash_completion.d/gmic %config %attr(0644,root,root) /etc/bash_completion.d/gmic
%if 0%{?suse_version} == 0
%files zart %files zart
%defattr(-,root,root) %defattr(-,root,root)
/usr/bin/zart /usr/bin/zart
%doc zart/Licence_CeCILL_V2-en.html zart/README.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 %files gimp
%defattr(-,root,root) %defattr(-,root,root)

3
gmic_1.5.8.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:18c4fc427b7f620b9143115b4f2b5cb0b2d825c444c6969b19367b038b7fb056
size 1676335

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

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

4
gmic_reference.pdf
View File

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