[vlc-commits] contrib: matroska: update libmatroska to 1.6.0

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jul  6 07:52:01 2020 +0200| [26b306fa78cc506438a0aa8ebc40f6eca0e79aa7] | committer: Steve Lhomme

contrib: matroska: update libmatroska to 1.6.0

No need to force fvisibility=hidden explicitly anymore.

Log why the -O2 is needed (this still feels like an odd fix)

(cherry picked from commit 41a6658766351ce088b9b0e56fe4b4caff8207a6) (edited)

edited:
- the -O2 patch is only applied for iOS on this branch

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=26b306fa78cc506438a0aa8ebc40f6eca0e79aa7
---

 contrib/src/matroska/SHA512SUMS | 2 +-
 contrib/src/matroska/rules.mak  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/contrib/src/matroska/SHA512SUMS b/contrib/src/matroska/SHA512SUMS
index 3a3a4ab5fc..7a33056233 100644
--- a/contrib/src/matroska/SHA512SUMS
+++ b/contrib/src/matroska/SHA512SUMS
@@ -1 +1 @@
-122b71b91ae89e2a7cc89db17655a006248d58f18d913b4f9ffc885aef7e39681a3a16eed43cd8ecd949c570a939007797c79829f5ee87d08562aee3f0224ba2  libmatroska-1.5.2.tar.xz
+7908730aeae426e3f7a90c6cc9151686b453e03cc7046b87a655e51c78c6e5fde5c37d7e0db18c2c237ce853dbe428671b983801104a0860ab0ab1919234f30f  libmatroska-1.6.0.tar.xz
diff --git a/contrib/src/matroska/rules.mak b/contrib/src/matroska/rules.mak
index 631a13b88f..0091c7e53b 100644
--- a/contrib/src/matroska/rules.mak
+++ b/contrib/src/matroska/rules.mak
@@ -1,6 +1,6 @@
 # matroska
 
-MATROSKA_VERSION := 1.5.2
+MATROSKA_VERSION := 1.6.0
 MATROSKA_URL := http://dl.matroska.org/downloads/libmatroska/libmatroska-$(MATROSKA_VERSION).tar.xz
 
 PKGS += matroska
@@ -16,17 +16,17 @@ $(TARBALLS)/libmatroska-$(MATROSKA_VERSION).tar.xz:
 
 .sum-matroska: libmatroska-$(MATROSKA_VERSION).tar.xz
 
-libmatroska: libmatroska-$(MATROSKA_VERSION).tar.xz .sum-matroska
+matroska: libmatroska-$(MATROSKA_VERSION).tar.xz .sum-matroska
 	$(UNPACK)
 	$(call pkg_static,"libmatroska.pc.in")
 	$(MOVE)
 
-MATROSKA_CXXFLAGS := $(CXXFLAGS) $(PIC) -fvisibility=hidden
+# O2 optimization due to iOS issue https://code.videolan.org/videolan/vlc-ios/issues/248
 ifdef HAVE_IOS
 MATROSKA_CXXFLAGS +=  -O2
 endif
 
-.matroska: libmatroska toolchain.cmake
+.matroska: matroska toolchain.cmake
 	cd $< && $(HOSTVARS_PIC) CXXFLAGS="$(MATROSKA_CXXFLAGS)" $(CMAKE)
 	cd $< && $(MAKE) install
 	touch $@