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