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

--- cinelerra-1.2.1/cinelerra/Makefile.orig	2004-07-12 01:07:17.000000000 +0200
+++ cinelerra-1.2.1/cinelerra/Makefile	2004-08-22 20:29:36.344692752 +0200
@@ -1,18 +1,6 @@
 include ../global_config
 
-ALSA_DIR := ../alsa-lib-1.0.2
-AVC_DIR := ../libavc1394-0.4.1
-DV_DIR := ../quicktime/libdv-0.99
-FFMPEG_DIR := $(shell expr ../quicktime/ffmpeg* )
-LAME_DIR := ../quicktime/lame-3.93.1/include
-LIBRAW_DIR := ../libraw1394-0.9.0
-OGG_DIR := ../quicktime/libogg-1.0
-SNDFILE_DIR := $(shell expr ../libsndfile* )
-TIFF_DIR := ../tiff-v3.5.7
 TOOLAME_DIR := ../toolame-02l
-UUID_DIR := ../uuid
-VORBIS_DIR := ../quicktime/libvorbis-1.0
-EXR_DIR := ../OpenEXR-1.2.1/
 
 OBJS = \
 	$(OBJDIR)/aattachmentpoint.o \
@@ -285,24 +273,17 @@
 
 
 #ifeq ($(HAVE_AVIFILE), y)
-AVIFILE_DIR := $(shell expr ../avifile* )
+#AVIFILE_DIR := $(shell expr ../avifile* )
 #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 = \
-	$(AVC_DIR)/$(OBJDIR)/libavc.a \
-	../quicktime/$(OBJDIR)/libquicktime.a \
         $(ESOUNDLIBS) \
-	$(EXR_DIR)/$(OBJDIR)/libexr.a \
-	$(TIFF_DIR)/$(OBJDIR)/libtiff.a \
 	../guicast/$(OBJDIR)/libguicast.a \
-	../libmpeg3/$(OBJDIR)/libmpeg3.a \
-	$(SNDFILE_DIR)/$(OBJDIR)/libsndfile.a \
-	$(UUID_DIR)/$(OBJDIR)/libuuid.a \
 	../mpeg2enc/$(OBJDIR)/mpeg2enc.a \
 	$(TOOLAME_DIR)/$(OBJDIR)/toolame.a \
 	$(THEME_DATA)
@@ -323,7 +304,14 @@
 
 LIBS += \
 	$(ALSA_LIBS) \
-	$(LIBRAW_DIR)/$(OBJDIR)/libraw1394.a \
+	-lavc1394 -lrom1394 \
+	-lquicktime -lvorbisfile \
+	-lIlmImf -lImath -lHalf -lIex \
+	-ltiff \
+	-lmpeg3 \
+	-lsndfile \
+	-luuid \
+	-lraw1394 \
 	$(GLLIBS) \
 	-lX11 \
 	-lXext \
@@ -342,23 +330,17 @@
 
 CFLAGS += \
 	-I../guicast \
-	-I../quicktime \
-	-I$(DV_DIR) \
-	-I$(OGG_DIR)/include \
-	-I$(VORBIS_DIR)/include \
-	-I$(LIBRAW_DIR)/ \
-	-I$(TIFF_DIR)/libtiff \
-	-I$(UUID_DIR) \
-	-I$(DV_DIR) \
+	-I/usr/include/quicktime \
+	-I/usr/include/libdv \
+	-I/usr/include/libraw1394 \
+	-I/usr/include/uuid \
 	-I$(TOOLAME_DIR) \
-	-I$(LAME_DIR) \
-	-I$(AVC_DIR) \
-	-I../audiofile \
-	-I../libmpeg3 \
-	-I$(SNDFILE_DIR)/src \
+	-I/usr/include/lame \
+	-I/usr/include/libmpeg3 \
+	-I/usr/include/libavc1394 \
 	$(ESOUNDCFLAGS) \
 	$(ALSA_CFLAGS) \
-	-I$(FFMPEG_DIR)/libavcodec
+	-I/usr/include/ffmpeg
 
 
 # Speed up linking with this linking sequence
@@ -463,7 +445,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
 
 $(THEME_DATA):
 	cd $(OBJDIR) && \
