Contribs: update libmatroska to 1.4.2

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

diff --git a/contrib/src/matroska/rules.mak b/contrib/src/matroska/rules.mak
index 336e00166e7bb3655fc8e37de7e392e60f79ebd2..b8d0165369f06d51e966650c3b986c5fb27852e1 100644 (file)
--- a/contrib/src/matroska/rules.mak
+++ b/contrib/src/matroska/rules.mak
@@ -1,6 +1,6 @@
 # matroska
 
-MATROSKA_VERSION := 1.4.1
+MATROSKA_VERSION := 1.4.2
 MATROSKA_URL := http://dl.matroska.org/downloads/libmatroska/libmatroska-$(MATROSKA_VERSION).tar.bz2
 #MATROSKA_URL := $(CONTRIB_VIDEOLAN)/libmatroska-$(MATROSKA_VERSION).tar.bz2
 
@@ -14,15 +14,9 @@ $(TARBALLS)/libmatroska-$(MATROSKA_VERSION).tar.bz2:
 
 libmatroska: libmatroska-$(MATROSKA_VERSION).tar.bz2 .sum-matroska
        $(UNPACK)
-       $(APPLY) $(SRC)/matroska/matroska-pic.patch
        $(MOVE)
 
 .matroska: libmatroska
-ifdef HAVE_WIN32
-       cd $< && $(MAKE) -C make/mingw32 prefix="$(PREFIX)" $(HOSTVARS) SHARED=no EBML_DLL=no libmatroska.a
-else
-       cd $< && $(MAKE) -C make/linux prefix="$(PREFIX)" $(HOSTVARS) staticlib
-endif
-       cd $< && $(MAKE) -C make/linux install_staticlib install_headers prefix="$(PREFIX)" $(HOSTVARS)
-       $(RANLIB) "$(PREFIX)/lib/libmatroska.a"
+       cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+       cd $< && $(MAKE) install
        touch $@