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
81 lines
3.4 KiB
Diff
81 lines
3.4 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
|
|
@@ -80,7 +80,7 @@ INCLUDE=include
|
|
IS_BETA_CFLAGS =
|
|
|
|
# Flags that are mandatory to compile 'gmic'.
|
|
-MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/$(INCLUDE)
|
|
+MANDATORY_CFLAGS += $(CFLAGS) -Dgmic_build -I$(USR)/$(INCLUDE)
|
|
MANDATORY_LIBS += -L$(USR)/$(LIB)
|
|
ifeq ($(CC),g++)
|
|
MANDATORY_CFLAGS += -Wall -W
|
|
@@ -99,7 +99,7 @@ DEBUG_CFLAGS = -Dcimg_verbosity=3 -g
|
|
|
|
# Flags to enable optimizations.
|
|
ifeq ($(CC),g++)
|
|
-OPT_CFLAGS = -O2 -fno-ipa-sra -mtune=generic # -fno-tree-pre # -ffast-math
|
|
+OPT_CFLAGS = -O2 # -mtune=generic # -fno-tree-pre # -ffast-math
|
|
endif
|
|
ifeq ($(CC),clang++)
|
|
OPT_CFLAGS = -O2
|
|
@@ -130,13 +130,13 @@ OPENMP_LIBS = -lgomp
|
|
# 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_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).
|
|
XSHM_CFLAGS = -Dcimg_use_xshm
|
|
-XSHM_LIBS = -L$(USR)/X11R6/lib -lXext
|
|
+XSHM_LIBS = -L$(USR)/X11R6/$(LIB) -lXext
|
|
|
|
# Flags to enable image display, using GDI32.
|
|
# This requires the presence of the GDI32 include and library files.
|
|
@@ -241,7 +241,8 @@ MINIMAL_UNIX_LIBS = $(MANDATORY_LIBS) $(
|
|
${TIFF_LIBS} ${PNG_LIBS} $(ZLIB_LIBS) $(FFTW_LIBS) # $(OPENCV_LIBS)
|
|
|
|
# Unix : Static build.
|
|
-STATIC_PATH = $(USR)/${LIB}/x86_64-linux-gnu
|
|
+#STATIC_PATH = $(USR)/${LIB}/x86_64-linux-gnu
|
|
+STATIC_PATH=$(USR)/$(LIB)
|
|
STATIC_EXTRA =
|
|
STATIC_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) -Dcimg_display=0
|
|
STATIC_UNIX_LIBS = $(PARALLEL_LIBS) \
|
|
@@ -279,12 +280,11 @@ STD_LIB_LIBS = $(MANDATORY_LIBS) $(PARAL
|
|
|
|
# GMICol : Standard build.
|
|
GMICOL_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(PARALLEL_CFLAGS) $(PNG_CFLAGS) $(JPEG_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) -Dcimg_display=0
|
|
-GMICOL_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) /usr/lib/x86_64-linux-gnu/libfftw3.a /usr/lib/x86_64-linux-gnu/libfftw3_threads.a
|
|
+GMICOL_UNIX_LIBS = $(MANDATORY_LIBS) $(PARALLEL_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(ZLIB_LIBS) /usr/$(LIB)/libfftw3.a /usr/$(LIB)/libfftw3_threads.a
|
|
|
|
#--------------------------
|
|
# Define Makefile entries.
|
|
#--------------------------
|
|
-
|
|
# Main entries
|
|
all:
|
|
ifeq ($(OS),Unix)
|
|
@@ -307,7 +307,7 @@ endif
|
|
endif
|
|
|
|
gimp:
|
|
- $(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS) $(OPT_LIBS)" "STRIP_EXE=1" gmic_gimp
|
|
+ $(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS) $(OPT_LIBS)" gmic_gimp
|
|
|
|
lib:
|
|
$(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_LIB_LIBS) $(OPT_LIBS)" gmic_lib
|
|
@@ -321,7 +321,7 @@ endif
|
|
|
|
# Entries for other configurations.
|
|
linux:
|
|
- $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS)" "STRIP_EXE=1" gmic
|
|
+ $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS)" gmic
|
|
|
|
solaris:
|
|
$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LIBS=$(STD_UNIX_LIBS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic
|