1 --- cinelerra-1.1.5/mplexlo/Makefile.orig Sat Jul 13 04:19:23 2002
2 +++ cinelerra-1.1.5/mplexlo/Makefile Fri Mar 21 00:41:10 2003
5 OBJS = $(OBJDIR)/mplex.o
7 -CFLAGS += -I../libmpeg3
8 +CFLAGS += -I/usr/include/libmpeg3
10 OUTPUT := $(OBJDIR)/mplexlo
13 - $(CC) -o $(OUTPUT) $(OBJS) ../libmpeg3/$(OBJDIR)/libmpeg3.a -lpthread -lm
14 + $(CC) -o $(OUTPUT) $(OBJS) -lmpeg3 -lpthread -lm
17 $(CC) -c $(CFLAGS) $(subst $(OBJDIR)/,, $*.c) -o $*.o
18 --- cinelerra-1.1.5/cinelerra/Makefile.orig Wed Jan 29 07:33:06 2003
19 +++ cinelerra-1.1.5/cinelerra/Makefile Fri Mar 21 00:51:55 2003
21 -DV_DIR := $(shell expr ../quicktime/libdv-0.9.5 )
22 -ALSA_DIR := $(shell expr ../alsa-lib* )
23 -OGG_DIR := $(shell expr ../quicktime/libogg-1.0 )
24 -VORBIS_DIR := $(shell expr ../quicktime/libvorbis-1.0 )
25 include ../global_config
32 - ../libavc/$(OBJDIR)/libavc.a \
33 - ../quicktime/$(OBJDIR)/libquicktime.a \
34 + -lavc1394 -lrom1394 \
37 - ../tiff/$(OBJDIR)/libtiff.a \
39 ../guicast/$(OBJDIR)/libguicast.a \
40 - ../libmpeg3/$(OBJDIR)/libmpeg3.a \
41 - ../libsndfile/$(OBJDIR)/libsndfile.a
43 + -lsndfile -lvorbisfile
53 - -I$(OGG_DIR)/include \
54 - -I$(VORBIS_DIR)/include \
55 - -I../quicktime/libdv \
56 - -I../quicktime/libraw1394/src \
60 - -I../libavc/common \
61 - -I../libavc/libavc1394 \
62 - -I../libavc/librom1394 \
66 + -I/usr/include/quicktime -I../quicktime \
67 + -I/usr/include/libdv \
68 + -I/usr/include/ogg \
69 + -I/usr/include/vorbis \
70 + -I/usr/include/libraw1394 \
71 + -I/usr/include/libmpeg3 \
72 + -I/usr/include/libavc1394 \
73 `glib-config --cflags`
76 --- cinelerra-1.1.5/global_config.orig Wed Jan 29 07:32:31 2003
77 +++ cinelerra-1.1.5/global_config Fri Mar 21 00:53:25 2003
80 ############################# FINAL DESTINATION FOR INSTALLATION BINARIES
84 LIBPREFIX = $(PREFIX)/lib
86 ########################## COMPILER
90 ifeq ($(HAVE_ESOUND), yes)
91 -ESOUNDCFLAGS = -DHAVE_ESOUND -I../esound
92 -ESOUNDLIBS = ../esound/$(OBJDIR)/libesound.a
93 +ESOUNDCFLAGS = -DHAVE_ESOUND
98 --- cinelerra-1.1.5/plugin_config.orig Mon Jul 29 02:31:12 2002
99 +++ cinelerra-1.1.5/plugin_config Fri Mar 21 00:53:41 2003
101 CFLAGS += -I../ -I../../cinelerra \
103 - -I../../quicktime \
104 + -I/usr/include/quicktime -I../../quicktime \
107 $(shell echo $(CFLAGS) > ../$(OBJDIR)/c_flags)
108 --- cinelerra-1.1.5/plugins/mpeg2enc/Makefile.orig Sat Aug 3 04:18:42 2002
109 +++ cinelerra-1.1.5/plugins/mpeg2enc/Makefile Fri Mar 21 01:35:40 2003
111 include ../../global_config
113 -CFLAGS += -I../../libmpeg3 -I../../quicktime
114 +CFLAGS += -I/usr/include/libmpeg3 -I/usr/include/quicktime
117 ifeq ($(OBJDIR), i686)
122 - ../../quicktime/$(OBJDIR)/libquicktime.a \
123 - ../../libmpeg3/$(OBJDIR)/libmpeg3.a \
129 --- cinelerra-1.1.5/plugins/titler/Makefile.orig Sat Aug 17 04:26:42 2002
130 +++ cinelerra-1.1.5/plugins/titler/Makefile Fri Mar 21 08:40:47 2003
132 FREETYPE_DIR = $(shell expr ../../freetype* )
133 -CFLAGS += -I$(FREETYPE_DIR)/include -I../../
134 +CFLAGS += -I/usr/include/freetype2
136 include ../../global_config
138 OBJS = $(OBJDIR)/title.o \
139 $(OBJDIR)/titlewindow.o \
140 ../colors/$(OBJDIR)/colorpicker.o \
141 - ../colors/$(OBJDIR)/plugincolors.o \
142 - $(FREETYPE_DIR)/objs/.libs/libfreetype.a
143 + ../colors/$(OBJDIR)/plugincolors.o
147 OUTPUT = ../$(OBJDIR)/titler.plugin
149 -include ../../plugin_config
154 cp $(OUTPUT) /usr/lib/cinelerra
155 cp -a fonts /usr/lib/cinelerra
158 + $(LDLINKER) -o $(OUTPUT) $(OBJS) $(LIBS)
163 + $(CC) -c $(CFLAGS) -I/usr/include/quicktime -I../../quicktime -I../../cinelerra -I../../guicast -I../colors $(subst $(OBJDIR)/,, $*.C) -o $*.o
165 $(OBJDIR)/title.o: title.C
166 $(OBJDIR)/titlewindow.o: titlewindow.C