From 5d114f59c6fb96706ab4716079f7cc13bc144acb Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 19 Feb 2016 15:16:41 +0100 Subject: [PATCH 01/23] Update submodules. --- submodules/bctoolbox | 2 +- submodules/belle-sip | 2 +- submodules/bzrtp | 2 +- submodules/cmake-builder | 2 +- submodules/linphone | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/submodules/bctoolbox b/submodules/bctoolbox index 1f469d085..d8fca7869 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit 1f469d085dfd67dd05288ff7dc8af00201fab31c +Subproject commit d8fca786989c9b3f4670dedb374efd28ef3a4673 diff --git a/submodules/belle-sip b/submodules/belle-sip index fa541d67f..f628dd66a 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit fa541d67f415bb6379ddf99f97e32c84250ef63f +Subproject commit f628dd66a27df5dcd1df223a16370313e1bb34f7 diff --git a/submodules/bzrtp b/submodules/bzrtp index de8bd747f..5ff480819 160000 --- a/submodules/bzrtp +++ b/submodules/bzrtp @@ -1 +1 @@ -Subproject commit de8bd747f4dd38c32bb7ba5d0613fdfdf4b0475c +Subproject commit 5ff480819a3ec2124807113f1c28402391bbe4e7 diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 1f2091190..511d0948d 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 1f2091190c8e56927d614d837eb8983aa62a241e +Subproject commit 511d0948d563b9cd2b27192ac42d69ff39a7a6fc diff --git a/submodules/linphone b/submodules/linphone index 1c599d081..f9eaa1a0f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 1c599d081ee047ed26e29e4fab7e69aae1eeae6e +Subproject commit f9eaa1a0f15e0a7fcc0d0b1029620203fb37f367 From c6101591a2b44712be87ba6ee4b39b663b1439b1 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 22 Feb 2016 15:58:41 +0100 Subject: [PATCH 02/23] Update belle-sip and linphone submodules. --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index f628dd66a..b6b263c5b 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit f628dd66a27df5dcd1df223a16370313e1bb34f7 +Subproject commit b6b263c5b400de6f4ff1a681390ed04b46f7a357 diff --git a/submodules/linphone b/submodules/linphone index f9eaa1a0f..1f82ae286 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit f9eaa1a0f15e0a7fcc0d0b1029620203fb37f367 +Subproject commit 1f82ae286cd250a799f39eb96eb1472213ae4c9b From fae3213656460589ca13fc14c706b6a2537b40b2 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Mon, 22 Feb 2016 16:29:33 +0100 Subject: [PATCH 03/23] submodules: update belle-sip and linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 1f82ae286..12902257f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 1f82ae286cd250a799f39eb96eb1472213ae4c9b +Subproject commit 12902257fed79c58737d893ac7c07f35a6933d41 From 9d1e922a390e4110b1258314963452e8d70f5bda Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Mon, 22 Feb 2016 16:57:49 +0100 Subject: [PATCH 04/23] submodules: update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 12902257f..76de5cec0 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 12902257fed79c58737d893ac7c07f35a6933d41 +Subproject commit 76de5cec0711e6c5a939d9ed3ed329bec1109bc9 From 86ca540e691b8458539d99a31af191c06142106f Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 23 Feb 2016 11:35:21 +0100 Subject: [PATCH 05/23] Update bctoolbox, bzrtp, cmake-builder and linphone submodules. --- submodules/bctoolbox | 2 +- submodules/bzrtp | 2 +- submodules/cmake-builder | 2 +- submodules/linphone | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/submodules/bctoolbox b/submodules/bctoolbox index d8fca7869..0de09e31e 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit d8fca786989c9b3f4670dedb374efd28ef3a4673 +Subproject commit 0de09e31eeed2f75055a1fcdd3a9e7cd2341f02d diff --git a/submodules/bzrtp b/submodules/bzrtp index 5ff480819..d953d56ad 160000 --- a/submodules/bzrtp +++ b/submodules/bzrtp @@ -1 +1 @@ -Subproject commit 5ff480819a3ec2124807113f1c28402391bbe4e7 +Subproject commit d953d56ad3224ae375453548e001dc16449f303f diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 511d0948d..417f63c4a 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 511d0948d563b9cd2b27192ac42d69ff39a7a6fc +Subproject commit 417f63c4a79e352ad45939b305a1f9c761a4f511 diff --git a/submodules/linphone b/submodules/linphone index 76de5cec0..4eced3bf2 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 76de5cec0711e6c5a939d9ed3ed329bec1109bc9 +Subproject commit 4eced3bf2a0aa388ddc1f3d8662e3ab4bee5de99 From 7f627306889adcca171a5e7eea5cd302f47f1594 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 24 Feb 2016 09:00:47 +0100 Subject: [PATCH 06/23] update belle-sip --- submodules/belle-sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index b6b263c5b..0d7d95df4 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit b6b263c5b400de6f4ff1a681390ed04b46f7a357 +Subproject commit 0d7d95df4806cf4751355f577437ab2da1e3ea72 From bf79c3c5be2e08cc7be18b6445bc56c3ac4c513f Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 24 Feb 2016 11:14:24 +0100 Subject: [PATCH 07/23] update submodules --- submodules/bctoolbox | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/bctoolbox b/submodules/bctoolbox index 0de09e31e..8b2e3897b 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit 0de09e31eeed2f75055a1fcdd3a9e7cd2341f02d +Subproject commit 8b2e3897bc3d8388292c498caa1d39068ddd03b0 diff --git a/submodules/linphone b/submodules/linphone index 4eced3bf2..b427b8c3f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 4eced3bf2a0aa388ddc1f3d8662e3ab4bee5de99 +Subproject commit b427b8c3f94953d4c3e39ff729206fb12ec22bba From c333c2cf3c7ef8b75d034c1f16ffa73417ae4c13 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 24 Feb 2016 11:53:35 +0100 Subject: [PATCH 08/23] submodules: update linphone and cmake-builder --- 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 417f63c4a..0e83927fb 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 417f63c4a79e352ad45939b305a1f9c761a4f511 +Subproject commit 0e83927fb73577ecf492c2c939f7686f928f75a9 diff --git a/submodules/linphone b/submodules/linphone index b427b8c3f..f734477ce 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit b427b8c3f94953d4c3e39ff729206fb12ec22bba +Subproject commit f734477ce43e19e492b4650965b4c286fc19523e From 827618cc0ca3080b65f0667b3dec55f90329c9d0 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 24 Feb 2016 15:36:00 +0100 Subject: [PATCH 09/23] submodules: update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index f734477ce..e42a90d2d 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit f734477ce43e19e492b4650965b4c286fc19523e +Subproject commit e42a90d2da9fa0b81c6b8f62ef3a93d2082d7e57 From 570d4610c41abbd98392e9673a23d9e45ff2e5c6 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 24 Feb 2016 18:28:22 +0100 Subject: [PATCH 10/23] Remove deprecated submodules. --- .gitmodules | 6 ------ submodules/libilbc-rfc3951 | 1 - submodules/msilbc | 1 - 3 files changed, 8 deletions(-) delete mode 160000 submodules/libilbc-rfc3951 delete mode 160000 submodules/msilbc diff --git a/.gitmodules b/.gitmodules index 4034090f8..944ebd196 100644 --- a/.gitmodules +++ b/.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 diff --git a/submodules/libilbc-rfc3951 b/submodules/libilbc-rfc3951 deleted file mode 160000 index 91b61e39f..000000000 --- a/submodules/libilbc-rfc3951 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 91b61e39fb9c5d3dc78691f3d6e4f1d65c8b0d2a diff --git a/submodules/msilbc b/submodules/msilbc deleted file mode 160000 index 4d36bb77f..000000000 --- a/submodules/msilbc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4d36bb77f6a7e259dc4c6f76b7aab3c65eaece96 From 17b7a6470131b5fd112b672feae26ad92bf3151b Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 24 Feb 2016 18:29:57 +0100 Subject: [PATCH 11/23] Update submodules. --- submodules/bcg729 | 2 +- submodules/bctoolbox | 2 +- submodules/belle-sip | 2 +- submodules/bzrtp | 2 +- submodules/cmake-builder | 2 +- submodules/externals/libmatroska-c | 2 +- submodules/linphone | 2 +- submodules/msamr | 2 +- submodules/msopenh264 | 2 +- submodules/mssilk | 2 +- submodules/mswebrtc | 2 +- submodules/msx264 | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/submodules/bcg729 b/submodules/bcg729 index e540e0c4d..0ed137cd5 160000 --- a/submodules/bcg729 +++ b/submodules/bcg729 @@ -1 +1 @@ -Subproject commit e540e0c4d5521c5125e1de496ad1085e642df120 +Subproject commit 0ed137cd58de8b90e80e35bd723eb83c20d8b322 diff --git a/submodules/bctoolbox b/submodules/bctoolbox index 8b2e3897b..c5bfbd519 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit 8b2e3897bc3d8388292c498caa1d39068ddd03b0 +Subproject commit c5bfbd5198e68b02829c15e0092d38ec436440cb diff --git a/submodules/belle-sip b/submodules/belle-sip index 0d7d95df4..1be18ba6b 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 0d7d95df4806cf4751355f577437ab2da1e3ea72 +Subproject commit 1be18ba6bb3ef1607a4b01bb5b1d06863498d1c0 diff --git a/submodules/bzrtp b/submodules/bzrtp index d953d56ad..a2fa297d8 160000 --- a/submodules/bzrtp +++ b/submodules/bzrtp @@ -1 +1 @@ -Subproject commit d953d56ad3224ae375453548e001dc16449f303f +Subproject commit a2fa297d840dda4e821a8c23beface339856746b diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 0e83927fb..002db87d0 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 0e83927fb73577ecf492c2c939f7686f928f75a9 +Subproject commit 002db87d090fd190bc0cab3425df6b47250d0ff1 diff --git a/submodules/externals/libmatroska-c b/submodules/externals/libmatroska-c index c3fc2746f..0629df2dc 160000 --- a/submodules/externals/libmatroska-c +++ b/submodules/externals/libmatroska-c @@ -1 +1 @@ -Subproject commit c3fc2746f18bafefe3010669d8d2855240565c86 +Subproject commit 0629df2dcd9b2ab8333a2a9c40cb2cf38cf8c321 diff --git a/submodules/linphone b/submodules/linphone index e42a90d2d..c64cf6b4c 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit e42a90d2da9fa0b81c6b8f62ef3a93d2082d7e57 +Subproject commit c64cf6b4caa05710c9040e1e98fc4ff148452016 diff --git a/submodules/msamr b/submodules/msamr index 5e180193d..d2f749d94 160000 --- a/submodules/msamr +++ b/submodules/msamr @@ -1 +1 @@ -Subproject commit 5e180193d06e5d6b3394571ac7750b5359856c15 +Subproject commit d2f749d94d621c0f7321f42435667918094157e1 diff --git a/submodules/msopenh264 b/submodules/msopenh264 index 709e1f690..0324cd360 160000 --- a/submodules/msopenh264 +++ b/submodules/msopenh264 @@ -1 +1 @@ -Subproject commit 709e1f6903914fa883ebcf26f51fece65e3e1ab5 +Subproject commit 0324cd360e05c4499a7840597d4827dfe022108a diff --git a/submodules/mssilk b/submodules/mssilk index e766ae43c..a608e5b15 160000 --- a/submodules/mssilk +++ b/submodules/mssilk @@ -1 +1 @@ -Subproject commit e766ae43c503aa08080df9beb24a0fe81ce213bb +Subproject commit a608e5b153d31bc3a7158980d9ad0da21e640f7d diff --git a/submodules/mswebrtc b/submodules/mswebrtc index 113e98188..c083e9589 160000 --- a/submodules/mswebrtc +++ b/submodules/mswebrtc @@ -1 +1 @@ -Subproject commit 113e9818866ebbf75a03d4559d76ee89a6dcfd9f +Subproject commit c083e9589291942bdb25ab1f145edb386ef361bd diff --git a/submodules/msx264 b/submodules/msx264 index 427e20aea..503b951bd 160000 --- a/submodules/msx264 +++ b/submodules/msx264 @@ -1 +1 @@ -Subproject commit 427e20aeabcf62fbd2fdb48ab80f56833d3db790 +Subproject commit 503b951bde7f8aa4e8a2d8e828c75f9d83a24dc7 From d677b7ed9ff92d1514b9bbd270360a3fa6e14189 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Thu, 25 Feb 2016 12:41:18 +0100 Subject: [PATCH 12/23] submodules: update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index c64cf6b4c..3df89f60e 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit c64cf6b4caa05710c9040e1e98fc4ff148452016 +Subproject commit 3df89f60e0132af237b15e31e1d812f1e87d05fd From 608ed449f1046c3bddf46b632429e45b22497a86 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 25 Feb 2016 14:46:59 +0100 Subject: [PATCH 13/23] Improve definition of all codecs option. --- prepare.py | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/prepare.py b/prepare.py index b2e8decb4..8c351a58b 100755 --- a/prepare.py +++ b/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=YES"] if args.package: additional_args += ["-DENABLE_PACKAGING=YES"] From 1798610de5d656a2ef29518d55c7b834a76a5f02 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 25 Feb 2016 14:47:33 +0100 Subject: [PATCH 14/23] Update bctoolbox, belle-sip, bzrtp, cmake-builder and linphone submodules. --- submodules/bctoolbox | 2 +- submodules/belle-sip | 2 +- submodules/bzrtp | 2 +- submodules/cmake-builder | 2 +- submodules/linphone | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/submodules/bctoolbox b/submodules/bctoolbox index c5bfbd519..98eebe531 160000 --- a/submodules/bctoolbox +++ b/submodules/bctoolbox @@ -1 +1 @@ -Subproject commit c5bfbd5198e68b02829c15e0092d38ec436440cb +Subproject commit 98eebe531da3086db68db353f4402fad129339c9 diff --git a/submodules/belle-sip b/submodules/belle-sip index 1be18ba6b..7a156039a 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 1be18ba6bb3ef1607a4b01bb5b1d06863498d1c0 +Subproject commit 7a156039a79ff3f2a517f0d946f5791596ff76b8 diff --git a/submodules/bzrtp b/submodules/bzrtp index a2fa297d8..916a3bc87 160000 --- a/submodules/bzrtp +++ b/submodules/bzrtp @@ -1 +1 @@ -Subproject commit a2fa297d840dda4e821a8c23beface339856746b +Subproject commit 916a3bc8773c4230de5813bbb844413864823b8b diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 002db87d0..19538de21 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 002db87d090fd190bc0cab3425df6b47250d0ff1 +Subproject commit 19538de21f717e0da6cec5cae54aa5cdce5234be diff --git a/submodules/linphone b/submodules/linphone index 3df89f60e..f38ccbc88 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 3df89f60e0132af237b15e31e1d812f1e87d05fd +Subproject commit f38ccbc88a3f0a7ffe8b50e31ebf8fd845b2521d From 3a81b6ba40afdf80399cf757532b58af6fd977a5 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 25 Feb 2016 15:17:57 +0100 Subject: [PATCH 15/23] Update 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 19538de21..4edbd57aa 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 19538de21f717e0da6cec5cae54aa5cdce5234be +Subproject commit 4edbd57aa493e5be548d941bb2031d1d83051e2e From 8a7f79c8d7a601ac832d22445fd9a99300c4b76c Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 25 Feb 2016 15:29:47 +0100 Subject: [PATCH 16/23] Update belle-sip submodule. --- submodules/belle-sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 7a156039a..bb8563132 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 7a156039a79ff3f2a517f0d946f5791596ff76b8 +Subproject commit bb8563132cfba7ee77334fadce804f7c760dcefb From bd86a61a67f8d338e8636c853ebbb753aa7de678 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 25 Feb 2016 15:52:09 +0100 Subject: [PATCH 17/23] Update belle-sip and linphone submodules. --- submodules/belle-sip | 2 +- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index bb8563132..42b8463db 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit bb8563132cfba7ee77334fadce804f7c760dcefb +Subproject commit 42b8463dbaeff97c41409dd0480729ecea2ee3c8 diff --git a/submodules/linphone b/submodules/linphone index f38ccbc88..cc981d329 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit f38ccbc88a3f0a7ffe8b50e31ebf8fd845b2521d +Subproject commit cc981d329a91f1bf0715cbcfd7953c0c94256de3 From 04fc05e021cedeeeb9363fb33fd731e640e2d803 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 25 Feb 2016 17:07:34 +0100 Subject: [PATCH 18/23] Update belle-sip submodule. --- submodules/belle-sip | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 42b8463db..8da731d1f 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 42b8463dbaeff97c41409dd0480729ecea2ee3c8 +Subproject commit 8da731d1f79f210bb295d59f103ad56cc13f19bd From 04a51cd31af2702e226dfd642b087a4a75c009fa Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 25 Feb 2016 17:18:39 +0100 Subject: [PATCH 19/23] Update libmatroska-c submodule. --- submodules/externals/libmatroska-c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/externals/libmatroska-c b/submodules/externals/libmatroska-c index 0629df2dc..a1134df5c 160000 --- a/submodules/externals/libmatroska-c +++ b/submodules/externals/libmatroska-c @@ -1 +1 @@ -Subproject commit 0629df2dcd9b2ab8333a2a9c40cb2cf38cf8c321 +Subproject commit a1134df5cd2794652fcb1d116ec6efba99bf70bb From f67733a68a3986c31ede1677378c9f23dd11b4ec Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 25 Feb 2016 18:17:11 +0100 Subject: [PATCH 20/23] Update libmatroska-c submodule. --- submodules/externals/libmatroska-c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/externals/libmatroska-c b/submodules/externals/libmatroska-c index a1134df5c..18f81ac29 160000 --- a/submodules/externals/libmatroska-c +++ b/submodules/externals/libmatroska-c @@ -1 +1 @@ -Subproject commit a1134df5cd2794652fcb1d116ec6efba99bf70bb +Subproject commit 18f81ac295d4a99661ab208eeef09cbb20742374 From ee2b845b3b23a0897a947d084107922a9db5ec4d Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 25 Feb 2016 18:46:52 +0100 Subject: [PATCH 21/23] Update libmatroska-c submodule. --- submodules/externals/libmatroska-c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/externals/libmatroska-c b/submodules/externals/libmatroska-c index 18f81ac29..73cb571a4 160000 --- a/submodules/externals/libmatroska-c +++ b/submodules/externals/libmatroska-c @@ -1 +1 @@ -Subproject commit 18f81ac295d4a99661ab208eeef09cbb20742374 +Subproject commit 73cb571a49b84c0eb51f450df7a0a967676997a2 From 6941367faea4b459f3c20375342161a9edaf40e0 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 26 Feb 2016 10:30:15 +0100 Subject: [PATCH 22/23] Update 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 4edbd57aa..69cfbd68e 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 4edbd57aa493e5be548d941bb2031d1d83051e2e +Subproject commit 69cfbd68effda8c4dacde397b1d677243206b243 From 440c35cba020404b7e5351425987fa0bf7e8a6ee Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 26 Feb 2016 11:05:03 +0100 Subject: [PATCH 23/23] Deactivate x264 for all codecs build. --- prepare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prepare.py b/prepare.py index 8c351a58b..32ba60112 100755 --- a/prepare.py +++ b/prepare.py @@ -201,7 +201,7 @@ def main(argv=None): additional_args += ["-DENABLE_MPEG4=YES"] additional_args += ["-DENABLE_OPENH264=YES"] additional_args += ["-DENABLE_VPX=YES"] - additional_args += ["-DENABLE_X264=YES"] + additional_args += ["-DENABLE_X264=NO"] if args.package: additional_args += ["-DENABLE_PACKAGING=YES"]