--- cinelerra-1.1.8/cinelerra/jpegwrapper.h.orig	2003-10-14 09:54:01.000000000 +0200
+++ cinelerra-1.1.8/cinelerra/jpegwrapper.h	2003-11-12 22:28:31.358423944 +0100
@@ -7,7 +7,7 @@
 extern "C" {
 #endif
 
-#include "jpeg/jpeglib.h"
+#include <jpeglib.h>
 
 #ifdef __cplusplus
 }
--- 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-1.1.8/plugins/titler/Makefile.orig	2003-10-24 05:22:18.000000000 +0200
+++ cinelerra-1.1.8/plugins/titler/Makefile	2003-11-12 22:28:16.244721576 +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) /usr/lib/cinelerra
 	cp -a fonts /usr/lib/cinelerra
 
--- 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-1.2.0/cinelerra/avc1394control.h.orig	2004-04-09 09:22:12.000000000 +0200
+++ cinelerra-1.2.0/cinelerra/avc1394control.h	2004-06-05 10:27:24.377846960 +0200
@@ -2,11 +2,11 @@
 #define _AVC1394Control_H
 
 
-#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-1.2.1/cinelerra/device1394input.h.orig	2004-07-06 06:32:42.000000000 +0200
+++ cinelerra-1.2.1/cinelerra/device1394input.h	2004-08-22 21:26:29.328840296 +0200
@@ -7,7 +7,7 @@
 
 #include "condition.inc"
 #include "libdv.h"
-#include "libdv/dv1394.h"
+#include "dv1394.h"
 #include "mutex.inc"
 #include "libraw1394/raw1394.h"
 #include "thread.h"
--- cinelerra-1.2.1/cinelerra/device1394output.h.orig	2004-04-13 00:52:55.000000000 +0200
+++ cinelerra-1.2.1/cinelerra/device1394output.h	2004-08-22 21:23:11.293946176 +0200
@@ -8,7 +8,7 @@
 #include "audiodevice.inc"
 #include "condition.inc"
 #include "libdv.h"
-#include "libdv/dv1394.h"
+#include "dv1394.h"
 #include "ieee1394-ioctl.h"
 #include "mutex.inc"
 #include "thread.h"
Commit	Line	Data
d0731054 JB	1	--- cinelerra-1.2.1/cinelerra/Makefile.orig 2004-07-12 01:07:17.000000000 +0200
	2	+++ cinelerra-1.2.1/cinelerra/Makefile 2004-08-22 20:29:36.344692752 +0200
	3	@@ -1,18 +1,6 @@
020dfac3 JB	4	include ../global_config
	5
	6	-ALSA_DIR := ../alsa-lib-1.0.2
	7	-AVC_DIR := ../libavc1394-0.4.1
86291af4	8	-DV_DIR := ../quicktime/libdv-0.99
020dfac3 JB	9	-FFMPEG_DIR := $(shell expr ../quicktime/ffmpeg* )
020dfac3 JB	10	-LAME_DIR := ../quicktime/lame-3.93.1/include
86291af4	11	-LIBRAW_DIR := ../libraw1394-0.9.0
020dfac3 JB	12	-OGG_DIR := ../quicktime/libogg-1.0
020dfac3 JB	13	-SNDFILE_DIR := $(shell expr ../libsndfile* )
86291af4	14	-TIFF_DIR := ../tiff-v3.5.7
86291af4	15	TOOLAME_DIR := ../toolame-02l
020dfac3 JB	16	-UUID_DIR := ../uuid
020dfac3 JB	17	-VORBIS_DIR := ../quicktime/libvorbis-1.0
d0731054	18	-EXR_DIR := ../OpenEXR-1.2.1/
584c94b3 JB	19
584c94b3 JB	20	OBJS = \
020dfac3	21	$(OBJDIR)/aattachmentpoint.o \
d0731054	22	@@ -285,24 +273,17 @@
6eea70d2 JB	23
	24
	25	#ifeq ($(HAVE_AVIFILE), y)
	26	-AVIFILE_DIR := $(shell expr ../avifile* )
	27	+#AVIFILE_DIR := $(shell expr ../avifile* )
	28	#endif
86291af4	29
6eea70d2 JB	30	ifeq ($(HAVE_ALSA), y)
6eea70d2 JB	31	-ALSA_CFLAGS := -DHAVE_ALSA -I$(ALSA_DIR)/include
86291af4	32	-ALSA_LIBS := $(ALSA_DIR)/$(OBJDIR)/libasound.a
6eea70d2	33	+ALSA_CFLAGS := -DHAVE_ALSA
86291af4	34	+ALSA_LIBS := -lasound
584c94b3 JB	35	endif
	36
	37	STATICLIBS = \
