From 4bdd29a5d946b6bc2b8cad4405ff179bf0ad3b78 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Wed, 20 Sep 2017 17:59:19 +0200
Subject: [PATCH] [Outgrade submodule] fix xcode9 compilation

---
 .gitmodules                                                | 6 +++---
 Resources/Images.xcassets/AppIcon.appiconset/Contents.json | 5 +++++
 submodules/bcmatroska2                                     | 1 +
 submodules/cmake-builder                                   | 2 +-
 submodules/externals/libmatroska-c                         | 1 -
 5 files changed, 10 insertions(+), 5 deletions(-)
 create mode 160000 submodules/bcmatroska2
 delete mode 160000 submodules/externals/libmatroska-c

diff --git a/.gitmodules b/.gitmodules
index 1702fc8f8..d4527eeb8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -75,9 +75,6 @@
 	path = submodules/externals/vo-amrwbenc
 	url = git://git.linphone.org/vo-amrwbenc.git
 	ignore = dirty
-[submodule "submodules/externals/libmatroska-c"]
-	path = submodules/externals/libmatroska-c
-	url = git://git.linphone.org/libmatroska-c.git
 [submodule "submodules/belr"]
 	path = submodules/belr
 	url = git://git.linphone.org/belr
@@ -111,3 +108,6 @@
 [submodule "submodules/ortp"]
 	path = submodules/ortp
 	url = git://git.linphone.org/ortp.git
+[submodule "submodules/bcmatroska2"]
+	path = submodules/bcmatroska2
+	url = git://git.linphone.org/bcmatroska2.git
diff --git a/Resources/Images.xcassets/AppIcon.appiconset/Contents.json b/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
index 4685e885b..8a8659e60 100644
--- a/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
+++ b/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
@@ -127,6 +127,11 @@
       "idiom" : "ipad",
       "filename" : "linphone_icon_167.png",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {
diff --git a/submodules/bcmatroska2 b/submodules/bcmatroska2
new file mode 160000
index 000000000..46f30179f
--- /dev/null
+++ b/submodules/bcmatroska2
@@ -0,0 +1 @@
+Subproject commit 46f30179fcc9d00f35f7d0ef8eacce0a204e4d07
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 5bcddfbf5..404cd8694 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 5bcddfbf5d3433723919cd540cd23040e3b88255
+Subproject commit 404cd869464fa591c2a11fb91242c2983f73270f
diff --git a/submodules/externals/libmatroska-c b/submodules/externals/libmatroska-c
deleted file mode 160000
index 9837df79a..000000000
--- a/submodules/externals/libmatroska-c
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9837df79acb64f81670e464665985b09c4d0a994