* all: updated the used Matroska/Ebml versions to 0.7.5 / 0.7.3, removed the old...

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index b2ce3f23047d8be76c5ffb6e6fb3dee8babcbe7a..3e03aae025026da9bcf43dd5c73458099330d676 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -590,7 +590,6 @@ libebml-$(LIBEBML_VERSION).tar.bz2:
 
 libebml: libebml-$(LIBEBML_VERSION).tar.bz2
        $(EXTRACT_BZ2)
-       patch -p 0 < Patches/ebml.patch
        -rm -rf $@/CVS
 
 .ebml: libebml
@@ -611,7 +610,6 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
 
 libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
        $(EXTRACT_BZ2)
-       patch -p 0 < Patches/matroska.patch
        -rm -rf $@/CVS
 
 .matroska: libmatroska

diff --git a/extras/contrib/src/Patches/ebml.patch b/extras/contrib/src/Patches/ebml.patch
deleted file mode 100644 (file)
index f27ca33..0000000
--- a/extras/contrib/src/Patches/ebml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru libebml-original/ebml/c/libebml_t.h libebml/ebml/c/libebml_t.h
---- libebml-original/ebml/c/libebml_t.h        Thu Apr 15 01:16:31 2004
-+++ libebml/ebml/c/libebml_t.h Mon Aug 16 14:29:14 2004
-@@ -72,6 +72,8 @@
-     typedef uint16_t uint16;
-     typedef uint8_t uint8;
- #endif // __GNUC__
-+#elif defined(__BEOS__)
-+#include <SupportDefs.h>
- #else
- #ifdef DJGPP                          /* SL : DJGPP doesn't support POSIX types ???? */
-     typedef signed long long int64;

diff --git a/extras/contrib/src/Patches/matroska.patch b/extras/contrib/src/Patches/matroska.patch
deleted file mode 100644 (file)
index a79d236..0000000
--- a/extras/contrib/src/Patches/matroska.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru libmatroska-original/make/linux/Makefile libmatroska/make/linux/Makefile
---- libmatroska-original/make/linux/Makefile   Mon Jan  5 12:28:43 2004
-+++ libmatroska/make/linux/Makefile    Mon Aug 16 11:56:22 2004
-@@ -93,7 +93,7 @@
- depend: $(sources)
-       $(DEPEND) $(DEPENDFLAGS) $(sources)
- 
--test: test6 test8 test9
-+test: test6 test9
- 
- test6:        test6.o $(LIBRARY)
-       $(LD) -o $@ $(LDFLAGS) $< $(MUX_LIBS)

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 111a8641e6644b075de36ab5e6139be99d07b86a..054fb1ee528a9e9e8e6cfca06814a0dfc77f38a3 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -71,10 +71,10 @@ FAAC_VERSION=1.24
 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.bz2
-LIBMATROSKA_VERSION=0.7.3
-LIBMATROSKA_URL=$(VIDEOLAN)/testing/contrib/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
+LIBEBML_VERSION=0.7.3
+LIBEBML_URL=http://dl.matroska.org/downloads/libebml/libebml-$(LIBEBML_VERSION).tar.bz2
+LIBMATROSKA_VERSION=0.7.5
+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
 FFMPEG_CVSROOT=:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg