Commit f751549b authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* added faac support to Mac OSX build

* ffmpeg cvs no longer asks you for a passwd. (this is for nightly's :)
parent fd5451ec
...@@ -42,7 +42,7 @@ export LDFLAGS = -L$(PREFIX)/lib ...@@ -42,7 +42,7 @@ export LDFLAGS = -L$(PREFIX)/lib
all: .autoconf .libtool .automake .iconv .intl .freetype .fribidi \ all: .autoconf .libtool .automake .iconv .intl .freetype .fribidi \
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \ .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 .dvdcss .dvdread .dvdplay .dvbpsi .live .goom .caca .dts .mod
FORCE: FORCE:
...@@ -457,6 +457,25 @@ CLEAN_FILE += .faad ...@@ -457,6 +457,25 @@ CLEAN_FILE += .faad
CLEAN_PKG += faad2 CLEAN_PKG += faad2
DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz 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 # lame
# *************************************************************************** # ***************************************************************************
...@@ -520,8 +539,8 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.gz ...@@ -520,8 +539,8 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.gz
# *************************************************************************** # ***************************************************************************
ffmpeg: ffmpeg:
cvs -d $(FFMPEG_CVSROOT) login echo $(FFMPEG_CVSROOT) A > ./ffmpeg.cvs
cvs -d $(FFMPEG_CVSROOT) co ffmpeg CVS_PASSFILE=./ffmpeg.cvs cvs -d $(FFMPEG_CVSROOT) co ffmpeg
patch -p 0 < Patches/ffmpeg.patch.cvs patch -p 0 < Patches/ffmpeg.patch.cvs
# (cd $@; ./bootstrap) # (cd $@; ./bootstrap)
...@@ -533,7 +552,7 @@ ffmpeg-$(FFMPEG_VERSION).tar.gz: ...@@ -533,7 +552,7 @@ ffmpeg-$(FFMPEG_VERSION).tar.gz:
# patch -p 0 < Patches/ffmpeg.patch # patch -p 0 < Patches/ffmpeg.patch
.ffmpeg: ffmpeg .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 $@ touch $@
CLEAN_FILE += .ffmpeg CLEAN_FILE += .ffmpeg
......
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
...@@ -63,6 +63,8 @@ SPEEX_URL=http://www.speex.org/download/speex-$(SPEEX_VERSION).tar.gz ...@@ -63,6 +63,8 @@ SPEEX_URL=http://www.speex.org/download/speex-$(SPEEX_VERSION).tar.gz
FAAD2_VERSION=20040426 FAAD2_VERSION=20040426
FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2 FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2
FAAD2_CVSROOT=:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac 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_VERSION=3.93.1
LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz
LIBEBML_VERSION=0.7.0 LIBEBML_VERSION=0.7.0
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment