2755fcf4b6
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
37 lines
2.3 KiB
Diff
37 lines
2.3 KiB
Diff
diff -ru gmic-1.6.8.orig2/src/Makefile gmic-1.6.8/src/Makefile
|
|
--- gmic-1.6.8.orig2/src/Makefile 2015-12-21 12:22:46.000000000 +0100
|
|
+++ gmic-1.6.8/src/Makefile 2015-12-21 12:24:21.301442314 +0100
|
|
@@ -152,8 +152,8 @@
|
|
# 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.
|
|
-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.
|
|
@@ -232,8 +232,8 @@
|
|
STD_CLI_CFLAGS = $(MANDATORY_CFLAGS) $(CIMG_ABORT_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 += $(PARALLEL_CFLAGS) $(X11_CFLAGS) $(EXR_CFLAGS)
|
|
@@ -262,8 +262,8 @@
|
|
STD_GIMP_CFLAGS = $(MANDATORY_CFLAGS) $(CIMG_ABORT_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 += $(PARALLEL_CFLAGS) $(X11_CFLAGS)
|