From 29628c0c11cbc42d74e5e785bf3b8d0ac2bcff67 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 22 May 2015 17:21:33 +0200
Subject: [PATCH 01/32] Update several submodules for build with CMake.

---
 submodules/bcg729           | 2 +-
 submodules/belle-sip        | 2 +-
 submodules/bzrtp            | 2 +-
 submodules/cmake-builder    | 2 +-
 submodules/externals/antlr3 | 2 +-
 submodules/externals/speex  | 2 +-
 submodules/externals/srtp   | 2 +-
 submodules/libilbc-rfc3951  | 2 +-
 submodules/linphone         | 2 +-
 submodules/msamr            | 2 +-
 submodules/msilbc           | 2 +-
 submodules/msopenh264       | 2 +-
 submodules/mssilk           | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/submodules/bcg729 b/submodules/bcg729
index 0a58e95c1..dc37a9a01 160000
--- a/submodules/bcg729
+++ b/submodules/bcg729
@@ -1 +1 @@
-Subproject commit 0a58e95c1d7f7da9035456f2b1bcfa832bfd2d7e
+Subproject commit dc37a9a01a9b69f49b6339cd2f5d999fcf584a89
diff --git a/submodules/belle-sip b/submodules/belle-sip
index aa049d272..97bdfd1f5 160000
--- a/submodules/belle-sip
+++ b/submodules/belle-sip
@@ -1 +1 @@
-Subproject commit aa049d2723f7dd9441cb5de1138f5aa6f417d8cc
+Subproject commit 97bdfd1f51c441c441e713de8c1d50cd037cda5d
diff --git a/submodules/bzrtp b/submodules/bzrtp
index 4a4f757f6..7f0b84802 160000
--- a/submodules/bzrtp
+++ b/submodules/bzrtp
@@ -1 +1 @@
-Subproject commit 4a4f757f66b02cf8834fd8d7a939bf54b245ad7e
+Subproject commit 7f0b84802a6e1d1f99efb95de4d9b460069a3f23
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 0e703903c..80cabceb7 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 0e703903c89ab1e3ef06d2697b4d844afc5a0851
+Subproject commit 80cabceb7c60c308285d428bc7c6edaecc9bde5f
diff --git a/submodules/externals/antlr3 b/submodules/externals/antlr3
index 489f375fb..812695383 160000
--- a/submodules/externals/antlr3
+++ b/submodules/externals/antlr3
@@ -1 +1 @@
-Subproject commit 489f375fb391cb70d82b56f509c39cbf7fa0b706
+Subproject commit 812695383316c7227c06df2b30725a9e5e4a11a0
diff --git a/submodules/externals/speex b/submodules/externals/speex
index f0bbb55db..415653bfe 160000
--- a/submodules/externals/speex
+++ b/submodules/externals/speex
@@ -1 +1 @@
-Subproject commit f0bbb55db823234366993ce4b64f2b14ab025260
+Subproject commit 415653bfef10b46d5e7bfa3ad70a68976b77e7b5
diff --git a/submodules/externals/srtp b/submodules/externals/srtp
index 4338c102f..37448b2ae 160000
--- a/submodules/externals/srtp
+++ b/submodules/externals/srtp
@@ -1 +1 @@
-Subproject commit 4338c102f5a4b8f89b7019ed66fb456e3e3359ae
+Subproject commit 37448b2aebeb5e9bd2d39d3a82f0721123cdd4a2
diff --git a/submodules/libilbc-rfc3951 b/submodules/libilbc-rfc3951
index 9ab4928dc..bc20f1196 160000
--- a/submodules/libilbc-rfc3951
+++ b/submodules/libilbc-rfc3951
@@ -1 +1 @@
-Subproject commit 9ab4928dcacaa1ef35a7bdc328d706a4569f29a3
+Subproject commit bc20f11963878a1f32511de59b05490093e5c9b8
diff --git a/submodules/linphone b/submodules/linphone
index 5d5808b70..9dbaa4299 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 5d5808b705214fb1db2ae8241d5476606e09eb97
+Subproject commit 9dbaa4299b785d01868b50e6bc4c24f14b34920b
diff --git a/submodules/msamr b/submodules/msamr
index eb17e35a2..c2a0886a9 160000
--- a/submodules/msamr
+++ b/submodules/msamr
@@ -1 +1 @@
-Subproject commit eb17e35a22301db309b51bd9d458fb00972bd4c3
+Subproject commit c2a0886a9350004e3da94d968cae9978c7472a9d
diff --git a/submodules/msilbc b/submodules/msilbc
index afe533687..b5a2b0702 160000
--- a/submodules/msilbc
+++ b/submodules/msilbc
@@ -1 +1 @@
-Subproject commit afe5336871be478f54e794d4f649e2c1f18dcaff
+Subproject commit b5a2b070259ef0c4f404fa8ca87752b8b1259d76
diff --git a/submodules/msopenh264 b/submodules/msopenh264
index 5a8473c09..172e97a83 160000
--- a/submodules/msopenh264
+++ b/submodules/msopenh264
@@ -1 +1 @@
-Subproject commit 5a8473c091d05d9eed67febdd555955f0b925900
+Subproject commit 172e97a83aa2a868fd3dbbd6e7d57ad7d55f3054
diff --git a/submodules/mssilk b/submodules/mssilk
index dcb4798df..06504344a 160000
--- a/submodules/mssilk
+++ b/submodules/mssilk
@@ -1 +1 @@
-Subproject commit dcb4798df328186b3d177d10af5145aafed8352e
+Subproject commit 06504344a367c033598a9dcaa6ff8387269e5a9a

From 4c5a6458f95680adc29c24a6b8ae007a2081834d Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 25 May 2015 11:16:20 +0200
Subject: [PATCH 02/32] Update gsm and linphone-cmake-builder submodules.

---
 submodules/cmake-builder | 2 +-
 submodules/externals/gsm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 80cabceb7..135daa1a2 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 80cabceb7c60c308285d428bc7c6edaecc9bde5f
+Subproject commit 135daa1a26407ce7b1e46ce87544b096bb794c83
diff --git a/submodules/externals/gsm b/submodules/externals/gsm
index 405fb3856..57d904f7f 160000
--- a/submodules/externals/gsm
+++ b/submodules/externals/gsm
@@ -1 +1 @@
-Subproject commit 405fb3856f0b9e902dcb159ec6a3409ba6e78476
+Subproject commit 57d904f7fdc97e611b4a09ff7753d5d648ff82cd

From 31e61e19cf1f49e3ca4ec9f674927f9ce72e8c61 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 25 May 2015 17:30:46 +0200
Subject: [PATCH 03/32] Generate Makefile from prepare.py when building with
 CMake.

---
 prepare.py               | 51 ++++++++++++++++++++++++++++++++++++++++
 submodules/cmake-builder |  2 +-
 2 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/prepare.py b/prepare.py
index 6c3601bac..47951104b 100755
--- a/prepare.py
+++ b/prepare.py
@@ -55,6 +55,7 @@ def main(argv = None):
 		selected_platforms += [args.platform]
 
 	retcode = 0
+	makefile_platforms = []
 	for platform in selected_platforms:
 		target = prepare.targets['ios-' + platform]
 
@@ -66,6 +67,56 @@ def main(argv = None):
 			retcode = prepare.run(target, args.debug, False, args.list_cmake_variables, args.force, additional_args)
 			if retcode != 0:
 				return retcode
+			makefile_platforms += [platform]
+
+	if makefile_platforms:
+		archs_specific = ""
+		for arch in makefile_platforms[1:]:
+			archs_specific += \
+"""		if test -f "$${arch}_path"; then \\
+			all_paths=`echo $$all_paths $${arch}_path`; \\
+			all_archs="$$all_archs,{arch}" ; \\
+		else \\
+			echo "WARNING: archive `basename $$archive` exists in {first_arch} tree but does not exists in {arch} tree: $${arch}_path."; \\
+		fi; \\
+""".format(first_arch=makefile_platforms[0], arch=arch)
+		makefile = """
+archs={archs}
+
+.PHONY: all
+
+all: multi-arch
+
+build-%:
+	make -C WORK/cmake-ios-$*
+
+multi-arch: $(addprefix build-,$(archs))
+	archives=`find liblinphone-sdk/{first_arch}-apple-darwin.ios -name *.a` && \\
+	mkdir -p liblinphone-sdk/apple-darwin && \\
+	cp -rf liblinphone-sdk/{first_arch}-apple-darwin.ios/include liblinphone-sdk/apple-darwin/. && \\
+	cp -rf liblinphone-sdk/{first_arch}-apple-darwin.ios/share liblinphone-sdk/apple-darwin/. && \\
+	for archive in $$archives ; do \\
+		armv7_path=`echo $$archive | sed -e "s/{first_arch}/armv7/"`; \\
+		arm64_path=`echo $$archive | sed -e "s/{first_arch}/aarch64/"`; \\
+		i386_path=`echo $$archive | sed -e "s/{first_arch}/i386/"`; \\
+		x86_64_path=`echo $$archive | sed -e "s/{first_arch}/x86_64/"`; \\
+		destpath=`echo $$archive | sed -e "s/-debug//" | sed -e "s/{first_arch}-//" | sed -e "s/\.ios//"`; \\
+		all_paths=`echo $$archive`; \\
+		all_archs="{first_arch}"; \\
+		mkdir -p `dirname $$destpath`; \\
+		{archs_specific} \\
+		echo "[$$all_archs] Mixing `basename $$archive` in $$destpath"; \\
+		lipo -create $$all_paths -output $$destpath; \\
+	done && \\
+	if ! test -f liblinphone-sdk/apple-darwin/lib/libtunnel.a ; then \\
+		cp -f submodules/binaries/libdummy.a liblinphone-sdk/apple-darwin/lib/libtunnel.a ; \\
+	fi
+""".format(archs=' '.join(makefile_platforms), first_arch=makefile_platforms[0], archs_specific=archs_specific)
+		f = open('Makefile', 'w')
+		f.write(makefile)
+		f.close()
+	elif os.path.isfile('Makefile'):
+		os.remove('Makefile')
 
 	return retcode
 
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 135daa1a2..3ae778a60 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 135daa1a26407ce7b1e46ce87544b096bb794c83
+Subproject commit 3ae778a60f65ac3aca2cc89d13fe0695bfd78cb7

