Update contrib to a newer faad2 version, which is used in 0.9.0

extras/contrib/src/Makefile

@@ -805,16 +805,15 @@ faad2-rpm: faad2-$(FAAD2_VERSION).tar.bz2
 #	(cd $@; patch -p 0 < ../Patches/faad2.patch)
 #	(cd $@; sh ./bootstrap)
 
-faad2-$(FAAD2_VERSION).tar.bz2:
+faad2-$(FAAD2_VERSION).tar.gz:
 	$(WGET) $(FAAD2_URL)
 
-faad2: faad2-$(FAAD2_VERSION).tar.bz2
-	$(EXTRACT_BZ2)
-	(cd $@; patch -p 0  < ../Patches/faad2.patch && ./bootstrap)
+faad2: faad2-$(FAAD2_VERSION).tar.gz
+	$(EXTRACT_GZ)
+	(cd $@; ./bootstrap)
 
 .faad2: faad2
-	(cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3" && sed -i.orig "s/shrext_cmds/shrext/g" libtool && make -C libfaad && make -C libfaad install)
-	$(INSTALL_NAME)
+	(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 += .faad2 faad2-rpm

extras/contrib/src/packages.mak

@@ -71,8 +71,9 @@ SPEEX_VERSION=1.2beta1
 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.24
 FAAC_URL=$(VIDEOLAN)/testing/contrib/faac-$(FAAC_VERSION).tar.bz2