* added faac support to Mac OSX build

* ffmpeg cvs no longer asks you for a passwd. (this is for nightly's :)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 7267103a3b4ed346587af17d816c54b04a1c38df..92549f7f106dbfedc5771145ecd2b02cc8333ed1 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -42,7 +42,7 @@ export LDFLAGS = -L$(PREFIX)/lib
 
 all: .autoconf .libtool .automake .iconv .intl .freetype .fribidi \
        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
-       .FLAC .speex .faad .lame .ebml .matroska .ffmpeg .openslp \
+       .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .openslp \
        .dvdcss .dvdread .dvdplay .dvbpsi .live .goom .caca .dts .mod
 FORCE:
 
@@ -457,6 +457,25 @@ CLEAN_FILE += .faad
 CLEAN_PKG += faad2
 DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz
 
+# ***************************************************************************
+# faac
+# ***************************************************************************
+
+faac-$(FAAC_VERSION).tar.bz2:
+       $(WGET) $(FAAC_URL)
+       patch -p 0 < Patches/faac.patch
+
+faac: faac-$(FAAC_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
+
+.faac: faac
+       (cd $<; ./bootstrap && ./configure --prefix=$(PREFIX) && make && make install)
+       touch $@
+
+CLEAN_FILE += .faac
+CLEAN_PKG += faac
+DISTCLEAN_PKG += faac-$(FAAC_VERSION).tar.bz2
+
 # ***************************************************************************
 # lame
 # ***************************************************************************
@@ -520,8 +539,8 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.gz
 # ***************************************************************************
 
 ffmpeg:
-       cvs -d $(FFMPEG_CVSROOT) login
-       cvs -d $(FFMPEG_CVSROOT) co ffmpeg
+       echo $(FFMPEG_CVSROOT) A > ./ffmpeg.cvs
+       CVS_PASSFILE=./ffmpeg.cvs cvs -d $(FFMPEG_CVSROOT) co ffmpeg
        patch -p 0 < Patches/ffmpeg.patch.cvs
 #      (cd $@; ./bootstrap)
 
@@ -533,7 +552,7 @@ ffmpeg-$(FFMPEG_VERSION).tar.gz:
 #      patch -p 0 < Patches/ffmpeg.patch
 
 .ffmpeg: ffmpeg
-       (cd $<; ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS)" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-mp3lame --enable-pp --disable-vhook --disable-vorbis --disable-faad --disable-a52 --enable-mp3lame --disable-zlib --enable-a52 && make && make -C libavcodec/libpostproc install && make -C libavcodec installlib && make -C libavformat installlib)
+       (cd $<; ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS)" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-mp3lame --enable-faac --enable-pp --disable-vhook --disable-vorbis --disable-faad --disable-a52 --enable-mp3lame --disable-zlib --enable-a52 && make && make -C libavcodec/libpostproc install && make -C libavcodec installlib && make -C libavformat installlib)
        touch $@
 
 CLEAN_FILE += .ffmpeg

diff --git a/extras/contrib/src/Patches/faac.patch b/extras/contrib/src/Patches/faac.patch
new file mode 100644 (file)
index 0000000..d7c8422
--- /dev/null
+++ b/extras/contrib/src/Patches/faac.patch
@@ -0,0 +1,11 @@
+diff -ruN faac.orig/bootstrap faac/bootstrap
+--- faac.orig/bootstrap        Sat May 10 17:42:36 2003
++++ faac/bootstrap     Fri May 14 23:28:50 2004
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ 
+-aclocal -I .
++aclocal -I /usr/share/aclocal
+ autoheader
+ libtoolize --automake
+ automake --add-missing

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 1f2e92b9cd2f0d226be41ce439817e0f5570f517..7329e26415dab590471bd30fa051af4a1c76fdaa 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -63,6 +63,8 @@ SPEEX_URL=http://www.speex.org/download/speex-$(SPEEX_VERSION).tar.gz
 FAAD2_VERSION=20040426
 FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2
 FAAD2_CVSROOT=:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac
+FAAC_VERSION=1.24
+FAAC_URL=$(VIDEOLAN)/testing/contrib/faac-$(FAAC_VERSION).tar.bz2
 LAME_VERSION=3.93.1
 LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz
 LIBEBML_VERSION=0.7.0