Commit f3a2e3f5 authored by Felix Paul Kühne's avatar Felix Paul Kühne

Use release versions of libmatroska and libebml.

There is no difference to svn's HEAD. Additionally, svn access is currently blocked.
parent 30b23594
...@@ -883,16 +883,12 @@ DISTCLEAN_PKG += lame-$(LAME_VERSION).tar.gz ...@@ -883,16 +883,12 @@ DISTCLEAN_PKG += lame-$(LAME_VERSION).tar.gz
# libebml # libebml
# *************************************************************************** # ***************************************************************************
ifdef SVN
libebml:
$(SVN) co http://svn.matroska.org/svn/matroska/trunk/libebml -r 1254 libebml
else
libebml-$(LIBEBML_VERSION).tar.bz2: libebml-$(LIBEBML_VERSION).tar.bz2:
$(WGET) $(LIBEBML_URL) $(WGET) $(LIBEBML_URL)
libebml: libebml-$(LIBEBML_VERSION).tar.bz2 libebml: libebml-$(LIBEBML_VERSION).tar.bz2
$(EXTRACT_BZ2) $(EXTRACT_BZ2)
endif
ifdef HAVE_WIN32 ifdef HAVE_WIN32
(cd $@; patch -p 0 < ../Patches/libebml-svn-win32.patch) (cd $@; patch -p 0 < ../Patches/libebml-svn-win32.patch)
endif endif
...@@ -914,16 +910,12 @@ DISTCLEAN_PKG += libebml-$(LIBEBML_VERSION).tar.bz2 ...@@ -914,16 +910,12 @@ DISTCLEAN_PKG += libebml-$(LIBEBML_VERSION).tar.bz2
# libmatroska # libmatroska
# *************************************************************************** # ***************************************************************************
ifdef SVN
libmatroska:
$(SVN) co http://svn.matroska.org/svn/matroska/trunk/libmatroska -r 1254 libmatroska
else
libmatroska-$(LIBMATROSKA_VERSION).tar.bz2: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
$(WGET) $(LIBMATROSKA_URL) $(WGET) $(LIBMATROSKA_URL)
libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
$(EXTRACT_BZ2) $(EXTRACT_BZ2)
endif
ifdef HAVE_WIN32 ifdef HAVE_WIN32
(cd $@; patch -p 0 < ../Patches/libmatroska-win32.patch) (cd $@; patch -p 0 < ../Patches/libmatroska-win32.patch)
endif endif
......
...@@ -80,9 +80,9 @@ FAAC_VERSION=1.24 ...@@ -80,9 +80,9 @@ FAAC_VERSION=1.24
FAAC_URL=$(VIDEOLAN)/testing/contrib/faac-$(FAAC_VERSION).tar.bz2 FAAC_URL=$(VIDEOLAN)/testing/contrib/faac-$(FAAC_VERSION).tar.bz2
LAME_VERSION=3.97b2 LAME_VERSION=3.97b2
LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz 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 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 LIBMATROSKA_URL=http://dl.matroska.org/downloads/libmatroska/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
FFMPEG_VERSION=0.4.8 FFMPEG_VERSION=0.4.8
FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment