[packages/cinelerra.git] / cinelerra-system-libs.patch

--- cinelerra-2.0/cinelerra/Makefile.orig	2005-09-07 23:25:21.000000000 +0200
+++ cinelerra-2.0/cinelerra/Makefile	2005-11-01 13:25:17.219148368 +0100
@@ -1,27 +1,27 @@
 include ../global_config
 
-ALSA_DIR := ../alsa-lib-1.0.8
-AVC_DIR := $(shell expr ../libavc1394* )
-DV_DIR := ../quicktime/libdv-0.104
-EXR_DIR := ../OpenEXR-1.2.1/
-FFMPEG_DIR := $(shell expr ../quicktime/ffmpeg* )
-JPEG_DIR := $(shell expr ../quicktime/jpeg-mmx* )
-LAME_DIR := ../quicktime/lame-3.93.1/include
-LIBIEC_DIR := $(shell expr ../libiec61883* )
-LIBRAW_DIR := $(shell expr ../libraw1394* )
-OGG_DIR := $(shell expr ../quicktime/libogg* )
-SNDFILE_DIR := $(shell expr ../libsndfile* )
-THEORA_DIR := $(shell expr ../libtheora* )
-TIFF_DIR := ../tiff-v3.5.7
+#ALSA_DIR := ../alsa-lib-1.0.8
+#AVC_DIR := $(shell expr ../libavc1394* )
+#DV_DIR := ../quicktime/libdv-0.104
+#EXR_DIR := ../OpenEXR-1.2.1/
+#FFMPEG_DIR := $(shell expr ../quicktime/ffmpeg* )
+#JPEG_DIR := $(shell expr ../quicktime/jpeg-mmx* )
+#LAME_DIR := ../quicktime/lame-3.93.1/include
+#LIBIEC_DIR := $(shell expr ../libiec61883* )
+#LIBRAW_DIR := $(shell expr ../libraw1394* )
+#OGG_DIR := $(shell expr ../quicktime/libogg* )
+#SNDFILE_DIR := $(shell expr ../libsndfile* )
+#THEORA_DIR := $(shell expr ../libtheora* )
+#TIFF_DIR := ../tiff-v3.5.7
 TOOLAME_DIR := ../toolame-02l
-UUID_DIR := ../uuid
-VORBIS_DIR := $(shell expr ../quicktime/libvorbis* )
+#UUID_DIR := ../uuid
+#VORBIS_DIR := $(shell expr ../quicktime/libvorbis* )
 
-AVC_LIB := $(AVC_DIR)/libavc1394/.libs/libavc1394.a $(AVC_DIR)/librom1394/.libs/librom1394.a
-RAW_LIB := $(LIBRAW_DIR)/src/.libs/libraw1394.a
-IEC_LIB := $(LIBIEC_DIR)/src/.libs/libiec61883.a
-SNDFILE_LIB := $(SNDFILE_DIR)/src/.libs/libsndfile.a
-THEORA_LIB := $(THEORA_DIR)/lib/.libs/libtheora.a
+AVC_LIB := -lavc1394 -lrom1394
+RAW_LIB := -lraw1394
+IEC_LIB := -liec61883
+SNDFILE_LIB := -lsndfile
+THEORA_LIB := -ltheora
 
 OBJS = \
 	$(OBJDIR)/aattachmentpoint.o \
@@ -305,29 +305,17 @@
 #endif
 
 ifeq ($(HAVE_ALSA), y)
-ALSA_CFLAGS := -DHAVE_ALSA -I$(ALSA_DIR)/include
-ALSA_LIBS := $(ALSA_DIR)/$(OBJDIR)/libasound.a
+ALSA_CFLAGS := -DHAVE_ALSA
+ALSA_LIBS := -lasound
 endif
 
 
 
 STATICLIBS = \
