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
4 include ../global_config
6 -AVC_DIR := $(shell expr ../libavc1394* )
7 -DV_DIR := ../quicktime/libdv-0.104
8 -EXR_DIR := ../OpenEXR-1.2.1/
9 -FFMPEG_DIR := $(shell expr ../quicktime/ffmpeg* )
10 -JPEG_DIR := $(shell expr ../quicktime/jpeg-mmx* )
11 -LAME_DIR := ../quicktime/lame-3.93.1/include
12 -LIBIEC_DIR := $(shell expr ../libiec61883* )
13 -LIBRAW_DIR := $(shell expr ../libraw1394* )
14 -OGG_DIR := $(shell expr ../quicktime/libogg* )
15 -SNDFILE_DIR := $(shell expr ../libsndfile* )
16 -THEORA_DIR := $(shell expr ../libtheora* )
17 -TIFF_DIR := ../tiff-v3.5.7
18 TOOLAME_DIR := ../toolame-02l
20 -VORBIS_DIR := $(shell expr ../quicktime/libvorbis* )
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
28 +AVC_LIB := -lavc1394 -lrom1394
30 +IEC_LIB := -liec61883
31 +SNDFILE_LIB := -lsndfile
32 +THEORA_LIB := -ltheora
35 $(OBJDIR)/aattachmentpoint.o \
36 $(OBJDIR)/aautomation.o \
44 - ../quicktime/$(OBJDIR)/libquicktime.a \
46 - $(EXR_DIR)/$(OBJDIR)/libexr.a \
47 - $(TIFF_DIR)/$(OBJDIR)/libtiff.a \
48 ../guicast/$(OBJDIR)/libguicast.a \
49 - ../libmpeg3/$(OBJDIR)/libmpeg3.a \
51 - $(UUID_DIR)/$(OBJDIR)/libuuid.a \
52 ../mpeg2enc/$(OBJDIR)/mpeg2enc.a \
53 $(TOOLAME_DIR)/$(OBJDIR)/toolame.a \
67 + -lquicktime -lvorbisfile \
69 + -lIlmImf -lImath -lHalf -lIex \
85 - -I$(OGG_DIR)/include \
86 - -I$(VORBIS_DIR)/include \
89 - -I$(LIBIEC_DIR)/src/ \
90 - -I$(TIFF_DIR)/libtiff \
92 + -I/usr/include/quicktime \
93 + -I/usr/include/libdv \
94 + -I/usr/include/libraw1394 \
95 + -I/usr/include/libiec61883 \
96 + -I/usr/include/uuid \
101 - -I$(SNDFILE_DIR)/src \
102 + -I/usr/include/lame \
103 + -I/usr/include/libmpeg3 \
105 - -I$(FFMPEG_DIR)/libavcodec -I$(FFMPEG_DIR)/libavutil \
106 - -I$(THEORA_DIR)/include
107 + -I/usr/include/ffmpeg \
108 + -I/usr/include/theora
111 # Speed up linking with this linking sequence
112 -ifeq ($(OBJDIR), alpha)
113 +ifeq ($(OBJDIR), alpha-ccc)
119 $(FILEEXR): fileexr.C
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
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
129 include ../global_config
131 -CFLAGS += -I../libmpeg3 -I../quicktime
132 +CFLAGS += -I/usr/include/libmpeg3 -I/usr/include/quicktime
135 ifeq ($(OBJDIR), i686)
140 - ../../quicktime/$(OBJDIR)/libquicktime.a \
141 - ../../libmpeg3/$(OBJDIR)/libmpeg3.a \
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
151 OBJS = $(OBJDIR)/mplex.o
153 -CFLAGS += -I../libmpeg3
154 +CFLAGS += -I/usr/include/libmpeg3
156 OUTPUT := $(OBJDIR)/mplexlo
159 - $(CC) -o $(OUTPUT) $(OBJS) ../libmpeg3/$(OBJDIR)/libmpeg3.a -lpthread -lm
160 + $(CC) -o $(OUTPUT) $(OBJS) -lmpeg3 -lpthread -lm
163 $(CC) -c $(CFLAGS) $(subst $(OBJDIR)/,, $*.c) -o $*.o
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
169 OUTPUT_PLUGIN = ../$(OBJDIR)/titler.plugin
170 -FREETYPE_DIR = ../../freetype-2.1.4
171 -CFLAGS += -I$(FREETYPE_DIR)/include -I../../
173 +CFLAGS += -I/usr/include/freetype2 -I../../
176 $(OUTPUT_PLUGIN): $(OBJS)
177 $(LDLINKER) -o $(OUTPUT_PLUGIN) \
179 - $(FREETYPE_DIR)/$(OBJDIR)/libfreetype.a
180 - strip $(OUTPUT_PLUGIN)
183 include ../../plugin_config
187 cp $(OUTPUT_PLUGIN) $(PLUGINDIR)
188 mkdir -p $(PLUGINDIR)/fonts
189 cp fonts/* $(PLUGINDIR)/fonts
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
194 ############################# FINAL DESTINATION FOR INSTALLATION BINARIES
198 LIBPREFIX = $(PREFIX)/lib
200 ########################## THE COMPILER
204 ifeq ($(HAVE_ESOUND), y)
205 -ESOUNDCFLAGS = -DHAVE_ESOUND -I../esound
206 -ESOUNDLIBS = ../esound/$(OBJDIR)/libesound.a
207 +ESOUNDCFLAGS = -DHAVE_ESOUND
213 CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
214 #CFLAGS += -I. # Caused fileavi.C to fail
216 -FREETYPE_DIR = ../../freetype-2.1.4
217 -CFLAGS += -I$(FREETYPE_DIR)/include -I../../
219 +CFLAGS += -I/usr/include/freeetype2
221 ifeq ($(HAVE_OSS), y)
224 CFLAGS += $(ALSA_CFLAGS)
227 -ifeq ($(OBJDIR), alpha)
228 +ifeq ($(OBJDIR), alpha-ccc)
229 CXXREPOSITORY = cxx_repository/*.o
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
235 CFLAGS += -I../ -I../../cinelerra \
237 - -I../../quicktime \
238 + -I/usr/include/quicktime \
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
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 )
251 -CFLAGS += -I../quicktime -I$(FREETYPE_DIR)
252 +CFLAGS += -I/usr/include/quicktime -I/usr/include/freetype2
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
261 #include "bcwindowbase.inc"
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>
269 -#include "libraw1394/raw1394.h"
270 +#include <libraw1394/raw1394.h>
271 #include <sys/types.h>
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
280 -#include "../config.h"
281 +#include "../hvirtual_config.h"
282 #include "filebase.h"