pool/gmic
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
662b013d9c
gmic/gmic-zart-qmake.diff

44 lines
2.1 KiB
Diff
Raw Normal View History

Accepting request 315257 from home:garloff:branches:graphics - Fix build of gmic with older 2.6 GIMP (SLE11). - Update to gmic-1.6.5.0: * https://www.flickr.com/groups/gmic/discuss/72157653514140862/ * New commands: -label3d, -head, -files * Improvements -repeat, -axes, -warn, -displacement, -files2video, -apply_files * Math parser now supports sqr() * Bugfixes: Iain Fergusson denoising with selections and new layers, video stream, -display garbage, -graph, -display_graph, -plot with plot_type=3, 3d rendering, -camera with specified resolution. - Update to gmic-1.6.3.1: * https://www.flickr.com/groups/gmic/discuss/72157652079823575/ * New commands: -pack, -x_landscape * Improvements for 3d object rendering with z-buffer * Shared gmicrc resource directory * Math parser supporrts isfile(path), isdir(path) and fdate() now. * libgmic now uses libpng, libtiff, libjpeg, libcurl, libfftw. * Added some tooltips (gimp plugin) * Bugfixes: Possible buffer overflows in plugins - Update to gmic-1.6.2.0: * https://www.flickr.com/groups/gmic/discuss/72157651409869115/ * New commands -apply_timeout, -boxfilter, -serialize, -unserialize, -fps, -transition. * New filters Sequences / Spatial transition, Colors / Transfer colors [advanced] * Improved error message line numbers in -if .. -endif block. * Improved -blur, -displacement, - input, -warp * Compressed storage of custom commands OBS-URL: https://build.opensuse.org/request/show/315257 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=5
2015-07-07 15:18:59 +00:00
Index: gmic-1.6.5.0/src/Makefile
Accepting request 225522 from home:garloff:Photography Submit gmic package to openSUSE:Factory via the graphics Devel package. Sidenote: While I will continue to build the full gmic binary in my home:garloff:Photography project (and use MMX,SSE on i386) for continuity reasons, I follow upstream to only build gmic the float type for openSUSE submission, covering probably 99% of the use cases ... This is controlled by a %define in the specfile, so I can keep the packages in sync otherwise at least for the time being. OBS-URL: https://build.opensuse.org/request/show/225522 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=1
2014-03-11 05:52:11 +00:00
===================================================================
Accepting request 315257 from home:garloff:branches:graphics - Fix build of gmic with older 2.6 GIMP (SLE11). - Update to gmic-1.6.5.0: * https://www.flickr.com/groups/gmic/discuss/72157653514140862/ * New commands: -label3d, -head, -files * Improvements -repeat, -axes, -warn, -displacement, -files2video, -apply_files * Math parser now supports sqr() * Bugfixes: Iain Fergusson denoising with selections and new layers, video stream, -display garbage, -graph, -display_graph, -plot with plot_type=3, 3d rendering, -camera with specified resolution. - Update to gmic-1.6.3.1: * https://www.flickr.com/groups/gmic/discuss/72157652079823575/ * New commands: -pack, -x_landscape * Improvements for 3d object rendering with z-buffer * Shared gmicrc resource directory * Math parser supporrts isfile(path), isdir(path) and fdate() now. * libgmic now uses libpng, libtiff, libjpeg, libcurl, libfftw. * Added some tooltips (gimp plugin) * Bugfixes: Possible buffer overflows in plugins - Update to gmic-1.6.2.0: * https://www.flickr.com/groups/gmic/discuss/72157651409869115/ * New commands -apply_timeout, -boxfilter, -serialize, -unserialize, -fps, -transition. * New filters Sequences / Spatial transition, Colors / Transfer colors [advanced] * Improved error message line numbers in -if .. -endif block. * Improved -blur, -displacement, - input, -warp * Compressed storage of custom commands OBS-URL: https://build.opensuse.org/request/show/315257 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=5
2015-07-07 15:18:59 +00:00
--- gmic-1.6.5.0.orig/src/Makefile
+++ gmic-1.6.5.0/src/Makefile
@@ -348,13 +348,15 @@ static:
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 15:02:09 +00:00
Accepting request 315257 from home:garloff:branches:graphics - Fix build of gmic with older 2.6 GIMP (SLE11). - Update to gmic-1.6.5.0: * https://www.flickr.com/groups/gmic/discuss/72157653514140862/ * New commands: -label3d, -head, -files * Improvements -repeat, -axes, -warn, -displacement, -files2video, -apply_files * Math parser now supports sqr() * Bugfixes: Iain Fergusson denoising with selections and new layers, video stream, -display garbage, -graph, -display_graph, -plot with plot_type=3, 3d rendering, -camera with specified resolution. - Update to gmic-1.6.3.1: * https://www.flickr.com/groups/gmic/discuss/72157652079823575/ * New commands: -pack, -x_landscape * Improvements for 3d object rendering with z-buffer * Shared gmicrc resource directory * Math parser supporrts isfile(path), isdir(path) and fdate() now. * libgmic now uses libpng, libtiff, libjpeg, libcurl, libfftw. * Added some tooltips (gimp plugin) * Bugfixes: Possible buffer overflows in plugins - Update to gmic-1.6.2.0: * https://www.flickr.com/groups/gmic/discuss/72157651409869115/ * New commands -apply_timeout, -boxfilter, -serialize, -unserialize, -fps, -transition. * New filters Sequences / Spatial transition, Colors / Transfer colors [advanced] * Improved error message line numbers in -if .. -endif block. * Improved -blur, -displacement, - input, -warp * Compressed storage of custom commands OBS-URL: https://build.opensuse.org/request/show/315257 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=5
2015-07-07 15:18:59 +00:00
debug:
$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(DEBUG_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
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 06:03:29 +00:00
+QMAKE = qmake
+
zart: lib
Accepting request 315257 from home:garloff:branches:graphics - Fix build of gmic with older 2.6 GIMP (SLE11). - Update to gmic-1.6.5.0: * https://www.flickr.com/groups/gmic/discuss/72157653514140862/ * New commands: -label3d, -head, -files * Improvements -repeat, -axes, -warn, -displacement, -files2video, -apply_files * Math parser now supports sqr() * Bugfixes: Iain Fergusson denoising with selections and new layers, video stream, -display garbage, -graph, -display_graph, -plot with plot_type=3, 3d rendering, -camera with specified resolution. - Update to gmic-1.6.3.1: * https://www.flickr.com/groups/gmic/discuss/72157652079823575/ * New commands: -pack, -x_landscape * Improvements for 3d object rendering with z-buffer * Shared gmicrc resource directory * Math parser supporrts isfile(path), isdir(path) and fdate() now. * libgmic now uses libpng, libtiff, libjpeg, libcurl, libfftw. * Added some tooltips (gimp plugin) * Bugfixes: Possible buffer overflows in plugins - Update to gmic-1.6.2.0: * https://www.flickr.com/groups/gmic/discuss/72157651409869115/ * New commands -apply_timeout, -boxfilter, -serialize, -unserialize, -fps, -transition. * New filters Sequences / Spatial transition, Colors / Transfer colors [advanced] * Improved error message line numbers in -if .. -endif block. * Improved -blur, -displacement, - input, -warp * Compressed storage of custom commands OBS-URL: https://build.opensuse.org/request/show/315257 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=5
2015-07-07 15:18:59 +00:00
ifeq ($(OS),Darwin)
- cd ../zart && qmake zart.pro && $(MAKE) "CFLAGS=$(OPT_CFLAGS)" "SUBLIBS=$(OPT_LIBS)" && strip zart.app/Contents/MacOS/zart
+ cd ../zart && $(QMAKE) zart.pro && $(MAKE) "CFLAGS=$(OPT_CFLAGS)" "SUBLIBS=$(OPT_LIBS)" && strip zart.app/Contents/MacOS/zart
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 06:03:29 +00:00
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 15:18:59 +00:00
- cd ../zart && qmake zart.pro && $(MAKE) && strip zart
+ cd ../zart && $(QMAKE) zart.pro && $(MAKE) && strip zart
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 06:03:29 +00:00
endif
Accepting request 315257 from home:garloff:branches:graphics - Fix build of gmic with older 2.6 GIMP (SLE11). - Update to gmic-1.6.5.0: * https://www.flickr.com/groups/gmic/discuss/72157653514140862/ * New commands: -label3d, -head, -files * Improvements -repeat, -axes, -warn, -displacement, -files2video, -apply_files * Math parser now supports sqr() * Bugfixes: Iain Fergusson denoising with selections and new layers, video stream, -display garbage, -graph, -display_graph, -plot with plot_type=3, 3d rendering, -camera with specified resolution. - Update to gmic-1.6.3.1: * https://www.flickr.com/groups/gmic/discuss/72157652079823575/ * New commands: -pack, -x_landscape * Improvements for 3d object rendering with z-buffer * Shared gmicrc resource directory * Math parser supporrts isfile(path), isdir(path) and fdate() now. * libgmic now uses libpng, libtiff, libjpeg, libcurl, libfftw. * Added some tooltips (gimp plugin) * Bugfixes: Possible buffer overflows in plugins - Update to gmic-1.6.2.0: * https://www.flickr.com/groups/gmic/discuss/72157651409869115/ * New commands -apply_timeout, -boxfilter, -serialize, -unserialize, -fps, -transition. * New filters Sequences / Spatial transition, Colors / Transfer colors [advanced] * Improved error message line numbers in -if .. -endif block. * Improved -blur, -displacement, - input, -warp * Compressed storage of custom commands OBS-URL: https://build.opensuse.org/request/show/315257 OBS-URL: https://build.opensuse.org/package/show/graphics/gmic?expand=0&rev=5
2015-07-07 15:18:59 +00:00
# Internal rules to build compilation modules.
libgmic.o: gmic.cpp gmic.h gmic_def.h CImg.h
Index: gmic-1.6.5.0/zart/zart.pro
===================================================================
--- gmic-1.6.5.0.orig/zart/zart.pro
+++ gmic-1.6.5.0/zart/zart.pro
@@ -83,14 +83,14 @@ system(pkg-config opencv --libs > /dev/n
# LIBS += -lX11 ../src/libgmic.a `pkg-config opencv --libs` -lfftw3 -lfftw3_threads
OPENCVLIBS = $$system(pkg-config opencv --libs)
OPENCVLIBS = $$replace( OPENCVLIBS, -lcvaux, )
# LIBS += -lX11 ../src/libgmic.a $$OPENCVLIBS -lfftw3 -lfftw3_threads -lz -Dcimg_use_openmp -fopenmp
-LIBS += -lX11 ../src/libgmic.a $$OPENCVLIBS -lfftw3 -lfftw3_threads -lz -ljpeg -lpng -ltiff -lX11 -lcurl
+LIBS += -lX11 ../src/libgmic.a -lXrandr $$OPENCVLIBS -lfftw3 -lfftw3_threads -lz -ljpeg -lpng -ltiff -lX11 -lcurl
!macx {
LIBS += -Dcimg_use_openmp -fopenmp
}
} else {
- LIBS += -lX11 ../src/libgmic.a -lopencv_core -lopencv_highgui -lfftw3 -lfftw3_threads -lz -ljpeg -lpng -ltiff -lX11 -lcurl -lopencv_imgproc -lopencv_objdetect -Dcimg_use_openmp -fopenmp
+ LIBS += -lX11 ../src/libgmic.a -lXrandr -lopencv_core -lopencv_highgui -lfftw3 -lfftw3_threads -lz -ljpeg -lpng -ltiff -lX11 -lcurl -lopencv_imgproc -lopencv_objdetect -Dcimg_use_openmp -fopenmp
# LIBS += -lX11 ../src/libgmic.a -lcxcore -lcv -lml -lhighgui -lfftw3 -lfftw3_threads
}
PRE_TARGETDEPS +=
Reference in New Issue Copy Permalink