-	$(ALSA_LIBS) \
-	$(AVC_LIB) \
-	$(RAW_LIB) \
-	$(IEC_LIB) \
-	../quicktime/$(OBJDIR)/libquicktime.a \
-        $(ESOUNDLIBS) \
-	$(EXR_DIR)/$(OBJDIR)/libexr.a \
-	$(TIFF_DIR)/$(OBJDIR)/libtiff.a \
 	../guicast/$(OBJDIR)/libguicast.a \
-	../libmpeg3/$(OBJDIR)/libmpeg3.a \
-	$(SNDFILE_LIB) \
-	$(UUID_DIR)/$(OBJDIR)/libuuid.a \
 	../mpeg2enc/$(OBJDIR)/mpeg2enc.a \
 	$(TOOLAME_DIR)/$(OBJDIR)/toolame.a \
-	$(THEME_DATA) \
-	$(THEORA_LIB)
+	$(THEME_DATA)
 
 LIBS := \
 	-L./ \
@@ -344,6 +332,18 @@
 
 
 LIBS += \
+	$(ALSA_LIBS) \
+	$(AVC_LIB) \
+	$(RAW_LIB) \
+	$(IEC_LIB) \
+	-lquicktime -lvorbisfile \
+        $(ESOUNDLIBS) \
+	-lIlmImf -lImath -lHalf -lIex \
+	-ltiff \
+	-lmpeg3 \
+	$(SNDFILE_LIB) \
+	-luuid \
+	$(THEORA_LIB) \
 	$(GLLIBS) \
 	-lX11 \
 	-lXext \
@@ -361,29 +361,22 @@
 
 CFLAGS += \
 	-I../guicast \
-	-I../quicktime \
-	-I$(JPEG_DIR) \
-	-I$(DV_DIR) \
-	-I$(OGG_DIR)/include \
-	-I$(VORBIS_DIR)/include \
-	-I$(LIBRAW_DIR)/ \
-	-I$(AVC_DIR) \
-	-I$(LIBIEC_DIR)/src/ \
-	-I$(TIFF_DIR)/libtiff \
-	-I$(UUID_DIR) \
+	-I/usr/include/quicktime \
+	-I/usr/include/libdv \
+	-I/usr/include/libraw1394 \
+	-I/usr/include/libiec61883 \
+	-I/usr/include/uuid \
 	-I$(TOOLAME_DIR) \
-	-I$(LAME_DIR) \
-	-I../audiofile \
-	-I../libmpeg3 \
-	-I$(SNDFILE_DIR)/src \
+	-I/usr/include/lame \
+	-I/usr/include/libmpeg3 \
 	$(ESOUNDCFLAGS) \
 	$(ALSA_CFLAGS) \
-	-I$(FFMPEG_DIR)/libavcodec \
-	-I$(THEORA_DIR)/include
+	-I/usr/include/ffmpeg \
+	-I/usr/include/theora
 
 
 # Speed up linking with this linking sequence
-ifeq ($(OBJDIR), alpha)
+ifeq ($(OBJDIR), alpha-ccc)
 
 
 
@@ -489,7 +482,7 @@
 
 $(FILEEXR): fileexr.C
 	@echo C++ $*.o
