]> git.pld-linux.org Git - packages/cinelerra.git/blame_incremental - cinelerra-system-libs.patch
projects / packages / cinelerra.git / blame_incremental
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (non-incremental) | history | HEAD
- updated for 2.0
[packages/cinelerra.git] / cinelerra-system-libs.patch
... / ...
CommitLineData
1--- cinelerra-2.0/cinelerra/Makefile.orig 2005-09-07 23:25:21.000000000 +0200
2+++ cinelerra-2.0/cinelerra/Makefile 2005-11-01 13:25:17.219148368 +0100
3@@ -1,27 +1,27 @@
4 include ../global_config
5
6-ALSA_DIR := ../alsa-lib-1.0.8
7-AVC_DIR := $(shell expr ../libavc1394* )
8-DV_DIR := ../quicktime/libdv-0.104
9-EXR_DIR := ../OpenEXR-1.2.1/
10-FFMPEG_DIR := $(shell expr ../quicktime/ffmpeg* )
11-JPEG_DIR := $(shell expr ../quicktime/jpeg-mmx* )
12-LAME_DIR := ../quicktime/lame-3.93.1/include
13-LIBIEC_DIR := $(shell expr ../libiec61883* )
14-LIBRAW_DIR := $(shell expr ../libraw1394* )
15-OGG_DIR := $(shell expr ../quicktime/libogg* )
16-SNDFILE_DIR := $(shell expr ../libsndfile* )
17-THEORA_DIR := $(shell expr ../libtheora* )
18-TIFF_DIR := ../tiff-v3.5.7
19+#ALSA_DIR := ../alsa-lib-1.0.8
20+#AVC_DIR := $(shell expr ../libavc1394* )
21+#DV_DIR := ../quicktime/libdv-0.104
22+#EXR_DIR := ../OpenEXR-1.2.1/
23+#FFMPEG_DIR := $(shell expr ../quicktime/ffmpeg* )
24+#JPEG_DIR := $(shell expr ../quicktime/jpeg-mmx* )
25+#LAME_DIR := ../quicktime/lame-3.93.1/include
26+#LIBIEC_DIR := $(shell expr ../libiec61883* )
27+#LIBRAW_DIR := $(shell expr ../libraw1394* )
28+#OGG_DIR := $(shell expr ../quicktime/libogg* )
29+#SNDFILE_DIR := $(shell expr ../libsndfile* )
30+#THEORA_DIR := $(shell expr ../libtheora* )
31+#TIFF_DIR := ../tiff-v3.5.7
32 TOOLAME_DIR := ../toolame-02l
33-UUID_DIR := ../uuid
34-VORBIS_DIR := $(shell expr ../quicktime/libvorbis* )
35+#UUID_DIR := ../uuid
36+#VORBIS_DIR := $(shell expr ../quicktime/libvorbis* )
37
38-AVC_LIB := $(AVC_DIR)/libavc1394/.libs/libavc1394.a $(AVC_DIR)/librom1394/.libs/librom1394.a
39-RAW_LIB := $(LIBRAW_DIR)/src/.libs/libraw1394.a
40-IEC_LIB := $(LIBIEC_DIR)/src/.libs/libiec61883.a
41-SNDFILE_LIB := $(SNDFILE_DIR)/src/.libs/libsndfile.a
42-THEORA_LIB := $(THEORA_DIR)/lib/.libs/libtheora.a
43+AVC_LIB := -lavc1394 -lrom1394
44+RAW_LIB := -lraw1394
45+IEC_LIB := -liec61883
46+SNDFILE_LIB := -lsndfile
47+THEORA_LIB := -ltheora
48
49 OBJS = \
50 $(OBJDIR)/aattachmentpoint.o \
51@@ -305,29 +305,17 @@
52 #endif
53
54 ifeq ($(HAVE_ALSA), y)
55-ALSA_CFLAGS := -DHAVE_ALSA -I$(ALSA_DIR)/include
56-ALSA_LIBS := $(ALSA_DIR)/$(OBJDIR)/libasound.a
57+ALSA_CFLAGS := -DHAVE_ALSA
58+ALSA_LIBS := -lasound
59 endif
60
61
62
63 STATICLIBS = \
64- $(ALSA_LIBS) \
65- $(AVC_LIB) \
66- $(RAW_LIB) \
67- $(IEC_LIB) \
68- ../quicktime/$(OBJDIR)/libquicktime.a \
69- $(ESOUNDLIBS) \
70- $(EXR_DIR)/$(OBJDIR)/libexr.a \
71- $(TIFF_DIR)/$(OBJDIR)/libtiff.a \
72 ../guicast/$(OBJDIR)/libguicast.a \
73- ../libmpeg3/$(OBJDIR)/libmpeg3.a \
74- $(SNDFILE_LIB) \
75- $(UUID_DIR)/$(OBJDIR)/libuuid.a \
76 ../mpeg2enc/$(OBJDIR)/mpeg2enc.a \
77 $(TOOLAME_DIR)/$(OBJDIR)/toolame.a \
78- $(THEME_DATA) \
79- $(THEORA_LIB)
80+ $(THEME_DATA)
81
82 LIBS := \
83 -L./ \
84@@ -344,6 +332,18 @@
85
86
87 LIBS += \
88+ $(ALSA_LIBS) \
89+ $(AVC_LIB) \
90+ $(RAW_LIB) \
91+ $(IEC_LIB) \
92+ -lquicktime -lvorbisfile \
93+ $(ESOUNDLIBS) \
94+ -lIlmImf -lImath -lHalf -lIex \
95+ -ltiff \
96+ -lmpeg3 \
97+ $(SNDFILE_LIB) \
98+ -luuid \
99+ $(THEORA_LIB) \
100 $(GLLIBS) \
101 -lX11 \
102 -lXext \
103@@ -361,29 +361,22 @@
104
105 CFLAGS += \
106 -I../guicast \
107- -I../quicktime \
108- -I$(JPEG_DIR) \
109- -I$(DV_DIR) \
110- -I$(OGG_DIR)/include \
111- -I$(VORBIS_DIR)/include \
112- -I$(LIBRAW_DIR)/ \
113- -I$(AVC_DIR) \
114- -I$(LIBIEC_DIR)/src/ \
115- -I$(TIFF_DIR)/libtiff \
116- -I$(UUID_DIR) \
117+ -I/usr/include/quicktime \
118+ -I/usr/include/libdv \
119+ -I/usr/include/libraw1394 \
120+ -I/usr/include/libiec61883 \
121+ -I/usr/include/uuid \
122 -I$(TOOLAME_DIR) \
123- -I$(LAME_DIR) \
124- -I../audiofile \
125- -I../libmpeg3 \
126- -I$(SNDFILE_DIR)/src \
127+ -I/usr/include/lame \
128+ -I/usr/include/libmpeg3 \
129 $(ESOUNDCFLAGS) \
130 $(ALSA_CFLAGS) \
131- -I$(FFMPEG_DIR)/libavcodec \
132- -I$(THEORA_DIR)/include
133+ -I/usr/include/ffmpeg \
134+ -I/usr/include/theora
135
136
137 # Speed up linking with this linking sequence
138-ifeq ($(OBJDIR), alpha)
139+ifeq ($(OBJDIR), alpha-ccc)
140
141
142
143@@ -489,7 +482,7 @@
144
145 $(FILEEXR): fileexr.C
146 @echo C++ $*.o
147- @$(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
148+ @$(CC) -c `cat $(OBJDIR)/c_flags` -I/usr/include/OpenEXR $(subst $(OBJDIR)/,, $*.C) -o $*.o
149
150 $(DCRAW): dcraw.c
151 @echo CC $*.o
152--- cinelerra-1.1.8/mpeg2enc/Makefile.orig 2003-10-14 09:54:43.000000000 +0200
153+++ cinelerra-1.1.8/mpeg2enc/Makefile 2003-11-12 22:23:56.387225920 +0100
154@@ -1,6 +1,6 @@
155 include ../global_config
156 CC = gcc
157-CFLAGS += -I../libmpeg3 -I../quicktime
158+CFLAGS += -I/usr/include/libmpeg3 -I/usr/include/quicktime
159
160
161 ifeq ($(OBJDIR), i686)
162@@ -48,8 +48,8 @@
163 $(OBJDIR)/writepic.o
164
165 LIBS = \
166- ../../quicktime/$(OBJDIR)/libquicktime.a \
167- ../../libmpeg3/$(OBJDIR)/libmpeg3.a \
168+ -lquicktime \
169+ -lmpeg3 \
170 -lpthread \
171 -lpng \
172 -lz \
173--- cinelerra-1.1.8/mplexlo/Makefile.orig 2003-10-14 09:54:14.000000000 +0200
174+++ cinelerra-1.1.8/mplexlo/Makefile 2003-11-12 22:06:01.235673800 +0100
175@@ -2,12 +2,12 @@
176
177 OBJS = $(OBJDIR)/mplex.o
178 CC = gcc
179-CFLAGS += -I../libmpeg3
180+CFLAGS += -I/usr/include/libmpeg3
181
182 OUTPUT := $(OBJDIR)/mplexlo
183
184 $(OUTPUT): $(OBJS)
185- $(CC) -o $(OUTPUT) $(OBJS) ../libmpeg3/$(OBJDIR)/libmpeg3.a -lpthread -lm
186+ $(CC) -o $(OUTPUT) $(OBJS) -lmpeg3 -lpthread -lm
187
188 $(OBJS):
189 $(CC) -c $(CFLAGS) $(subst $(OBJDIR)/,, $*.c) -o $*.o
190--- cinelerra-2.0/plugins/titler/Makefile.orig 2005-05-29 02:01:50.000000000 +0200
191+++ cinelerra-2.0/plugins/titler/Makefile 2005-11-01 13:29:05.682416672 +0100
192@@ -8,19 +8,18 @@
193
194
195 OUTPUT_PLUGIN = ../$(OBJDIR)/titler.plugin
196-FREETYPE_DIR = ../../freetype-2.1.4
197-CFLAGS += -I$(FREETYPE_DIR)/include -I../../
198+FREETYPE_DIR =
199+CFLAGS += -I/usr/include/freetype2 -I../../
200
201
202 $(OUTPUT_PLUGIN): $(OBJS)
203 $(LDLINKER) -o $(OUTPUT_PLUGIN) \
204 $(OBJS) \
205- $(FREETYPE_DIR)/$(OBJDIR)/libfreetype.a
206- strip $(OUTPUT_PLUGIN)
207+ -lfreetype
208
209 include ../../plugin_config
210
211-inst:
212+install:
213 cp $(OUTPUT_PLUGIN) $(PLUGINDIR)
214 mkdir -p $(PLUGINDIR)/fonts
215 cp fonts/* $(PLUGINDIR)/fonts
216--- cinelerra-1.1.8/global_config.orig 2003-10-29 10:05:08.000000000 +0100
217+++ cinelerra-1.1.8/global_config 2003-11-12 22:22:09.103535520 +0100
218@@ -24,7 +24,7 @@
219
220 ############################# FINAL DESTINATION FOR INSTALLATION BINARIES
221
222-PREFIX = /usr/
223+PREFIX = /usr
224 LIBPREFIX = $(PREFIX)/lib
225
226 ########################## THE COMPILER
227@@ -50,8 +50,8 @@
228
229
230 ifeq ($(HAVE_ESOUND), y)
231-ESOUNDCFLAGS = -DHAVE_ESOUND -I../esound
232-ESOUNDLIBS = ../esound/$(OBJDIR)/libesound.a
233+ESOUNDCFLAGS = -DHAVE_ESOUND
234+ESOUNDLIBS = -lesd
235 endif
236
237
238@@ -59,8 +59,8 @@
239 CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
240 #CFLAGS += -I. # Caused fileavi.C to fail
241
242-FREETYPE_DIR = ../../freetype-2.1.4
243-CFLAGS += -I$(FREETYPE_DIR)/include -I../../
244+FREETYPE_DIR =
245+CFLAGS += -I/usr/include/freeetype2
246
247 ifeq ($(HAVE_OSS), y)
248 CFLAGS += -DHAVE_OSS
249--- cinelerra-1.1.8/plugin_config.orig 2003-10-14 09:53:58.000000000 +0200
250+++ cinelerra-1.1.8/plugin_config 2003-11-12 22:22:42.189505688 +0100
251@@ -1,6 +1,6 @@
252 CFLAGS += -I../ -I../../cinelerra \
253 -I../../guicast \
254- -I../../quicktime \
255+ -I/usr/include/quicktime \
256 -I../colors \
257 -fPIC
258
259--- cinelerra-1.2.0/cinelerra/audioalsa.h.orig 2003-10-14 09:53:59.000000000 +0200
260+++ cinelerra-1.2.0/cinelerra/audioalsa.h 2004-06-05 10:26:45.584744408 +0200
261@@ -5,7 +5,7 @@
262 #include "audiodevice.h"
263
264 #ifdef HAVE_ALSA
265-#include "asoundlib.h"
266+#include <alsa/asoundlib.h>
267
268 class AudioALSA : public AudioLowLevel
269 {
270--- cinelerra-2.0/guicast/Makefile.orig 2005-11-01 14:30:52.865839000 +0100
271+++ cinelerra-2.0/guicast/Makefile 2005-11-01 14:41:01.161364152 +0100
272@@ -2,9 +2,9 @@
273
274 # Need the freetype include that matches the X server for Xft rendering
275 #FREETYPE_DIR := ..//usr/X11R6/include/freetype2
276-FREETYPE_DIR := $(shell expr ../freetype*/include )
277+#FREETYPE_DIR := $(shell expr ../freetype*/include )
278
279-CFLAGS += -I../quicktime -I$(FREETYPE_DIR)
280+CFLAGS += -I/usr/include/quicktime -I/usr/include/freetype2
281
282 # must only define here so applications using libpng don't see any of the XFT
283 # includes at all. They use a conflicting setjmp.
284--- cinelerra-2.0/cinelerra/avc1394control.h.orig 2005-09-11 22:13:22.000000000 +0200
285+++ cinelerra-2.0/cinelerra/avc1394control.h 2005-11-01 16:49:01.785731768 +0100
286@@ -3,11 +3,11 @@
287
288
289 #include "bcwindowbase.inc"
290-#include "librom1394/rom1394.h"
291-#include "libavc1394/avc1394.h"
292-#include "libavc1394/avc1394_vcr.h"
293+#include <libavc1394/rom1394.h>
294+#include <libavc1394/avc1394.h>
295+#include <libavc1394/avc1394_vcr.h>
296 #include "mutex.inc"
297-#include "libraw1394/raw1394.h"
298+#include <libraw1394/raw1394.h>
299 #include <sys/types.h>
300 #include <stdio.h>
301 #include <errno.h>
302--- cinelerra-2.0/cinelerra/fileogg.h.orig 2005-09-07 23:25:21.000000000 +0200
303+++ cinelerra-2.0/cinelerra/fileogg.h 2005-11-01 17:03:29.505818264 +0100
304@@ -1,7 +1,7 @@
305 #ifndef FILEOGG_H
306 #define FILEOGG_H
307
308-#include "../config.h"
309+#include "../hvirtual_config.h"
310 #include "filebase.h"
311 #include "file.inc"
312
Cinelerra - capturing, editing and production of audio/video material
This page took 0.064297 seconds and 4 git commands to generate.