137607746c
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
40 lines
2.5 KiB
Diff
40 lines
2.5 KiB
Diff
Index: gmic-1.6.0.0/src/Makefile
|
|
===================================================================
|
|
--- gmic-1.6.0.0.orig/src/Makefile
|
|
+++ gmic-1.6.0.0/src/Makefile
|
|
@@ -130,8 +130,8 @@ 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_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.
|
|
@@ -228,17 +228,17 @@ BOARD_LIBS = -lboard
|
|
#----------------------------------------------------------------
|
|
|
|
# Unix : Standard build.
|
|
-STD_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) $(PNG_CFLAGS) \
|
|
+STD_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
|
|
$(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \
|
|
- $(EXR_CFLAGS) $(FFTW_CFLAGS) # $(XSHM_CFLAGS) $(OPENCV_CFLAGS) $(FFMPEG_CFLAGS) # $(MAGICK_CFLAGS)
|
|
-STD_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(PNG_LIBS) \
|
|
+ $(EXR_CFLAGS) $(FFTW_CFLAGS) # $(OPENCV_CFLAGS) $(FFMPEG_CFLAGS) # $(MAGICK_CFLAGS)
|
|
+STD_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(XSHM_LIBS) $(PNG_LIBS) \
|
|
$(JPEG_LIBS) $(TIFF_LIBS) $(ZLIB_LIBS) \
|
|
- $(EXR_LIBS) $(FFTW_LIBS) # $(XSHM_LIBS) $(OPENCV_LIBS) $(FFMPEG_LIBS) # $(MAGICK_LIBS)
|
|
+ $(EXR_LIBS) $(FFTW_LIBS) # $(OPENCV_LIBS) $(FFMPEG_LIBS) # $(MAGICK_LIBS)
|
|
|
|
# Unix : Minimal build.
|
|
-MINIMAL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) \
|
|
+MINIMAL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) \
|
|
${TIFF_CFLAGS} ${PNG_CFLAGS} $(ZLIB_CFLAGS) $(FFTW_CFLAGS) $(CHECKIMAGE_CFLAGS) # $(OPENCV_CFLAGS)
|
|
-MINIMAL_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) \
|
|
+MINIMAL_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(OPENMP_LIBS) $(X11_LIBS) $(XSHM_LIBS) \
|
|
${TIFF_LIBS} ${PNG_LIBS} $(ZLIB_LIBS) $(FFTW_LIBS) # $(OPENCV_LIBS)
|
|
|
|
# Unix : Static build.
|