| 1 |
radhermit 12/11/02 07:22:35 |
| 2 |
|
| 3 |
Added: gmic-1.5.2.1-makefile.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-gfx/gmic/files/gmic-1.5.2.1-makefile.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gmic/files/gmic-1.5.2.1-makefile.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gmic/files/gmic-1.5.2.1-makefile.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: gmic-1.5.2.1-makefile.patch |
| 16 |
=================================================================== |
| 17 |
--- gmic-1.5.2.1/src/Makefile |
| 18 |
+++ gmic-1.5.2.1/src/Makefile |
| 19 |
@@ -77,7 +77,7 @@ |
| 20 |
|
| 21 |
# Flags that are mandatory to compile 'gmic'. |
| 22 |
MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/include |
| 23 |
-MANDATORY_LDFLAGS += -L$(USR)/lib |
| 24 |
+MANDATORY_LDFLAGS += |
| 25 |
ifeq ($(IS_GCC),yes) |
| 26 |
MANDATORY_CFLAGS += -Wall -W |
| 27 |
MANDATORY_LDFLAGS += -lm |
| 28 |
@@ -85,15 +85,7 @@ |
| 29 |
MANDATORY_CFLAGS+=$(IS_BETA_CFLAGS) |
| 30 |
|
| 31 |
# Flags to enable debugging. |
| 32 |
-DEBUG_CFLAGS = -Dcimg_use_vt100 -Dcimg_verbosity=3 -g |
| 33 |
- |
| 34 |
-# Flags to enable optimizations. |
| 35 |
-ifeq ($(IS_GCC),yes) |
| 36 |
-OPT_CFLAGS = -O3 # -fno-tree-pre # -ffast-math |
| 37 |
-endif |
| 38 |
-ifeq ($(CC),icc) |
| 39 |
-OPT_CFLAGS = -O3 -ipo -no-prec-div -override-limits |
| 40 |
-endif |
| 41 |
+DEBUG_CFLAGS = -Dcimg_use_vt100 -Dcimg_verbosity=3 |
| 42 |
|
| 43 |
# Flags to enable image display, using X11 |
| 44 |
# (keep /usr/ dirname here since X11 is located in /usr/ on Mac too). |
| 45 |
@@ -152,14 +144,8 @@ |
| 46 |
# Flags to enable native support of webcams, using the OpenCV library. |
| 47 |
# This requires the presence of the OpenCV include and library files. |
| 48 |
# (package 'libcv3-2-dev' on Debian). |
| 49 |
-ifeq ($(OS),Darwin) |
| 50 |
OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv |
| 51 |
OPENCV_LDFLAGS = `pkg-config opencv --libs` #-> Use this for OpenCV 2.2.0 ! |
| 52 |
-else |
| 53 |
-OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv |
| 54 |
-OPENCV_LDFLAGS = -lcv -lhighgui |
| 55 |
-# OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui #-> Use this for OpenCV 2.2.0 ! |
| 56 |
-endif |
| 57 |
|
| 58 |
# Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library. |
| 59 |
# This requires the presence of the GraphicsMagick++ include and library files. |
| 60 |
@@ -204,11 +190,11 @@ |
| 61 |
$(EXR_LDFLAGS) $(FFTW_LDFLAGS) # $(OPENCV_LDFLAGS) $(FFMPEG_LDFLAGS) $(XSHM_LDFLAGS) # $(MAGICK_LDFLAGS) |
| 62 |
|
| 63 |
CUST_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \ |
| 64 |
- $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(MINC2_CFLAGS) $(ZLIB_CFLAGS) \ |
| 65 |
- $(FFTW_CFLAGS) $(BOARD_CFLAGS) $(EXR_CFLAGS) $(MAGICK_CFLAGS) # $(FFMPEG_CFLAGS) $(OPENCV_CFLAGS) |
| 66 |
+ $(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) \ |
| 67 |
+ $(FFTW_CFLAGS) $(EXR_CFLAGS) $(MAGICK_CFLAGS) $(FFMPEG_CFLAGS) $(OPENCV_CFLAGS) |
| 68 |
CUST_UNIX_LDFLAGS = $(MANDATORY_LDFLAGS) $(X11_LDFLAGS) $(XSHM_LDFLAGS) $(PNG_LDFLAGS) \ |
| 69 |
- $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(MINC2_LDFLAGS) $(ZLIB_LDFLAGS) \ |
| 70 |
- $(FFTW_LDFLAGS) $(BOARD_LDFLAGS) $(EXR_LDFLAGS) $(MAGICK_LDFLAGS) # $(FFMPEG_LDFLAGS) $(OPENCV_LDFLAGS) |
| 71 |
+ $(JPEG_LDFLAGS) $(TIFF_LDFLAGS) $(ZLIB_LDFLAGS) \ |
| 72 |
+ $(FFTW_LDFLAGS) $(EXR_LDFLAGS) $(MAGICK_LDFLAGS) $(FFMPEG_LDFLAGS) $(OPENCV_LDFLAGS) |
| 73 |
|
| 74 |
DEBUG_UNIX_CFLAGS = $(MANDATORY_CFLAGS) $(DEBUG_CFLAGS) $(X11_CFLAGS) $(XSHM_CFLAGS) $(PNG_CFLAGS) \ |
| 75 |
$(JPEG_CFLAGS) $(TIFF_CFLAGS) $(ZLIB_CFLAGS) $(FFTW_CFLAGS) \ |
| 76 |
@@ -234,7 +220,7 @@ |
| 77 |
STD_WINDOWS_LDFLAGS = $(MANDATORY_LDFLAGS) $(GDI32_LDFLAGS) $(ZLIB_LDFLAGS) $(PNG_LDFLAGS) $(JPEG_LDFLAGS) $(FFTW_LDFLAGS) |
| 78 |
|
| 79 |
STD_GIMP_CFLAGS = -Dgmic_build -Dcimg_display=0 -Dcimg_use_rng -I$(USR)/include $(FFTW_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) ${IS_BETA_CFLAGS} |
| 80 |
-STD_GIMP_LDFLAGS = -L$(USR)/lib -lpthread $(FFTW_LDFLAGS) $(PNG_LDFLAGS) $(ZLIB_LDFLAGS) |
| 81 |
+STD_GIMP_LDFLAGS = -lpthread $(FFTW_LDFLAGS) $(PNG_LDFLAGS) $(ZLIB_LDFLAGS) |
| 82 |
ifeq ($(OS),MINGW32_NT-5.1) |
| 83 |
STD_GIMP_LDFLAGS += -mwindows |
| 84 |
endif |
| 85 |
@@ -287,10 +273,10 @@ |
| 86 |
endif |
| 87 |
|
| 88 |
gimp: |
| 89 |
- $(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" "STRIP_EXE=1" gmic_gimp |
| 90 |
+ $(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" gmic_gimp |
| 91 |
|
| 92 |
lib: |
| 93 |
- $(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib |
| 94 |
+ $(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib |
| 95 |
|
| 96 |
zart: lib |
| 97 |
ifneq ($(OS),Darwin) |
| 98 |
@@ -313,10 +299,10 @@ |
| 99 |
$(MAKE) "CFLAGS+=$(DEBUG_UNIX_CFLAGS)" "LDFLAGS+=$(DEBUG_UNIX_LDFLAGS)" gmic_minimal |
| 100 |
|
| 101 |
linux: |
| 102 |
- $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic |
| 103 |
+ $(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_UNIX_LDFLAGS)" gmic_gmic |
| 104 |
|
| 105 |
custom: |
| 106 |
- $(MAKE) "CFLAGS=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(CUST_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic |
| 107 |
+ $(MAKE) "CFLAGS+=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(CUST_UNIX_LDFLAGS)" gmic_gmic |
| 108 |
|
| 109 |
solaris: |
| 110 |
$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic_gmic |
| 111 |
@@ -346,7 +332,6 @@ |
| 112 |
$(CC) -o gmic_gimp.o -c gmic.cpp -Dgmic_gimp -Dgmic_minimal -Dgmic_float $(CFLAGS) |
| 113 |
gmic_gimp : gmic_gimp.o gmic_gimp.cpp |
| 114 |
$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LDFLAGS) |
| 115 |
- strip gmic_gimp$(EXE) |
| 116 |
|
| 117 |
gmic_minimal: gmic.cpp |
| 118 |
$(CC) -o gmic gmic.cpp -Dgmic_minimal -Dgmic_float -Dgmic_main $(CFLAGS) $(LDFLAGS) |
| 119 |
@@ -371,7 +356,6 @@ |
| 120 |
$(CC) -o gmic_double.o -c gmic.cpp -Dgmic_separate_compilation -Dgmic_double $(CFLAGS) |
| 121 |
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 |
| 122 |
$(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) |
| 123 |
- strip gmic$(EXE) |
| 124 |
|
| 125 |
def: |
| 126 |
@echo "#ifndef gmic_gimp" > gmic_def.h |
Archives