Contribs: update libebml and libmatroska to 1.0.0

This hopefully should fix multiple issues with live webm files

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 9e1c978ca31bf04e18c299c2695eee64137029e4..de4c12c325a6ca9aa6d88b1939193e2e65078118 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -977,7 +977,6 @@ libebml-$(LIBEBML_VERSION).tar.bz2:
 
 libebml: libebml-$(LIBEBML_VERSION).tar.bz2
        $(EXTRACT_BZ2)
-       patch -p0 < Patches/libebml-win32.patch
 
 .ebml: libebml
 ifdef HAVE_WIN32
@@ -1001,9 +1000,6 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
 
 libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
        $(EXTRACT_BZ2)
-ifdef HAVE_WIN32
-       patch -p0 < Patches/libmatroska-win32.patch
-endif
 
 .matroska: libmatroska .ebml
 ifdef HAVE_WIN32

diff --git a/extras/contrib/src/Patches/libebml-win32.patch b/extras/contrib/src/Patches/libebml-win32.patch
deleted file mode 100644 (file)
index cea0086..0000000
--- a/extras/contrib/src/Patches/libebml-win32.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN libebml/make/mingw32/Makefile libebml.new/make/mingw32/Makefile
---- libebml/make/mingw32/Makefile      2010-04-11 18:36:50.000000000 +0200
-+++ libebml.new/make/mingw32/Makefile  2010-05-29 14:26:07.000000000 +0200
-@@ -50,7 +50,7 @@
-       rm -f .depend\r
- \r
- libebml.a: $(OBJ)\r
--      $(AR) r $@ $(OBJ)\r
-+      $(AR) rcvu $@ $(OBJ)\r
-       $(RANLIB) $@\r
- \r
- libebml.dll: $(OBJ)\r

diff --git a/extras/contrib/src/Patches/libmatroska-win32.patch b/extras/contrib/src/Patches/libmatroska-win32.patch
deleted file mode 100644 (file)
index 39a4160..0000000
--- a/extras/contrib/src/Patches/libmatroska-win32.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmatroska/make/mingw32/Makefile  2010-04-11 18:40:15.000000000 +0200
-+++ libmatroska.new/make/mingw32/Makefile      2010-05-29 14:38:19.000000000 +0200
-@@ -67,7 +67,7 @@
-       rm -f .depend\r
- \r
- libmatroska.a: $(OBJ)\r
--      $(AR) r $@ $(OBJ)\r
-+      $(AR) rcvu $@ $(OBJ)\r
-       $(RANLIB) $@\r
- \r
- libmatroska.dll: $(OBJ)\r

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index abf951ef5110d966c038edb4239896d68087335a..cbd5e8715bf3d310f748c7e22846bc9ec2e3c66a 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -90,10 +90,10 @@ FAAD2_URL=$(SF)/faac/faad2-$(FAAD2_VERSION).tar.gz
 FAAD2_CVSROOT=:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac
 LAME_VERSION=3.98.4
 LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz
-LIBEBML_VERSION=0.8.0
+LIBEBML_VERSION=1.0.0
 LIBEBML_URL=http://dl.matroska.org/downloads/libebml/libebml-$(LIBEBML_VERSION).tar.bz2
 #LIBEBML_URL=$(CONTRIB_VIDEOLAN)/libebml-$(LIBEBML_VERSION).tar.bz2
-LIBMATROSKA_VERSION=0.9.0
+LIBMATROSKA_VERSION=1.0.0
 LIBMATROSKA_URL=http://dl.matroska.org/downloads/libmatroska/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 #IBMATROSKA_URL=$(CONTRIB_VIDEOLAN)/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 FFMPEG_VERSION=0.4.8