- Enable building of libamrnb and libamrwb (disabled by default). To enable add HAVE_...

- Bumped up libdvbpsi version number to 0.1.6

diff --git a/extras/contrib/README b/extras/contrib/README
index beeda4f33732f7b9240aae03b7ed5da4d27fd025..082042d5c08ebbf928aea702efcd3f81890d3353 100644 (file)
--- a/extras/contrib/README
+++ b/extras/contrib/README
@@ -28,8 +28,19 @@ or INSTALL.win32 for more details on that.
 Happy hacking.
 --Meuuh 2003-11-15
 
+Appendix: 
+ I) BUILDING AMR SUPPORT IN FFMPEG
 
-The following patches have already been sent to the upstream developers:
+To build ffmpeg with AMR support add HAVE_AMR=1 to config.mak or do:
+
+echo "HAVE_AMR=1" >> config.mak
+
+and add .libamrwb .libamrnb (before .ffmpeg) to your distro.mak. Then rebuild the contrib with: 
+
+make src
+
+
+ II) The following patches have already been sent to the upstream developers:
 
 ffmpeg-cvs-mactel.patch - split in 5 and sent to ffmpeg-devel@mplayerhq.hu
  o patch-ffmpeg-0b.diff

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 6e23d10ebbdf2e10eb3653f9bbfc55b2057c3d0a..977f93aafc7913d6643c131e07c801751ccb8f8c 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -154,6 +154,10 @@ FFMPEG_CFLAGS += -DHAVE_LRINTF
 endif
 endif
 
+ifdef HAVE_AMR
+FFMPEGCONF+= --enable-libamr --enable-libamr-nb --enable-libamr-wb
+endif
+
 DATE=`date +%Y-%m-%d`
 
 # ***************************************************************************
@@ -1002,6 +1006,44 @@ CLEAN_PKG += libmatroska
 DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 
 # ***************************************************************************
+# libamrnb
+# ***************************************************************************
+
+amrnb-$(LIBAMR_NB_VERSION).tar.bz2:
+       $(WGET) $(LIBAMR_NB)
+
+libamrnb: amrnb-$(LIBAMR_NB_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
+
+.libamrnb: libamrnb
+       (cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --enable-shared && make && make install)
+       touch $@
+
+CLEAN_FILE += .libamrnb
+CLEAN_PKG += libamrnb
+DISTCLEAN_PKG += amrnb-$(LIBAMR_NB_VERSION).tar.bz2
+
+# ***************************************************************************
+# libamrwb
+# ***************************************************************************
+
+amrwb-$(LIBAMR_WB_VERSION).tar.bz2:
+       $(WGET) $(LIBAMR_WB)
+
+libamrwb: amrwb-$(LIBAMR_WB_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
+
+.libamrwb: libamrwb
+       (cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --enable-shared && make && make install)
+       touch $@
+
+
+CLEAN_FILE += .libamrwb
+CLEAN_PKG += libamrwb
+DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).bz2
+
+# ***************************************************************************
+
 # ffmpeg
 # ***************************************************************************
 
@@ -1132,10 +1174,10 @@ DISTCLEAN_PKG += libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 # libdvbpsi
 # ***************************************************************************
 
-libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz:
+libdvbpsi5-$(LIBDVBPSI_VERSION).tar.gz:
        $(WGET) $(LIBDVBPSI_URL)
 
-libdvbpsi: libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz
+libdvbpsi: libdvbpsi5-$(LIBDVBPSI_VERSION).tar.gz
        $(EXTRACT_GZ)
 
 .dvbpsi: libdvbpsi
@@ -1145,7 +1187,7 @@ libdvbpsi: libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz
 
 CLEAN_FILE += .dvbpsi
 CLEAN_PKG += libdvbpsi
-DISTCLEAN_PKG += libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz
+DISTCLEAN_PKG += libdvbpsi5-$(LIBDVBPSI_VERSION).tar.gz
 
 # ***************************************************************************
 # live

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index aaf6b806d6edd1939b9caf9e4fa885060076d8e6..1bd1ed3f96e45ed9a9e6ab10db56a59a3162da40 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -1,4 +1,4 @@
-#b ***************************************************************************
+# ***************************************************************************
 # src/packages.mak : Archive locations
 # ***************************************************************************
 # Copyright (C) 2003 - 2006 the VideoLAN team
@@ -23,11 +23,16 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
 # ***************************************************************************
 
+PENGUIN=http://ftp.penguin.cz/pub/users/utx/amr
 GNU=http://ftp.belnet.be/mirror/ftp.gnu.org/gnu
 SF=http://switch.dl.sourceforge.net/sourceforge
 VIDEOLAN=http://download.videolan.org/pub/videolan
 PERL_VERSION=5.8.8
 PERL_URL=http://ftp.funet.fi/pub/CPAN/src/perl-$(PERL_VERSION).tar.gz
+LIBAMR_NB_VERSION=7.0.0.0
+LIBAMR_NB=$(PENGUIN)/amrnb-$(LIBAMR_NB_VERSION).tar.bz2
+LIBAMR_WB_VERSION=7.0.0.0
+LIBAMR_WB=$(PENGUIN)/amrwb-$(LIBAMR_WB_VERSION).tar.bz2
 # Autoconf > 2.57 doesn't work ok on BeOS. Don't ask why.
 # we have to use a newer though, because bootstrap won't work otherwise
 AUTOCONF_VERSION=2.61
@@ -94,8 +99,8 @@ LIBDVDCSS_VERSION=1.2.9
 LIBDVDCSS_URL=$(VIDEOLAN)/libdvdcss/$(LIBDVDCSS_VERSION)/libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 LIBDVDNAV_VERSION=20050211
 LIBDVDNAV_URL=$(VIDEOLAN)/testing/contrib/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
-LIBDVBPSI_VERSION=0.1.5
-LIBDVBPSI_URL=$(VIDEOLAN)/libdvbpsi/$(LIBDVBPSI_VERSION)/libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz
+LIBDVBPSI_VERSION=0.1.6
+LIBDVBPSI_URL=$(VIDEOLAN)/libdvbpsi/$(LIBDVBPSI_VERSION)/libdvbpsi5-$(LIBDVBPSI_VERSION).tar.gz
 LIVEDOTCOM_VERSION=latest
 LIVEDOTCOM_URL=http://live555.com/liveMedia/public/live555-$(LIVEDOTCOM_VERSION).tar.gz
 #GOOM_URL=$(VIDEOLAN)/testing/contrib/goom-macosx-altivec-bin.tar.gz