* fix the ebml and matroska downloads. added toolame target, but not enabled, since...

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 0a795e383c1c543690352814d8acf47154f5fb0a..b68f1fe7f248767735448ce05c18c607419c9102 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -582,11 +582,11 @@ DISTCLEAN_PKG += lame-$(LAME_VERSION).tar.gz
 # libebml
 # ***************************************************************************
 
-libebml-$(LIBEBML_VERSION).tar.gz:
+libebml-$(LIBEBML_VERSION).tar.bz2:
        $(WGET) $(LIBEBML_URL)
 
-libebml: libebml-$(LIBEBML_VERSION).tar.gz
-       $(EXTRACT_GZ)
+libebml: libebml-$(LIBEBML_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
        patch -p 0 < Patches/ebml.patch
        -rm -rf $@/CVS
 
@@ -597,17 +597,17 @@ libebml: libebml-$(LIBEBML_VERSION).tar.gz
 
 CLEAN_FILE += .ebml
 CLEAN_PKG += libebml
-DISTCLEAN_PKG += libebml-$(LIBEBML_VERSION).tar.gz
+DISTCLEAN_PKG += libebml-$(LIBEBML_VERSION).tar.bz2
 
 # ***************************************************************************
 # libmatroska
 # ***************************************************************************
 
-libmatroska-$(LIBMATROSKA_VERSION).tar.gz:
+libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
        $(WGET) $(LIBMATROSKA_URL)
 
-libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.gz
-       $(EXTRACT_GZ)
+libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
        patch -p 0 < Patches/matroska.patch
        -rm -rf $@/CVS
 
@@ -618,7 +618,7 @@ libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.gz
 
 CLEAN_FILE += .matroska
 CLEAN_PKG += libmatroska
-DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.gz
+DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 
 # ***************************************************************************
 # ffmpeg
@@ -922,6 +922,25 @@ CLEAN_FILE += .mash
 CLEAN_PKG += mash-code
 DISTCLEAN_PKG += mash-src-$(MASH_VERSION).tar.gz
 
+# ***************************************************************************
+# toolame
+# ***************************************************************************
+
+toolame-$(TOOLAME_VERSION).tar.bz2:
+       $(WGET) $(TOOLAME_URL)
+
+toolame: toolame-$(TOOLAME_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
+
+.toolame: toolame
+       (cd toolame; ./configure --prefix=$(PREFIX) && make && make install)
+       $(INSTALL_NAME)
+       touch $@
+
+CLEAN_FILE += .toolame
+CLEAN_PKG += toolame
+DISTCLEAN_PKG += toolame-$(TOOLAME_VERSION).tar.bz2
+
 # ***************************************************************************
 # Some cleansing
 # ***************************************************************************

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 9a511cfc4428fbf21b95e1b443fd5f955a402922..e8368d28f1bdd32095ed3a798fd7676db67afaea 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -72,9 +72,9 @@ FAAC_URL=$(VIDEOLAN)/testing/contrib/faac-$(FAAC_VERSION).tar.bz2
 LAME_VERSION=3.93.1
 LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz
 LIBEBML_VERSION=0.7.1
-LIBEBML_URL=$(VIDEOLAN)/testing/contrib/libebml-$(LIBEBML_VERSION).tar.gz
+LIBEBML_URL=$(VIDEOLAN)/testing/contrib/libebml-$(LIBEBML_VERSION).tar.bz2
 LIBMATROSKA_VERSION=0.7.3
-LIBMATROSKA_URL=$(VIDEOLAN)/testing/contrib/libmatroska-$(LIBMATROSKA_VERSION).tar.gz
+LIBMATROSKA_URL=$(VIDEOLAN)/testing/contrib/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 FFMPEG_VERSION=0.4.8
 FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz
 FFMPEG_CVSROOT=:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg
@@ -105,4 +105,6 @@ VCDIMAGER_VERSION=0.7.20
 VCDIMAGER_URL=$(VIDEOLAN)/testing/contrib/vcdimager-$(VCDIMAGER_VERSION).tar.gz
 CDIO_VERSION=0.69
 CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz
+TOOLAME_VERSION=02m-beta8
+TOOLAME_URL=$(VIDEOLAN)/testing/contrib/toolame-$(TOOLAME_VERSION).tar.bz2