]>
Commit | Line | Data |
---|---|---|
584c94b3 JB |
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 | |
3 | @@ -2,12 +2,12 @@ | |
4 | ||
5 | OBJS = $(OBJDIR)/mplex.o | |
6 | CC = gcc | |
7 | -CFLAGS += -I../libmpeg3 | |
8 | +CFLAGS += -I/usr/include/libmpeg3 | |
9 | ||
10 | OUTPUT := $(OBJDIR)/mplexlo | |
11 | ||
12 | $(OUTPUT): $(OBJS) | |
13 | - $(CC) -o $(OUTPUT) $(OBJS) ../libmpeg3/$(OBJDIR)/libmpeg3.a -lpthread -lm | |
14 | + $(CC) -o $(OUTPUT) $(OBJS) -lmpeg3 -lpthread -lm | |
15 | ||
16 | $(OBJS): | |
17 | $(CC) -c $(CFLAGS) $(subst $(OBJDIR)/,, $*.c) -o $*.o | |
86291af4 JB |
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 | |
20 | @@ -1,12 +1,4 @@ | |
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 | |
27 | -UUID_DIR := ../uuid | |
28 | TOOLAME_DIR := ../toolame-02l | |
29 | -LAME_DIR := ../quicktime/lame-3.93.1/include | |
584c94b3 JB |
30 | include ../global_config |
31 | ||
32 | OBJS = \ | |
86291af4 JB |
33 | @@ -271,18 +263,12 @@ |
34 | ||
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 | |
584c94b3 JB |
39 | endif |
40 | ||
41 | STATICLIBS = \ | |
42 | - ../libavc/$(OBJDIR)/libavc.a \ | |
43 | - ../quicktime/$(OBJDIR)/libquicktime.a \ | |
584c94b3 | 44 | $(ESOUNDLIBS) \ |
86291af4 | 45 | - $(TIFF_DIR)/$(OBJDIR)/libtiff.a \ |
584c94b3 JB |
46 | ../guicast/$(OBJDIR)/libguicast.a \ |
47 | - ../libmpeg3/$(OBJDIR)/libmpeg3.a \ | |
86291af4 JB |
48 | - ../libsndfile/$(OBJDIR)/libsndfile.a \ |
49 | - $(UUID_DIR)/$(OBJDIR)/libuuid.a \ | |
50 | ../mpeg2enc/$(OBJDIR)/mpeg2enc.a \ | |
51 | $(TOOLAME_DIR)/$(OBJDIR)/toolame.a | |
52 | ||
53 | @@ -301,8 +287,13 @@ | |
584c94b3 | 54 | |
86291af4 JB |
55 | |
56 | LIBS += \ | |
57 | - $(ALSA_LIBS) \ | |
58 | - $(LIBRAW_DIR)/$(OBJDIR)/libraw1394.a \ | |
59 | + -lavc1394 -lrom1394 \ | |
60 | + -lquicktime -lvorbisfile \ | |
61 | + -ltiff \ | |
62 | + -lmpeg3 \ | |
63 | + -lsndfile \ | |
64 | + -luuid \ | |
65 | + -lraw1394 \ | |
66 | $(GLLIBS) \ | |
67 | -lX11 \ | |
68 | -lXext \ | |
69 | @@ -317,22 +308,14 @@ | |
584c94b3 JB |
70 | |
71 | CFLAGS += \ | |
72 | -I../guicast \ | |
73 | - -I../quicktime \ | |
74 | - -I$(DV_DIR) \ | |
75 | - -I$(OGG_DIR)/include \ | |
76 | - -I$(VORBIS_DIR)/include \ | |
86291af4 JB |
77 | - -I$(LIBRAW_DIR)/src \ |
78 | - -I$(TIFF_DIR)/libtiff \ | |
79 | - -I$(UUID_DIR) \ | |
80 | - -I$(DV_DIR) \ | |
81 | + -I/usr/include/quicktime \ | |
82 | + -I/usr/include/libdv \ | |
83 | + -I/usr/include/libraw1394 \ | |
84 | + -I/usr/include/uuid \ | |
85 | -I$(TOOLAME_DIR) \ | |
86 | - -I$(LAME_DIR) \ | |
584c94b3 JB |
87 | - -I../audiofile \ |
88 | - -I../libmpeg3 \ | |
89 | - -I../libsndfile \ | |
90 | - -I../libavc/common \ | |
91 | - -I../libavc/libavc1394 \ | |
92 | - -I../libavc/librom1394 \ | |
86291af4 | 93 | + -I/usr/include/lame \ |
584c94b3 JB |
94 | + -I/usr/include/libmpeg3 \ |
95 | + -I/usr/include/libavc1394 \ | |
86291af4 JB |
96 | $(ESOUNDCFLAGS) \ |
97 | $(ALSA_CFLAGS) \ | |
584c94b3 | 98 | `glib-config --cflags` |
584c94b3 JB |
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 | |
101 | @@ -15,7 +15,7 @@ | |
102 | ||
103 | ############################# FINAL DESTINATION FOR INSTALLATION BINARIES | |
104 | ||
105 | -PREFIX = /usr/local | |
106 | +PREFIX = /usr | |
107 | LIBPREFIX = $(PREFIX)/lib | |
108 | ||
109 | ########################## COMPILER | |
110 | @@ -41,8 +41,8 @@ | |
111 | ||
112 | ||
113 | ifeq ($(HAVE_ESOUND), yes) | |
114 | -ESOUNDCFLAGS = -DHAVE_ESOUND -I../esound | |
115 | -ESOUNDLIBS = ../esound/$(OBJDIR)/libesound.a | |
116 | +ESOUNDCFLAGS = -DHAVE_ESOUND | |
117 | +ESOUNDLIBS = -lesd | |
118 | endif | |
119 | ||
120 | ||
86291af4 JB |
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 | |
584c94b3 JB |
123 | @@ -1,6 +1,6 @@ |
124 | CFLAGS += -I../ -I../../cinelerra \ | |
125 | -I../../guicast \ | |
126 | - -I../../quicktime \ | |
a601b4a3 | 127 | + -I/usr/include/quicktime \ |
86291af4 JB |
128 | -I../colors \ |
129 | -fPIC | |
584c94b3 | 130 | |
86291af4 JB |
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 | |
584c94b3 | 133 | @@ -1,6 +1,6 @@ |
86291af4 | 134 | include ../global_config |
584c94b3 | 135 | CC = gcc |
86291af4 | 136 | -CFLAGS += -I../libmpeg3 -I../quicktime |
584c94b3 JB |
137 | +CFLAGS += -I/usr/include/libmpeg3 -I/usr/include/quicktime |
138 | ||
139 | ||
140 | ifeq ($(OBJDIR), i686) | |
141 | @@ -48,8 +48,8 @@ | |
142 | $(OBJDIR)/writepic.o | |
143 | ||
144 | LIBS = \ | |
145 | - ../../quicktime/$(OBJDIR)/libquicktime.a \ | |
146 | - ../../libmpeg3/$(OBJDIR)/libmpeg3.a \ | |
147 | + -lquicktime \ | |
148 | + -lmpeg3 \ | |
149 | -lpthread \ | |
150 | -lpng \ | |
151 | -lz \ | |
86291af4 JB |
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 | |
154 | @@ -1,5 +1,4 @@ | |
155 | -FREETYPE_DIR = ../../freetype-2.1.4 | |
ccb0dca0 JB |
156 | -CFLAGS += -I$(FREETYPE_DIR)/include -I../../ |
157 | +CFLAGS += -I/usr/include/freetype2 | |
158 | ||
159 | include ../../global_config | |
160 | ||
86291af4 JB |
161 | @@ -15,12 +14,11 @@ |
162 | $(OUTPUT_PLUGIN): $(OBJS) | |
163 | $(LDLINKER) -o $(OUTPUT_PLUGIN) \ | |
164 | $(OBJS) \ | |
165 | - $(FREETYPE_DIR)/$(OBJDIR)/libfreetype.a | |
166 | - strip $(OUTPUT_PLUGIN) | |
167 | + -lfreetype | |
ccb0dca0 | 168 | |
86291af4 | 169 | include ../../plugin_config |
ccb0dca0 JB |
170 | |
171 | -inst: | |
172 | +install: | |
86291af4 | 173 | cp $(OUTPUT_PLUGIN) /usr/lib/cinelerra |
ccb0dca0 JB |
174 | cp -a fonts /usr/lib/cinelerra |
175 | ||
a601b4a3 JB |
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 | |
178 | @@ -7,7 +7,7 @@ | |
179 | extern "C" { | |
180 | #endif | |
181 | ||
182 | -#include "jpeg/jpeglib.h" | |
183 | +#include <jpeglib.h> | |
184 | ||
185 | #ifdef __cplusplus | |
186 | } |