]>
Commit | Line | Data |
---|---|---|
033017fd JB |
1 | --- cinelerra-4/cinelerra/Makefile.orig 2008-08-08 08:29:31.000000000 +0200 |
2 | +++ cinelerra-4/cinelerra/Makefile 2008-08-28 17:53:28.910125929 +0200 | |
3 | @@ -1,33 +1,14 @@ | |
020dfac3 JB |
4 | include ../global_config |
5 | ||
033017fd JB |
6 | -AVC_DIR := $(shell expr ../thirdparty/libavc1394* ) |
7 | -DV_DIR := $(shell expr ../quicktime/thirdparty/libdv-*/ ) | |
8 | -FLAC_DIR := $(shell expr ../thirdparty/flac*/ ) | |
9 | -FFMPEG_DIR := $(shell expr ../quicktime/thirdparty/ffmpeg* ) | |
10 | -JPEG_DIR := $(shell expr ../quicktime/thirdparty/jpeg-mmx* ) | |
11 | -LAME_DIR := ../quicktime/thirdparty/lame-3.93.1/include | |
12 | -LIBIEC_DIR := $(shell expr ../thirdparty/libiec61883* ) | |
13 | -LIBRAW_DIR := $(shell expr ../thirdparty/libraw1394* ) | |
14 | -OGG_DIR := $(shell expr ../quicktime/thirdparty/libogg* ) | |
15 | -SNDFILE_DIR := $(shell expr ../thirdparty/libsndfile* ) | |
16 | -THEORA_DIR := $(shell expr ../thirdparty/libtheora* ) | |
17 | -TIFF_DIR := ../thirdparty/tiff-v3.5.7 | |
18 | TOOLAME_DIR := ../thirdparty/toolame-02l | |
19 | -UUID_DIR := ../thirdparty/uuid | |
20 | -VORBIS_DIR := $(shell expr ../quicktime/thirdparty/libvorbis* ) | |
21 | ||
5ba5c72b JB |
22 | -AVC_LIB := $(AVC_DIR)/libavc1394/.libs/libavc1394.a $(AVC_DIR)/librom1394/.libs/librom1394.a |
23 | -RAW_LIB := $(LIBRAW_DIR)/src/.libs/libraw1394.a | |
24 | -IEC_LIB := $(LIBIEC_DIR)/src/.libs/libiec61883.a | |
25 | -SNDFILE_LIB := $(SNDFILE_DIR)/src/.libs/libsndfile.a | |
26 | -THEORA_LIB := $(THEORA_DIR)/lib/.libs/libtheora.a | |
033017fd JB |
27 | -EXR_LIBS := \ |
28 | - ../thirdparty/lib/libIlmImf.a \ | |
29 | - ../thirdparty/lib/libIlmThread.a \ | |
30 | - ../thirdparty/lib/libImath.a \ | |
31 | - ../thirdparty/lib/libHalf.a \ | |
32 | - ../thirdparty/lib/libIex.a | |
33 | -EXR_INCLUDES := -I../thirdparty/include/OpenEXR | |
5ba5c72b JB |
34 | +AVC_LIB := -lavc1394 -lrom1394 |
35 | +RAW_LIB := -lraw1394 | |
36 | +IEC_LIB := -liec61883 | |
37 | +SNDFILE_LIB := -lsndfile | |
38 | +THEORA_LIB := -ltheora | |
033017fd JB |
39 | +EXR_LIBS := -lIlmImf -lIlmThread -lImath -lHalf -lIex |
40 | +EXR_INCLUDES := -I/usr/include/OpenEXR | |
584c94b3 | 41 | OBJS = \ |
020dfac3 | 42 | $(OBJDIR)/aattachmentpoint.o \ |
ca4f2944 | 43 | $(OBJDIR)/aautomation.o \ |
033017fd | 44 | @@ -331,34 +312,16 @@ |
5ba5c72b JB |
45 | |
46 | ||
584c94b3 | 47 | STATICLIBS = \ |
5ba5c72b JB |
48 | - $(AVC_LIB) \ |
49 | - $(RAW_LIB) \ | |
50 | - $(IEC_LIB) \ | |
584c94b3 | 51 | - ../quicktime/$(OBJDIR)/libquicktime.a \ |
5ba5c72b | 52 | - $(ESOUNDLIBS) \ |
033017fd JB |
53 | - $(EXR_LIBS) \ |
54 | - $(FLAC_DIR)/src/libFLAC/.libs/libFLAC.a \ | |
86291af4 | 55 | - $(TIFF_DIR)/$(OBJDIR)/libtiff.a \ |
584c94b3 JB |
56 | ../guicast/$(OBJDIR)/libguicast.a \ |
57 | - ../libmpeg3/$(OBJDIR)/libmpeg3.a \ | |
5ba5c72b | 58 | - $(SNDFILE_LIB) \ |
86291af4 JB |
59 | - $(UUID_DIR)/$(OBJDIR)/libuuid.a \ |
60 | ../mpeg2enc/$(OBJDIR)/mpeg2enc.a \ | |
d0731054 | 61 | $(TOOLAME_DIR)/$(OBJDIR)/toolame.a \ |
5ba5c72b JB |
62 | - $(THEME_DATA) \ |
63 | - $(THEORA_LIB) | |
64 | + $(THEME_DATA) | |
65 | ||
66 | LIBS := \ | |
67 | -L./ \ | |
033017fd JB |
68 | -L../guicast |
69 | ||
70 | ||
71 | -ifeq ($(OBJDIR), x86_64) | |
72 | -LIBS += -L/usr/X11R6/lib64 | |
73 | -else | |
74 | -LIBS += -L/usr/X11R6/lib | |
75 | -endif | |
76 | - | |
77 | ifeq ($(HAVE_GL), y) | |
78 | LIBS += -lGL -lGLU | |
79 | endif | |
80 | @@ -372,6 +334,19 @@ | |
5ba5c72b | 81 | |
86291af4 JB |
82 | |
83 | LIBS += \ | |
5ba5c72b JB |
84 | + $(AVC_LIB) \ |
85 | + $(RAW_LIB) \ | |
86 | + $(IEC_LIB) \ | |
86291af4 | 87 | + -lquicktime -lvorbisfile \ |
033017fd | 88 | + -lavformat \ |
ca4f2944 | 89 | + $(ESOUNDLIBS) \ |
033017fd JB |
90 | + $(EXR_LIBS) \ |
91 | + -lFLAC \ | |
86291af4 JB |
92 | + -ltiff \ |
93 | + -lmpeg3 \ | |
5ba5c72b | 94 | + $(SNDFILE_LIB) \ |
86291af4 | 95 | + -luuid \ |
5ba5c72b | 96 | + $(THEORA_LIB) \ |
86291af4 JB |
97 | -lX11 \ |
98 | -lXext \ | |
ca4f2944 | 99 | -lXv \ |
033017fd | 100 | @@ -390,26 +365,20 @@ |
584c94b3 JB |
101 | |
102 | CFLAGS += \ | |
103 | -I../guicast \ | |
104 | - -I../quicktime \ | |
5ba5c72b | 105 | - -I$(JPEG_DIR) \ |
584c94b3 JB |
106 | - -I$(DV_DIR) \ |
107 | - -I$(OGG_DIR)/include \ | |
108 | - -I$(VORBIS_DIR)/include \ | |
020dfac3 | 109 | - -I$(LIBRAW_DIR)/ \ |
5ba5c72b JB |
110 | - -I$(AVC_DIR) \ |
111 | - -I$(LIBIEC_DIR)/src/ \ | |
86291af4 JB |
112 | - -I$(TIFF_DIR)/libtiff \ |
113 | - -I$(UUID_DIR) \ | |
86291af4 JB |
114 | + -I/usr/include/quicktime \ |
115 | + -I/usr/include/libdv \ | |
116 | + -I/usr/include/libraw1394 \ | |
5ba5c72b | 117 | + -I/usr/include/libiec61883 \ |
86291af4 JB |
118 | + -I/usr/include/uuid \ |
119 | -I$(TOOLAME_DIR) \ | |
120 | - -I$(LAME_DIR) \ | |
584c94b3 | 121 | - -I../libmpeg3 \ |
6eea70d2 | 122 | - -I$(SNDFILE_DIR)/src \ |
86291af4 | 123 | + -I/usr/include/lame \ |
584c94b3 | 124 | + -I/usr/include/libmpeg3 \ |
86291af4 | 125 | $(ESOUNDCFLAGS) \ |
5ba5c72b | 126 | - -I$(THEORA_DIR)/include |
5ba5c72b | 127 | + -I/usr/include/theora |
020dfac3 | 128 | |
584c94b3 | 129 | |
020dfac3 | 130 | # Speed up linking with this linking sequence |
5ba5c72b JB |
131 | -ifeq ($(OBJDIR), alpha) |
132 | +ifeq ($(OBJDIR), alpha-ccc) | |
133 | ||
134 | ||
135 | ||
033017fd JB |
136 | @@ -431,10 +431,9 @@ |
137 | ||
138 | FFMPEG_CFLAGS := \ | |
139 | $(CFLAGS) \ | |
140 | - -I$(FFMPEG_DIR)/libavcodec \ | |
141 | - -I$(FFMPEG_DIR)/libavformat \ | |
142 | - -I$(FFMPEG_DIR)/libavutil \ | |
143 | - -I$(FFMPEG_DIR) | |
144 | + -I/usr/include/libavcodec \ | |
145 | + -I/usr/include/libavformat \ | |
146 | + -I/usr/include/libavutil | |
d0731054 | 147 | |
d0731054 | 148 | |
033017fd JB |
149 | $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags) |
150 | @@ -519,7 +488,7 @@ | |
151 | $(CC) -c `cat $(OBJDIR)/c_flags` $(EXR_INCLUDES) $(subst $(OBJDIR)/,, $*.C) -o $*.o | |
152 | ||
153 | $(FILEFLAC): fileflac.C | |
154 | - $(CC) -c `cat $(OBJDIR)/c_flags` -I$(FLAC_DIR)/include $(subst $(OBJDIR)/,, $*.C) -o $*.o | |
155 | + $(CC) -c `cat $(OBJDIR)/c_flags` -I/usr/include/FLAC $(subst $(OBJDIR)/,, $*.C) -o $*.o | |
156 | ||
157 | $(FFMPEG_OBJS): | |
158 | $(CC) -c `cat $(OBJDIR)/ffmpeg_cflags` $(subst $(OBJDIR)/,, $*.C) -o $*.o | |
6eea70d2 JB |
159 | --- cinelerra-1.1.8/mpeg2enc/Makefile.orig 2003-10-14 09:54:43.000000000 +0200 |
160 | +++ cinelerra-1.1.8/mpeg2enc/Makefile 2003-11-12 22:23:56.387225920 +0100 | |
584c94b3 | 161 | @@ -1,6 +1,6 @@ |
86291af4 | 162 | include ../global_config |
584c94b3 | 163 | CC = gcc |
86291af4 | 164 | -CFLAGS += -I../libmpeg3 -I../quicktime |
584c94b3 JB |
165 | +CFLAGS += -I/usr/include/libmpeg3 -I/usr/include/quicktime |
166 | ||
167 | ||
168 | ifeq ($(OBJDIR), i686) | |
169 | @@ -48,8 +48,8 @@ | |
170 | $(OBJDIR)/writepic.o | |
171 | ||
172 | LIBS = \ | |
173 | - ../../quicktime/$(OBJDIR)/libquicktime.a \ | |
174 | - ../../libmpeg3/$(OBJDIR)/libmpeg3.a \ | |
175 | + -lquicktime \ | |
176 | + -lmpeg3 \ | |
177 | -lpthread \ | |
178 | -lpng \ | |
179 | -lz \ | |
6eea70d2 JB |
180 | --- cinelerra-1.1.8/mplexlo/Makefile.orig 2003-10-14 09:54:14.000000000 +0200 |
181 | +++ cinelerra-1.1.8/mplexlo/Makefile 2003-11-12 22:06:01.235673800 +0100 | |
182 | @@ -2,12 +2,12 @@ | |
183 | ||
184 | OBJS = $(OBJDIR)/mplex.o | |
185 | CC = gcc | |
186 | -CFLAGS += -I../libmpeg3 | |
187 | +CFLAGS += -I/usr/include/libmpeg3 | |
188 | ||
189 | OUTPUT := $(OBJDIR)/mplexlo | |
190 | ||
191 | $(OUTPUT): $(OBJS) | |
192 | - $(CC) -o $(OUTPUT) $(OBJS) ../libmpeg3/$(OBJDIR)/libmpeg3.a -lpthread -lm | |
193 | + $(CC) -o $(OUTPUT) $(OBJS) -lmpeg3 -lpthread -lm | |
194 | ||
195 | $(OBJS): | |
196 | $(CC) -c $(CFLAGS) $(subst $(OBJDIR)/,, $*.c) -o $*.o | |
3910a3dc ER |
197 | --- cinelerra-4/plugins/titler/Makefile~ 2008-09-02 14:38:09.000000000 +0300 |
198 | +++ cinelerra-4/plugins/titler/Makefile 2009-07-07 11:50:40.564300866 +0300 | |
033017fd | 199 | @@ -8,8 +8,8 @@ |
6eea70d2 JB |
200 | |
201 | ||
3910a3dc | 202 | OUTPUT = $(PLUGIN_DIR)/titler.plugin |
033017fd JB |
203 | -CFLAGS += -I$(FREETYPE_DIR)/include -I../../thirdparty/ |
204 | -LFLAGS += $(FREETYPE_DIR)/$(OBJDIR)/libfreetype.a | |
205 | +CFLAGS += -I/usr/include/freetype2 | |
206 | +LFLAGS += -lfreetype | |
ccb0dca0 | 207 | |
86291af4 | 208 | include ../../plugin_config |
ccb0dca0 | 209 | |
033017fd JB |
210 | --- cinelerra-4/global_config.orig 2008-08-07 05:33:09.000000000 +0200 |
211 | +++ cinelerra-4/global_config 2008-08-28 17:31:46.010117548 +0200 | |
212 | @@ -36,7 +36,7 @@ | |
a601b4a3 | 213 | |
6eea70d2 JB |
214 | ############################# FINAL DESTINATION FOR INSTALLATION BINARIES |
215 | ||
216 | -PREFIX = /usr/ | |
217 | +PREFIX = /usr | |
218 | LIBPREFIX = $(PREFIX)/lib | |
219 | ||
033017fd JB |
220 | |
221 | @@ -64,10 +64,10 @@ | |
6eea70d2 JB |
222 | |
223 | ||
224 | ifeq ($(HAVE_ESOUND), y) | |
033017fd JB |
225 | -ESOUND_DIR := ../thirdparty/esound |
226 | -AUDIOFILE_DIR := ../thirdparty/audiofile | |
227 | -ESOUNDCFLAGS = -DHAVE_ESOUND -I$(ESOUND_DIR) -I$(AUDIOFILE_DIR) | |
228 | -ESOUNDLIBS = $(ESOUND_DIR)/$(OBJDIR)/libesound.a | |
229 | +AUDIOFILEDIR= | |
230 | +ESOUNDDIR= | |
6eea70d2 JB |
231 | +ESOUNDCFLAGS = -DHAVE_ESOUND |
232 | +ESOUNDLIBS = -lesd | |
233 | endif | |
234 | ||
235 | ||
033017fd | 236 | @@ -76,8 +76,8 @@ |
6eea70d2 JB |
237 | #CFLAGS += -I. # Caused fileavi.C to fail |
238 | ||
033017fd JB |
239 | # the directory for plugin includes |
240 | -FREETYPE_DIR := $(shell expr ../../thirdparty/freetype-* ) | |
6eea70d2 JB |
241 | -CFLAGS += -I$(FREETYPE_DIR)/include -I../../ |
242 | +FREETYPE_DIR = | |
033017fd | 243 | +CFLAGS += -I/usr/include/freetype2 |
6eea70d2 JB |
244 | |
245 | ifeq ($(HAVE_OSS), y) | |
246 | CFLAGS += -DHAVE_OSS | |
033017fd | 247 | @@ -91,7 +91,7 @@ |
58be6144 JB |
248 | CFLAGS += $(ALSA_CFLAGS) |
249 | endif | |
250 | ||
251 | -ifeq ($(OBJDIR), alpha) | |
252 | +ifeq ($(OBJDIR), alpha-ccc) | |
253 | CXXREPOSITORY = cxx_repository/*.o | |
254 | endif | |
255 | ||
6eea70d2 JB |
256 | --- cinelerra-1.1.8/plugin_config.orig 2003-10-14 09:53:58.000000000 +0200 |
257 | +++ cinelerra-1.1.8/plugin_config 2003-11-12 22:22:42.189505688 +0100 | |
258 | @@ -1,6 +1,6 @@ | |
259 | CFLAGS += -I../ -I../../cinelerra \ | |
260 | -I../../guicast \ | |
261 | - -I../../quicktime \ | |
262 | + -I/usr/include/quicktime \ | |
263 | -I../colors \ | |
264 | -fPIC | |
a601b4a3 | 265 | |
5ba5c72b JB |
266 | --- cinelerra-2.0/guicast/Makefile.orig 2005-11-01 14:30:52.865839000 +0100 |
267 | +++ cinelerra-2.0/guicast/Makefile 2005-11-01 14:41:01.161364152 +0100 | |
268 | @@ -2,9 +2,9 @@ | |
269 | ||
270 | # Need the freetype include that matches the X server for Xft rendering | |
271 | #FREETYPE_DIR := ..//usr/X11R6/include/freetype2 | |
272 | -FREETYPE_DIR := $(shell expr ../freetype*/include ) | |
273 | +#FREETYPE_DIR := $(shell expr ../freetype*/include ) | |
020dfac3 | 274 | |
5ba5c72b JB |
275 | -CFLAGS += -I../quicktime -I$(FREETYPE_DIR) |
276 | +CFLAGS += -I/usr/include/quicktime -I/usr/include/freetype2 | |
020dfac3 | 277 | |
5ba5c72b JB |
278 | # must only define here so applications using libpng don't see any of the XFT |
279 | # includes at all. They use a conflicting setjmp. | |
280 | --- cinelerra-2.0/cinelerra/avc1394control.h.orig 2005-09-11 22:13:22.000000000 +0200 | |
281 | +++ cinelerra-2.0/cinelerra/avc1394control.h 2005-11-01 16:49:01.785731768 +0100 | |
282 | @@ -3,11 +3,11 @@ | |
283 | ||
284 | ||
285 | #include "bcwindowbase.inc" | |
020dfac3 JB |
286 | -#include "librom1394/rom1394.h" |
287 | -#include "libavc1394/avc1394.h" | |
288 | -#include "libavc1394/avc1394_vcr.h" | |
289 | +#include <libavc1394/rom1394.h> | |
290 | +#include <libavc1394/avc1394.h> | |
291 | +#include <libavc1394/avc1394_vcr.h> | |
292 | #include "mutex.inc" | |
293 | -#include "libraw1394/raw1394.h" | |
294 | +#include <libraw1394/raw1394.h> | |
295 | #include <sys/types.h> | |
296 | #include <stdio.h> | |
297 | #include <errno.h> | |
5ba5c72b JB |
298 | --- cinelerra-2.0/cinelerra/fileogg.h.orig 2005-09-07 23:25:21.000000000 +0200 |
299 | +++ cinelerra-2.0/cinelerra/fileogg.h 2005-11-01 17:03:29.505818264 +0100 | |
300 | @@ -1,7 +1,7 @@ | |
301 | #ifndef FILEOGG_H | |
302 | #define FILEOGG_H | |
303 | ||
304 | -#include "../config.h" | |
305 | +#include "../hvirtual_config.h" | |
306 | #include "filebase.h" | |
307 | #include "file.inc" | |
308 |