020dfac3	38	- $(AVC_DIR)/$(OBJDIR)/libavc.a \
584c94b3	39	- ../quicktime/$(OBJDIR)/libquicktime.a \
584c94b3	40	$(ESOUNDLIBS) \
d0731054	41	- $(EXR_DIR)/$(OBJDIR)/libexr.a \
86291af4	42	- $(TIFF_DIR)/$(OBJDIR)/libtiff.a \
584c94b3 JB	43	../guicast/$(OBJDIR)/libguicast.a \
584c94b3 JB	44	- ../libmpeg3/$(OBJDIR)/libmpeg3.a \
6eea70d2	45	- $(SNDFILE_DIR)/$(OBJDIR)/libsndfile.a \
86291af4 JB	46	- $(UUID_DIR)/$(OBJDIR)/libuuid.a \
86291af4 JB	47	../mpeg2enc/$(OBJDIR)/mpeg2enc.a \
d0731054 JB	48	$(TOOLAME_DIR)/$(OBJDIR)/toolame.a \
	49	$(THEME_DATA)
	50	@@ -323,7 +304,14 @@
86291af4 JB	51
86291af4 JB	52	LIBS += \
6eea70d2	53	$(ALSA_LIBS) \
86291af4 JB	54	- $(LIBRAW_DIR)/$(OBJDIR)/libraw1394.a \
	55	+ -lavc1394 -lrom1394 \
	56	+ -lquicktime -lvorbisfile \
d0731054	57	+ -lIlmImf -lImath -lHalf -lIex \
86291af4 JB	58	+ -ltiff \
	59	+ -lmpeg3 \
	60	+ -lsndfile \
	61	+ -luuid \
	62	+ -lraw1394 \
	63	$(GLLIBS) \
	64	-lX11 \
	65	-lXext \
d0731054	66	@@ -342,23 +330,17 @@
584c94b3 JB	67
	68	CFLAGS += \
	69	-I../guicast \
	70	- -I../quicktime \
	71	- -I$(DV_DIR) \
	72	- -I$(OGG_DIR)/include \
	73	- -I$(VORBIS_DIR)/include \
020dfac3	74	- -I$(LIBRAW_DIR)/ \
86291af4 JB	75	- -I$(TIFF_DIR)/libtiff \
	76	- -I$(UUID_DIR) \
	77	- -I$(DV_DIR) \
	78	+ -I/usr/include/quicktime \
	79	+ -I/usr/include/libdv \
	80	+ -I/usr/include/libraw1394 \
	81	+ -I/usr/include/uuid \
	82	-I$(TOOLAME_DIR) \
	83	- -I$(LAME_DIR) \
020dfac3	84	- -I$(AVC_DIR) \
584c94b3 JB	85	- -I../audiofile \
584c94b3 JB	86	- -I../libmpeg3 \
6eea70d2	87	- -I$(SNDFILE_DIR)/src \
86291af4	88	+ -I/usr/include/lame \
584c94b3 JB	89	+ -I/usr/include/libmpeg3 \
584c94b3 JB	90	+ -I/usr/include/libavc1394 \
86291af4	91	$(ESOUNDCFLAGS) \
020dfac3 JB	92	$(ALSA_CFLAGS) \
	93	- -I$(FFMPEG_DIR)/libavcodec
	94	+ -I/usr/include/ffmpeg
	95
