Merge branch 'master' into dev_vcard

Conflicts:
	submodules/linphone

.gitmodules

@@ -16,9 +16,6 @@
 [submodule "submodules/msamr"]
 	path = submodules/msamr
 	url = git://git.linphone.org/msamr.git
-[submodule "submodules/msilbc"]
-	path = submodules/msilbc
-	url = git://git.linphone.org/msilbc.git
 [submodule "submodules/msopenh264"]
 	path = submodules/msopenh264
 	url = git://git.linphone.org/msopenh264.git
@@ -28,9 +25,6 @@
 [submodule "submodules/mswasapi"]
 	path = submodules/mswasapi
 	url = git://git.linphone.org/mswasapi.git
-[submodule "submodules/libilbc-rfc3951"]
-	path = submodules/libilbc-rfc3951
-	url = git://git.linphone.org/libilbc-rfc3951.git
 [submodule "submodules/msx264"]
 	path = submodules/msx264
 	url = git://git.linphone.org/msx264.git

prepare.py

@@ -51,8 +51,8 @@ class DesktopTarget(prepare.Target):
             self.generator = 'Visual Studio 12 2013'
         self.additional_args = [
             '-DCMAKE_INSTALL_MESSAGE=LAZY',
-            '-DLINPHONE_BUILDER_EXTERNAL_SOURCE_PATH=' +
-            current_path + '/submodules'
+            '-DLINPHONE_BUILDER_EXTERNAL_SOURCE_PATH=' + current_path + '/submodules',
+            '-DLINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS=YES'
         ]
 
 
@@ -68,8 +68,8 @@ class PythonTarget(prepare.Target):
             self.generator = 'Visual Studio 9 2008'
         self.additional_args = [
             '-DCMAKE_INSTALL_MESSAGE=LAZY',
-            '-DLINPHONE_BUILDER_EXTERNAL_SOURCE_PATH=' +
-            current_path + '/submodules'
+            '-DLINPHONE_BUILDER_EXTERNAL_SOURCE_PATH=' + current_path + '/submodules',
+            '-DLINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS=YES'
         ]
 
 
@@ -83,8 +83,8 @@ class PythonRaspberryTarget(prepare.Target):
         self.toolchain_file = 'toolchains/toolchain-raspberry.cmake'
         self.additional_args = [
             '-DCMAKE_INSTALL_MESSAGE=LAZY',
-            '-DLINPHONE_BUILDER_EXTERNAL_SOURCE_PATH=' +
-            current_path + '/submodules'
+            '-DLINPHONE_BUILDER_EXTERNAL_SOURCE_PATH=' + current_path + '/submodules',
+            '-DLINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS=YES'
         ]
 
 
@@ -180,23 +180,28 @@ def main(argv=None):
 
     args, additional_args = argparser.parse_known_args()
 
-    additional_args += ["-DLINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS=YES"]
-
     if args.only_submodules:
         additional_args += ["-DLINPHONE_BUILDER_BUILD_ONLY_EXTERNAL_SOURCE_PATH=YES"]
 
     if args.all_codecs:
-        additional_args += ["-DENABLE_NON_FREE_CODECS=YES",
-                            "-DENABLE_AMRNB=YES",
-                            "-DENABLE_AMRWB=YES",
-                            "-DENABLE_G729=YES",
-                            "-DENABLE_H263=YES",
-                            "-DENABLE_H263P=YES",
-                            "-DENABLE_ILBC=YES",
-                            "-DENABLE_ISAC=YES",
-                            "-DENABLE_MPEG4=YES",
-                            "-DENABLE_OPENH264=YES",
-                            "-DENABLE_SILK=YES"]
+        additional_args += ["-DENABLE_GPL_THIRD_PARTIES=YES"]
+        additional_args += ["-DENABLE_NON_FREE_CODECS=YES"]
+        additional_args += ["-DENABLE_AMRNB=YES"]
+        additional_args += ["-DENABLE_AMRWB=YES"]
+        additional_args += ["-DENABLE_G729=YES"]
+        additional_args += ["-DENABLE_GSM=YES"]
+        additional_args += ["-DENABLE_ILBC=YES"]
+        additional_args += ["-DENABLE_ISAC=YES"]
+        additional_args += ["-DENABLE_OPUS=YES"]
+        additional_args += ["-DENABLE_SILK=YES"]
+        additional_args += ["-DENABLE_SPEEX=YES"]
+        additional_args += ["-DENABLE_FFMPEG=YES"]
+        additional_args += ["-DENABLE_H263=YES"]
+        additional_args += ["-DENABLE_H263P=YES"]
+        additional_args += ["-DENABLE_MPEG4=YES"]
+        additional_args += ["-DENABLE_OPENH264=YES"]
+        additional_args += ["-DENABLE_VPX=YES"]
+        additional_args += ["-DENABLE_X264=NO"]
 
     if args.package:
         additional_args += ["-DENABLE_PACKAGING=YES"]

bcg729 @ 0ed137cd

-Subproject commit e540e0c4d5521c5125e1de496ad1085e642df120
+Subproject commit 0ed137cd58de8b90e80e35bd723eb83c20d8b322

bctoolbox @ 98eebe53

-Subproject commit d8fca786989c9b3f4670dedb374efd28ef3a4673
+Subproject commit 98eebe531da3086db68db353f4402fad129339c9

belle-sip @ 8da731d1

-Subproject commit f628dd66a27df5dcd1df223a16370313e1bb34f7
+Subproject commit 8da731d1f79f210bb295d59f103ad56cc13f19bd

bzrtp @ 916a3bc8

-Subproject commit 5ff480819a3ec2124807113f1c28402391bbe4e7
+Subproject commit 916a3bc8773c4230de5813bbb844413864823b8b

cmake-builder @ 69cfbd68

-Subproject commit 511d0948d563b9cd2b27192ac42d69ff39a7a6fc
+Subproject commit 69cfbd68effda8c4dacde397b1d677243206b243

libmatroska-c @ 73cb571a

-Subproject commit c3fc2746f18bafefe3010669d8d2855240565c86
+Subproject commit 73cb571a49b84c0eb51f450df7a0a967676997a2

libilbc-rfc3951 @ 91b61e39

-Subproject commit 91b61e39fb9c5d3dc78691f3d6e4f1d65c8b0d2a

linphone @ 425cb42f

-Subproject commit 456de10d65aa9f1464bbbd3f928107cf1e5909d3
+Subproject commit 425cb42f7f5ddc32e4782e9956da7bb95f43d724

msamr @ d2f749d9

-Subproject commit 5e180193d06e5d6b3394571ac7750b5359856c15
+Subproject commit d2f749d94d621c0f7321f42435667918094157e1

msilbc @ 4d36bb77

-Subproject commit 4d36bb77f6a7e259dc4c6f76b7aab3c65eaece96

msopenh264 @ 0324cd36

-Subproject commit 709e1f6903914fa883ebcf26f51fece65e3e1ab5
+Subproject commit 0324cd360e05c4499a7840597d4827dfe022108a

mssilk @ a608e5b1

-Subproject commit e766ae43c503aa08080df9beb24a0fe81ce213bb
+Subproject commit a608e5b153d31bc3a7158980d9ad0da21e640f7d

mswebrtc @ c083e958

-Subproject commit 113e9818866ebbf75a03d4559d76ee89a6dcfd9f
+Subproject commit c083e9589291942bdb25ab1f145edb386ef361bd

msx264 @ 503b951b

-Subproject commit 427e20aeabcf62fbd2fdb48ab80f56833d3db790
+Subproject commit 503b951bde7f8aa4e8a2d8e828c75f9d83a24dc7