| 1 |
radhermit 14/02/11 05:30:28 |
| 2 |
|
| 3 |
Added: gmic-1.5.8.3-makefile.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/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.8.3-makefile.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gmic/files/gmic-1.5.8.3-makefile.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gmic/files/gmic-1.5.8.3-makefile.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: gmic-1.5.8.3-makefile.patch |
| 16 |
=================================================================== |
| 17 |
--- gmic-1.5.8.3/src/Makefile |
| 18 |
+++ gmic-1.5.8.3/src/Makefile |
| 19 |
@@ -77,7 +77,6 @@ |
| 20 |
|
| 21 |
# Flags that are mandatory to compile 'gmic'. |
| 22 |
MANDATORY_CFLAGS += -Dgmic_build -I$(USR)/include |
| 23 |
-MANDATORY_LDFLAGS += -L$(USR)/lib |
| 24 |
ifeq ($(CC),g++) |
| 25 |
MANDATORY_CFLAGS += -Wall -W |
| 26 |
MANDATORY_LDFLAGS += -lm |
| 27 |
@@ -118,14 +117,14 @@ |
| 28 |
# (keep /usr/ dirname here since X11 is located in /usr/ on Mac too). |
| 29 |
# This requires the presence of the X11 include and library files. |
| 30 |
# (package 'libx11-dev' on Debian). |
| 31 |
-X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" -I/usr/X11R6/include #-Dcimg_use_xrandr |
| 32 |
-X11_LDFLAGS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr |
| 33 |
+X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr |
| 34 |
+X11_LDFLAGS = -lX11 -lpthread #-lXrandr |
| 35 |
|
| 36 |
# Flags to enable fast display, using XShm. |
| 37 |
# This requires the presence of the X11 extension include and library files. |
| 38 |
# (package 'libx11-dev' on Debian). |
| 39 |
XSHM_CFLAGS = -Dcimg_use_xshm |
| 40 |
-XSHM_LDFLAGS = -L$(USR)/X11R6/lib -lXext |
| 41 |
+XSHM_LDFLAGS = -lXext |
| 42 |
|
| 43 |
# Flags to enable image display, using GDI32. |
| 44 |
# This requires the presence of the GDI32 include and library files. |
| 45 |
@@ -160,7 +159,7 @@ |
| 46 |
# This requires the presence of the FFMPEG include and library files. |
| 47 |
# (packages 'libavcodec-dev', 'libavutil-dev', 'libavformat-dev' and 'libswscale-dev' on Debian). |
| 48 |
FFMPEG_CFLAGS = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS -I$(USR)/include/libavcodec -I$(USR)/include/libavformat -I$(USR)/include/libswscale -I$(USR)/include/ffmpeg |
| 49 |
-FFMPEG_LDFLAGS = -lavcodec -lavformat -lswscale |
| 50 |
+FFMPEG_LDFLAGS = -lavcodec -lavformat -lavutil -lswscale |
| 51 |
|
| 52 |
# Flags to enable native support for compressed .cimgz files, using the Zlib library. |
| 53 |
# This requires the presence of the Zlib include and library files. |
| 54 |
@@ -171,14 +170,8 @@ |
| 55 |
# Flags to enable native support of webcams, using the OpenCV library. |
| 56 |
# This requires the presence of the OpenCV include and library files. |
| 57 |
# (package 'libcv3-2-dev' on Debian). |
| 58 |
-ifeq ($(OS),Darwin) |
| 59 |
OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv |
| 60 |
OPENCV_LDFLAGS = `pkg-config opencv --libs` #-> Use this for OpenCV 2.2.0 ! |
| 61 |
-else |
| 62 |
-OPENCV_CFLAGS = -Dcimg_use_opencv -I$(USR)/include -I$(USR)/include/opencv |
| 63 |
-# OPENCV_LDFLAGS = -lcv -lhighgui |
| 64 |
-OPENCV_LDFLAGS = -lopencv_core -lopencv_highgui #-> Use this for OpenCV >= 2.2.0 ! |
| 65 |
-endif |
| 66 |
|
| 67 |
# Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library. |
| 68 |
# This requires the presence of the GraphicsMagick++ include and library files. |
| 69 |
@@ -311,10 +304,10 @@ |
| 70 |
endif |
| 71 |
|
| 72 |
gimp: |
| 73 |
- $(MAKE) "CFLAGS=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" "STRIP_EXE=1" gmic_gimp |
| 74 |
+ $(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_GIMP_LDFLAGS) $(OPT_LDFLAGS)" gmic_gimp |
| 75 |
|
| 76 |
lib: |
| 77 |
- $(MAKE) "CFLAGS=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib |
| 78 |
+ $(MAKE) "CFLAGS+=$(STD_LIB_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_LIB_LDFLAGS) $(OPT_LDFLAGS)" gmic_lib |
| 79 |
|
| 80 |
zart: lib |
| 81 |
ifneq ($(OS),Darwin) |
| 82 |
@@ -334,10 +327,10 @@ |
| 83 |
$(MAKE) "CFLAGS+=$(MINIMAL_UNIX_CFLAGS)" "LDFLAGS+=$(MINIMAL_UNIX_LDFLAGS)" gmic_minimal |
| 84 |
|
| 85 |
linux: |
| 86 |
- $(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic |
| 87 |
+ $(MAKE) "CFLAGS+=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(STD_UNIX_LDFLAGS)" gmic_gmic |
| 88 |
|
| 89 |
custom: |
| 90 |
- $(MAKE) "CFLAGS=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(CUST_UNIX_LDFLAGS)" "STRIP_EXE=1" gmic_gmic |
| 91 |
+ $(MAKE) "CFLAGS+=$(CUST_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS+=$(CUST_UNIX_LDFLAGS)" gmic_gmic |
| 92 |
|
| 93 |
solaris: |
| 94 |
$(MAKE) "CFLAGS=$(STD_UNIX_CFLAGS) $(OPT_CFLAGS)" "LDFLAGS=$(STD_UNIX_LDFLAGS) -R$(USR)/X11R6/lib -lrt -lnsl -lsocket" "STRIP_EXE=1" gmic_gmic |
| 95 |
@@ -355,10 +348,9 @@ |
| 96 |
gmic_lib.o: gmic.cpp gmic_def.h |
| 97 |
$(CC) -o gmic_lib.o -c gmic.cpp -fPIC $(CFLAGS) -Dgmic_float_only |
| 98 |
gmic_lib: gmic_lib.o |
| 99 |
- ar rcs libgmic.a gmic_lib.o |
| 100 |
+ $(AR) rcs libgmic.a gmic_lib.o |
| 101 |
ifneq ($(OS),Darwin) |
| 102 |
$(CC) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so gmic_lib.o $(LDFLAGS) |
| 103 |
- $(CC) -o gmic_use_lib gmic_use_lib.cpp -L. -lgmic $(FFTW_LDFLAGS) |
| 104 |
else |
| 105 |
$(CC) -shared -o libgmic.so gmic_lib.o $(LDFLAGS) |
| 106 |
endif |
| 107 |
@@ -367,7 +359,6 @@ |
| 108 |
$(CC) -o gmic_gimp.o -c gmic.cpp $(CFLAGS) -Dgmic_gimp -Dgmic_float_only |
| 109 |
gmic_gimp : gmic_gimp.o gmic_gimp.cpp |
| 110 |
$(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LDFLAGS) |
| 111 |
- strip gmic_gimp$(EXE) |
| 112 |
|
| 113 |
gmic_minimal: gmic.cpp |
| 114 |
$(CC) -o gmic gmic.cpp $(CFLAGS) -Dgmic_float_only -Dgmic_main $(LDFLAGS) |
| 115 |
@@ -392,7 +383,6 @@ |
| 116 |
$(CC) -o gmic_double.o -c gmic.cpp $(CFLAGS) -Dgmic_split_compilation -Dgmic_double |
| 117 |
gmic_gmic: 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 |
| 118 |
$(CC) -o gmic 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) |
| 119 |
- strip gmic$(EXE) |
| 120 |
|
| 121 |
def: |
| 122 |
@echo "#ifndef gmic_gimp" > gmic_def.h |
Archives