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.5 KiB
Diff
44 lines
2.5 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
|
|
@@ -140,10 +140,10 @@ OPENMP_LIBS = -lgomp
|
|
# Flags to enable image display, using X11
|
|
# (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_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include -Dcimg_use_xrandr
|
|
+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).
|
|
@@ -236,10 +236,10 @@ BOARD_LIBS = -lboard
|
|
#-------------------------------
|
|
STD_CLI_CFLAGS = $(MANDATORY_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(CURL_CFLAGS) $(FFTW_CFLAGS)
|
|
STD_CLI_LIBS = $(MANDATORY_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(TIFF_LIBS) $(CURL_LIBS) $(FFTW_LIBS)
|
|
ifeq ($(OS),Unix) # Unix.
|
|
-STD_CLI_CFLAGS += $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) $(EXR_CFLAGS) $(OPENCV_CFLAGS) # $(XSHM_CFLAGS) $(MAGICK_CFLAGS)
|
|
-STD_CLI_LIBS += $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(EXR_LIBS) $(OPENCV_LIBS) # $(XSHM_LIBS) # $(MAGICK_LIBS)
|
|
+STD_CLI_CFLAGS += $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(EXR_CFLAGS) $(OPENCV_CFLAGS) # $(MAGICK_CFLAGS)
|
|
+STD_CLI_LIBS += $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(XSHM_LIBS) $(EXR_LIBS) $(OPENCV_LIBS) # $(MAGICK_LIBS)
|
|
else
|
|
ifeq ($(OS),Darwin) # MacOSX.
|
|
STD_CLI_CFLAGS += $(X11_CFLAGS) $(EXR_CFLAGS)
|
|
STD_CLI_LIBS += $(X11_LIBS) $(EXR_LIBS) $(OPT_LIBS)
|
|
@@ -266,10 +266,10 @@ STATIC_CLI_LIBS = $(PARALLEL_LIBS) \
|
|
#--------------------------------
|
|
STD_GIMP_CFLAGS = $(MANDATORY_CFLAGS) $(PNG_CFLAGS) $(CURL_CFLAGS) $(FFTW_CFLAGS) -Dcimg_use_rng
|
|
STD_GIMP_LIBS = $(MANDATORY_LIBS) $(PNG_LIBS) $(CURL_LIBS) $(FFTW_LIBS)
|
|
ifeq ($(OS),Unix) # Unix.
|
|
-STD_GIMP_CFLAGS += $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS)
|
|
-STD_GIMP_LIBS += $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS)
|
|
+STD_GIMP_CFLAGS += $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS)
|
|
+STD_GIMP_LIBS += $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(XSHM_LIBS)
|
|
else
|
|
ifeq ($(OS),Darwin) # MaxOSX.
|
|
STD_GIMP_CFLAGS += $(X11_CFLAGS)
|
|
STD_GIMP_LIBS += $(X11_LIBS)
|