From 20f8787e14150ee4c148b20d234eeac7999aeeed Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Tue, 26 May 2015 10:51:47 +0200
Subject: [PATCH 04/32] =?UTF-8?q?AboutViewController:=20remove=20ending=20?=
 =?UTF-8?q?part=20of=20copyright=20since=20it=20still=20applies=20(=C2=A9?=
 =?UTF-8?q?=202010=20-=20Belledonne=20Communications)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Classes/Base.lproj/AboutViewController.xib | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Classes/Base.lproj/AboutViewController.xib b/Classes/Base.lproj/AboutViewController.xib
index 052697f51..8248666f4 100644
--- a/Classes/Base.lproj/AboutViewController.xib
+++ b/Classes/Base.lproj/AboutViewController.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AboutViewController">
@@ -62,7 +62,7 @@
                     <color key="textColor" red="0.35686275360000003" green="0.3960784376" blue="0.43529412150000002" alpha="1" colorSpace="deviceRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="© 2010-2012 Belledonne Communications " textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" id="58" userLabel="copyrightLabel">
+                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="© 2010 Belledonne Communications " textAlignment="center" lineBreakMode="tailTruncation" minimumFontSize="10" id="58" userLabel="copyrightLabel">
                     <rect key="frame" x="10" y="300" width="300" height="21"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>

From b43e8fde1f2df296fb7c55aec53cfbbd3204a8b0 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 26 May 2015 11:46:12 +0200
Subject: [PATCH 05/32] Update linphone-cmake-builder submodule + move IOS
 targets to here.

---
 prepare.py               | 44 ++++++++++++++++++++++++++++++++++++++--
 submodules/cmake-builder |  2 +-
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/prepare.py b/prepare.py
index 47951104b..0478c31a2 100755
--- a/prepare.py
+++ b/prepare.py
@@ -24,11 +24,51 @@
 
 import argparse
 import os
+import shutil
 import sys
 sys.path.insert(0, 'submodules/cmake-builder')
 import prepare
 
 
+class IOSTarget(prepare.Target):
+	def __init__(self, arch):
+		prepare.Target.__init__(self, 'ios-' + arch)
+		current_path = os.path.dirname(os.path.realpath(__file__))
+		self.config_file = 'configs/config-ios-' + arch + '.cmake'
+		self.toolchain_file = 'toolchains/toolchain-ios-' + arch + '.cmake'
+		self.output = 'liblinphone-sdk/' + arch + '-apple-darwin.ios'
+		self.additional_args = [
+			'-DLINPHONE_BUILDER_EXTERNAL_SOURCE_PATH=' + current_path + '/submodules'
+		]
+
+	def clean(self):
+		prepare.Target.clean(self)
+		if os.path.isdir('liblinphone-sdk/apple-darwin'):
+			shutil.rmtree('liblinphone-sdk/apple-darwin', ignore_errors=False, onerror=self.handle_remove_read_only)
+
+
+class IOSi386Target(IOSTarget):
+	def __init__(self):
+		IOSTarget.__init__(self, 'i386')
+
+class IOSx8664Target(IOSTarget):
+	def __init__(self):
+		IOSTarget.__init__(self, 'x86_64')
+
+class IOSarmv7Target(IOSTarget):
+	def __init__(self):
+		IOSTarget.__init__(self, 'armv7')
+
+class IOSarm64Target(IOSTarget):
+	def __init__(self):
+		IOSTarget.__init__(self, 'arm64')
+
+
+targets = {}
+targets['i386'] = IOSi386Target()
+targets['x86_64'] = IOSx8664Target()
+targets['armv7'] = IOSarmv7Target()
+targets['arm64'] = IOSarm64Target()
 platforms = ['all', 'devices', 'simulators', 'armv7', 'arm64', 'i386', 'x86_64']
 
 
@@ -57,7 +97,7 @@ def main(argv = None):
 	retcode = 0
 	makefile_platforms = []
 	for platform in selected_platforms:
-		target = prepare.targets['ios-' + platform]
+		target = targets[platform]
 
 		if args.veryclean:
 			target.veryclean()
@@ -88,7 +128,7 @@ archs={archs}
 all: multi-arch
 
 build-%:
-	make -C WORK/cmake-ios-$*
+	$(MAKE) -C WORK/ios-$*/cmake
 
 multi-arch: $(addprefix build-,$(archs))
 	archives=`find liblinphone-sdk/{first_arch}-apple-darwin.ios -name *.a` && \\
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 3ae778a60..fcc8df3d3 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 3ae778a60f65ac3aca2cc89d13fe0695bfd78cb7
+Subproject commit fcc8df3d3ea5f90c3d09713487073a7065a3b542

From 7d31299ca8fb2793d7bfb3f60d810ce60318a8f0 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 26 May 2015 14:12:18 +0200
Subject: [PATCH 06/32] Add same makefile targets for build with CMake as the
 classic build system.

---
 prepare.py | 84 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 77 insertions(+), 7 deletions(-)

diff --git a/prepare.py b/prepare.py
index 0478c31a2..dd83562de 100755
--- a/prepare.py
+++ b/prepare.py
@@ -110,9 +110,23 @@ def main(argv = None):
 			makefile_platforms += [platform]
 
 	if makefile_platforms:
-		archs_specific = ""
+		packages = os.listdir('WORK/ios-' + makefile_platforms[0] + '/Build')
+		packages.sort()
+		arch_targets = ""
+		for arch in makefile_platforms:
+			arch_targets += """
+{arch}:
+	$(MAKE) -C WORK/ios-{arch}/cmake
+
+{arch}-build-%:
+	$(MAKE) -C WORK/ios-{arch}/Build/$* install || exit 1;
+
+{arch}-clean-%:
+	$(MAKE) -C WORK/ios-{arch}/Build/$* clean || exit 1;
+""".format(arch=arch)
+		multiarch = ""
 		for arch in makefile_platforms[1:]:
