[vlc-commits] contrib: update libebml to 1.3.5

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Sat Aug 19 09:42:01 2017 +0200| [9d11ab47a89cfec95e80367b8f5e5a0bfc6f0545] | committer: Jean-Baptiste Kempf

contrib: update libebml to 1.3.5

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9d11ab47a89cfec95e80367b8f5e5a0bfc6f0545
---

 contrib/src/ebml/SHA512SUMS |  2 +-
 contrib/src/ebml/rules.mak  | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/contrib/src/ebml/SHA512SUMS b/contrib/src/ebml/SHA512SUMS
index cc8b819979..1b384b2511 100644
--- a/contrib/src/ebml/SHA512SUMS
+++ b/contrib/src/ebml/SHA512SUMS
@@ -1 +1 @@
-ebf5b71afe725e40ee6415463e51ca14810eecc2fef186caacd0269077f5febeb62623fd48674b21ea732f43a620d0c91603fa48d3f8d163284d1cf204642194  libebml-1.3.4.tar.bz2
+cdf05015724919b19281bf99c562bb7e0bdf16990da274010f664ff316b6ce95ecbeaa1e479f03505281a7f45d5796aee6e7750a9e1c0596b630911d220dca24  libebml-1.3.5.tar.xz
diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak
index d857aac7d6..4e13fa9a0a 100644
--- a/contrib/src/ebml/rules.mak
+++ b/contrib/src/ebml/rules.mak
@@ -1,22 +1,24 @@
 # ebml
 
-EBML_VERSION := 1.3.4
-EBML_URL := http://dl.matroska.org/downloads/libebml/libebml-$(EBML_VERSION).tar.bz2
+EBML_VERSION := 1.3.5
+EBML_URL := http://dl.matroska.org/downloads/libebml/libebml-$(EBML_VERSION).tar.xz
 
-$(TARBALLS)/libebml-$(EBML_VERSION).tar.bz2:
+$(TARBALLS)/libebml-$(EBML_VERSION).tar.xz:
 	$(call download_pkg,$(EBML_URL),ebml)
 
-.sum-ebml: libebml-$(EBML_VERSION).tar.bz2
+.sum-ebml: libebml-$(EBML_VERSION).tar.xz
 
-libebml: libebml-$(EBML_VERSION).tar.bz2 .sum-ebml
+ebml: libebml-$(EBML_VERSION).tar.xz .sum-ebml
 	$(UNPACK)
 	$(MOVE)
 
 # libebml requires exceptions
-EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions -fvisibility=hidden" \
-					CPPFLAGS=""
+EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions -fvisibility=hidden"
+ifdef HAVE_ANDROID
+EBML_EXTRA_FLAGS += CPPFLAGS=""
+endif
 
-.ebml: libebml
+.ebml: ebml
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) $(EBML_EXTRA_FLAGS)
 	cd $< && $(MAKE) install
 	touch $@