584c94b3	96
020dfac3	97	# Speed up linking with this linking sequence
d0731054 JB	98	@@ -463,7 +445,7 @@
	99
	100	$(FILEEXR): fileexr.C
	101	@echo C++ $*.o
	102	- @$(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
	103	+ @$(CC) -c `cat $(OBJDIR)/c_flags` -I/usr/include/OpenEXR $(subst $(OBJDIR)/,, $.C) -o $.o
	104
	105	$(THEME_DATA):
	106	cd $(OBJDIR) && \
6eea70d2 JB	107	--- cinelerra-1.1.8/cinelerra/jpegwrapper.h.orig 2003-10-14 09:54:01.000000000 +0200
	108	+++ cinelerra-1.1.8/cinelerra/jpegwrapper.h 2003-11-12 22:28:31.358423944 +0100
	109	@@ -7,7 +7,7 @@
	110	extern "C" {
	111	#endif
584c94b3	112
6eea70d2 JB	113	-#include "jpeg/jpeglib.h"
6eea70d2 JB	114	+#include <jpeglib.h>
584c94b3	115
6eea70d2 JB	116	#ifdef __cplusplus
	117	}
	118	--- cinelerra-1.1.8/mpeg2enc/Makefile.orig 2003-10-14 09:54:43.000000000 +0200
	119	+++ cinelerra-1.1.8/mpeg2enc/Makefile 2003-11-12 22:23:56.387225920 +0100
584c94b3	120	@@ -1,6 +1,6 @@
86291af4	121	include ../global_config
584c94b3	122	CC = gcc
86291af4	123	-CFLAGS += -I../libmpeg3 -I../quicktime
584c94b3 JB	124	+CFLAGS += -I/usr/include/libmpeg3 -I/usr/include/quicktime
	125
	126
	127	ifeq ($(OBJDIR), i686)
	128	@@ -48,8 +48,8 @@
	129	$(OBJDIR)/writepic.o
	130
	131	LIBS = \
	132	- ../../quicktime/$(OBJDIR)/libquicktime.a \
	133	- ../../libmpeg3/$(OBJDIR)/libmpeg3.a \
	134	+ -lquicktime \
	135	+ -lmpeg3 \
	136	-lpthread \
	137	-lpng \
	138	-lz \
6eea70d2 JB	139	--- cinelerra-1.1.8/mplexlo/Makefile.orig 2003-10-14 09:54:14.000000000 +0200
	140	+++ cinelerra-1.1.8/mplexlo/Makefile 2003-11-12 22:06:01.235673800 +0100
	141	@@ -2,12 +2,12 @@
	142
	143	OBJS = $(OBJDIR)/mplex.o
	144	CC = gcc
	145	-CFLAGS += -I../libmpeg3
	146	+CFLAGS += -I/usr/include/libmpeg3
	147
	148	OUTPUT := $(OBJDIR)/mplexlo
	149
	150	$(OUTPUT): $(OBJS)
	151	- $(CC) -o $(OUTPUT) $(OBJS) ../libmpeg3/$(OBJDIR)/libmpeg3.a -lpthread -lm
	152	+ $(CC) -o $(OUTPUT) $(OBJS) -lmpeg3 -lpthread -lm
	153
	154	$(OBJS):
	155	$(CC) -c $(CFLAGS) $(subst $(OBJDIR)/,, $.c) -o $.o
	156	--- cinelerra-1.1.8/plugins/titler/Makefile.orig 2003-10-24 05:22:18.000000000 +0200
	157	+++ cinelerra-1.1.8/plugins/titler/Makefile 2003-11-12 22:28:16.244721576 +0100
	158	@@ -8,19 +8,18 @@
	159
	160
	161	OUTPUT_PLUGIN = ../$(OBJDIR)/titler.plugin
86291af4	162	-FREETYPE_DIR = ../../freetype-2.1.4
ccb0dca0	163	-CFLAGS += -I$(FREETYPE_DIR)/include -I../../
6eea70d2 JB	164	+FREETYPE_DIR =
6eea70d2 JB	165	+CFLAGS += -I/usr/include/freetype2 -I../../
ccb0dca0	166
ccb0dca0	167
86291af4 JB	168	$(OUTPUT_PLUGIN): $(OBJS)
	169	$(LDLINKER) -o $(OUTPUT_PLUGIN) \
	170	$(OBJS) \
	171	- $(FREETYPE_DIR)/$(OBJDIR)/libfreetype.a
	172	- strip $(OUTPUT_PLUGIN)
	173	+ -lfreetype
ccb0dca0	174
86291af4	175	include ../../plugin_config
ccb0dca0 JB	176
	177	-inst:
	178	+install:
86291af4	179	cp $(OUTPUT_PLUGIN) /usr/lib/cinelerra
ccb0dca0 JB	180	cp -a fonts /usr/lib/cinelerra
ccb0dca0 JB	181
6eea70d2 JB	182	--- cinelerra-1.1.8/global_config.orig 2003-10-29 10:05:08.000000000 +0100
	183	+++ cinelerra-1.1.8/global_config 2003-11-12 22:22:09.103535520 +0100
	184	@@ -24,7 +24,7 @@
a601b4a3	185
6eea70d2 JB	186	############################# FINAL DESTINATION FOR INSTALLATION BINARIES
	187
	188	-PREFIX = /usr/
	189	+PREFIX = /usr
	190	LIBPREFIX = $(PREFIX)/lib
	191
	192	########################## THE COMPILER
	193	@@ -50,8 +50,8 @@
	194
	195
	196	ifeq ($(HAVE_ESOUND), y)
	197	-ESOUNDCFLAGS = -DHAVE_ESOUND -I../esound
	198	-ESOUNDLIBS = ../esound/$(OBJDIR)/libesound.a
	199	+ESOUNDCFLAGS = -DHAVE_ESOUND
	200	+ESOUNDLIBS = -lesd
	201	endif
	202
	203
	204	@@ -59,8 +59,8 @@
	205	CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
	206	#CFLAGS += -I. # Caused fileavi.C to fail
	207
	208	-FREETYPE_DIR = ../../freetype-2.1.4
	209	-CFLAGS += -I$(FREETYPE_DIR)/include -I../../
	210	+FREETYPE_DIR =
	211	+CFLAGS += -I/usr/include/freeetype2
	212
	213	ifeq ($(HAVE_OSS), y)
	214	CFLAGS += -DHAVE_OSS
	215	--- cinelerra-1.1.8/plugin_config.orig 2003-10-14 09:53:58.000000000 +0200
	216	+++ cinelerra-1.1.8/plugin_config 2003-11-12 22:22:42.189505688 +0100
	217	@@ -1,6 +1,6 @@
	218	CFLAGS += -I../ -I../../cinelerra \
	219	-I../../guicast \
	220	- -I../../quicktime \
	221	+ -I/usr/include/quicktime \
	222	-I../colors \
	223	-fPIC
a601b4a3	224
020dfac3 JB	225	--- cinelerra-1.2.0/cinelerra/audioalsa.h.orig 2003-10-14 09:53:59.000000000 +0200
	226	+++ cinelerra-1.2.0/cinelerra/audioalsa.h 2004-06-05 10:26:45.584744408 +0200
	227	@@ -5,7 +5,7 @@
	228	#include "audiodevice.h"
	229
	230	#ifdef HAVE_ALSA
	231	-#include "asoundlib.h"
	232	+#include <alsa/asoundlib.h>
	233
	234	class AudioALSA : public AudioLowLevel
	235	{
	236	--- cinelerra-1.2.0/cinelerra/avc1394control.h.orig 2004-04-09 09:22:12.000000000 +0200
	237	+++ cinelerra-1.2.0/cinelerra/avc1394control.h 2004-06-05 10:27:24.377846960 +0200
	238	@@ -2,11 +2,11 @@
	239	#define _AVC1394Control_H
	240
	241
	242	-#include "librom1394/rom1394.h"
	243	-#include "libavc1394/avc1394.h"
	244	-#include "libavc1394/avc1394_vcr.h"
	245	+#include <libavc1394/rom1394.h>
	246	+#include <libavc1394/avc1394.h>
	247	+#include <libavc1394/avc1394_vcr.h>
	248	#include "mutex.inc"
	249	-#include "libraw1394/raw1394.h"
	250	+#include <libraw1394/raw1394.h>
	251	#include <sys/types.h>
	252	#include <stdio.h>
	253	#include <errno.h>
d0731054 JB	254	--- cinelerra-1.2.1/cinelerra/device1394input.h.orig 2004-07-06 06:32:42.000000000 +0200
	255	+++ cinelerra-1.2.1/cinelerra/device1394input.h 2004-08-22 21:26:29.328840296 +0200
	256	@@ -7,7 +7,7 @@
	257
	258	#include "condition.inc"
	259	#include "libdv.h"
	260	-#include "libdv/dv1394.h"
	261	+#include "dv1394.h"
	262	#include "mutex.inc"
	263	#include "libraw1394/raw1394.h"
	264	#include "thread.h"
	265	--- cinelerra-1.2.1/cinelerra/device1394output.h.orig 2004-04-13 00:52:55.000000000 +0200
	266	+++ cinelerra-1.2.1/cinelerra/device1394output.h 2004-08-22 21:23:11.293946176 +0200
	267	@@ -8,7 +8,7 @@
	268	#include "audiodevice.inc"
	269	#include "condition.inc"
	270	#include "libdv.h"
	271	-#include "libdv/dv1394.h"
	272	+#include "dv1394.h"
	273	#include "ieee1394-ioctl.h"
	274	#include "mutex.inc"
	275	#include "thread.h"