Contribs: jump to faad 2.6.1. The patch is useless, but don't remove it might still...

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 056e7303412ce9d0587d49085daa7f260c46da9e..5301db7bc95572c49ec8502e8fec90a42fceae92 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -877,20 +877,20 @@ DISTCLEAN_PKG += speex-$(SPEEX_VERSION).tar.gz
 #      (cd $@; patch -p1 < ../Patches/faad2.patch)
 #      (cd $@; sh ./bootstrap)
 
-faad2-$(FAAD2_VERSION).tar.bz2:
+faad2-$(FAAD2_VERSION).tar.gz:
        $(WGET) $(FAAD2_URL)
 
-faad: faad2-$(FAAD2_VERSION).tar.bz2
-       $(EXTRACT_BZ2)
-       (cd $@; patch -p1 < ../Patches/faad2.patch && ./bootstrap)
+faad2: faad2-$(FAAD2_VERSION).tar.gz
+       $(EXTRACT_GZ)
+       (cd $@; ./bootstrap)
 
-.faad: faad
+.faad: faad2
        (cd $< && $(HOSTCC) ./configure $(HOSTCONF) --disable-shared --prefix=$(PREFIX) CFLAGS="-O3" && sed -i.orig "s/shrext_cmds/shrext/g" libtool && make -C libfaad && make -C libfaad install)
        touch $@
 
 CLEAN_FILE += .faad
-CLEAN_PKG += faad
-DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.bz2
+CLEAN_PKG += faad2
+DISTCLEAN_PKG += faad2-$(FAAD2_VERSION).tar.gz
 
 # ***************************************************************************
 # faac

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 2907ef62fa6ae3126a55a443fa20a5c15a199ba0..2ab90b92214032ad6046a7347d5e039e258bfccc 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -81,8 +81,9 @@ SPEEX_VERSION=1.2beta2
 SPEEX_URL=http://downloads.us.xiph.org/releases/speex/speex-$(SPEEX_VERSION).tar.gz
 SHOUT_VERSION=2.2.2
 SHOUT_URL=http://downloads.us.xiph.org/releases/libshout/libshout-$(SHOUT_VERSION).tar.gz
-FAAD2_VERSION=20040923
-FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2
+FAAD2_VERSION=2.6.1
+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.26
 FAAC_URL=$(SF)/faac/faac-$(FAAC_VERSION).tar.gz