package-update/multimedia/cinelerra/world.patch

# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../cinelerra/world.patch
# Copyright (C) 2006 The OpenSDE Project
# Copyright (C) 2006 The T2 SDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---

diff -ur cinelerra-2.1.orig/build/Makefile.cinelerra cinelerra-2.1/build/Makefile.cinelerra
--- cinelerra-2.1.orig/build/Makefile.cinelerra	2006-10-11 20:50:15.286456500 +0200
+++ cinelerra-2.1/build/Makefile.cinelerra	2006-10-11 20:52:02.405151000 +0200
@@ -5,9 +5,7 @@
 
 DIRS := \
 	doc \
-	libmpeg3 \
 	mpeg2enc \
-	mplexlo \
 	guicast \
 	cinelerra \
 	plugins \
@@ -23,22 +21,10 @@
 
 
 all: $(OBJDIR)/soundtest
-ifeq ($(HAVE_FIREWIRE), y)
-	$(MAKE) -C libraw1394*
 	$(MAKE) -C libiec61883*
-	$(MAKE) -C libavc1394*
-endif
-	$(MAKE) -C fftw*
-	$(MAKE) -f build/Makefile.esound
-	$(MAKE) -f build/Makefile.freetype
-	$(MAKE) -f build/Makefile.tiff
 	$(MAKE) -f build/Makefile.toolame
 	$(MAKE) -f build/Makefile.uuid
-	MAKE='make -j1' make -j1 -C mjpegtools*
-	$(MAKE) -C libsndfile*
 	$(MAKE) -C quicktime
-	$(MAKE) -C libtheora*
-	$(MAKE) -f build/Makefile.exr
 	@ for i in $(DIRS) ; \
 	do \
 		 $(MAKE) -C $$i ; \
@@ -83,8 +69,6 @@
 install:
 	$(MAKE) -C cinelerra install
 	$(MAKE) -C plugins install
-	$(MAKE) -C libmpeg3 install
-	$(MAKE) -C mplexlo install
 	$(MAKE) -C po install
 	cp $(OBJDIR)/soundtest /usr/bin
 
diff -ur cinelerra-2.1.orig/cinelerra/Makefile cinelerra-2.1/cinelerra/Makefile
--- cinelerra-2.1.orig/cinelerra/Makefile	2006-10-11 20:51:04.481531000 +0200
+++ cinelerra-2.1/cinelerra/Makefile	2006-10-11 20:52:58.244640750 +0200
@@ -16,11 +16,11 @@
 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
+AVC_LIB := -lavc1394 -lrom1394
+RAW_LIB := -lraw1394
 IEC_LIB := $(LIBIEC_DIR)/src/.libs/libiec61883.a
-SNDFILE_LIB := $(SNDFILE_DIR)/src/.libs/libsndfile.a
-THEORA_LIB := $(THEORA_DIR)/lib/.libs/libtheora.a
+SNDFILE_LIB := -lsndfile
+THEORA_LIB := -ltheora
 
 OBJS = \
 	$(OBJDIR)/aattachmentpoint.o \
@@ -322,11 +322,11 @@
 	$(RAW_LIB) \
 	$(IEC_LIB) \
 	../quicktime/$(OBJDIR)/libquicktime.a \
-        $(ESOUNDLIBS) \
-	$(EXR_DIR)/$(OBJDIR)/libexr.a \
-	$(TIFF_DIR)/$(OBJDIR)/libtiff.a \
+       -lesd \
+	-lHalf -lIex -lImath -lIlmImf \
+	-ltiff \
 	../guicast/$(OBJDIR)/libguicast.a \
-	../libmpeg3/$(OBJDIR)/libmpeg3.a \
+	$(LDIR)/libmpeg3.a \
 	$(SNDFILE_LIB) \
 	$(UUID_DIR)/$(OBJDIR)/libuuid.a \
 	../mpeg2enc/$(OBJDIR)/mpeg2enc.a \
@@ -340,9 +340,9 @@
 
 
 ifeq ($(OBJDIR), x86_64)
-LIBS += -L/usr/X11R6/lib64
+LIBS += -L/usr/X11/lib64
 else
-LIBS += -L/usr/X11R6/lib
+LIBS += -L/usr/X11/lib
 endif
 
 ifeq ($(HAVE_GL), y)
@@ -450,7 +450,7 @@
 
 $(shell echo "\#define BUILDDATE \"`date`\"" > builddate.h )
 $(shell echo $(CFLAGS) > $(OBJDIR)/c_flags)
-$(shell echo $(LDFLAGS1) $(OBJS) $(DCRAW) $(FILEEXR) $(AVIOBJS) $(CXXREPOSITORY) $(STATICLIBS) $(LIBS) $(LDFLAGS2) > $(OBJDIR)/objs)
+$(shell echo $(LDFLAGS1) $(OBJS) $(DCRAW) $(FILEEXR) $(AVIOBJS) $(CXXREPOSITORY) $(STATICLIBS) $(LIBS) $(LDFLAGS2) -lvorbis -lvorbisfile -lvorbisenc -logg -ltiff -lmp3lame -ldv -lavcodec > $(OBJDIR)/objs)
 
 
 
@@ -501,7 +501,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
diff -ur cinelerra-2.1.orig/configure cinelerra-2.1/configure
--- cinelerra-2.1.orig/configure	2006-10-11 20:49:40.788300500 +0200
+++ cinelerra-2.1/configure	2006-10-11 20:52:02.405151000 +0200
@@ -135,47 +135,12 @@
 echo CONFIGURING QUICKTIME
 cd quicktime* && ./configure && cd ..
 
-echo CONFIGURING LIBMPEG3
-cd libmpeg3* && ./configure && cd ..
-
-echo CONFIGURING FFTW
-cd fftw* && CFLAGS=-fPIC ./configure && cd ..
-
-echo CONFIGURING MJPEGTOOLS
-cd mjpegtools* && ./configure --enable-shared=no && cd ..
-
-
-
-echo CONFIGURING SNDFILE
-cd libsndfile* && chmod a+x ./configure && ./configure && cd ..
-
-echo CONFIGURING RAW1394
-cd libraw1394* && \
-./configure --enable-shared=no && \
-ln -sf src libraw1394 && \
-cd ..
-
-echo CONFIGURING AVC1394
-cd libavc1394* && \
-RAW1394_PATH=`expr $TOPDIR/libraw1394*` && \
-PKG_CONFIG_PATH=$RAW1394_PATH CFLAGS=-I$RAW1394_PATH/ LDFLAGS=-L$RAW1394_PATH/src/.libs ./configure --enable-shared=no && \
-cd ..
-
 echo CONFIGURING IEC61883
 cd libiec61883* && \
 RAW1394_PATH=`expr $TOPDIR/libraw1394*` && \
 PKG_CONFIG_PATH=$RAW1394_PATH CFLAGS=-I$RAW1394_PATH/ LDFLAGS=-L$RAW1394_PATH/src/.libs ./configure --enable-shared=no && \
 cd ..
 
-echo CONFIGURING THEORA
-LIBOGG_PATH=`expr $TOPDIR/quicktime/libogg*` && \
-LIBVORBIS_PATH=`expr $TOPDIR/quicktime/libvorbis*` && \
-cd libtheora* && \
-PKG_CONFIG_PATH=$LIBOGG_PATH:$LIBVORBIS_PATH CFLAGS="-I$LIBOGG_PATH/include -L$LIBOGG_PATH/src -I$LIBVORBIS_PATH/include -L$LIBVORBIS_PATH/lib" ./configure --enable-shared=no && \
-cd ..
-
-
-
 # write configuration header
 echo "Writing hvirtual_config.h"
 cat > hvirtual_config.h << EOF
diff -ur cinelerra-2.1.orig/global_config cinelerra-2.1/global_config
--- cinelerra-2.1.orig/global_config	2006-10-11 20:49:40.800301250 +0200
+++ cinelerra-2.1/global_config	2006-10-11 20:52:02.413151500 +0200
@@ -49,8 +49,10 @@
 # libraries are stored in different directories depending on CPU
 ifeq ($(OBJDIR), i686)
 PLUGINDIR := /usr/lib/cinelerra
+LDIR := /usr/lib
 else
 PLUGINDIR := /usr/lib64/cinelerra
+LDIR := /usr/lib64
 endif
 
 
diff -ur cinelerra-2.1.orig/plugins/Makefile cinelerra-2.1/plugins/Makefile
--- cinelerra-2.1.orig/plugins/Makefile	2006-10-11 20:49:43.972499500 +0200
+++ cinelerra-2.1/plugins/Makefile	2006-10-11 20:52:02.413151500 +0200
@@ -132,7 +132,7 @@
 	cp $(OBJDIR)/*.plugin $(PLUGINDIR)
 	mkdir -p $(PLUGINDIR)/fonts
 	cp titler/fonts/* $(PLUGINDIR)/fonts
-	cp ../mjpegtools*/mpeg2enc/mpeg2enc $(PLUGINDIR)/mpeg2enc.plugin
+
 
 
 
diff -ur cinelerra-2.1.orig/plugins/titler/Makefile cinelerra-2.1/plugins/titler/Makefile
--- cinelerra-2.1.orig/plugins/titler/Makefile	2006-10-11 20:49:43.368461750 +0200
+++ cinelerra-2.1/plugins/titler/Makefile	2006-10-11 20:52:02.409151250 +0200
@@ -15,7 +15,7 @@
 $(OUTPUT_PLUGIN): $(OBJS)
 	$(LDLINKER) -o $(OUTPUT_PLUGIN) \
 		$(OBJS) \
-		$(FREETYPE_DIR)/$(OBJDIR)/libfreetype.a
+		-lfreetype
 	strip $(OUTPUT_PLUGIN)
 
 include ../../plugin_config
diff -ur cinelerra-2.1.orig/quicktime/Makefile cinelerra-2.1/quicktime/Makefile
--- cinelerra-2.1.orig/quicktime/Makefile	2006-10-11 20:50:07.377962250 +0200
+++ cinelerra-2.1/quicktime/Makefile	2006-10-11 20:52:02.413151500 +0200
@@ -94,11 +94,11 @@
 
 #include Makefile.jpeg
 #include Makefile.vorbis
-include Makefile.lame
+#include Makefile.lame
 #include Makefile.dv
 include Makefile.encore50
 
-
+LAME_DIR = /usr
 
 
 
@@ -218,7 +218,7 @@
 	-I$(DV_INCLUDE) \
 	-I$(JPEG_INCLUDE) \
 	-I$(MPEG3_DIR) \
-	-I$(LAME_DIR)/include \
+	-I$(LAME_DIR)/include/lame \
 	-I$(OGG_DIR)/include \
 	-I$(VORBIS_DIR)/include \
 	-ffast-math \
@@ -248,11 +248,11 @@
 $(shell if ! test -d $(OBJDIR) \; then mkdir -p $(DIRS) \; fi )
 $(shell echo  $(CFLAGS) > $(OBJDIR)/c_flags)
 $(shell echo  $(LAME_CFLAGS) > $(OBJDIR)/lame_flags)
-$(shell echo  $(OBJS) $(JPEG_LIB)/*.o $(DV_LIB)/*.o $(FAAD_LIB)/*.o $(FAAC_LIB)/*.o $(FFMPEG_LIB)/*.o $(X264_LIB)/*.o $(OGG_LIB)/*.o $(VORBIS_LIB)/*.o $(LAME_OBJS) > $(OBJDIR)/objs)
+$(shell echo  $(OBJS) $(X264_LIB)/*.o > $(OBJDIR)/objs)
 
 all: $(OBJDIR) $(OUTPUT)
 
-$(OUTPUT): $(OBJS) $(ENCOREMMX_OBJS) $(JPEG_NASM) $(LAME_OBJS) $(FAAD_LIB) $(FAAC_LIB) $(FFMPEG_LIB) $(X264_LIB) $(DV_LIB) $(JPEG_LIB) $(OGG_LIB)/ $(VORBIS_LIB)
+$(OUTPUT): $(OBJS) $(ENCOREMMX_OBJS) $(JPEG_NASM) $(X264_LIB)
 	ar rcs $(OUTPUT) `cat $(OBJDIR)/objs`
 
 # this is the only way we figured out to merge .a files
diff -ur cinelerra-2.1.orig/quicktime/configure cinelerra-2.1/quicktime/configure
--- cinelerra-2.1.orig/quicktime/configure	2006-10-11 20:49:47.504720250 +0200
+++ cinelerra-2.1/quicktime/configure	2006-10-11 20:52:02.413151500 +0200
@@ -54,24 +54,12 @@
 # configure them all
 
 # version 2.0 of faad2 produced defective Makefile
-cd faad2* && ./configure && sed 's/       /\t/' Makefile > Makefile2 && mv -f Makefile2 Makefile && cd ..
+##cd faad2* && ./configure && sed 's/       /\t/' Makefile > Makefile2 && mv -f Makefile2 Makefile && cd ..
 
-cd faac* && ./configure && cd ..
-
-cd ffmpeg* && ./configure && cd ..
+##cd faac* && ./configure && cd ..
 
 cd x264* && ./configure --enable-pthread && cd ..
 
-cd libdv* && ./configure --disable-gtk --enable-shared=no && cd ..
-
-cd libogg* && ./configure && cd ..
-
-LIBOGG_PATH=`expr libogg*` && \
-cd libvorbis* && \
-CFLAGS="-I../../$LIBOGG_PATH/include -L../../$LIBOGG_PATH/src/" ./configure --enable-shared=no&& \
-cd ..
-
-
 
 if [ `arch` == i686 ];
 then
diff -ur cinelerra-2.1.orig/quicktime/mp4a.c cinelerra-2.1/quicktime/mp4a.c
--- cinelerra-2.1.orig/quicktime/mp4a.c	2006-10-11 20:49:53.981125000 +0200
+++ cinelerra-2.1/quicktime/mp4a.c	2006-10-11 20:52:02.413151500 +0200
@@ -10,7 +10,7 @@
 #undef LTP
 
 
-#include "faad.h"
+#include "neaacdec.h"
 #include "funcprotos.h"
 #include "quicktime.h"