1 |
radhermit 15/06/27 03:21:34 |
2 |
|
3 |
Added: gmic-1.6.5.0-makefile.patch |
4 |
Log: |
5 |
Version bump. |
6 |
|
7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 media-plugins/gimp-gmic/files/gmic-1.6.5.0-makefile.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/gimp-gmic/files/gmic-1.6.5.0-makefile.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/gimp-gmic/files/gmic-1.6.5.0-makefile.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: gmic-1.6.5.0-makefile.patch |
16 |
=================================================================== |
17 |
--- gmic-1.6.5.0/src/Makefile |
18 |
+++ gmic-1.6.5.0/src/Makefile |
19 |
@@ -85,7 +85,6 @@ |
20 |
ifndef NO_STDLIB |
21 |
MANDATORY_CFLAGS += -std=c++11 |
22 |
endif |
23 |
-MANDATORY_LIBS += -L$(USR)/$(LIB) |
24 |
ifeq ($(notdir $(CC)),g++) |
25 |
MANDATORY_CFLAGS += -Wall -W |
26 |
MANDATORY_LIBS += -lm |
27 |
@@ -139,14 +138,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_LIBS = -L/usr/X11R6/lib -lX11 -lpthread #-lXrandr |
33 |
+X11_CFLAGS = -Dcimg_display=1 -Dcimg_appname=\\\"gmic\\\" #-Dcimg_use_xrandr |
34 |
+X11_LIBS = -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_LIBS = -L$(USR)/X11R6/lib -lXext |
41 |
+XSHM_LIBS = -lXext |
42 |
|
43 |
# Flags to enable image display, using GDI32. |
44 |
# This requires the presence of the GDI32 include and library files. |
45 |
@@ -174,8 +173,8 @@ |
46 |
# Flags to enable native support for MINC2 image files, using the MINC2 library. |
47 |
# ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide ) |
48 |
# (package 'libminc-dev' on Debian). |
49 |
-MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include |
50 |
-MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib |
51 |
+MINC2_CFLAGS = -Dcimg_use_minc2 |
52 |
+MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz |
53 |
|
54 |
# Flags to enable native support for downloading files from the network. |
55 |
# ( http://curl.haxx.se/libcurl/ ) |
56 |
@@ -325,7 +324,6 @@ |
57 |
|
58 |
cli: |
59 |
$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic |
60 |
- strip gmic$(EXE) |
61 |
|
62 |
gimp: |
63 |
$(MAKE) "CFLAGS+=$(STD_GIMP_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GIMP_LIBS)" gmic_gimp |
64 |
@@ -335,11 +333,9 @@ |
65 |
|
66 |
gmicol: |
67 |
$(MAKE) "CFLAGS+=$(STD_GMICOL_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STD_GMICOL_LIBS)" gmic |
68 |
- strip gmic$(EXE) |
69 |
|
70 |
static: |
71 |
$(MAKE) "CFLAGS+=$(STATIC_CLI_CFLAGS) $(OPT_CFLAGS)" "LIBS+=$(STATIC_CLI_LIBS)" gmic |
72 |
- strip gmic$(EXE) |
73 |
|
74 |
debug: |
75 |
$(MAKE) "CFLAGS+=$(STD_CLI_CFLAGS) $(DEBUG_CFLAGS)" "LIBS+=$(STD_CLI_LIBS)" gmic |
76 |
@@ -355,24 +351,22 @@ |
77 |
libgmic.o: gmic.cpp gmic.h gmic_def.h CImg.h |
78 |
$(CC) -o libgmic.o -c gmic.cpp -fPIC $(CFLAGS) |
79 |
|
80 |
-libgmic: libgmic.o gmic_use_lib.cpp |
81 |
- ar rcs libgmic.a libgmic.o |
82 |
+libgmic: libgmic.o |
83 |
+ $(AR) rcs libgmic.a libgmic.o |
84 |
ifeq ($(OS),Darwin) |
85 |
- $(CC) -shared -o libgmic.so libgmic.o $(LIBS) |
86 |
+ $(CC) $(LDFLAGS) -shared -o libgmic.so libgmic.o $(LIBS) |
87 |
else |
88 |
- $(CC) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so libgmic.o $(LIBS) |
89 |
- $(CC) -o gmic_use_lib gmic_use_lib.cpp -L. -lgmic |
90 |
+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libgmic.so.1 -o libgmic.so libgmic.o $(LIBS) |
91 |
endif |
92 |
|
93 |
gmic_gimp.o: gmic.cpp gmic.h gmic_def.h CImg.h |
94 |
$(CC) -o gmic_gimp.o -c gmic.cpp -Dgmic_gimp $(CFLAGS) |
95 |
|
96 |
gmic_gimp : gmic_gimp.o gmic_gimp.cpp |
97 |
- $(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS) |
98 |
- strip gmic_gimp$(EXE) |
99 |
+ $(CC) -o gmic_gimp gmic_gimp.cpp gmic_gimp.o -Dgmic_gimp `gimptool-2.0$(EXE) --cflags` $(CFLAGS) $(LDFLAGS) `gimptool-2.0$(EXE) --libs` $(LIBS) |
100 |
|
101 |
gmic: gmic.cpp gmic.h gmic_def.h CImg.h |
102 |
- $(CC) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LIBS) |
103 |
+ $(CC) -o gmic gmic.cpp -Dgmic_main $(CFLAGS) $(LDFLAGS) $(LIBS) |
104 |
|
105 |
gmic_def.h: |
106 |
@wget --quiet -O gmic_def.h http://gmic.eu/gmic_def.h |
107 |
@@ -397,38 +391,43 @@ |
108 |
# Generate bash completion script (requires 'gmic' to be installed first). |
109 |
bashcompletion: |
110 |
@mkdir -p ../resources |
111 |
- @\gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh |
112 |
+ @./gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -document_gmic bash 2> ../resources/gmic_bashcompletion.sh |
113 |
|
114 |
# Generate man page (requires 'gmic' to be installed first). |
115 |
man: |
116 |
@mkdir -p ../man |
117 |
- @\gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -__help man 2> ../man/gmic.1 |
118 |
- @gzip -f ../man/gmic.1 |
119 |
+ @./gmic -v - gmic_def.gmic raw:gmic_def.gmic,uchar -__help man 2> ../man/gmic.1 |
120 |
|
121 |
# Install/uninstall/clean procedures. |
122 |
-install: |
123 |
+install-gimp: |
124 |
mkdir -p $(DESTDIR)$(PLUGINDIR)/ |
125 |
cp -f gmic_gimp $(DESTDIR)$(PLUGINDIR)/ |
126 |
+ |
127 |
+install-bin: |
128 |
mkdir -p $(DESTDIR)$(USR)/$(BIN)/ |
129 |
cp -f gmic $(DESTDIR)$(USR)/$(BIN)/ |
130 |
+ |
131 |
+install-lib: |
132 |
mkdir -p $(DESTDIR)$(USR)/$(INCLUDE)/ |
133 |
cp -f gmic.h $(DESTDIR)$(USR)/$(INCLUDE)/ |
134 |
- |
135 |
ifneq ($(OS),Darwin) |
136 |
mkdir -p $(DESTDIR)$(USR)/share |
137 |
mkdir -p $(DESTDIR)$(USR)/$(LIB) |
138 |
cp -f libgmic.so $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1.6.5 |
139 |
ln -fs libgmic.so.1.6.5 $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1 |
140 |
ln -fs libgmic.so.1 $(DESTDIR)$(USR)/$(LIB)/libgmic.so |
141 |
- cp -f ../zart/zart $(DESTDIR)$(USR)/$(BIN)/ |
142 |
endif |
143 |
+ |
144 |
+install-zart: |
145 |
+ cp -f ../zart/zart $(DESTDIR)$(USR)/$(BIN)/ |
146 |
+ |
147 |
+install-man: |
148 |
mkdir -p $(DESTDIR)$(USR)/share/man/ |
149 |
mkdir -p $(DESTDIR)$(USR)/share/man/man1/ |
150 |
- mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/ |
151 |
- cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz |
152 |
- cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz |
153 |
+ cp -f ../man/gmic.1 $(DESTDIR)$(USR)/share/man/man1/gmic.1 |
154 |
+ |
155 |
+install-bash: |
156 |
if [ -d /etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/etc/bash_completion.d/gmic; fi |
157 |
- if [ -d /opt/local/etc/bash_completion.d/ ]; then mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; fi |
158 |
|
159 |
uninstall: |
160 |
rm -f $(DESTDIR)$(USR)/$(BIN)/gmic |
161 |
@@ -438,8 +437,7 @@ |
162 |
rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so.1 |
163 |
rm -f $(DESTDIR)$(USR)/$(LIB)/libgmic.so |
164 |
rm -rf $(DESTDIR)$(USR)/share/doc/gmic/ |
165 |
- rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1.gz |
166 |
- rm -f $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz |
167 |
+ rm -f $(DESTDIR)$(USR)/share/man/man1/gmic.1 |
168 |
|
169 |
distclean: clean |