Marcus Meissner
662b013d9c
- 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
44 lines
2.1 KiB
Diff
44 lines
2.1 KiB
Diff
Index: gmic-1.6.5.0/src/Makefile
|
|
===================================================================
|
|
--- gmic-1.6.5.0.orig/src/Makefile
|
|
+++ gmic-1.6.5.0/src/Makefile
|
|
@@ -348,13 +348,15 @@ static:
|
|
|
|
debug:
|
|
$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(DEBUG_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic
|
|
|
|
+QMAKE = qmake
|
|
+
|
|
zart: lib
|
|
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
|
|
else
|
|
- cd ../zart && qmake zart.pro && $(MAKE) && strip zart
|
|
+ cd ../zart && $(QMAKE) zart.pro && $(MAKE) && strip zart
|
|
endif
|
|
|
|
# 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 +=
|