vlc | branch: master | Steve Lhomme <[email protected]> | Sat Apr 21 11:10:05 2018 +0200| [b99c05e0d2c32f1c272833dd7be6e13c29fefee4] | committer: Steve Lhomme
contrib: update libmatroska to 1.4.9 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b99c05e0d2c32f1c272833dd7be6e13c29fefee4 --- contrib/src/matroska/SHA512SUMS | 2 +- contrib/src/matroska/rules.mak | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/src/matroska/SHA512SUMS b/contrib/src/matroska/SHA512SUMS index 29d24bd761..2e92e95f4e 100644 --- a/contrib/src/matroska/SHA512SUMS +++ b/contrib/src/matroska/SHA512SUMS @@ -1 +1 @@ -75371a94c68a472fa55e2277b90a2717dd777b506ac89fb115fa83c5093aee6609eb4b01aa65c1d5a9ce9fc597684baff2ffc330a756050b2fb746abffc2417e libmatroska-1.4.7.tar.bz2 +281224b66ce7ef39daf0f186cda1144250e190b914e64f4f2524e8bf0170a3d18dbc50f204d4ca8d7eaffe183a61f96c92ba6ec4325bacb068272d62cdbcef33 libmatroska-1.4.9.tar.xz diff --git a/contrib/src/matroska/rules.mak b/contrib/src/matroska/rules.mak index 6c86639b89..d533861213 100644 --- a/contrib/src/matroska/rules.mak +++ b/contrib/src/matroska/rules.mak @@ -1,7 +1,7 @@ # matroska -MATROSKA_VERSION := 1.4.7 -MATROSKA_URL := http://dl.matroska.org/downloads/libmatroska/libmatroska-$(MATROSKA_VERSION).tar.bz2 +MATROSKA_VERSION := 1.4.9 +MATROSKA_URL := http://dl.matroska.org/downloads/libmatroska/libmatroska-$(MATROSKA_VERSION).tar.xz PKGS += matroska @@ -11,12 +11,12 @@ endif DEPS_matroska = ebml $(DEPS_ebml) -$(TARBALLS)/libmatroska-$(MATROSKA_VERSION).tar.bz2: +$(TARBALLS)/libmatroska-$(MATROSKA_VERSION).tar.xz: $(call download_pkg,$(MATROSKA_URL),matroska) -.sum-matroska: libmatroska-$(MATROSKA_VERSION).tar.bz2 +.sum-matroska: libmatroska-$(MATROSKA_VERSION).tar.xz -libmatroska: libmatroska-$(MATROSKA_VERSION).tar.bz2 .sum-matroska +libmatroska: libmatroska-$(MATROSKA_VERSION).tar.xz .sum-matroska $(UNPACK) $(call pkg_static,"libmatroska.pc.in") $(MOVE) @@ -24,6 +24,6 @@ libmatroska: libmatroska-$(MATROSKA_VERSION).tar.bz2 .sum-matroska MATROSKA_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fvisibility=hidden" .matroska: libmatroska - cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(MATROSKA_EXTRA_FLAGS) + cd $< && $(HOSTVARS) $(CMAKE) -DBUILD_SHARED_LIBS=OFF cd $< && $(MAKE) install touch $@ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
