updated on Thu Jan 12 04:00:44 UTC 2012
[aur-mirror.git] / cinelerra-heroine / quicktime.patch
blobc5d5633b6a326fda41a438e6e5b42c0ae3727bee
1 diff -ur cinelerra-4.3.orig/quicktime/configure cinelerra-4.3/quicktime/configure
2 --- cinelerra-4.3.orig/quicktime/configure 2009-09-16 15:24:09.000000000 -0700
3 +++ cinelerra-4.3/quicktime/configure 2011-08-07 15:16:53.821297032 -0700
4 @@ -80,7 +80,7 @@
5 # 030209
6 #cd thirdparty/ffmpeg* && ./configure --enable-pthreads --enable-libfaad --enable-gpl --disable-ffplay --extra-cflags=-I$TOPDIR/$LIBFAAD_PATH/include --extra-libs=-L$TOPDIR/$LIBFAAD_PATH/libfaad/.libs/ --disable-ffmpeg --disable-ffserver --disable-ffplay && cd ../..
7 # 052906
8 -cd thirdparty/ffmpeg* && ./configure --enable-pthreads --enable-gpl --disable-ffplay --extra-cflags=-I$TOPDIR/$LIBFAAD_PATH/include --extra-libs=-L$TOPDIR/$LIBFAAD_PATH/libfaad/.libs/ --disable-ffserver --disable-ffplay && cd ../..
9 +cd thirdparty/ffmpeg* && ./configure --disable-vaapi --enable-pthreads --enable-gpl --disable-ffplay --extra-cflags=-I$TOPDIR/$LIBFAAD_PATH/include --extra-libs=-L$TOPDIR/$LIBFAAD_PATH/libfaad/.libs/ --disable-ffserver --disable-ffplay && cd ../..
11 if [ $? -ne 0 ]; then echo "Giving up and going to a movie."; exit 1; fi
13 diff -ur cinelerra-4.3.orig/quicktime/Makefile cinelerra-4.3/quicktime/Makefile
14 --- cinelerra-4.3.orig/quicktime/Makefile 2011-07-29 01:25:00.000000000 -0700
15 +++ cinelerra-4.3/quicktime/Makefile 2011-08-07 15:16:18.434348511 -0700
16 @@ -262,7 +262,7 @@
18 all: $(OBJDIR) $(OUTPUT)
20 -$(OUTPUT): $(OBJS) $(FFMPEG_OBJS) $(ENCOREMMX_OBJS) $(JPEG_NASM) $(LAME_OBJS) $(FAAD_LIB) $(FAAC_LIB) $(FFMPEG_LIB) $(X264_LIB) $(DV_LIB) $(JPEG_LIB) $(OGG_LIB)/ $(VORBIS_LIB)
21 +$(OUTPUT): $(OBJS) $(FFMPEG_OBJS) $(ENCOREMMX_OBJS) $(JPEG_NASM) $(LAME_OBJS) $(FAAD_LIB) $(FAAC_LIB) $(FFMPEG_LIB) $(X264_LIB) $(DV_LIB) $(JPEG_LIB) $(OGG_LIB) $(VORBIS_LIB)
22 find $(FFMPEG_DIR)/libavcodec/ -name *.o >> $(OBJDIR)/objs
23 find $(FFMPEG_DIR)/libavformat/ -name *.o >> $(OBJDIR)/objs
24 find $(FFMPEG_DIR)/libavutil/ -name *.o >> $(OBJDIR)/objs
25 diff -ur cinelerra-4.3.orig/quicktime/thirdparty/faac-1.24/frontend/main.c cinelerra-4.3/quicktime/thirdparty/faac-1.24/frontend/main.c
26 --- cinelerra-4.3.orig/quicktime/thirdparty/faac-1.24/frontend/main.c 2008-07-09 17:51:19.000000000 -0700
27 +++ cinelerra-4.3/quicktime/thirdparty/faac-1.24/frontend/main.c 2011-08-07 15:19:06.592354688 -0700
28 @@ -30,7 +30,7 @@
29 #endif
31 #ifdef HAVE_LIBMP4V2
32 -# include <mp4.h>
33 +# include <mp4v2/mp4v2.h>
34 #endif
36 #define DEFAULT_TNS 1