-	@$(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
+	@$(CC) -c `cat $(OBJDIR)/c_flags` -I/usr/include/OpenEXR $(subst $(OBJDIR)/,, $*.C) -o $*.o
 
 $(DCRAW): dcraw.c
 	@echo CC $*.o
--- cinelerra-1.1.8/mpeg2enc/Makefile.orig	2003-10-14 09:54:43.000000000 +0200
+++ cinelerra-1.1.8/mpeg2enc/Makefile	2003-11-12 22:23:56.387225920 +0100
@@ -1,6 +1,6 @@
 include ../global_config
 CC = gcc
-CFLAGS += -I../libmpeg3 -I../quicktime
+CFLAGS += -I/usr/include/libmpeg3 -I/usr/include/quicktime
 
 
 ifeq ($(OBJDIR), i686)
@@ -48,8 +48,8 @@
 	$(OBJDIR)/writepic.o
 
 LIBS = \
-	../../quicktime/$(OBJDIR)/libquicktime.a \
-	../../libmpeg3/$(OBJDIR)/libmpeg3.a \
+	-lquicktime \
+	-lmpeg3 \
 	-lpthread \
 	-lpng \
 	-lz \
--- cinelerra-1.1.8/mplexlo/Makefile.orig	2003-10-14 09:54:14.000000000 +0200
+++ cinelerra-1.1.8/mplexlo/Makefile	2003-11-12 22:06:01.235673800 +0100
@@ -2,12 +2,12 @@
 
 OBJS = $(OBJDIR)/mplex.o
 CC = gcc
-CFLAGS += -I../libmpeg3
+CFLAGS += -I/usr/include/libmpeg3
 
 OUTPUT := $(OBJDIR)/mplexlo
 
 $(OUTPUT): $(OBJS)
-	$(CC) -o $(OUTPUT) $(OBJS) ../libmpeg3/$(OBJDIR)/libmpeg3.a -lpthread -lm
+	$(CC) -o $(OUTPUT) $(OBJS) -lmpeg3 -lpthread -lm
 
 $(OBJS):
 	$(CC) -c $(CFLAGS) $(subst $(OBJDIR)/,, $*.c) -o $*.o
--- cinelerra-2.0/plugins/titler/Makefile.orig	2005-05-29 02:01:50.000000000 +0200
+++ cinelerra-2.0/plugins/titler/Makefile	2005-11-01 13:29:05.682416672 +0100
@@ -8,19 +8,18 @@
 
 
 OUTPUT_PLUGIN = ../$(OBJDIR)/titler.plugin
-FREETYPE_DIR = ../../freetype-2.1.4
-CFLAGS += -I$(FREETYPE_DIR)/include -I../../
+FREETYPE_DIR =
+CFLAGS += -I/usr/include/freetype2 -I../../
 
 
 $(OUTPUT_PLUGIN): $(OBJS)
 	$(LDLINKER) -o $(OUTPUT_PLUGIN) \
 		$(OBJS) \
-		$(FREETYPE_DIR)/$(OBJDIR)/libfreetype.a
-	strip $(OUTPUT_PLUGIN)
+		-lfreetype
 
 include ../../plugin_config
 
-inst:
+install:
 	cp $(OUTPUT_PLUGIN) $(PLUGINDIR)
 	mkdir -p $(PLUGINDIR)/fonts
 	cp fonts/* $(PLUGINDIR)/fonts
--- cinelerra-1.1.8/global_config.orig	2003-10-29 10:05:08.000000000 +0100
+++ cinelerra-1.1.8/global_config	2003-11-12 22:22:09.103535520 +0100
@@ -24,7 +24,7 @@
 
 ############################# FINAL DESTINATION FOR INSTALLATION BINARIES
 
-PREFIX = /usr/
+PREFIX = /usr
 LIBPREFIX = $(PREFIX)/lib
 
 ########################## THE COMPILER
@@ -50,8 +50,8 @@
 
 
 ifeq ($(HAVE_ESOUND), y)
-ESOUNDCFLAGS = -DHAVE_ESOUND -I../esound
-ESOUNDLIBS = ../esound/$(OBJDIR)/libesound.a
+ESOUNDCFLAGS = -DHAVE_ESOUND
+ESOUNDLIBS = -lesd
 endif
 
 
@@ -59,8 +59,8 @@
 CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 #CFLAGS += -I.      # Caused fileavi.C to fail
 
-FREETYPE_DIR = ../../freetype-2.1.4
-CFLAGS += -I$(FREETYPE_DIR)/include -I../../
+FREETYPE_DIR =
+CFLAGS += -I/usr/include/freeetype2
 
 ifeq ($(HAVE_OSS), y)
 CFLAGS += -DHAVE_OSS
--- cinelerra-1.1.8/plugin_config.orig	2003-10-14 09:53:58.000000000 +0200
+++ cinelerra-1.1.8/plugin_config	2003-11-12 22:22:42.189505688 +0100
@@ -1,6 +1,6 @@
 CFLAGS += -I../ -I../../cinelerra \
 	-I../../guicast \
-	-I../../quicktime \
+	-I/usr/include/quicktime \
 	-I../colors \
 	-fPIC
 
--- cinelerra-1.2.0/cinelerra/audioalsa.h.orig	2003-10-14 09:53:59.000000000 +0200
+++ cinelerra-1.2.0/cinelerra/audioalsa.h	2004-06-05 10:26:45.584744408 +0200
@@ -5,7 +5,7 @@
 #include "audiodevice.h"
 
 #ifdef HAVE_ALSA
-#include "asoundlib.h"
+#include <alsa/asoundlib.h>
 
 class AudioALSA : public AudioLowLevel
 {
--- cinelerra-2.0/guicast/Makefile.orig	2005-11-01 14:30:52.865839000 +0100
+++ cinelerra-2.0/guicast/Makefile	2005-11-01 14:41:01.161364152 +0100
@@ -2,9 +2,9 @@
 
 # Need the freetype include that matches the X server for Xft rendering
 #FREETYPE_DIR := ..//usr/X11R6/include/freetype2
-FREETYPE_DIR := $(shell expr ../freetype*/include )
+#FREETYPE_DIR := $(shell expr ../freetype*/include )
 
