Contribs: attempt to update faac to 1.25.

extras/contrib/src/Makefile

@@ -848,20 +848,21 @@ DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.bz2
 # faac
 # ***************************************************************************
 
-faac-$(FAAC_VERSION).tar.bz2:
+faac-$(FAAC_VERSION).tar.gz:
 	$(WGET) $(FAAC_URL)
 
-faac: faac-$(FAAC_VERSION).tar.bz2
-	$(EXTRACT_BZ2)
+faac: faac-$(FAAC_VERSION).tar.gz
+	$(EXTRACT_GZ)
+	sed -i 's/\r$//' bootstrap configure.in Makefile.am
 	patch -p0 < Patches/faac.patch
 
 .faac: faac
-	(cd $<; rm -f install-sh mkinstalldirs missing && ./bootstrap && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared && make && make install)
+	(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.bz2
+DISTCLEAN_PKG += faac-$(FAAC_VERSION).tar.gz
 
 # ***************************************************************************
 # lame

extras/contrib/src/Patches/faac.patch

-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
+diff -ruN faac/bootstrap faac-new/bootstrap
+--- faac/bootstrap	2004-07-28 10:18:20.000000000 +0200
++++ faac-new/bootstrap	2007-08-04 12:57:19.000000000 +0200
 @@ -1,6 +1,6 @@
  #! /bin/sh
  
 -aclocal -I .
 +aclocal -I /usr/share/aclocal
  autoheader
- libtoolize --automake
- automake --add-missing
+ if test "`uname -s`" = Darwin; then
+     glibtoolize --automake

extras/contrib/src/packages.mak

@@ -77,8 +77,8 @@ SHOUT_URL=http://downloads.us.xiph.org/releases/libshout/libshout-$(SHOUT_VERSIO
 FAAD2_VERSION=20040923
 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
+FAAC_VERSION=1.25
+FAAC_URL=$(VIDEOLAN)/testing/contrib/faac-$(FAAC_VERSION).tar.gz
 LAME_VERSION=3.97b2
 LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz
 LIBEBML_VERSION=0.7.7