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
4 include ../global_config
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* )
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 - ../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
34 +AVC_LIB := -lavc1394 -lrom1394
36 +IEC_LIB := -liec61883
37 +SNDFILE_LIB := -lsndfile
38 +THEORA_LIB := -ltheora
39 +EXR_LIBS := -lIlmImf -lIlmThread -lImath -lHalf -lIex
40 +EXR_INCLUDES := -I/usr/include/OpenEXR
42 $(OBJDIR)/aattachmentpoint.o \
43 $(OBJDIR)/aautomation.o \
51 - ../quicktime/$(OBJDIR)/libquicktime.a \
54 - $(FLAC_DIR)/src/libFLAC/.libs/libFLAC.a \
55 - $(TIFF_DIR)/$(OBJDIR)/libtiff.a \
56 ../guicast/$(OBJDIR)/libguicast.a \
57 - ../libmpeg3/$(OBJDIR)/libmpeg3.a \
59 - $(UUID_DIR)/$(OBJDIR)/libuuid.a \
60 ../mpeg2enc/$(OBJDIR)/mpeg2enc.a \
61 $(TOOLAME_DIR)/$(OBJDIR)/toolame.a \
71 -ifeq ($(OBJDIR), x86_64)
72 -LIBS += -L/usr/X11R6/lib64
74 -LIBS += -L/usr/X11R6/lib
87 + -lquicktime -lvorbisfile \
100 @@ -390,26 +365,20 @@
107 - -I$(OGG_DIR)/include \
108 - -I$(VORBIS_DIR)/include \
111 - -I$(LIBIEC_DIR)/src/ \
112 - -I$(TIFF_DIR)/libtiff \
114 + -I/usr/include/quicktime \
115 + -I/usr/include/libdv \
116 + -I/usr/include/libraw1394 \
117 + -I/usr/include/libiec61883 \
118 + -I/usr/include/uuid \
122 - -I$(SNDFILE_DIR)/src \
123 + -I/usr/include/lame \
124 + -I/usr/include/libmpeg3 \
126 - -I$(THEORA_DIR)/include
127 + -I/usr/include/theora
130 # Speed up linking with this linking sequence
131 -ifeq ($(OBJDIR), alpha)
132 +ifeq ($(OBJDIR), alpha-ccc)
140 - -I$(FFMPEG_DIR)/libavcodec \
141 - -I$(FFMPEG_DIR)/libavformat \
142 - -I$(FFMPEG_DIR)/libavutil \
144 + -I/usr/include/libavcodec \
145 + -I/usr/include/libavformat \
146 + -I/usr/include/libavutil
149 $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
151 $(CC) -c `cat $(OBJDIR)/c_flags` $(EXR_INCLUDES) $(subst $(OBJDIR)/,, $*.C) -o $*.o
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
158 $(CC) -c `cat $(OBJDIR)/ffmpeg_cflags` $(subst $(OBJDIR)/,, $*.C) -o $*.o
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
162 include ../global_config
164 -CFLAGS += -I../libmpeg3 -I../quicktime
165 +CFLAGS += -I/usr/include/libmpeg3 -I/usr/include/quicktime
168 ifeq ($(OBJDIR), i686)
173 - ../../quicktime/$(OBJDIR)/libquicktime.a \
174 - ../../libmpeg3/$(OBJDIR)/libmpeg3.a \
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
184 OBJS = $(OBJDIR)/mplex.o
186 -CFLAGS += -I../libmpeg3
187 +CFLAGS += -I/usr/include/libmpeg3
189 OUTPUT := $(OBJDIR)/mplexlo
192 - $(CC) -o $(OUTPUT) $(OBJS) ../libmpeg3/$(OBJDIR)/libmpeg3.a -lpthread -lm
193 + $(CC) -o $(OUTPUT) $(OBJS) -lmpeg3 -lpthread -lm
196 $(CC) -c $(CFLAGS) $(subst $(OBJDIR)/,, $*.c) -o $*.o
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
202 OUTPUT = $(PLUGIN_DIR)/titler.plugin
203 -CFLAGS += -I$(FREETYPE_DIR)/include -I../../thirdparty/
204 -LFLAGS += $(FREETYPE_DIR)/$(OBJDIR)/libfreetype.a
205 +CFLAGS += -I/usr/include/freetype2
206 +LFLAGS += -lfreetype
208 include ../../plugin_config
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
214 ############################# FINAL DESTINATION FOR INSTALLATION BINARIES
218 LIBPREFIX = $(PREFIX)/lib
224 ifeq ($(HAVE_ESOUND), y)
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
231 +ESOUNDCFLAGS = -DHAVE_ESOUND
237 #CFLAGS += -I. # Caused fileavi.C to fail
239 # the directory for plugin includes
240 -FREETYPE_DIR := $(shell expr ../../thirdparty/freetype-* )
241 -CFLAGS += -I$(FREETYPE_DIR)/include -I../../
243 +CFLAGS += -I/usr/include/freetype2
245 ifeq ($(HAVE_OSS), y)
248 CFLAGS += $(ALSA_CFLAGS)
251 -ifeq ($(OBJDIR), alpha)
252 +ifeq ($(OBJDIR), alpha-ccc)
253 CXXREPOSITORY = cxx_repository/*.o
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
259 CFLAGS += -I../ -I../../cinelerra \
261 - -I../../quicktime \
262 + -I/usr/include/quicktime \
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
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 )
275 -CFLAGS += -I../quicktime -I$(FREETYPE_DIR)
276 +CFLAGS += -I/usr/include/quicktime -I/usr/include/freetype2
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
285 #include "bcwindowbase.inc"
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>
293 -#include "libraw1394/raw1394.h"
294 +#include <libraw1394/raw1394.h>
295 #include <sys/types.h>
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
304 -#include "../config.h"
305 +#include "../hvirtual_config.h"
306 #include "filebase.h"