-CFLAGS += -I../quicktime -I$(FREETYPE_DIR)
+CFLAGS += -I/usr/include/quicktime -I/usr/include/freetype2
 
 # must only define here so applications using libpng don't see any of the XFT
 # includes at all.  They use a conflicting setjmp.
--- cinelerra-2.0/cinelerra/avc1394control.h.orig	2005-09-11 22:13:22.000000000 +0200
+++ cinelerra-2.0/cinelerra/avc1394control.h	2005-11-01 16:49:01.785731768 +0100
@@ -3,11 +3,11 @@
 
 
 #include "bcwindowbase.inc"
-#include "librom1394/rom1394.h"
-#include "libavc1394/avc1394.h"
-#include "libavc1394/avc1394_vcr.h"
+#include <libavc1394/rom1394.h>
+#include <libavc1394/avc1394.h>
+#include <libavc1394/avc1394_vcr.h>
 #include "mutex.inc"
-#include "libraw1394/raw1394.h"
+#include <libraw1394/raw1394.h>
 #include <sys/types.h>
 #include <stdio.h>
 #include <errno.h>
--- cinelerra-2.0/cinelerra/fileogg.h.orig	2005-09-07 23:25:21.000000000 +0200
+++ cinelerra-2.0/cinelerra/fileogg.h	2005-11-01 17:03:29.505818264 +0100
@@ -1,7 +1,7 @@
 #ifndef FILEOGG_H
 #define FILEOGG_H
 
-#include "../config.h"
+#include "../hvirtual_config.h"
 #include "filebase.h"
 #include "file.inc"
Commit	Line	Data
5ba5c72b JB	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 @@
020dfac3 JB	4	include ../global_config
020dfac3 JB	5
5ba5c72b JB	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/
020dfac3	10	-FFMPEG_DIR := $(shell expr ../quicktime/ffmpeg* )
5ba5c72b	11	-JPEG_DIR := $(shell expr ../quicktime/jpeg-mmx* )
020dfac3	12	-LAME_DIR := ../quicktime/lame-3.93.1/include
5ba5c72b JB	13	-LIBIEC_DIR := $(shell expr ../libiec61883* )
	14	-LIBRAW_DIR := $(shell expr ../libraw1394* )
	15	-OGG_DIR := $(shell expr ../quicktime/libogg* )
