contrib: Allow libebml build on Android x86

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

diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak
index 21177af0237cff6ca8c175f6d04e105c7c75a15e..3708b33063dca3f71b44b50f7fad332fcd65f727 100644 (file)
--- a/contrib/src/ebml/rules.mak
+++ b/contrib/src/ebml/rules.mak
@@ -1,24 +1,29 @@
 # ebml
 
-EBML_VERSION := 1.2.0
+EBML_VERSION := 1.2.2
 EBML_URL := http://dl.matroska.org/downloads/libebml/libebml-$(EBML_VERSION).tar.bz2
 #EBML_URL := $(CONTRIB_VIDEOLAN)/libebml-$(EBML_VERSION).tar.bz2
 
 $(TARBALLS)/libebml-$(EBML_VERSION).tar.bz2:
-       $(DOWNLOAD) $(EBML_URL)
+       $(call download,$(EBML_URL))
 
 .sum-ebml: libebml-$(EBML_VERSION).tar.bz2
 
 libebml: libebml-$(EBML_VERSION).tar.bz2 .sum-ebml
        $(UNPACK)
-       mv $@-$(EBML_VERSION) $@
-       touch $@
+       $(APPLY) $(SRC)/ebml/ebml-pic.patch
+       $(APPLY) $(SRC)/ebml/no-ansi.patch
+       $(MOVE)
+
+# libebml requires exceptions
+EBML_EXTRA_FLAGS = CXXFLAGS="${CXXFLAGS} -fexceptions" \
+                                       CPPFLAGS=""
 
 .ebml: libebml
 ifdef HAVE_WIN32
        cd $< && $(MAKE) -C make/mingw32 prefix="$(PREFIX)" $(HOSTVARS) SHARED=no
 else
-       cd $< && $(MAKE) -C make/linux prefix="$(PREFIX)" $(HOSTVARS) staticlib
+       cd $< && $(MAKE) -C make/linux prefix="$(PREFIX)" $(HOSTVARS) $(EBML_EXTRA_FLAGS) staticlib
 endif
        cd $< && $(MAKE) -C make/linux install_staticlib install_headers prefix="$(PREFIX)" $(HOSTVARS)
        $(RANLIB) "$(PREFIX)/lib/libebml.a"