[vlc-devel] commit: Use release versions of libmatroska and libebml. ( Felix Paul Kühne )

[git version control]

vlc | branch: 0.8.6-bugfix | Felix Paul Kühne <fkuehne at videolan.org> | Sat May 24 01:54:15 2008 +0200| [f3a2e3f53c842ae34a5f946f39d7fa84b3cb6b25]

Use release versions of libmatroska and libebml.

There is no difference to svn's HEAD. Additionally, svn access is currently blocked.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f3a2e3f53c842ae34a5f946f39d7fa84b3cb6b25
---

 extras/contrib/src/Makefile     |   12 ++----------
 extras/contrib/src/packages.mak |    4 ++--
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 7e4c4b0..c62afa9 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -883,16 +883,12 @@ DISTCLEAN_PKG += lame-$(LAME_VERSION).tar.gz
 # libebml
 # ***************************************************************************
 
-ifdef SVN
-libebml: 
-	$(SVN) co http://svn.matroska.org/svn/matroska/trunk/libebml -r 1254 libebml
-else
 libebml-$(LIBEBML_VERSION).tar.bz2:
 	$(WGET) $(LIBEBML_URL)
 
 libebml: libebml-$(LIBEBML_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-endif
+
 ifdef HAVE_WIN32
 	(cd $@; patch -p 0 < ../Patches/libebml-svn-win32.patch)
 endif
@@ -914,16 +910,12 @@ DISTCLEAN_PKG += libebml-$(LIBEBML_VERSION).tar.bz2
 # libmatroska
 # ***************************************************************************
 
-ifdef SVN
-libmatroska:
-	$(SVN) co http://svn.matroska.org/svn/matroska/trunk/libmatroska -r 1254 libmatroska
-else
 libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
 	$(WGET) $(LIBMATROSKA_URL)
 
 libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-endif
+
 ifdef HAVE_WIN32
 	(cd $@; patch -p 0 < ../Patches/libmatroska-win32.patch)
 endif
diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index d692d6c..4663020 100644
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -80,9 +80,9 @@ FAAC_VERSION=1.24
 FAAC_URL=$(VIDEOLAN)/testing/contrib/faac-$(FAAC_VERSION).tar.bz2
 LAME_VERSION=3.97b2
 LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz
-LIBEBML_VERSION=0.7.7
+LIBEBML_VERSION=0.7.8
 LIBEBML_URL=http://dl.matroska.org/downloads/libebml/libebml-$(LIBEBML_VERSION).tar.bz2
-LIBMATROSKA_VERSION=0.8.0
+LIBMATROSKA_VERSION=0.8.1
 LIBMATROSKA_URL=http://dl.matroska.org/downloads/libmatroska/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 FFMPEG_VERSION=0.4.8
 FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz