Commit 34ba8bd4 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Faac is NOT compatible with VLC

Too bad for your AAC encoding, but, well.
parent f4180b54
......@@ -3,7 +3,7 @@ ifeq ($(HOST),$(BUILD))
# Native build: we need perl, autoconf, etc first
all: .perl .autoconf .automake .libtool .iconv .intl .freetype .fribidi \
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.flac .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
.flac .speex .faad .lame .ebml .matroska .ffmpeg .dvdcss \
.dvdnav .dvbpsi .dca .aclocal
#.speex seems
else
......
# Darwin rules
all: .autoconf .gnumake .automake .libtool .intl .pkgcfg .yasm .freetype \
.fribidi .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.flac .speex .shout .faad .faac .lame .twolame .ebml .matroska .ffmpeg \
.flac .speex .shout .faad .lame .twolame .ebml .matroska .ffmpeg \
.dvdcss .libdvdread .dvdnav .dvbpsi .live .caca .mod .fontconfig \
.png .gpg-error .gcrypt .gnutls .cddb .cdio .vcdimager \
.SDL_image .glib .gecko .mpcdec .dirac_encoder .dirac_decoder \
......
# Debian Linux
all: .iconv .intl .freetype .fribidi .zlib \
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.flac .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
.flac .speex .faad .lame .ebml .matroska .ffmpeg .dvdcss \
.live .goom2k4 .caca .mod .x264 .xml .twolame \
.png .gpg-error .gcrypt .gnutls .mpcdec \
.dvdnav .dvbpsi .dirac \
......
# Fedora Linux rules
# Most dependencies are available from livna repro.
all: .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.flac .speex .faad .faac .lame .ebml .matroska .ffmpeg \
.flac .speex .faad .lame .ebml .matroska .ffmpeg \
.live .goom2k4 .caca .mod .x264 .xml .twolame \
.mpcdec \
.dvbpsi .dirac .schroedinger \
......
# Standard Linux or other UNIX-like systems
all: .iconv .intl .freetype .fribidi .zlib \
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
.flac .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
.flac .speex .faad .lame .ebml .matroska .ffmpeg .dvdcss \
.live .goom2k4 .caca .mod .x264 .xml .twolame \
.png .gpg-error .gcrypt .gnutls .mpcdec \
.dvdnav .dvbpsi .dirac \
......
# WIN32 rules
all: .iconv .intl .freetype .fribidi .zlib \
.a52 .mpeg2 .id3tag .mad .ogg .vorbis .shout .vorbisenc .theora \
.flac .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
.flac .speex .faad .lame .ebml .matroska .ffmpeg .dvdcss \
.live .pthreads .goom2k4 .caca .mod .x264 .xml .twolame \
.png .gpg-error .gcrypt .gnutls .mpcdec \
.dvdnav .dvbpsi .qt4_win32 .schroedinger .SDL_image \
......
......@@ -148,7 +148,6 @@ ifdef HAVE_DARWIN_OS
X264CONF += --enable-pic
FFMPEGCONF += --cc=$(CC)
FFMPEGCONF += --arch=$(ARCH)
FFMPEGCONF += --disable-libfaac
ifdef HAVE_DARWIN_10
FFMPEGCONF += --cpu=core2
X264CONF+=--host=x86_64-apple-darwin10
......@@ -921,24 +920,6 @@ CLEAN_FILE += .faad
CLEAN_PKG += faad2
DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz
# ***************************************************************************
# faac
# ***************************************************************************
faac-$(FAAC_VERSION).tar.gz:
$(WGET) $(FAAC_URL)
faac: faac-$(FAAC_VERSION).tar.gz
$(EXTRACT_GZ)
.faac: faac
(cd $<; ./bootstrap && $(HOSTCC) ./configure $(HOSTCONF) --without-mp4v2 --prefix=$(PREFIX) --disable-shared && make && make install)
touch $@
CLEAN_FILE += .faac
CLEAN_PKG += faac
DISTCLEAN_PKG += faac-$(FAAC_VERSION).tar.gz
# ***************************************************************************
# lame
# ***************************************************************************
......@@ -1129,7 +1110,7 @@ else
ifdef HAVE_UCLIBC
.ffmpeg: ffmpeg
else
.ffmpeg: ffmpeg .faac .lame .gsm
.ffmpeg: ffmpeg .lame .gsm
endif
endif
(cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
......
......@@ -86,8 +86,6 @@ FAAD2_VERSION=2.7
FAAD2_URL=$(SF)/faac/faad2-$(FAAD2_VERSION).tar.gz
#FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2
FAAD2_CVSROOT=:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac
FAAC_VERSION=1.28
FAAC_URL=$(SF)/faac/faac-$(FAAC_VERSION).tar.gz
LAME_VERSION=398-2
LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz
LIBEBML_VERSION=0.7.8
......
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