From 6ee24d980478de7ec8e4e0f74e06ee50e93f8170 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 28 Jan 2016 12:01:42 +0100
Subject: [PATCH] Makefile: fix libmatroska compilation

---
 Makefile                                                      | 4 ++--
 jni/Android.mk                                                | 2 +-
 submodules/belle-sip                                          | 2 +-
 .../externals/build/{libmatroska => libmatroska-c}/Android.mk | 2 +-
 .../{libmatroska => libmatroska-c}/fix_libmatroska2.patch     | 0
 submodules/linphone                                           | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename submodules/externals/build/{libmatroska => libmatroska-c}/Android.mk (97%)
 rename submodules/externals/build/{libmatroska => libmatroska-c}/fix_libmatroska2.patch (100%)

diff --git a/Makefile b/Makefile
index e7f81cb53..142822082 100644
--- a/Makefile
+++ b/Makefile
@@ -418,8 +418,8 @@ prepare-liblinphone_tester: $(TOPDIR)/submodules/linphone/tester/tester_hosts $(
 
 
 #Matroska2
-MATROSKA_SRC_DIR=$(TOPDIR)/submodules/externals/libmatroska
-MATROSKA_BUILD_DIR=$(TOPDIR)/submodules/externals/build/libmatroska
+MATROSKA_SRC_DIR=$(TOPDIR)/submodules/externals/libmatroska-c
+MATROSKA_BUILD_DIR=$(TOPDIR)/submodules/externals/build/libmatroska-c
 ifeq ($(BUILD_MATROSKA), 1)
 prepare-matroska2: $(MATROSKA_SRC_DIR)/patch_applied.txt
 else
diff --git a/jni/Android.mk b/jni/Android.mk
index fbb7fb5a0..30cf57f03 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -54,7 +54,7 @@ include $(linphone-root-dir)/submodules/externals/build/gsm/Android.mk
 
 # Matroska
 ifeq ($(BUILD_MATROSKA), 1)
-include $(linphone-root-dir)/submodules/externals/build/libmatroska/Android.mk
+include $(linphone-root-dir)/submodules/externals/build/libmatroska-c/Android.mk
 endif
 
 include $(linphone-root-dir)/submodules/externals/build/polarssl/Android.mk
diff --git a/submodules/belle-sip b/submodules/belle-sip
index f76447b43..77d350a94 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit f76447b43e3bbd31dfe6fdbe280e99e2aea73382
+Subproject commit 77d350a949ad073de0718ab60b86c74930517f1b
diff --git a/submodules/externals/build/libmatroska/Android.mk b/submodules/externals/build/libmatroska-c/Android.mk
similarity index 97%
rename from submodules/externals/build/libmatroska/Android.mk
rename to submodules/externals/build/libmatroska-c/Android.mk
index f84021249..720bf2535 100644
--- a/submodules/externals/build/libmatroska/Android.mk
+++ b/submodules/externals/build/libmatroska-c/Android.mk
@@ -1,4 +1,4 @@
-LOCAL_PATH:=$(call my-dir)/../../libmatroska
+LOCAL_PATH:=$(call my-dir)/../../libmatroska-c
 
 include $(CLEAR_VARS)
 
diff --git a/submodules/externals/build/libmatroska/fix_libmatroska2.patch b/submodules/externals/build/libmatroska-c/fix_libmatroska2.patch
similarity index 100%
rename from submodules/externals/build/libmatroska/fix_libmatroska2.patch
rename to submodules/externals/build/libmatroska-c/fix_libmatroska2.patch
diff --git a/submodules/linphone b/submodules/linphone
index b0ea18f83..fdaca52ec 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit b0ea18f83cd642243c5a2e1690d5cf95bfe55000
+Subproject commit fdaca52ec4aa225670ee978ddfc7f5fe7cd9df9b