contrib: ffmpeg: remove unused FFMPEG_CFLAGS

[vlc] / contrib / src / matroska / rules.mak

diff --git a/contrib/src/matroska/rules.mak b/contrib/src/matroska/rules.mak
index dc876bc6852f8330431fd2e90c575ec7fd928190..62ecf0d82b6bab84430356a61371732c94b31566 100644 (file)
--- a/contrib/src/matroska/rules.mak
+++ b/contrib/src/matroska/rules.mak
@@ -1,22 +1,24 @@
 # matroska
 
-MATROSKA_VERSION := 1.1.0
+MATROSKA_VERSION := 1.3.0
 MATROSKA_URL := http://dl.matroska.org/downloads/libmatroska/libmatroska-$(MATROSKA_VERSION).tar.bz2
 #MATROSKA_URL := $(CONTRIB_VIDEOLAN)/libmatroska-$(MATROSKA_VERSION).tar.bz2
 
 PKGS += matroska
+DEPS_matroska = ebml $(DEPS_ebml)
 
 $(TARBALLS)/libmatroska-$(MATROSKA_VERSION).tar.bz2:
-       $(DOWNLOAD) $(MATROSKA_URL)
+       $(call download,$(MATROSKA_URL))
 
 .sum-matroska: libmatroska-$(MATROSKA_VERSION).tar.bz2
 
 libmatroska: libmatroska-$(MATROSKA_VERSION).tar.bz2 .sum-matroska
-       $(UNPACK_BZ2)
-       mv $@-$(MATROSKA_VERSION) $@
-       touch $@
+       $(UNPACK)
+       $(APPLY) $(SRC)/matroska/matroska-pic.patch
+       $(APPLY) $(SRC)/matroska/no-ansi.patch
+       $(MOVE)
 
-.matroska: libmatroska .ebml
+.matroska: libmatroska
 ifdef HAVE_WIN32
        cd $< && $(MAKE) -C make/mingw32 prefix="$(PREFIX)" $(HOSTVARS) SHARED=no EBML_DLL=no libmatroska.a
 else