Marcus Meissner
3f4d6eef0a
- 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
101 lines
4.0 KiB
Diff
101 lines
4.0 KiB
Diff
Index: gmic-1.6.0.3/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 =
|
|
|
|
# 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 ($(notdir $(CC)),g++)
|
|
MANDATORY_CFLAGS += -Wall -W
|
|
@@ -108,11 +108,11 @@ DEBUG_CFLAGS = -Dcimg_verbosity=3 -g
|
|
|
|
# Flags to enable optimizations.
|
|
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
|
|
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
|
|
-X11_LIBS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr
|
|
+X11_LIBS = -L/usr/X11R6/$(LIB) -lX11 -lpthread #-lXrandr
|
|
|
|
# Flags to enable fast display, using XShm.
|
|
# This requires the presence of the X11 extension include and library files.
|
|
# (package 'libx11-dev' on Debian).
|
|
XSHM_CFLAGS = -Dcimg_use_xshm
|
|
-XSHM_LIBS = -L$(USR)/X11R6/lib -lXext
|
|
+XSHM_LIBS = -L$(USR)/X11R6/$(LIB) -lXext
|
|
|
|
# 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)
|
|
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
|
|
|
|
#--------------------------
|
|
# 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
|
|
|