020dfac3	16	-SNDFILE_DIR := $(shell expr ../libsndfile* )
5ba5c72b	17	-THEORA_DIR := $(shell expr ../libtheora* )
86291af4	18	-TIFF_DIR := ../tiff-v3.5.7
5ba5c72b JB	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
86291af4	32	TOOLAME_DIR := ../toolame-02l
020dfac3	33	-UUID_DIR := ../uuid
5ba5c72b JB	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
584c94b3 JB	48
584c94b3 JB	49	OBJS = \
020dfac3	50	$(OBJDIR)/aattachmentpoint.o \
5ba5c72b	51	@@ -305,29 +305,17 @@
6eea70d2	52	#endif
86291af4	53
6eea70d2 JB	54	ifeq ($(HAVE_ALSA), y)
6eea70d2 JB	55	-ALSA_CFLAGS := -DHAVE_ALSA -I$(ALSA_DIR)/include
86291af4	56	-ALSA_LIBS := $(ALSA_DIR)/$(OBJDIR)/libasound.a
6eea70d2	57	+ALSA_CFLAGS := -DHAVE_ALSA
86291af4	58	+ALSA_LIBS := -lasound
584c94b3 JB	59	endif
584c94b3 JB	60
5ba5c72b JB	61
5ba5c72b JB	62
584c94b3	63	STATICLIBS = \
5ba5c72b JB	64	- $(ALSA_LIBS) \
	65	- $(AVC_LIB) \
	66	- $(RAW_LIB) \
	67	- $(IEC_LIB) \
584c94b3	68	- ../quicktime/$(OBJDIR)/libquicktime.a \
5ba5c72b	69	- $(ESOUNDLIBS) \
d0731054	70	- $(EXR_DIR)/$(OBJDIR)/libexr.a \
86291af4	71	- $(TIFF_DIR)/$(OBJDIR)/libtiff.a \
584c94b3 JB	72	../guicast/$(OBJDIR)/libguicast.a \
584c94b3 JB	73	- ../libmpeg3/$(OBJDIR)/libmpeg3.a \
5ba5c72b	74	- $(SNDFILE_LIB) \
86291af4 JB	75	- $(UUID_DIR)/$(OBJDIR)/libuuid.a \
86291af4 JB	76	../mpeg2enc/$(OBJDIR)/mpeg2enc.a \
d0731054	77	$(TOOLAME_DIR)/$(OBJDIR)/toolame.a \
5ba5c72b JB	78	- $(THEME_DATA) \
	79	- $(THEORA_LIB)
	80	+ $(THEME_DATA)
	81
	82	LIBS := \
	83	-L./ \
	84	@@ -344,6 +332,18 @@
	85
86291af4 JB	86
86291af4 JB	87	LIBS += \
5ba5c72b JB	88	+ $(ALSA_LIBS) \
	89	+ $(AVC_LIB) \
	90	+ $(RAW_LIB) \
	91	+ $(IEC_LIB) \
86291af4	92	+ -lquicktime -lvorbisfile \
5ba5c72b	93	+ $(ESOUNDLIBS) \
d0731054	94	+ -lIlmImf -lImath -lHalf -lIex \
86291af4 JB	95	+ -ltiff \
86291af4 JB	96	+ -lmpeg3 \
5ba5c72b	97	+ $(SNDFILE_LIB) \
86291af4	98	+ -luuid \
5ba5c72b	99	+ $(THEORA_LIB) \
86291af4 JB	100	$(GLLIBS) \
	101	-lX11 \
	102	-lXext \
5ba5c72b	103	@@ -361,29 +361,22 @@
584c94b3 JB	104
	105	CFLAGS += \
	106	-I../guicast \
	107	- -I../quicktime \
5ba5c72b	108	- -I$(JPEG_DIR) \
584c94b3 JB	109	- -I$(DV_DIR) \
	110	- -I$(OGG_DIR)/include \
	111	- -I$(VORBIS_DIR)/include \
020dfac3	112	- -I$(LIBRAW_DIR)/ \
5ba5c72b JB	113	- -I$(AVC_DIR) \
5ba5c72b JB	114	- -I$(LIBIEC_DIR)/src/ \
86291af4 JB	115	- -I$(TIFF_DIR)/libtiff \
86291af4 JB	116	- -I$(UUID_DIR) \
86291af4 JB	117	+ -I/usr/include/quicktime \
	118	+ -I/usr/include/libdv \
	119	+ -I/usr/include/libraw1394 \
