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.7/cinelerra/Makefile.orig 2003-08-09 22:24:28.000000000 +0200
19 +++ cinelerra-1.1.7/cinelerra/Makefile 2003-08-16 23:10:48.654994168 +0200
21 -DV_DIR := ../quicktime/libdv-0.99
22 -ALSA_DIR := ../alsa-lib-0.9.0rc2
23 -OGG_DIR := ../quicktime/libogg-1.0
24 -VORBIS_DIR := ../quicktime/libvorbis-1.0
25 -LIBRAW_DIR := ../libraw1394-0.9.0
26 -TIFF_DIR := ../tiff-v3.5.7
28 TOOLAME_DIR := ../toolame-02l
29 -LAME_DIR := ../quicktime/lame-3.93.1/include
30 include ../global_config
35 ifeq ($(HAVE_ALSA), yes)
36 ALSA_CFLAGS := -DHAVE_ALSA -I$(ALSA_DIR)/include
37 -ALSA_LIBS := $(ALSA_DIR)/$(OBJDIR)/libasound.a
38 +ALSA_LIBS := -lasound
42 - ../libavc/$(OBJDIR)/libavc.a \
43 - ../quicktime/$(OBJDIR)/libquicktime.a \
45 - $(TIFF_DIR)/$(OBJDIR)/libtiff.a \
46 ../guicast/$(OBJDIR)/libguicast.a \
47 - ../libmpeg3/$(OBJDIR)/libmpeg3.a \
48 - ../libsndfile/$(OBJDIR)/libsndfile.a \
49 - $(UUID_DIR)/$(OBJDIR)/libuuid.a \
50 ../mpeg2enc/$(OBJDIR)/mpeg2enc.a \
51 $(TOOLAME_DIR)/$(OBJDIR)/toolame.a
58 - $(LIBRAW_DIR)/$(OBJDIR)/libraw1394.a \
59 + -lavc1394 -lrom1394 \
60 + -lquicktime -lvorbisfile \
75 - -I$(OGG_DIR)/include \
76 - -I$(VORBIS_DIR)/include \
77 - -I$(LIBRAW_DIR)/src \
78 - -I$(TIFF_DIR)/libtiff \
81 + -I/usr/include/quicktime \
82 + -I/usr/include/libdv \
83 + -I/usr/include/libraw1394 \
84 + -I/usr/include/uuid \
90 - -I../libavc/common \
91 - -I../libavc/libavc1394 \
92 - -I../libavc/librom1394 \
93 + -I/usr/include/lame \
94 + -I/usr/include/libmpeg3 \
95 + -I/usr/include/libavc1394 \
98 `glib-config --cflags`
99 --- cinelerra-1.1.5/global_config.orig Wed Jan 29 07:32:31 2003
100 +++ cinelerra-1.1.5/global_config Fri Mar 21 00:53:25 2003
103 ############################# FINAL DESTINATION FOR INSTALLATION BINARIES
107 LIBPREFIX = $(PREFIX)/lib
109 ########################## COMPILER
113 ifeq ($(HAVE_ESOUND), yes)
114 -ESOUNDCFLAGS = -DHAVE_ESOUND -I../esound
115 -ESOUNDLIBS = ../esound/$(OBJDIR)/libesound.a
116 +ESOUNDCFLAGS = -DHAVE_ESOUND
121 --- cinelerra-1.1.7/plugin_config.orig 2003-07-26 09:09:41.000000000 +0200
122 +++ cinelerra-1.1.7/plugin_config 2003-08-16 23:12:37.860392424 +0200
124 CFLAGS += -I../ -I../../cinelerra \
126 - -I../../quicktime \
127 + -I/usr/include/quicktime \
131 --- cinelerra-1.1.5/mpeg2enc/Makefile.orig Sat Aug 3 04:18:42 2002
132 +++ cinelerra-1.1.5/mpeg2enc/Makefile Fri Mar 21 01:35:40 2003
134 include ../global_config
136 -CFLAGS += -I../libmpeg3 -I../quicktime
137 +CFLAGS += -I/usr/include/libmpeg3 -I/usr/include/quicktime
140 ifeq ($(OBJDIR), i686)
145 - ../../quicktime/$(OBJDIR)/libquicktime.a \
146 - ../../libmpeg3/$(OBJDIR)/libmpeg3.a \
152 --- cinelerra-1.1.7/plugins/titler/Makefile.orig 2003-07-20 11:05:04.000000000 +0200
153 +++ cinelerra-1.1.7/plugins/titler/Makefile 2003-08-16 23:19:45.490382784 +0200
155 -FREETYPE_DIR = ../../freetype-2.1.4
156 -CFLAGS += -I$(FREETYPE_DIR)/include -I../../
157 +CFLAGS += -I/usr/include/freetype2
159 include ../../global_config
162 $(OUTPUT_PLUGIN): $(OBJS)
163 $(LDLINKER) -o $(OUTPUT_PLUGIN) \
165 - $(FREETYPE_DIR)/$(OBJDIR)/libfreetype.a
166 - strip $(OUTPUT_PLUGIN)
169 include ../../plugin_config
173 cp $(OUTPUT_PLUGIN) /usr/lib/cinelerra
174 cp -a fonts /usr/lib/cinelerra
176 --- cinelerra-1.1.5/cinelerra/jpegwrapper.h.orig Fri Jun 21 14:35:24 2002
177 +++ cinelerra-1.1.5/cinelerra/jpegwrapper.h Mon Mar 24 12:53:00 2003
182 -#include "jpeg/jpeglib.h"
183 +#include <jpeglib.h>