From b6ef06167896aca7ef603f0ba9e65b2e11ef1e16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
 <francois.grisez@belledonne-communications.com>
Date: Fri, 1 Aug 2014 17:32:50 +0200
Subject: [PATCH] Add matroska support

---
 Makefile            | 18 ++++++++++++++----
 jni/Android.mk      |  4 ++--
 submodules/linphone |  2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 976115fe0..0bd2bf08e 100644
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ BUILD_SILK=1
 BUILD_TUNNEL=0
 BUILD_WEBRTC_AECM=1
 BUILD_OPUS=1
-BUILD_MATROSKA=0
+BUILD_MATROSKA=1
 BUILD_WEBRTC_ISAC=1
 BUILD_FOR_X86=1
 USE_JAVAH=1
@@ -295,6 +295,7 @@ BUILD_MATROSKA_DEPS=$(LIBEBML2_BUILD_DIR)/arm/libebml2.a $(LIBMATROSKA_BUILD_DIR
 ifeq ($(BUILD_FOR_X86), 1)
 BUILD_MATROSKA_DEPS+=$(LIBEBML2_BUILD_DIR)/x86/libebml2.a $(LIBMATROSKA_BUILD_DIR)/x86/libmatroska2.a
 endif #BUILD_FOR_X86
+BUILD_MATROSKA_DEPS += $(LIBEBML2_BUILD_DIR)/include $(LIBMATROSKA_BUILD_DIR)/include
 endif #BUILD_MATROSKA
 endif #BUILD_VIDEO
 LIBMATROSKA_SRC_DIR=$(TOPDIR)/submodules/externals/libmatroska
@@ -354,11 +355,20 @@ $(LIBMATROSKA_SRC_DIR)/fix_coremake.txt:
 	cp $(LIBMATROSKA_BUILD_DIR)/android_x86.build $(LIBMATROSKA_SRC_DIR)/corec/tools/coremake
 	touch $@
 	
+$(LIBEBML2_BUILD_DIR)/include: $(LIBMATROSKA_SRC_DIR)/libebml2/ebml $(LIBMATROSKA_SRC_DIR)/corec/corec $(LIBMATROSKA_BUILD_DIR)/config.h
+	mkdir $@
+	cp -r $(LIBMATROSKA_SRC_DIR)/libebml2/ebml $(LIBMATROSKA_SRC_DIR)/corec/corec $@
+	cp $(LIBMATROSKA_BUILD_DIR)/config.h $(LIBEBML2_BUILD_DIR)/include/corec
+
+$(LIBMATROSKA_BUILD_DIR)/include: $(LIBMATROSKA_SRC_DIR)/libmatroska2/matroska
+	mkdir $@
+	cp -r $(LIBMATROSKA_SRC_DIR)/libmatroska2/matroska $@
+
 build-matroska: $(BUILD_MATROSKA_DEPS)
 
 clean-matroska:
-	rm -rf $(LIBMATROSKA_BUILD_DIR)/{arm,x86}
-	rm -rf $(LIBEBML2_BUILD_DIR)/{arm,x86}
+	rm -rf $(LIBMATROSKA_BUILD_DIR)/{arm,x86,include}
+	rm -rf $(LIBEBML2_BUILD_DIR)/{arm,x86,include}
 	cd $(LIBMATROSKA_SRC_DIR); $(COREMAKE) clean
 
 #SILK
@@ -458,7 +468,7 @@ prepare-sources: build-ffmpeg build-x264 build-openh264 prepare-ilbc build-vpx b
 
 GENERATE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) BUILD_FOR_X86=$(BUILD_FOR_X86) \
 	BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_OPUS=$(BUILD_OPUS) \
-	BUILD_VIDEO=$(BUILD_VIDEO) BUILD_X264=$(BUILD_X264) BUILD_OPENH264=$(BUILD_OPENH264) \
+	BUILD_VIDEO=$(BUILD_VIDEO) BUILD_X264=$(BUILD_X264) BUILD_OPENH264=$(BUILD_OPENH264) BUILD_MATROSKA=$(BUILD_MATROSKA) \
 	BUILD_UPNP=$(BUILD_UPNP) BUILD_ZRTP=$(BUILD_ZRTP) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_WEBRTC_ISAC=$(BUILD_WEBRTC_ISAC)
 
 
diff --git a/jni/Android.mk b/jni/Android.mk
index b1386f070..9c0309627 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -101,8 +101,8 @@ include $(linphone-root-dir)/submodules/externals/build/ffmpeg/Android.mk
 include $(linphone-root-dir)/submodules/externals/build/libvpx/Android.mk
 
 ifeq ($(BUILD_MATROSKA), 1)
-include $(linphone-root-dir)/submodules/externals/buil/libebml/Android.mk
-include $(linphone-root-dir)/submodules/externals/buil/libmatroska/Android.mk
+include $(linphone-root-dir)/submodules/externals/build/libebml2/Android.mk
+include $(linphone-root-dir)/submodules/externals/build/libmatroska/Android.mk
 endif
 
 endif #_BUILD_VIDEO
diff --git a/submodules/linphone b/submodules/linphone
index 3dc580128..7d7c860c9 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 3dc58012831d75d6622d2992aeeecdcdc269f639
+Subproject commit 7d7c860c973cbe205a33530ac7854bfcd0534dc1