/[gentoo-x86]/media-plugins/gimp-gmic/files/gmic-1.5.1.6-makefile.patch
Gentoo

Contents of /media-plugins/gimp-gmic/files/gmic-1.5.1.6-makefile.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Thu Jun 21 21:10:48 2012 UTC (2 years, 4 months ago) by radhermit
Branch: MAIN
Version bump.

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

1 --- gmic-1.5.1.6/src/Makefile
2 +++ gmic-1.5.1.6/src/Makefile
3 @@ -89,7 +89,7 @@
4
5 # Flags that are mandatory to compile 'gmic'.
6 MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/include
7 -MANDATORY_LDFLAGS += -L$(USR)/lib
8 +MANDATORY_LDFLAGS +=
9 ifeq ($(IS_GCC),yes)
10 MANDATORY_CFLAGS += -Wall -W
11 MANDATORY_LDFLAGS += -lm
12 @@ -99,14 +98,6 @@
13 # Flags to enable debugging.
14 -DEBUG_CFLAGS = -Dcimg_use_vt100 -Dcimg_verbosity=3 -g
15 -
16 -# Flags to enable optimizations.
17 -ifeq ($(IS_GCC),yes)
18 -OPT_CFLAGS = -O3 -fno-tree-pre # -ffast-math
19 -endif
20 -ifeq ($(CC),icc)
21 -OPT_CFLAGS = -O3 -ipo -no-prec-div -override-limits
22 -endif
23 +DEBUG_CFLAGS = -Dcimg_use_vt100 -Dcimg_verbosity=3
24
25 # Flags to enable image display, using X11
26 # (keep /usr/ dirname here since X11 is located in /usr/ on Mac too).
27 # This requires the presence of the X11 include and library files.
28 @@ -164,14 +155,8 @@
29 # Flags to enable native support of webcams, using the OpenCV library.
30 # This requires the presence of the OpenCV include and library files.
31 # (package 'libcv3-2-dev' on Debian).
32 -ifeq ($(OS),Darwin)
33 OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv
34 OPENCV_LDFLAGS = `pkg-config opencv --libs` #-> Use this for OpenCV 2.2.0 !
35 -else
36 -# OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv
37 -# OPENCV_LDFLAGS = -lcv -lhighgui
38 -# OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui #-> Use this for OpenCV 2.2.0 !
39 -endif
40
41 # Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library.
42 # This requires the presence of the GraphicsMagick++ include and library files.
43 @@ -216,11 +201,11 @@
44 $(EXR_LDFLAGS) $(FFTW_LDFLAGS) # $(OPENCV_LDFLAGS) $(FFMPEG_LDFLAGS) $(XSHM_LDFLAGS) # $(MAGICK_LDFLAGS)
45
46 CUST_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
47 - $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(MINC2_CFLAGS) $(ZLIB_CFLAGS) \
48 - $(FFTW_CFLAGS) $(BOARD_CFLAGS) $(EXR_CFLAGS) $(MAGICK_CFLAGS) # $(FFMPEG_CFLAGS) $(OPENCV_CFLAGS)
49 + $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \
50 + $(FFTW_CFLAGS) $(EXR_CFLAGS) $(MAGICK_CFLAGS) $(FFMPEG_CFLAGS) $(OPENCV_CFLAGS)
51 CUST_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(X11_LDFLAGS) $(XSHM_LDFLAGS) $(PNG_LDFLAGS) \
52 - $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(MINC2_LDFLAGS) $(ZLIB_LDFLAGS) \
53 - $(FFTW_LDFLAGS) $(BOARD_LDFLAGS) $(EXR_LDFLAGS) $(MAGICK_LDFLAGS) # $(FFMPEG_LDFLAGS) $(OPENCV_LDFLAGS)
54 + $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(ZLIB_LDFLAGS) \
55 + $(FFTW_LDFLAGS) $(EXR_LDFLAGS) $(MAGICK_LDFLAGS) $(FFMPEG_LDFLAGS) $(OPENCV_LDFLAGS)
56
57 DEBUG_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \
58 $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) \
59 @@ -246,7 +231,7 @@
60 STD_WINDOWS_LDFLAGS = $(MANDATORY_LDFLAGS) $(GDI32_LDFLAGS) $(ZLIB_LDFLAGS) $(PNG_LDFLAGS) $(JPEG_LDFLAGS) $(FFTW_LDFLAGS)
61
62 STD_GIMP_CFLAGS = -Dgmic_build -Dcimg_display=0 -Dcimg_use_rng -I$(USR)/include $(FFTW_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) ${IS_BETA_CFLAGS}
63 -STD_GIMP_LDFLAGS = -L$(USR)/lib -lpthread $(FFTW_LDFLAGS) $(PNG_LDFLAGS) $(ZLIB_LDFLAGS)
64 +STD_GIMP_LDFLAGS = -lpthread $(FFTW_LDFLAGS) $(PNG_LDFLAGS) $(ZLIB_LDFLAGS)
65 ifeq ($(OS),MINGW32_NT-5.1)
66 STD_GIMP_LDFLAGS += -mwindows
67 endif
68 @@ -292,10 +277,10 @@
69 endif
70
71 gimp:
72 - $(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" "STRIP_EXE=1" gmic_gimp
73 + $(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" gmic_gimp
74
75 lib:
76 - $(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib
77 + $(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib
78
79 zart: lib
80 ifneq ($(OS),Darwin)
81 @@ -312,10 +297,10 @@
82 $(MAKE) "CFLAGS+=$(DEBUG_UNIX_CFLAGS)" "LDFLAGS+=$(DEBUG_UNIX_LDFLAGS)" gmic_minimal
83
84 linux:
85 - $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
86 + $(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_UNIX_LDFLAGS)" gmic_gmic
87
88 custom:
89 - $(MAKE) "CFLAGS=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(CUST_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic
90 + $(MAKE) "CFLAGS+=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(CUST_UNIX_LDFLAGS)" gmic_gmic
91
92 solaris:
93 $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic_gmic
94 @@ -345,7 +330,6 @@
95 $(CC) -o gmic_gimp.o -c gmic.cpp -Dgmic_gimp -Dgmic_minimal -Dgmic_float $(CFLAGS)
96 gmic_gimp : gmic_gimp.o gmic_gimp.cpp
97 $(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LDFLAGS)
98 - strip gmic_gimp$(EXE)
99
100 gmic_minimal: gmic.cpp
101 $(CC) -o gmic gmic.cpp -Dgmic_minimal -Dgmic_float -Dgmic_main $(CFLAGS) $(LDFLAGS)
102 @@ -370,7 +354,6 @@
103 $(CC) -o gmic_double.o -c gmic.cpp -Dgmic_separate_compilation -Dgmic_double $(CFLAGS)
104 gmic_gmic: gmic.cpp gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o gmic_def.h
105 $(CC) -o gmic gmic.cpp -Dgmic_separate_compilation -Dgmic_main $(CFLAGS) gmic_bool.o gmic_uchar.o gmic_char.o gmic_ushort.o gmic_short.o gmic_uint.o gmic_int.o gmic_float.o gmic_double.o $(LDFLAGS)
106 - strip gmic$(EXE)
107
108 def:
109 @echo "#ifndef gmic_gimp" > gmic_def.h

  ViewVC Help
Powered by ViewVC 1.1.20