-			archs_specific += \
+			multiarch += \
 """		if test -f "$${arch}_path"; then \\
 			all_paths=`echo $$all_paths $${arch}_path`; \\
 			all_archs="$$all_archs,{arch}" ; \\
@@ -122,15 +136,31 @@ def main(argv = None):
 """.format(first_arch=makefile_platforms[0], arch=arch)
 		makefile = """
 archs={archs}
+LINPHONE_IPHONE_VERSION=$(shell git describe --always)
 
 .PHONY: all
 
-all: multi-arch
+all: build
 
-build-%:
+{arch_targets}
+all-%:
 	$(MAKE) -C WORK/ios-$*/cmake
 
-multi-arch: $(addprefix build-,$(archs))
+build-%:
+	@for arch in $(archs); do \\
+		echo "==== starting build of $* for arch $$arch ===="; \\
+		$(MAKE) -C WORK/ios-$$arch/Build/$* install || exit 1; \\
+	done
+
+clean-%:
+	@for arch in $(archs); do \\
+		echo "==== starting clean of $* for arch $$arch ===="; \\
+		$(MAKE) -C WORK/ios-$$arch/Build/$* clean || exit 1; \\
+	done
+
+build: libs
+
+libs: $(addprefix all-,$(archs))
 	archives=`find liblinphone-sdk/{first_arch}-apple-darwin.ios -name *.a` && \\
 	mkdir -p liblinphone-sdk/apple-darwin && \\
 	cp -rf liblinphone-sdk/{first_arch}-apple-darwin.ios/include liblinphone-sdk/apple-darwin/. && \\
@@ -144,14 +174,54 @@ multi-arch: $(addprefix build-,$(archs))
 		all_paths=`echo $$archive`; \\
 		all_archs="{first_arch}"; \\
 		mkdir -p `dirname $$destpath`; \\
-		{archs_specific} \\
+		{multiarch} \\
 		echo "[$$all_archs] Mixing `basename $$archive` in $$destpath"; \\
 		lipo -create $$all_paths -output $$destpath; \\
 	done && \\
 	if ! test -f liblinphone-sdk/apple-darwin/lib/libtunnel.a ; then \\
 		cp -f submodules/binaries/libdummy.a liblinphone-sdk/apple-darwin/lib/libtunnel.a ; \\
 	fi
-""".format(archs=' '.join(makefile_platforms), first_arch=makefile_platforms[0], archs_specific=archs_specific)
+
+sdk: libs
+	echo "Generating SDK zip file for version $(LINPHONE_IPHONE_VERSION)"
+	zip -r liblinphone-iphone-sdk-$(LINPHONE_IPHONE_VERSION).zip \\
+	liblinphone-sdk/apple-darwin \\
+	liblinphone-tutorials \\
+	-x liblinphone-tutorials/hello-world/build\* \\
+	-x liblinphone-tutorials/hello-world/hello-world.xcodeproj/*.pbxuser \\
+	-x liblinphone-tutorials/hello-world/hello-world.xcodeproj/*.mode1v3
+
+pull-transifex:
+	tx pull -af
+
+push-transifex:
+	&& ./Tools/generate_strings_files.sh && tx push -s -t -f --no-interactive
+
+zipres:
+	@tar -czf ios_assets.tar.gz Resources iTunesArtwork
+
+help:
+	@echo "(please read the README.md file first)"
+	@echo ""
+	@echo "Available architectures: {archs}"
+	@echo "Available packages: {packages}"
+	@echo ""
+	@echo "Available targets:"
+	@echo ""
+	@echo "   * all       : builds all architectures and creates the liblinphone sdk"
+	@echo "   * zipres    : creates a tar.gz file with all the resources (images)"
+	@echo ""
+	@echo "=== Advanced usage ==="
+	@echo ""
+	@echo "   *            build-[package] : builds the package for all architectures"
+	@echo "   *            clean-[package] : clean the package for all architectures"
+	@echo ""
+	@echo "   *     [{arch_opts}]-build-[package] : builds a package for the selected architecture"
+	@echo "   *     [{arch_opts}]-clean-[package] : clean the package for the selected architecture"
+	@echo ""
+	@echo "   * sdk  : re-add all generated libraries to the SDK. Use this only after a full build."
+	@echo "   * libs : after a rebuild of a subpackage, will mix the new libs in liblinphone-sdk/apple-darwin directory"
+""".format(archs=' '.join(makefile_platforms), arch_opts='|'.join(makefile_platforms), first_arch=makefile_platforms[0], arch_targets=arch_targets, packages=' '.join(packages), multiarch=multiarch)
 		f = open('Makefile', 'w')
 		f.write(makefile)
 		f.close()

From 75c3dbcfd3cb5928ede5b46dd3160bde9a81eca9 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 26 May 2015 16:37:56 +0200
Subject: [PATCH 07/32] Update linphone-cmake-builder.

---
 submodules/cmake-builder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index fcc8df3d3..c1ef3535b 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit fcc8df3d3ea5f90c3d09713487073a7065a3b542
+Subproject commit c1ef3535b8e1817137580355934547083000216c

From 44e48126f7ea984cc2392c4065061c0a20fec10c Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 26 May 2015 17:10:47 +0200
Subject: [PATCH 08/32] Fix installation path for arm64.

---
 prepare.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/prepare.py b/prepare.py
index dd83562de..e7c335e8f 100755
--- a/prepare.py
+++ b/prepare.py
@@ -167,7 +167,7 @@ libs: $(addprefix all-,$(archs))
 	cp -rf liblinphone-sdk/{first_arch}-apple-darwin.ios/share liblinphone-sdk/apple-darwin/. && \\
 	for archive in $$archives ; do \\
 		armv7_path=`echo $$archive | sed -e "s/{first_arch}/armv7/"`; \\
-		arm64_path=`echo $$archive | sed -e "s/{first_arch}/aarch64/"`; \\
+		arm64_path=`echo $$archive | sed -e "s/{first_arch}/arm64/"`; \\
 		i386_path=`echo $$archive | sed -e "s/{first_arch}/i386/"`; \\
 		x86_64_path=`echo $$archive | sed -e "s/{first_arch}/x86_64/"`; \\
 		destpath=`echo $$archive | sed -e "s/-debug//" | sed -e "s/{first_arch}-//" | sed -e "s/\.ios//"`; \\

From 5a377a454ce05da25eb99c92e0501ac3cc175d82 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 26 May 2015 18:02:04 +0200
Subject: [PATCH 09/32] Allow giving several platforms as arguments to the
 prepare.py script.

---
 prepare.py | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/prepare.py b/prepare.py
index e7c335e8f..4e87f74ad 100755
--- a/prepare.py
+++ b/prepare.py
@@ -71,6 +71,14 @@ targets['armv7'] = IOSarmv7Target()
 targets['arm64'] = IOSarm64Target()
 platforms = ['all', 'devices', 'simulators', 'armv7', 'arm64', 'i386', 'x86_64']
 
+class PlatformListAction(argparse.Action):
+	def __call__(self, parser, namespace, values, option_string=None):
+		if values:
+			for value in values:
+				if value not in platforms:
+					message = ("invalid platform: {0!r} (choose from {1})".format(value, ', '.join([repr(platform) for platform in platforms])))
+					raise argparse.ArgumentError(self, message)
+			setattr(namespace, self.dest, values)
 
 def main(argv = None):
 	if argv is None:
@@ -81,18 +89,20 @@ def main(argv = None):
 	argparser.add_argument('-d', '--debug', help="Prepare a debug build.", action='store_true')
 	argparser.add_argument('-f', '--force', help="Force preparation, even if working directory already exist.", action='store_true')
 	argparser.add_argument('-L', '--list-cmake-variables', help="List non-advanced CMake cache variables.", action='store_true', dest='list_cmake_variables')
-	argparser.add_argument('platform', choices=platforms, help="The platform to build for.")
+	argparser.add_argument('platform', nargs='*', action=PlatformListAction, default=['all'], help="The platform to build for (default is all), one of: {0}.".format(', '.join([repr(platform) for platform in platforms])))
 	args, additional_args = argparser.parse_known_args()
 
 	selected_platforms = []
-	if args.platform == 'all':
-		selected_platforms += ['armv7', 'arm64', 'i386', 'x86_64']
-	elif args.platform == 'devices':
-		selected_platforms += ['armv7', 'arm64']
-	elif args.platform == 'simulators':
-		selected_platforms += ['i386', 'x86_64']
-	else:
-		selected_platforms += [args.platform]
+	for platform in args.platform:
+		if platform == 'all':
+			selected_platforms += ['armv7', 'arm64', 'i386', 'x86_64']
+		elif platform == 'devices':
+			selected_platforms += ['armv7', 'arm64']
+		elif platform == 'simulators':
+			selected_platforms += ['i386', 'x86_64']
+		else:
+			selected_platforms += [platform]
+	selected_platforms = list(set(selected_platforms))
 
 	retcode = 0
 	makefile_platforms = []

From d98043b4aee3f50fe562b2cc5b8bf8d5313bafac Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 27 May 2015 11:23:03 +0200
Subject: [PATCH 10/32] Add Makefile rule to build ipa + show GPL third parties
 warning with prepare.py script.

---
 prepare.py               | 42 +++++++++++++++++++++++++++++++++++++++-
 submodules/cmake-builder |  2 +-
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/prepare.py b/prepare.py
index 4e87f74ad..45af70408 100755
--- a/prepare.py
+++ b/prepare.py
@@ -24,6 +24,7 @@
 
 import argparse
 import os
+import re
 import shutil
 import sys
 sys.path.insert(0, 'submodules/cmake-builder')
@@ -80,6 +81,40 @@ class PlatformListAction(argparse.Action):
 					raise argparse.ArgumentError(self, message)
 			setattr(namespace, self.dest, values)
 
+def warning(platforms):
+	gpl_third_parties_enabled = False
+	regex = re.compile("^ENABLE_GPL_THIRD_PARTIES:BOOL=ON")
+	f = open('WORK/ios-{arch}/cmake/CMakeCache.txt'.format(arch=platforms[0]), 'r')
+	for line in f:
+		if regex.match(line):
+			gpl_third_parties_enabled = True
+			break
+	f.close()
+	
+	if gpl_third_parties_enabled:
+		print("""
+***************************************************************************
+***************************************************************************
+***** CAUTION, this liblinphone SDK is built using 3rd party GPL code *****
+***** Even if you acquired a proprietary license from Belledonne      *****
+***** Communications, this SDK is GPL and GPL only.                   *****
+***** To disable 3rd party gpl code, please use:                      *****
+***** $ ./prepare.py -DENABLE_GPL_THIRD_PARTIES=NO                    *****
+***************************************************************************
+***************************************************************************
+""")
+	else:
+		print("""
+*****************************************************************
+*****************************************************************
+***** Linphone SDK without 3rd party GPL software           *****
+***** If you acquired a proprietary license from Belledonne *****
+***** Communications, this SDK can be used to create        *****
+***** a proprietary linphone-based application.             *****
+*****************************************************************
+*****************************************************************
+""")
+
 def main(argv = None):
 	if argv is None:
 		argv = sys.argv
@@ -168,7 +203,7 @@ clean-%:
 		$(MAKE) -C WORK/ios-$$arch/Build/$* clean || exit 1; \\
 	done
 
-build: libs
+build: libs sdk
 
 libs: $(addprefix all-,$(archs))
 	archives=`find liblinphone-sdk/{first_arch}-apple-darwin.ios -name *.a` && \\
@@ -192,6 +227,10 @@ libs: $(addprefix all-,$(archs))
 		cp -f submodules/binaries/libdummy.a liblinphone-sdk/apple-darwin/lib/libtunnel.a ; \\
 	fi
 
+ipa: build
+	xcodebuild -configuration Release \\
+	&& xcrun -sdk iphoneos PackageApplication -v build/Release-iphoneos/linphone.app -o linphone-iphone.ipa
+
 sdk: libs
 	echo "Generating SDK zip file for version $(LINPHONE_IPHONE_VERSION)"
 	zip -r liblinphone-iphone-sdk-$(LINPHONE_IPHONE_VERSION).zip \\
@@ -235,6 +274,7 @@ help:
 		f = open('Makefile', 'w')
 		f.write(makefile)
 		f.close()
+		warning(makefile_platforms)
 	elif os.path.isfile('Makefile'):
 		os.remove('Makefile')
 
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index c1ef3535b..047fa5e04 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit c1ef3535b8e1817137580355934547083000216c
+Subproject commit 047fa5e04c85c855b0afdabcca929bd35a261065

From f2db91c75daa1e3555222b30d4af04c3f2e2cf3a Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 27 May 2015 14:09:32 +0200
Subject: [PATCH 11/32] Fix xcode project for build with CMake.

---
 linphone.xcodeproj/project.pbxproj | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 7eb29c0da..939ab6314 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -8,7 +8,8 @@
 
 /* Begin PBXBuildFile section */
 		045B5CB318D72E9A0088350C /* libbzrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 045B5CB218D72E9A0088350C /* libbzrtp.a */; };
-		15017E701773578400784ACB /* libxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15017E6F1773578400784ACB /* libxml2.a */; };
+		152F22341B15E83B008C0621 /* libilbcrfc3951.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 152F22331B15E83B008C0621 /* libilbcrfc3951.a */; };
+		152F22361B15E889008C0621 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 152F22351B15E889008C0621 /* libxml2.dylib */; };
 		1560821F18EEF26100765332 /* libmsopenh264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1560821E18EEF26100765332 /* libmsopenh264.a */; };
 		1599105316F746B2007BF52B /* route_bluetooth_off_default_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104316F746B2007BF52B /* route_bluetooth_off_default_landscape.png */; };
 		1599105516F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png in Resources */ = {isa = PBXBuildFile; fileRef = 1599104416F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png */; };
@@ -59,7 +60,6 @@
 		22276E8513C73D3100210156 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8213C73D3100210156 /* libswscale.a */; };
 		22276E8713C73D8A00210156 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8613C73D8A00210156 /* CoreVideo.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		22276E8913C73DC000210156 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8813C73DC000210156 /* CoreMedia.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
-		223148E41178A08200637D6A /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223148E31178A08200637D6A /* libilbc.a */; };
 		223148E61178A09900637D6A /* libmsilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223148E51178A09900637D6A /* libmsilbc.a */; };
 		2234C8E915EE2F7F00E18E83 /* chat_message_delivered.png in Resources */ = {isa = PBXBuildFile; fileRef = 2234C8E715EE2F7F00E18E83 /* chat_message_delivered.png */; };
 		2234C8EB15EE2F7F00E18E83 /* chat_message_not_delivered.png in Resources */ = {isa = PBXBuildFile; fileRef = 2234C8E815EE2F7F00E18E83 /* chat_message_not_delivered.png */; };
@@ -73,8 +73,6 @@
 		224567C2107B968500F10948 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 224567C1107B968500F10948 /* AVFoundation.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		2248E90E12F7E4CF00220D9C /* UIDigitButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 2248E90D12F7E4CF00220D9C /* UIDigitButton.m */; };
 		22509042196BD902007863F6 /* libopenh264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22509041196BD902007863F6 /* libopenh264.a */; };
-		225CB2FA11ABB76400628906 /* linphone-banner.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2F911ABB76400628906 /* linphone-banner.png */; };
-		226183AD1472527D0037138E /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AA1472527D0037138E /* libSKP_SILK_SDK.a */; };
 		226183AE1472527D0037138E /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AB1472527D0037138E /* libsrtp.a */; };
 		226183B0147259670037138E /* libmssilk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AF147259670037138E /* libmssilk.a */; };
 		2264B6D211200342002C2C53 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2264B6D111200342002C2C53 /* SystemConfiguration.framework */; };
@@ -88,8 +86,6 @@
 		228697C411AC29B800E9E0CA /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 228697C311AC29B800E9E0CA /* CFNetwork.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		22968A5F12F875C600588287 /* UISpeakerButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22968A5E12F875C600588287 /* UISpeakerButton.m */; };
 		22A10F3B11F8960300373793 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2C10765B400068D98F /* libortp.a */; };
-		22AA8AFD13D7125600B30535 /* libx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22AA8AFB13D7125500B30535 /* libx264.a */; };
-		22AA8AFE13D7125600B30535 /* libmsx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22AA8AFC13D7125500B30535 /* libmsx264.a */; };
 		22AA8B0113D83F6300B30535 /* UICamSwitch.m in Sources */ = {isa = PBXBuildFile; fileRef = 22AA8B0013D83F6300B30535 /* UICamSwitch.m */; };
 		22AF73C21754C0D100BE8398 /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22AF73C11754C0D000BE8398 /* libopus.a */; };
 		22B5EFA310CE50BD00777D97 /* AddressBookUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22B5EFA210CE50BD00777D97 /* AddressBookUI.framework */; };
@@ -897,6 +893,8 @@
 /* Begin PBXFileReference section */
 		045B5CB218D72E9A0088350C /* libbzrtp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbzrtp.a; path = "liblinphone-sdk/apple-darwin/lib/libbzrtp.a"; sourceTree = "<group>"; };
 		15017E6F1773578400784ACB /* libxml2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxml2.a; path = "liblinphone-sdk/apple-darwin/lib/libxml2.a"; sourceTree = "<group>"; };
+		152F22331B15E83B008C0621 /* libilbcrfc3951.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libilbcrfc3951.a; path = "liblinphone-sdk/apple-darwin/lib/libilbcrfc3951.a"; sourceTree = "<group>"; };
+		152F22351B15E889008C0621 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; };
 		1560821E18EEF26100765332 /* libmsopenh264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmsopenh264.a; path = "liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmsopenh264.a"; sourceTree = "<group>"; };
 		1599104316F746B2007BF52B /* route_bluetooth_off_default_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_off_default_landscape.png; path = Resources/route_bluetooth_off_default_landscape.png; sourceTree = "<group>"; };
 		1599104416F746B2007BF52B /* route_bluetooth_off_disabled_landscape.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = route_bluetooth_off_disabled_landscape.png; path = Resources/route_bluetooth_off_disabled_landscape.png; sourceTree = "<group>"; };
@@ -972,7 +970,6 @@
 		2248E90C12F7E4CF00220D9C /* UIDigitButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIDigitButton.h; sourceTree = "<group>"; };
 		2248E90D12F7E4CF00220D9C /* UIDigitButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIDigitButton.m; sourceTree = "<group>"; };
 		22509041196BD902007863F6 /* libopenh264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopenh264.a; path = "liblinphone-sdk/apple-darwin/lib/libopenh264.a"; sourceTree = "<group>"; };
-		225CB2F911ABB76400628906 /* linphone-banner.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "linphone-banner.png"; path = "liblinphone-sdk/apple-darwin/share/pixmaps/linphone/linphone-banner.png"; sourceTree = "<group>"; };
 		226183AA1472527D0037138E /* libSKP_SILK_SDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libSKP_SILK_SDK.a; path = "liblinphone-sdk/apple-darwin/lib/libSKP_SILK_SDK.a"; sourceTree = "<group>"; };
 		226183AB1472527D0037138E /* libsrtp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsrtp.a; path = "liblinphone-sdk/apple-darwin/lib/libsrtp.a"; sourceTree = "<group>"; };
 		226183AF147259670037138E /* libmssilk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmssilk.a; path = "liblinphone-sdk/apple-darwin/lib/mediastreamer/plugins/libmssilk.a"; sourceTree = "<group>"; };
@@ -1867,11 +1864,12 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				152F22361B15E889008C0621 /* libxml2.dylib in Frameworks */,
+				152F22341B15E83B008C0621 /* libilbcrfc3951.a in Frameworks */,
 				F0B026F31AA710AF00FF49F7 /* libiconv.dylib in Frameworks */,
 				F05BAA621A5D594E00411815 /* libz.dylib in Frameworks */,
 				1560821F18EEF26100765332 /* libmsopenh264.a in Frameworks */,
 				22509042196BD902007863F6 /* libopenh264.a in Frameworks */,
-				15017E701773578400784ACB /* libxml2.a in Frameworks */,
 				22AF73C21754C0D100BE8398 /* libopus.a in Frameworks */,
 				57B0E360173C010400A476B8 /* libpolarssl.a in Frameworks */,
 				223CA7E616D9255800EF1BEC /* libantlr3c.a in Frameworks */,
@@ -1905,14 +1903,12 @@
 				22276E8313C73D3100210156 /* libavcodec.a in Frameworks */,
 				22276E8413C73D3100210156 /* libavutil.a in Frameworks */,
 				220FAD3210765B400068D98F /* libgsm.a in Frameworks */,
-				223148E41178A08200637D6A /* libilbc.a in Frameworks */,
 				F476004B147AAF2800FFF19B /* liblinphone.a in Frameworks */,
 				D37EE10916032DA4003608A6 /* libmediastreamer_base.a in Frameworks */,
 				D37EE10A16032DA4003608A6 /* libmediastreamer_voip.a in Frameworks */,
 				226F2ED81344B0EF00F6EF27 /* libmsamr.a in Frameworks */,
 				223148E61178A09900637D6A /* libmsilbc.a in Frameworks */,
 				226183B0147259670037138E /* libmssilk.a in Frameworks */,
-				22AA8AFE13D7125600B30535 /* libmsx264.a in Frameworks */,
 				22A10F3B11F8960300373793 /* libortp.a in Frameworks */,
 				226F2ED71344B0EF00F6EF27 /* libopencore-amrnb.a in Frameworks */,
 				226F2ED61344B0EF00F6EF27 /* libopencore-amrwb.a in Frameworks */,
@@ -1920,10 +1916,8 @@
 				220FAD3810765B400068D98F /* libspeex.a in Frameworks */,
 				220FAD3910765B400068D98F /* libspeexdsp.a in Frameworks */,
 				226183AE1472527D0037138E /* libsrtp.a in Frameworks */,
-				226183AD1472527D0037138E /* libSKP_SILK_SDK.a in Frameworks */,
 				22276E8513C73D3100210156 /* libswscale.a in Frameworks */,
 				7066FC0C13E830E400EFC6DC /* libvpx.a in Frameworks */,
-				22AA8AFD13D7125600B30535 /* libx264.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2266,6 +2260,8 @@
 		29B97323FDCFA39411CA2CEA /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				152F22351B15E889008C0621 /* libxml2.dylib */,
+				152F22331B15E83B008C0621 /* libilbcrfc3951.a */,
 				F0FF66AA1ACAEEB0008A4486 /* IOKit.framework */,
 				F0B026F21AA710AF00FF49F7 /* libiconv.dylib */,
 				F05BAA611A5D594E00411815 /* libz.dylib */,
@@ -2777,7 +2773,6 @@
 				D3432A5D158A4446001C6B0B /* led_error.png */,
 				D3432A6F158A45AF001C6B0B /* led_inprogress.png */,
 				D3012CC31610467D007CD926 /* linphone_logo.png */,
-				225CB2F911ABB76400628906 /* linphone-banner.png */,
 				D3EA5416159858A80037DC6B /* list_delete_default.png */,
 				D3EA5417159858A80037DC6B /* list_delete_over.png */,
 				D354981815876FE7000081D8 /* list_details_default.png */,
@@ -3332,7 +3327,6 @@
 			files = (
 				22F254811073D99800AC9B3F /* ringback.wav in Resources */,
 				2237D4091084D7A9001383EE /* ring.wav in Resources */,
-				225CB2FA11ABB76400628906 /* linphone-banner.png in Resources */,
 				636316D11A1DEBCB0009B839 /* AboutViewController.xib in Resources */,
 				2242E313125235120061DDCE /* ring.caf in Resources */,
 				D38187C915FE346400C3EDCA /* FirstLoginViewController.xib in Resources */,

From ee09658d1c1a4fd6f30ad02b1ab851e9fd0bd01a Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 27 May 2015 14:16:22 +0200
Subject: [PATCH 12/32] Git-ignore WORK directory and top Makefile + update
 linphone-cmake-builder submodule.

---
 .gitignore               | 2 ++
 prepare.py               | 1 +
 submodules/cmake-builder | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index d2bd1744b..57e16863b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@ Classes/LinphoneIOSVersion.h
 Pods/
 build
 test-reports
+WORK
+Makefile
diff --git a/prepare.py b/prepare.py
index 45af70408..cfa091b60 100755
--- a/prepare.py
+++ b/prepare.py
@@ -27,6 +27,7 @@ import os
 import re
 import shutil
 import sys
+sys.dont_write_bytecode = True
 sys.path.insert(0, 'submodules/cmake-builder')
 import prepare
 
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 047fa5e04..06b57cba3 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 047fa5e04c85c855b0afdabcca929bd35a261065
+Subproject commit 06b57cba316a864eae695974d6b06624bf8df6c2

From 1039959cd30295d09986529410f61f614f26c047 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 27 May 2015 15:17:58 +0200
Subject: [PATCH 13/32] Update linphone-cmake-builder submodule.

---
 submodules/cmake-builder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 06b57cba3..3465dedd6 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 06b57cba316a864eae695974d6b06624bf8df6c2
+Subproject commit 3465dedd6607d580572e397216bc73b6921a9cb2

From d93fc2332a61e53e3be00125426b8b745d6b399f Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 27 May 2015 15:18:15 +0200
Subject: [PATCH 14/32] Simplify clean option of prepare.py.

---
 prepare.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/prepare.py b/prepare.py
index cfa091b60..5e54d0ceb 100755
--- a/prepare.py
+++ b/prepare.py
@@ -44,9 +44,10 @@ class IOSTarget(prepare.Target):
 		]
 
 	def clean(self):
-		prepare.Target.clean(self)
-		if os.path.isdir('liblinphone-sdk/apple-darwin'):
-			shutil.rmtree('liblinphone-sdk/apple-darwin', ignore_errors=False, onerror=self.handle_remove_read_only)
+		if os.path.isdir('WORK'):
+			shutil.rmtree('WORK', ignore_errors=False, onerror=self.handle_remove_read_only)
+		if os.path.isdir('liblinphone-sdk'):
+			shutil.rmtree('liblinphone-sdk', ignore_errors=False, onerror=self.handle_remove_read_only)
 
 
 class IOSi386Target(IOSTarget):
@@ -120,8 +121,7 @@ def main(argv = None):
 	if argv is None:
 		argv = sys.argv
 	argparser = argparse.ArgumentParser(description="Prepare build of Linphone and its dependencies.")
-	argparser.add_argument('-c', '--clean', help="Clean a previous build instead of preparing a build.", action='store_true')
-	argparser.add_argument('-C', '--veryclean', help="Clean a previous build and its installation directory.", action='store_true')
+	argparser.add_argument('-c', '-C', '--clean', help="Clean a previous build instead of preparing a build.", action='store_true')
 	argparser.add_argument('-d', '--debug', help="Prepare a debug build.", action='store_true')
 	argparser.add_argument('-f', '--force', help="Force preparation, even if working directory already exist.", action='store_true')
 	argparser.add_argument('-L', '--list-cmake-variables', help="List non-advanced CMake cache variables.", action='store_true', dest='list_cmake_variables')
@@ -145,9 +145,7 @@ def main(argv = None):
 	for platform in selected_platforms:
 		target = targets[platform]
 
-		if args.veryclean:
-			target.veryclean()
-		elif args.clean:
+		if args.clean:
 			target.clean()
 		else:
 			retcode = prepare.run(target, args.debug, False, args.list_cmake_variables, args.force, additional_args)

From f770b8cc3267bf5b7b3a88e69bd6ddeeb015a348 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 27 May 2015 17:16:18 +0200
Subject: [PATCH 15/32] Add clean and veryclean targets in Makefile generated
 by prepare.py.

---
 prepare.py | 41 +++++++++++++++++++++++++++++++++++++----
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/prepare.py b/prepare.py
index 5e54d0ceb..673b205c6 100755
--- a/prepare.py
+++ b/prepare.py
@@ -166,7 +166,21 @@ def main(argv = None):
 	$(MAKE) -C WORK/ios-{arch}/Build/$* install || exit 1;
 
 {arch}-clean-%:
-	$(MAKE) -C WORK/ios-{arch}/Build/$* clean || exit 1;
+	$(MAKE) -C WORK/ios-{arch}/Build/$* clean; \\
+	rm -f WORK/ios-{arch}/Stamp/EP_$*/EP_$*-build; \\
+	rm -f WORK/ios-{arch}/Stamp/EP_$*/EP_$*-install;
+
+{arch}-veryclean-%:
+	cat WORK/ios-{arch}/Build/$*/install_manifest.txt | xargs rm; \\
+	rm -rf WORK/ios-{arch}/Build/$*/*; \\
+	rm -f WORK/ios-{arch}/Stamp/EP_$*/*; \\
+	echo "Run 'make {arch}' to rebuild $* correctly.";
+
+{arch}-clean-openh264:
+	cd WORK/ios-{arch}/Build/openh264; \\
+	make -f ../../../../submodules/externals/openh264/Makefile clean; \\
+	rm -f WORK/ios-{arch}/Stamp/EP_openh264/EP_openh264-build; \\
+	rm -f WORK/ios-{arch}/Stamp/EP_openh264/EP_openh264-install;
 """.format(arch=arch)
 		multiarch = ""
 		for arch in makefile_platforms[1:]:
@@ -180,6 +194,7 @@ def main(argv = None):
 """.format(first_arch=makefile_platforms[0], arch=arch)
 		makefile = """
 archs={archs}
+packages={packages}
 LINPHONE_IPHONE_VERSION=$(shell git describe --always)
 
 .PHONY: all
@@ -193,17 +208,35 @@ all-%:
 build-%:
 	@for arch in $(archs); do \\
 		echo "==== starting build of $* for arch $$arch ===="; \\
-		$(MAKE) -C WORK/ios-$$arch/Build/$* install || exit 1; \\
+		$(MAKE) $$arch-build-$*; \\
 	done
 
 clean-%:
-	@for arch in $(archs); do \\
+	for arch in $(archs); do \\
 		echo "==== starting clean of $* for arch $$arch ===="; \\
-		$(MAKE) -C WORK/ios-$$arch/Build/$* clean || exit 1; \\
+		$(MAKE) $$arch-clean-$*; \\
 	done
 
+veryclean-%:
+	for arch in $(archs); do \\
+		echo "==== starting veryclean of $* for arch $$arch ===="; \\
+		$(MAKE) $$arch-veryclean-$*; \\
+	done; \\
+	echo "Run 'make' to rebuild $* correctly."
+
+clean-openh264:
+	for arch in $(archs); do \\
+		echo "==== starting clean of openh264 for arch $$arch ===="; \\
+		$(MAKE) $(arch)-clean-openh264; \\
+	done; \\
+	echo "Run 'make' to rebuild openh264 correctly."
+
 build: libs sdk
 
+clean: $(addprefix clean-,$(packages))
+
+veryclean: $(addprefix veryclean-,$(packages))
+
 libs: $(addprefix all-,$(archs))
 	archives=`find liblinphone-sdk/{first_arch}-apple-darwin.ios -name *.a` && \\
 	mkdir -p liblinphone-sdk/apple-darwin && \\

From e84f0e2b5e8c571ea17d7d10efeec771a6953581 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Wed, 27 May 2015 17:31:42 +0200
Subject: [PATCH 16/32] Update linphone-cmake-builder and linphone submodules.

---
 submodules/cmake-builder | 2 +-
 submodules/linphone      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 3465dedd6..f520cf7ba 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 3465dedd6607d580572e397216bc73b6921a9cb2
+Subproject commit f520cf7baebead2dd6017c9e042c71f64c2b6d02
diff --git a/submodules/linphone b/submodules/linphone
index 9dbaa4299..f5b65146a 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 9dbaa4299b785d01868b50e6bc4c24f14b34920b
+Subproject commit f5b65146aca5fdcfc4f76937b5187284df052b5e

From d88d98de24cb032cf85442ea7aa6a0cf08bba90c Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 28 May 2015 09:49:46 +0200
Subject: [PATCH 17/32] Fix liblinphone-tester project.

---
 linphone.xcodeproj/project.pbxproj | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 939ab6314..c92f71bc4 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -43,6 +43,8 @@
 		15AF3C9A16F37A5D00FC52EC /* routes_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C9516F37A5D00FC52EC /* routes_disabled.png */; };
 		15AF3C9C16F37A5D00FC52EC /* routes_over.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C9616F37A5D00FC52EC /* routes_over.png */; };
 		15AF3C9E16F37A5D00FC52EC /* routes_selected.png in Resources */ = {isa = PBXBuildFile; fileRef = 15AF3C9716F37A5D00FC52EC /* routes_selected.png */; };
+		15F728731B16FF8B00A1C901 /* libilbcrfc3951.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 152F22331B15E83B008C0621 /* libilbcrfc3951.a */; };
+		15F728741B16FF9A00A1C901 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 152F22351B15E889008C0621 /* libxml2.dylib */; };
 		1D3623260D0F684500981E51 /* LinphoneAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* LinphoneAppDelegate.m */; };
 		1D60589B0D05DD56006BFB54 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
 		1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; };
@@ -731,26 +733,21 @@
 		F0BB8C191936245300974404 /* libbellesip.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223CA7E516D9255800EF1BEC /* libbellesip.a */; };
 		F0BB8C1A1936245300974404 /* libbzrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 045B5CB218D72E9A0088350C /* libbzrtp.a */; };
 		F0BB8C1B1936245300974404 /* libgsm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2910765B400068D98F /* libgsm.a */; };
-		F0BB8C1C1936245300974404 /* libilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223148E31178A08200637D6A /* libilbc.a */; };
 		F0BB8C1D1936245300974404 /* libmsamr.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226F2ED51344B0EF00F6EF27 /* libmsamr.a */; };
 		F0BB8C1E1936245300974404 /* libmsbcg729.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226CDADE14E2D0B800513B67 /* libmsbcg729.a */; };
 		F0BB8C1F1936245300974404 /* libmsilbc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 223148E51178A09900637D6A /* libmsilbc.a */; };
 		F0BB8C201936245300974404 /* libmssilk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AF147259670037138E /* libmssilk.a */; };
-		F0BB8C211936245300974404 /* libmsx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22AA8AFC13D7125500B30535 /* libmsx264.a */; };
 		F0BB8C221936245300974404 /* libopencore-amrnb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226F2ED41344B0EF00F6EF27 /* libopencore-amrnb.a */; };
 		F0BB8C231936245300974404 /* libopencore-amrwb.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226F2ED31344B0EF00F6EF27 /* libopencore-amrwb.a */; };
 		F0BB8C241936245300974404 /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22AF73C11754C0D000BE8398 /* libopus.a */; };
 		F0BB8C251936245300974404 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2C10765B400068D98F /* libortp.a */; };
 		F0BB8C261936245300974404 /* libpolarssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 57B0E35F173C010400A476B8 /* libpolarssl.a */; };
-		F0BB8C271936245300974404 /* libSKP_SILK_SDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AA1472527D0037138E /* libSKP_SILK_SDK.a */; };
 		F0BB8C281936245300974404 /* libspeex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2F10765B400068D98F /* libspeex.a */; };
 		F0BB8C291936245300974404 /* libspeexdsp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD3010765B400068D98F /* libspeexdsp.a */; };
 		F0BB8C2A1936245300974404 /* libsrtp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226183AB1472527D0037138E /* libsrtp.a */; };
 		F0BB8C2B1936245300974404 /* libswscale.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22276E8213C73D3100210156 /* libswscale.a */; };
 		F0BB8C2C1936245300974404 /* libtunnel.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D30BF33216A427BC00AF0026 /* libtunnel.a */; };
 		F0BB8C2D1936245300974404 /* libvpx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7066FC0B13E830E400EFC6DC /* libvpx.a */; };
-		F0BB8C2E1936245300974404 /* libx264.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 22AA8AFB13D7125500B30535 /* libx264.a */; };
-		F0BB8C2F1936245300974404 /* libxml2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15017E6F1773578400784ACB /* libxml2.a */; };
 		F0BB8C301936246600974404 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2274402E106F335E006EC466 /* AudioToolbox.framework */; };
 		F0BB8C331936247C00974404 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D32B6E2E15A5C0AC0033019F /* libsqlite3.dylib */; };
 		F0BB8C35193624C800974404 /* libresolv.9.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F0BB8C34193624C800974404 /* libresolv.9.dylib */; };
@@ -1936,6 +1933,8 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				15F728741B16FF9A00A1C901 /* libxml2.dylib in Frameworks */,
+				15F728731B16FF8B00A1C901 /* libilbcrfc3951.a in Frameworks */,
 				F0A54B0C1AD56F4600C22733 /* libc++.dylib in Frameworks */,
 				F0A54B0D1AD56F4600C22733 /* libstdc++.dylib in Frameworks */,
 				F08D468D1AA86849001E8CB5 /* libiconv.dylib in Frameworks */,
@@ -1953,7 +1952,6 @@
 				F0BB8C1A1936245300974404 /* libbzrtp.a in Frameworks */,
 				F0BB8C121936240300974404 /* libcunit.a in Frameworks */,
 				F0BB8C1B1936245300974404 /* libgsm.a in Frameworks */,
-				F0BB8C1C1936245300974404 /* libilbc.a in Frameworks */,
 				F0BB8C131936242400974404 /* liblinphone.a in Frameworks */,
 				F0BB8C10193623F300974404 /* liblinphonetester.a in Frameworks */,
 				F0BB8C141936242400974404 /* libmediastreamer_base.a in Frameworks */,
@@ -1962,21 +1960,17 @@
 				F0BB8C1E1936245300974404 /* libmsbcg729.a in Frameworks */,
 				F0BB8C1F1936245300974404 /* libmsilbc.a in Frameworks */,
 				F0BB8C201936245300974404 /* libmssilk.a in Frameworks */,
-				F0BB8C211936245300974404 /* libmsx264.a in Frameworks */,
 				F0BB8C221936245300974404 /* libopencore-amrnb.a in Frameworks */,
 				F0BB8C231936245300974404 /* libopencore-amrwb.a in Frameworks */,
 				F0BB8C241936245300974404 /* libopus.a in Frameworks */,
 				F0BB8C251936245300974404 /* libortp.a in Frameworks */,
 				F0BB8C261936245300974404 /* libpolarssl.a in Frameworks */,
-				F0BB8C271936245300974404 /* libSKP_SILK_SDK.a in Frameworks */,
 				F0BB8C281936245300974404 /* libspeex.a in Frameworks */,
 				F0BB8C291936245300974404 /* libspeexdsp.a in Frameworks */,
 				F0BB8C2A1936245300974404 /* libsrtp.a in Frameworks */,
 				F0BB8C2B1936245300974404 /* libswscale.a in Frameworks */,
 				F0BB8C2C1936245300974404 /* libtunnel.a in Frameworks */,
 				F0BB8C2D1936245300974404 /* libvpx.a in Frameworks */,
-				F0BB8C2E1936245300974404 /* libx264.a in Frameworks */,
-				F0BB8C2F1936245300974404 /* libxml2.a in Frameworks */,
 				F0BB8BD81936208100974404 /* UIKit.framework in Frameworks */,
 				F0BB8BD61936208100974404 /* Foundation.framework in Frameworks */,
 			);

From e9603bb702d184ac4c9bc4dbe1ba545552b54a25 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 28 May 2015 09:53:59 +0200
Subject: [PATCH 18/32] Add vo-amrwbenc submodule.

---
 .gitmodules                      | 3 +++
 submodules/externals/vo-amrwbenc | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 submodules/externals/vo-amrwbenc

diff --git a/.gitmodules b/.gitmodules
index 5033cf8fc..e6fc302e1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -85,3 +85,6 @@
 [submodule "submodules/cmake-builder"]
 	path = submodules/cmake-builder
 	url = git://git.linphone.org/linphone-cmake-builder.git
+[submodule "submodules/externals/vo-amrwbenc"]
+	path = submodules/externals/vo-amrwbenc
+	url = git://git.code.sf.net/p/opencore-amr/vo-amrwbenc
diff --git a/submodules/externals/vo-amrwbenc b/submodules/externals/vo-amrwbenc
new file mode 160000
index 000000000..080af7540
--- /dev/null
+++ b/submodules/externals/vo-amrwbenc
@@ -0,0 +1 @@
+Subproject commit 080af7540562e4adfbd3312837fe5fc6771c4cd0

From 2e5ab605dc33089f7c427a74d8439c3f664aa0c4 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 28 May 2015 10:29:54 +0200
Subject: [PATCH 19/32] Update linphone-cmake-builder submodule.

---
 submodules/cmake-builder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index f520cf7ba..3e732d845 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit f520cf7baebead2dd6017c9e042c71f64c2b6d02
+Subproject commit 3e732d845fbe7e7dfaf02e4392335bfb1134231c

From 98db8f96efe754bb6203442521d4fc4e1305e526 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 28 May 2015 10:30:08 +0200
Subject: [PATCH 20/32] Some cleaning in prepare.py.

---
 prepare.py | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/prepare.py b/prepare.py
index 673b205c6..a99658542 100755
--- a/prepare.py
+++ b/prepare.py
@@ -212,25 +212,18 @@ build-%:
 	done
 
 clean-%:
-	for arch in $(archs); do \\
+	@for arch in $(archs); do \\
 		echo "==== starting clean of $* for arch $$arch ===="; \\
 		$(MAKE) $$arch-clean-$*; \\
 	done
 
 veryclean-%:
-	for arch in $(archs); do \\
+	@for arch in $(archs); do \\
 		echo "==== starting veryclean of $* for arch $$arch ===="; \\
 		$(MAKE) $$arch-veryclean-$*; \\
 	done; \\
 	echo "Run 'make' to rebuild $* correctly."
 
-clean-openh264:
-	for arch in $(archs); do \\
-		echo "==== starting clean of openh264 for arch $$arch ===="; \\
-		$(MAKE) $(arch)-clean-openh264; \\
-	done; \\
-	echo "Run 'make' to rebuild openh264 correctly."
-
 build: libs sdk
 
 clean: $(addprefix clean-,$(packages))

From df3a84b7c523f53221c7b3f43ece9f95bd6b63ca Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 28 May 2015 11:49:40 +0200
Subject: [PATCH 21/32] Update linphone-cmake-builder and linphone submodules.

---
 submodules/cmake-builder | 2 +-
 submodules/linphone      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 3e732d845..012397469 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 3e732d845fbe7e7dfaf02e4392335bfb1134231c
+Subproject commit 0123974696a150d2da509947e5db6f3d6c176d84
diff --git a/submodules/linphone b/submodules/linphone
index f5b65146a..b1cd06e66 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit f5b65146aca5fdcfc4f76937b5187284df052b5e
+Subproject commit b1cd06e66f9d6fee919b32773bb97842cf0a29cf

From d0304711179a5b92a4c2d8f4256d0c636eb6d767 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 28 May 2015 13:43:54 +0200
Subject: [PATCH 22/32] Update linphone-cmake-builder submodule.

---
 submodules/cmake-builder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 012397469..b3479ecab 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 0123974696a150d2da509947e5db6f3d6c176d84
+Subproject commit b3479ecab92f651cac4cf0629d26dccd15cb3819

From 918ab479376ae3532b405d5e6cd7616cdb639785 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 28 May 2015 16:28:41 +0200
Subject: [PATCH 23/32] Update linphone-cmake-builder submodule.

---
 submodules/cmake-builder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index b3479ecab..1dccafa85 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit b3479ecab92f651cac4cf0629d26dccd15cb3819
+Subproject commit 1dccafa8521b8b97a63e61dd6ac64d43671c9f8d

From f35bb62dbae6b5739600764a15ebf9343cd124ef Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Fri, 29 May 2015 17:20:55 +0200
Subject: [PATCH 24/32] submodules: update linphone

---
 submodules/linphone | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/linphone b/submodules/linphone
index b1cd06e66..0bf665e86 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit b1cd06e66f9d6fee919b32773bb97842cf0a29cf
+Subproject commit 0bf665e86c128c6bcec2f769ad82bd5644704d5d

From 493ca87d57bf350b2df3c26fcb9f0746e54f476b Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 29 May 2015 17:25:16 +0200
Subject: [PATCH 25/32] Add {arch}-[build|clean|veryclean] targets in Makefile
 generated by prepare.py.

---
 prepare.py | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/prepare.py b/prepare.py
index a99658542..baa1907c1 100755
--- a/prepare.py
+++ b/prepare.py
@@ -162,8 +162,23 @@ def main(argv = None):
 {arch}:
 	$(MAKE) -C WORK/ios-{arch}/cmake
 
+{arch}-build:
+	@for package in $(packages); do \\
+		$(MAKE) {arch}-build-$$package; \\
+	done
+
+{arch}-clean:
+	@for package in $(packages); do \\
+		$(MAKE) {arch}-clean-$$package; \\
+	done
+
+{arch}-veryclean:
+	@for package in $(packages); do \\
+		$(MAKE) {arch}-veryclean-$$package; \\
+	done
+
 {arch}-build-%:
-	$(MAKE) -C WORK/ios-{arch}/Build/$* install || exit 1;
+	$(MAKE) -C WORK/ios-{arch}/cmake EP_$*
 
 {arch}-clean-%:
 	$(MAKE) -C WORK/ios-{arch}/Build/$* clean; \\

From cb5f409888fd0079735c26933736043094775475 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
 <gautier.pelloux-prayer@belledonne-communications.com>
Date: Mon, 1 Jun 2015 12:29:13 +0200
Subject: [PATCH 26/32] .gitmodules: ignore external dirty submodule
 vo-amrwbenc

---
 .gitmodules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitmodules b/.gitmodules
index e6fc302e1..8cfc3ac8c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -88,3 +88,4 @@
 [submodule "submodules/externals/vo-amrwbenc"]
 	path = submodules/externals/vo-amrwbenc
 	url = git://git.code.sf.net/p/opencore-amr/vo-amrwbenc
+	ignore = dirty

From 966f277b8241f51b5aab86a56466ba03791ffc02 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Tue, 2 Jun 2015 10:54:43 +0200
Subject: [PATCH 27/32] Enable debug logs when using the -d option of
 prepare.py.

---
 prepare.py               | 2 ++
 submodules/cmake-builder | 2 +-
 submodules/linphone      | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/prepare.py b/prepare.py
index baa1907c1..db08c89a1 100755
--- a/prepare.py
+++ b/prepare.py
@@ -148,6 +148,8 @@ def main(argv = None):
 		if args.clean:
 			target.clean()
 		else:
+			if args.debug:
+				additional_args += ["-DENABLE_DEBUG_LOGS=YES"]
 			retcode = prepare.run(target, args.debug, False, args.list_cmake_variables, args.force, additional_args)
 			if retcode != 0:
 				return retcode
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 1dccafa85..3104be280 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 1dccafa8521b8b97a63e61dd6ac64d43671c9f8d
+Subproject commit 3104be28033b1bf7981e7725aa020ac073379ff2
diff --git a/submodules/linphone b/submodules/linphone
index 0bf665e86..a4666bd1d 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 0bf665e86c128c6bcec2f769ad82bd5644704d5d
+Subproject commit a4666bd1dcf36ef25232cfa34bed3bd104808e6c

From 21024898ed1a4f13bac49ed85080153c496b937c Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 8 Jun 2015 12:29:34 +0200
Subject: [PATCH 28/32] Detect code source change to build again.

Force CMake to run the update step of external projects when the source directory is a git submodule.
---
 prepare.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/prepare.py b/prepare.py
index db08c89a1..5f26b6d04 100755
--- a/prepare.py
+++ b/prepare.py
@@ -180,6 +180,7 @@ def main(argv = None):
 	done
 
 {arch}-build-%:
+	rm -f WORK/ios-{arch}/Stamp/EP_$*/EP_$*-update; \\
 	$(MAKE) -C WORK/ios-{arch}/cmake EP_$*
 
 {arch}-clean-%:
@@ -220,6 +221,9 @@ all: build
 
 {arch_targets}
 all-%:
+	@for package in $(packages); do \\
+		rm -f WORK/ios-$*/Stamp/EP_$$package/EP_$$package-update; \\
+	done
 	$(MAKE) -C WORK/ios-$*/cmake
 
 build-%:

From 0c2dbc9fb6481a8b924c29b7c8e046d64ce959b4 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 8 Jun 2015 13:33:28 +0200
Subject: [PATCH 29/32] Add clean/veryclean targets for ffmpeg, openh264 and
 vpx.

---
 prepare.py | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/prepare.py b/prepare.py
index 5f26b6d04..7df811df4 100755
--- a/prepare.py
+++ b/prepare.py
@@ -192,13 +192,33 @@ def main(argv = None):
 	cat WORK/ios-{arch}/Build/$*/install_manifest.txt | xargs rm; \\
 	rm -rf WORK/ios-{arch}/Build/$*/*; \\
 	rm -f WORK/ios-{arch}/Stamp/EP_$*/*; \\
-	echo "Run 'make {arch}' to rebuild $* correctly.";
+	echo "Run 'make {arch}-build-$*' to rebuild $* correctly.";
+
+{arch}-veryclean-ffmpeg:
+	$(MAKE) -C WORK/ios-{arch}/Build/ffmpeg uninstall; \\
+	rm -rf WORK/ios-{arch}/Build/ffmpeg/*; \\
+	rm -f WORK/ios-{arch}/Stamp/EP_ffmpeg/*; \\
+	echo "Run 'make {arch}-build-ffmpeg' to rebuild ffmpeg correctly.";
 
 {arch}-clean-openh264:
 	cd WORK/ios-{arch}/Build/openh264; \\
-	make -f ../../../../submodules/externals/openh264/Makefile clean; \\
+	$(MAKE) -f ../../../../submodules/externals/openh264/Makefile clean; \\
 	rm -f WORK/ios-{arch}/Stamp/EP_openh264/EP_openh264-build; \\
 	rm -f WORK/ios-{arch}/Stamp/EP_openh264/EP_openh264-install;
+
+{arch}-veryclean-openh264:
+	rm -rf liblinphone-sdk/{arch}-apple-darwin.ios/include/wels; \\
+	rm -f liblinphone-sdk/{arch}-apple-darwin.ios/lib/libopenh264.*; \\
+	rm -rf WORK/ios-{arch}/Build/openh264/*; \\
+	rm -f WORK/ios-{arch}/Stamp/EP_openh264/*; \\
+	echo "Run 'make {arch}-build-openh264' to rebuild openh264 correctly.";
+
+{arch}-veryclean-vpx:
+	rm -rf liblinphone-sdk/{arch}-apple-darwin.ios/include/vpx; \\
+	rm -f liblinphone-sdk/{arch}-apple-darwin.ios/lib/libvpx.*; \\
+	rm -rf WORK/ios-{arch}/Build/vpx/*; \\
+	rm -f WORK/ios-{arch}/Stamp/EP_vpx/*; \\
+	echo "Run 'make {arch}-build-vpx' to rebuild vpx correctly.";
 """.format(arch=arch)
 		multiarch = ""
 		for arch in makefile_platforms[1:]:
@@ -243,7 +263,7 @@ veryclean-%:
 		echo "==== starting veryclean of $* for arch $$arch ===="; \\
 		$(MAKE) $$arch-veryclean-$*; \\
 	done; \\
-	echo "Run 'make' to rebuild $* correctly."
+	echo "Run 'make build-$*' to rebuild $* correctly."
 
 build: libs sdk
 

From 0ee705e9cc2fc25e336ad4f37421effc2bc148c4 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 8 Jun 2015 14:49:39 +0200
Subject: [PATCH 30/32] Improve make [arch] target.

---
 prepare.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/prepare.py b/prepare.py
index 7df811df4..3ae9d4fe1 100755
--- a/prepare.py
+++ b/prepare.py
@@ -161,8 +161,7 @@ def main(argv = None):
 		arch_targets = ""
 		for arch in makefile_platforms:
 			arch_targets += """
-{arch}:
-	$(MAKE) -C WORK/ios-{arch}/cmake
+{arch}: all-{arch}
 
 {arch}-build:
 	@for package in $(packages); do \\

From 0a43e5a9eea5b3fc828b186fb8a3a52daf066b52 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Mon, 8 Jun 2015 14:56:28 +0200
Subject: [PATCH 31/32] Update linphone-cmake-builder submodule.

---
 submodules/cmake-builder | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index 3104be280..cf6ad6e18 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit 3104be28033b1bf7981e7725aa020ac073379ff2
+Subproject commit cf6ad6e18ce9707e8236a6ab2c0fd789bdb9287d

From 79efdf44c42aaeeb176101c58275cf5628c21ed4 Mon Sep 17 00:00:00 2001
From: Guillaume BIENKOWSKI
 <guillaume.bienkowski@belledonne-communications.com>
Date: Thu, 28 May 2015 16:46:42 +0200
Subject: [PATCH 32/32] Factorize prepare.py

---
 prepare.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/prepare.py b/prepare.py
index 3ae9d4fe1..50dd95b81 100755
--- a/prepare.py
+++ b/prepare.py
@@ -68,11 +68,14 @@ class IOSarm64Target(IOSTarget):
 
 
 targets = {}
-targets['i386'] = IOSi386Target()
+targets[  'i386'] = IOSi386Target()
 targets['x86_64'] = IOSx8664Target()
-targets['armv7'] = IOSarmv7Target()
-targets['arm64'] = IOSarm64Target()
-platforms = ['all', 'devices', 'simulators', 'armv7', 'arm64', 'i386', 'x86_64']
+targets[ 'armv7'] = IOSarmv7Target()
+targets[ 'arm64'] = IOSarm64Target()
+
+archs_device = ['arm64', 'armv7']
+archs_simu = ['i386', 'x86_64']
+platforms = ['all', 'devices', 'simulators'] + archs_device + archs_simu
 
 class PlatformListAction(argparse.Action):
 	def __call__(self, parser, namespace, values, option_string=None):
@@ -117,6 +120,7 @@ def warning(platforms):
 *****************************************************************
 """)
 
+
 def main(argv = None):
 	if argv is None:
 		argv = sys.argv
@@ -131,11 +135,11 @@ def main(argv = None):
 	selected_platforms = []
 	for platform in args.platform:
 		if platform == 'all':
-			selected_platforms += ['armv7', 'arm64', 'i386', 'x86_64']
+			selected_platforms += archs_device + archs_simu
 		elif platform == 'devices':
-			selected_platforms += ['armv7', 'arm64']
+			selected_platforms += archs_device
 		elif platform == 'simulators':
-			selected_platforms += ['i386', 'x86_64']
+			selected_platforms += archs_simu
 		else:
 			selected_platforms += [platform]
 	selected_platforms = list(set(selected_platforms))