5ba5c72b	120	+ -I/usr/include/libiec61883 \
86291af4 JB	121	+ -I/usr/include/uuid \
	122	-I$(TOOLAME_DIR) \
	123	- -I$(LAME_DIR) \
584c94b3 JB	124	- -I../audiofile \
584c94b3 JB	125	- -I../libmpeg3 \
6eea70d2	126	- -I$(SNDFILE_DIR)/src \
86291af4	127	+ -I/usr/include/lame \
584c94b3	128	+ -I/usr/include/libmpeg3 \
86291af4	129	$(ESOUNDCFLAGS) \
020dfac3	130	$(ALSA_CFLAGS) \
5ba5c72b JB	131	- -I$(FFMPEG_DIR)/libavcodec \
	132	- -I$(THEORA_DIR)/include
	133	+ -I/usr/include/ffmpeg \
	134	+ -I/usr/include/theora
020dfac3	135
584c94b3	136
020dfac3	137	# Speed up linking with this linking sequence
5ba5c72b JB	138	-ifeq ($(OBJDIR), alpha)
	139	+ifeq ($(OBJDIR), alpha-ccc)
	140
	141
	142
	143	@@ -489,7 +482,7 @@
d0731054 JB	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
5ba5c72b JB	150	$(DCRAW): dcraw.c
5ba5c72b JB	151	@echo CC $*.o
6eea70d2 JB	152	--- cinelerra-1.1.8/mpeg2enc/Makefile.orig 2003-10-14 09:54:43.000000000 +0200
6eea70d2 JB	153	+++ cinelerra-1.1.8/mpeg2enc/Makefile 2003-11-12 22:23:56.387225920 +0100
584c94b3	154	@@ -1,6 +1,6 @@
86291af4	155	include ../global_config
584c94b3	156	CC = gcc
86291af4	157	-CFLAGS += -I../libmpeg3 -I../quicktime
584c94b3 JB	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 \
6eea70d2 JB	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
5ba5c72b JB	190	--- cinelerra-2.0/plugins/titler/Makefile.orig 2005-05-29 02:01:50.000000000 +0200
5ba5c72b JB	191	+++ cinelerra-2.0/plugins/titler/Makefile 2005-11-01 13:29:05.682416672 +0100
6eea70d2 JB	192	@@ -8,19 +8,18 @@
	193
	194
	195	OUTPUT_PLUGIN = ../$(OBJDIR)/titler.plugin
86291af4	196	-FREETYPE_DIR = ../../freetype-2.1.4
ccb0dca0	197	-CFLAGS += -I$(FREETYPE_DIR)/include -I../../
6eea70d2 JB	198	+FREETYPE_DIR =
6eea70d2 JB	199	+CFLAGS += -I/usr/include/freetype2 -I../../
ccb0dca0	200
ccb0dca0	201
86291af4 JB	202	$(OUTPUT_PLUGIN): $(OBJS)
	203	$(LDLINKER) -o $(OUTPUT_PLUGIN) \
	204	$(OBJS) \
	205	- $(FREETYPE_DIR)/$(OBJDIR)/libfreetype.a
	206	- strip $(OUTPUT_PLUGIN)
	207	+ -lfreetype
ccb0dca0	208
86291af4	209	include ../../plugin_config
ccb0dca0 JB	210
	211	-inst:
	212	+install:
5ba5c72b JB	213	cp $(OUTPUT_PLUGIN) $(PLUGINDIR)
	214	mkdir -p $(PLUGINDIR)/fonts
	215	cp fonts/* $(PLUGINDIR)/fonts
6eea70d2 JB	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 @@
a601b4a3	219
6eea70d2 JB	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
a601b4a3	258
020dfac3 JB	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	{
5ba5c72b JB	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 )
020dfac3	278
5ba5c72b JB	279	-CFLAGS += -I../quicktime -I$(FREETYPE_DIR)
5ba5c72b JB	280	+CFLAGS += -I/usr/include/quicktime -I/usr/include/freetype2
020dfac3	281
5ba5c72b JB	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"
020dfac3 JB	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>
5ba5c72b JB	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