pool/gmic
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
bb5a24041a
gmic/gmic-cflags.diff

57 lines
2.5 KiB
Diff
Raw Normal View History

Accepting request 350199 from home:msvec:branches:graphics Update to gmic-1.6.8 OBS-URL: https://build.opensuse.org/request/show/350199 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=6
2015-12-22 12:12:29 +01:00
diff -ru gmic-1.6.8.orig/src/Makefile gmic-1.6.8/src/Makefile
--- gmic-1.6.8.orig/src/Makefile 2015-12-09 13:49:16.000000000 +0100
+++ gmic-1.6.8/src/Makefile 2015-12-21 11:50:21.187411451 +0100
@@ -93,6 +93,7 @@
Accepting request 248864 from home:garloff:branches:graphics 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
2014-09-13 08:03:29 +02:00
# Flags that are mandatory to compile 'gmic'.
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 17:18:59 +02:00
MANDATORY_CFLAGS = -Dgmic_build -Dcimg_use_zlib -I$(USR)/$(INCLUDE) $(PRERELEASE_CFLAGS)
+MANDATORY_CFLAGS += $(CFLAGS)
MANDATORY_LIBS = -lz
Accepting request 350199 from home:msvec:branches:graphics Update to gmic-1.6.8 OBS-URL: https://build.opensuse.org/request/show/350199 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=6
2015-12-22 12:12:29 +01:00
ifndef NO_SRIPDLIB
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 17:18:59 +02:00
MANDATORY_CFLAGS += -std=c++11
Accepting request 350199 from home:msvec:branches:graphics Update to gmic-1.6.8 OBS-URL: https://build.opensuse.org/request/show/350199 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=6
2015-12-22 12:12:29 +01:00
@@ -119,7 +120,7 @@
Accepting request 248864 from home:garloff:branches:graphics 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
2014-09-13 08:03:29 +02:00
# Flags to enable optimizations.
Accepting request 280593 from home:garloff:branches:graphics - 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
2015-01-09 16:02:09 +01:00
ifeq ($(notdir $(CC)),g++)
-OPT_CFLAGS = -O2 -mtune=generic
+OPT_CFLAGS = -O2 # -mtune=generic
else
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 17:18:59 +02:00
ifeq ($(notdir $(CC)),icpc)
Accepting request 280593 from home:garloff:branches:graphics - 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
2015-01-09 16:02:09 +01:00
OPT_CFLAGS = -fast
Accepting request 350199 from home:msvec:branches:graphics Update to gmic-1.6.8 OBS-URL: https://build.opensuse.org/request/show/350199 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=6
2015-12-22 12:12:29 +01:00
@@ -151,12 +152,12 @@
Accepting request 280593 from home:garloff:branches:graphics - 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
2015-01-09 16:02:09 +01:00
# (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
Accepting request 248864 from home:garloff:branches:graphics 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
2014-09-13 08:03:29 +02:00
# This requires the presence of the X11 include and library files.
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.
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.
Accepting request 350199 from home:msvec:branches:graphics Update to gmic-1.6.8 OBS-URL: https://build.opensuse.org/request/show/350199 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=6
2015-12-22 12:12:29 +01:00
@@ -244,7 +245,8 @@
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 17:18:59 +02:00
# 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 =
Accepting request 350199 from home:msvec:branches:graphics Update to gmic-1.6.8 OBS-URL: https://build.opensuse.org/request/show/350199 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=6
2015-12-22 12:12:29 +01:00
STATIC_CLI_CFLAGS = $(MANDATORY_CFLAGS) $(CIMG_ABORT_CFLAGS) $(PARALLEL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) -Dcimg_display=0
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 17:18:59 +02:00
STATIC_CLI_LIBS = $(PARALLEL_LIBS) \
Accepting request 350199 from home:msvec:branches:graphics Update to gmic-1.6.8 OBS-URL: https://build.opensuse.org/request/show/350199 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=6
2015-12-22 12:12:29 +01:00
@@ -291,7 +293,7 @@
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 17:18:59 +02:00
# 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
Accepting request 248864 from home:garloff:branches:graphics 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
2014-09-13 08:03:29 +02:00
#--------------------------
# Define Makefile entries.
Accepting request 350199 from home:msvec:branches:graphics Update to gmic-1.6.8 OBS-URL: https://build.opensuse.org/request/show/350199 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=6
2015-12-22 12:12:29 +01:00
Only in gmic-1.6.8/src: Makefile.orig
Only in gmic-1.6.8/src: Makefile.rej
Reference in New Issue Copy Permalink