From ac24b6f76f36664f33c6b09d55e1e1699cb79a47 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 21 Dec 2015 18:08:14 +0100 Subject: [PATCH 01/46] update linphone submodule --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 150ce1d47..00ff31197 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 150ce1d479a1ecc0fab048be16164577fefa4c1d +Subproject commit 00ff311972edff6314212472787509fb16d307a2 From a149e666724eb462d4fabbf17edc75523e6e9417 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 21 Dec 2015 21:43:07 +0100 Subject: [PATCH 02/46] fix bundle generation (with new rings) --- 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 120770ede..6e2500b00 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 120770edefd4274b15a90d437e3527bf82b65d88 +Subproject commit 6e2500b00233d828304461f7f9f2e431e0d27056 diff --git a/submodules/linphone b/submodules/linphone index 00ff31197..c3049f287 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 00ff311972edff6314212472787509fb16d307a2 +Subproject commit c3049f287f529d8373c90d68f11f70dddcc55232 From 4e93c28d943906ea0c14632b85bcf6012e3bd639 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 22 Dec 2015 09:39:47 +0100 Subject: [PATCH 03/46] update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index c3049f287..2e9596f6f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit c3049f287f529d8373c90d68f11f70dddcc55232 +Subproject commit 2e9596f6f62fee3598d09f6bfe02f14b32f6c0d7 From 9d45e0ac0f848aea63eb8ce801827204271e8652 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 22 Dec 2015 09:42:25 +0100 Subject: [PATCH 04/46] update cmake-builder --- submodules/cmake-builder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 6e2500b00..e34784d91 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 6e2500b00233d828304461f7f9f2e431e0d27056 +Subproject commit e34784d911dfe54b9fd7a6516b020f49598c1990 From f69cf25c7379e2a13251bfafeb6f74ded409fe86 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Tue, 22 Dec 2015 10:43:39 +0100 Subject: [PATCH 05/46] submodules: update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 2e9596f6f..d18a67def 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 2e9596f6f62fee3598d09f6bfe02f14b32f6c0d7 +Subproject commit d18a67deff54f55f20052ff28674657f076c8426 From 9a84a0779fa2cb7c12dbcbf0bf75cd740a103dea Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 22 Dec 2015 15:16:53 +0100 Subject: [PATCH 06/46] update linphone and fix missing comas in prepare.py --- prepare.py | 4 ++-- submodules/linphone | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/prepare.py b/prepare.py index 54fa4bfd5..fa4b6f7a1 100755 --- a/prepare.py +++ b/prepare.py @@ -195,11 +195,11 @@ def main(argv=None): "-DENABLE_ISAC=YES", "-DENABLE_MKV=YES", "-DENABLE_MPEG4=YES", - "-DENABLE_OPENH264=YES" + "-DENABLE_OPENH264=YES", "-DENABLE_SILK=YES"] if args.package: - additional_args += ["-DENABLE_PACKAGING=YES" + additional_args += ["-DENABLE_PACKAGING=YES", "-DENABLE_RELATIVE_PREFIX=YES"] if check_tools() != 0: return 1 diff --git a/submodules/linphone b/submodules/linphone index d18a67def..7b5da68fd 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit d18a67deff54f55f20052ff28674657f076c8426 +Subproject commit 7b5da68fd8c192774da63efb4f8d7ea27d3015f3 From 9d51845032b1413262482b70a5c96bf7d172b30d Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 22 Dec 2015 18:40:36 +0100 Subject: [PATCH 07/46] update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 7b5da68fd..832a1c4bd 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 7b5da68fd8c192774da63efb4f8d7ea27d3015f3 +Subproject commit 832a1c4bd423f1ca79461041a56344c9db4381c2 From 282075a7ccbdd77c427e60654c590dfce899e6af Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Wed, 23 Dec 2015 11:00:20 +0100 Subject: [PATCH 08/46] Propagating update on RTCP feeback in linphone. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 832a1c4bd..f83d50db0 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 832a1c4bd423f1ca79461041a56344c9db4381c2 +Subproject commit f83d50db022ee9c1285d8c5eec382b55442889f1 From 7e996a610d27447bb796b67ef77a78064f7149da Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 23 Dec 2015 11:06:24 +0100 Subject: [PATCH 09/46] no reason to link mkv with all codecs. MKV is on by default now. --- prepare.py | 1 - submodules/cmake-builder | 2 +- submodules/linphone | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/prepare.py b/prepare.py index fa4b6f7a1..9551fba32 100755 --- a/prepare.py +++ b/prepare.py @@ -193,7 +193,6 @@ def main(argv=None): "-DENABLE_H263P=YES", "-DENABLE_ILBC=YES", "-DENABLE_ISAC=YES", - "-DENABLE_MKV=YES", "-DENABLE_MPEG4=YES", "-DENABLE_OPENH264=YES", "-DENABLE_SILK=YES"] diff --git a/submodules/cmake-builder b/submodules/cmake-builder index e34784d91..b1426c8be 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit e34784d911dfe54b9fd7a6516b020f49598c1990 +Subproject commit b1426c8be8ad9ccf02efd2bb771126091dc4fcf8 diff --git a/submodules/linphone b/submodules/linphone index f83d50db0..af1070f04 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit f83d50db022ee9c1285d8c5eec382b55442889f1 +Subproject commit af1070f04ce4c51b892315d52ebe0eacae2d4d47 From 8db7fd7d0d163a2ab4fe378578ab293d929a99a9 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 23 Dec 2015 15:00:37 +0100 Subject: [PATCH 10/46] Updated cmake builder to fix vcard compil issue --- submodules/cmake-builder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/cmake-builder b/submodules/cmake-builder index b1426c8be..5eeb32b3a 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit b1426c8be8ad9ccf02efd2bb771126091dc4fcf8 +Subproject commit 5eeb32b3ac0d36bb34bdf4b6f73ac72e64d3abec From d9a922f9391f90de8905ce5567a8fc8e2240f794 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Wed, 23 Dec 2015 15:54:16 +0100 Subject: [PATCH 11/46] submodules: update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index af1070f04..3532bfabf 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit af1070f04ce4c51b892315d52ebe0eacae2d4d47 +Subproject commit 3532bfabfb8525c0dac41f713fe022518a4a4201 From 8797cb00a2fb31d089c6daffc219024b1f9050f9 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 28 Dec 2015 16:09:46 +0100 Subject: [PATCH 12/46] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 3532bfabf..b9bfbb3df 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 3532bfabfb8525c0dac41f713fe022518a4a4201 +Subproject commit b9bfbb3df97cd04bee89f714bc15450a1033ff52 From fece1f16499e02b6ef14ce61cd801d14bce191eb Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 28 Dec 2015 17:46:34 +0100 Subject: [PATCH 13/46] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index b9bfbb3df..8a954ab6e 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit b9bfbb3df97cd04bee89f714bc15450a1033ff52 +Subproject commit 8a954ab6eda804610024ff8c542f7231b63e511e From 5192095d3ea4ff9bd88ecbcf1d6ef8b3e2c40207 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Tue, 29 Dec 2015 11:01:53 +0100 Subject: [PATCH 14/46] Propagating opus upgrade. --- submodules/cmake-builder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 5eeb32b3a..687fdf619 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 5eeb32b3ac0d36bb34bdf4b6f73ac72e64d3abec +Subproject commit 687fdf619624afbbb50ad0fabacea54c0a0a0b01 From cfe43ea33fba7cbb831542b913235bbf3321b372 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 30 Dec 2015 17:42:03 +0100 Subject: [PATCH 15/46] Update belle-sip, cmake-builder and linphone submodules. --- submodules/belle-sip | 2 +- submodules/cmake-builder | 2 +- submodules/linphone | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/submodules/belle-sip b/submodules/belle-sip index 4d5de406f..bb8d52bef 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 4d5de406f9056025f96b4db7fbf867be9999d826 +Subproject commit bb8d52befd3b65fc06bfdcffac1dac7079c8c964 diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 687fdf619..b94f3ae7a 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 687fdf619624afbbb50ad0fabacea54c0a0a0b01 +Subproject commit b94f3ae7acde004a08190ff6a31bcfb176b31b8f diff --git a/submodules/linphone b/submodules/linphone index 8a954ab6e..01ee6e21f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 8a954ab6eda804610024ff8c542f7231b63e511e +Subproject commit 01ee6e21f2ec552425768022c7ab7623fabaf2a2 From 09cf639f158d6e83a4d692ff3ec81b08563108f4 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 31 Dec 2015 10:02:32 +0100 Subject: [PATCH 16/46] 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 b94f3ae7a..da914e3fd 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit b94f3ae7acde004a08190ff6a31bcfb176b31b8f +Subproject commit da914e3fd996221b149e14fc57a3bfc45b378163 From 7e808c3054451f0d0d30c5c01a772c727fb7bd50 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Mon, 4 Jan 2016 14:49:35 +0100 Subject: [PATCH 17/46] submodules: update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 01ee6e21f..7778c48a3 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 01ee6e21f2ec552425768022c7ab7623fabaf2a2 +Subproject commit 7778c48a3305a9c7b4d51546b323d86795a4d91e From a80377529342b39d682af1b8a5b9b85903d344b9 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 4 Jan 2016 17:09:00 +0100 Subject: [PATCH 18/46] Update 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 da914e3fd..511422d7e 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit da914e3fd996221b149e14fc57a3bfc45b378163 +Subproject commit 511422d7e76c3b31a08535f80670ac189206b569 diff --git a/submodules/linphone b/submodules/linphone index 7778c48a3..ce01af18f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 7778c48a3305a9c7b4d51546b323d86795a4d91e +Subproject commit ce01af18f78925d387ac3b6db14a0c9744ae817f From 0202c7d27b2ac2ca6ab12e336e764530b2d75004 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 4 Jan 2016 17:41:05 +0100 Subject: [PATCH 19/46] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index ce01af18f..89aa46239 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit ce01af18f78925d387ac3b6db14a0c9744ae817f +Subproject commit 89aa4623977f84a7478ad155a80db0508552e867 From 0e69407448932eae90de42f676edfb5171c09563 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Tue, 5 Jan 2016 10:32:26 +0100 Subject: [PATCH 20/46] submodules: update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 89aa46239..743f1a619 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 89aa4623977f84a7478ad155a80db0508552e867 +Subproject commit 743f1a619b3ed335e0ff6ee8224b3f9b0526f4b9 From 6ec0428eb21dec275d1cdd6788e7af49cbb33208 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 5 Jan 2016 11:35:17 +0100 Subject: [PATCH 21/46] Update 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 511422d7e..5b890256a 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 511422d7e76c3b31a08535f80670ac189206b569 +Subproject commit 5b890256a5057e0c47f473e8a90c9ae318ab5419 diff --git a/submodules/linphone b/submodules/linphone index 743f1a619..7251c06e5 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 743f1a619b3ed335e0ff6ee8224b3f9b0526f4b9 +Subproject commit 7251c06e57076c9f3c294763fe88f04e80331258 From 9324fc31aa192fa449c137a0957c6149be0adb84 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 5 Jan 2016 11:35:35 +0100 Subject: [PATCH 22/46] Prevent giving useless ENABLE_RELATIVE_PREFIX option to CMake on Windows. --- prepare.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/prepare.py b/prepare.py index 9551fba32..fd47b66a6 100755 --- a/prepare.py +++ b/prepare.py @@ -198,8 +198,9 @@ def main(argv=None): "-DENABLE_SILK=YES"] if args.package: - additional_args += ["-DENABLE_PACKAGING=YES", - "-DENABLE_RELATIVE_PREFIX=YES"] + additional_args += ["-DENABLE_PACKAGING=YES"] + if platform.system() != 'Windows': + additional_args += ["-DENABLE_RELATIVE_PREFIX=YES"] # Already forced in all cases on Windows platform if check_tools() != 0: return 1 From 58d6f390cbb540225bbf79638c551493dc1c59b4 Mon Sep 17 00:00:00 2001 From: Gautier Pelloux-Prayer Date: Tue, 5 Jan 2016 14:00:01 +0100 Subject: [PATCH 23/46] submodules: update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 7251c06e5..2c815eeb8 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 7251c06e57076c9f3c294763fe88f04e80331258 +Subproject commit 2c815eeb8bfb5e844baaffe682b1cae3be9c125d From e269f43b86e3a518dc5118d8626508a3982525bf Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 5 Jan 2016 14:52:03 +0100 Subject: [PATCH 24/46] Update mswebrtc submodule. --- submodules/mswebrtc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/mswebrtc b/submodules/mswebrtc index 9f7b3128b..27680f2d9 160000 --- a/submodules/mswebrtc +++ b/submodules/mswebrtc @@ -1 +1 @@ -Subproject commit 9f7b3128b9c6b396c89d784ba5ddfa68be05607a +Subproject commit 27680f2d99e6f431d8fcc433c4120ddf48263578 From ba735d854f8dbf512a232172ca328227ae3a75a4 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 5 Jan 2016 17:37:32 +0100 Subject: [PATCH 25/46] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 2c815eeb8..1a7bb8463 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 2c815eeb8bfb5e844baaffe682b1cae3be9c125d +Subproject commit 1a7bb84633e6df4feab7921ddcb053c8e7842a6d From 6b2c1feffd6b8b086b6889c4fb0aa9fcc4eb1a5a Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 6 Jan 2016 12:00:53 +0100 Subject: [PATCH 26/46] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 1a7bb8463..7dc834b21 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 1a7bb84633e6df4feab7921ddcb053c8e7842a6d +Subproject commit 7dc834b219b039931ae3d51529fc28fc1d005b7d From 66720b8693bc3901382fd3254450ae5b53a31b79 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 6 Jan 2016 13:37:10 +0100 Subject: [PATCH 27/46] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 7dc834b21..849ef0f9e 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 7dc834b219b039931ae3d51529fc28fc1d005b7d +Subproject commit 849ef0f9ede49ec8a17efab740d0679f0d146e69 From 092cbc360db90368d5578531476b7a5008cc8e06 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 6 Jan 2016 14:40:23 +0100 Subject: [PATCH 28/46] 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 bb8d52bef..9e0cd4a73 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit bb8d52befd3b65fc06bfdcffac1dac7079c8c964 +Subproject commit 9e0cd4a739acf16a55cd3f6f54d99d7748e5c7be From 2c0cece9e6b5e3601677254ae9703afbb6435446 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 7 Jan 2016 11:18:24 +0100 Subject: [PATCH 29/46] update linphone submodules --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 849ef0f9e..1fc31123b 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 849ef0f9ede49ec8a17efab740d0679f0d146e69 +Subproject commit 1fc31123b88f478cb271e1f1ce010bae5459bd09 From 16ad2c39209bde9dbd4f6b6cef798506d584c1a8 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Fri, 8 Jan 2016 14:59:05 +0100 Subject: [PATCH 30/46] Propagating fix for compilation issue with matroska2 o macosx. --- submodules/cmake-builder | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/cmake-builder b/submodules/cmake-builder index 5b890256a..ebd953331 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 5b890256a5057e0c47f473e8a90c9ae318ab5419 +Subproject commit ebd95333197731ca6f174a69a4127ad54a6684af From 0bc7fe84b942271fc1bb4bb8a15feca6c7e04343 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Fri, 8 Jan 2016 16:19:57 +0100 Subject: [PATCH 31/46] Propagating bug fix for bad quality ausio on windows. --- submodules/mswasapi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/mswasapi b/submodules/mswasapi index 1adae8780..cf04af555 160000 --- a/submodules/mswasapi +++ b/submodules/mswasapi @@ -1 +1 @@ -Subproject commit 1adae8780c22b38a48bd5948ba0fbf88d1e7f8f0 +Subproject commit cf04af5559222eac11aa4f4a1979ce4ce39cca90 From e984a5ebc4e957263da9f860b44952426ef5fe5a Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 11 Jan 2016 10:43:50 +0100 Subject: [PATCH 32/46] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 1fc31123b..d52b44581 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 1fc31123b88f478cb271e1f1ce010bae5459bd09 +Subproject commit d52b445814fe34cf2b21dae44f82e69d626b961b From 8ab77e6a2fda6a17730bd0f4ad07f2cbaccafc49 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 11 Jan 2016 11:35:29 +0100 Subject: [PATCH 33/46] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index d52b44581..a1eb9a0f5 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit d52b445814fe34cf2b21dae44f82e69d626b961b +Subproject commit a1eb9a0f5ba5564ef0411f46198c4ac1edc77101 From 7974c261b60572718972912158e709cfedd1c149 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 11 Jan 2016 12:06:18 +0100 Subject: [PATCH 34/46] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index a1eb9a0f5..bd6add296 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit a1eb9a0f5ba5564ef0411f46198c4ac1edc77101 +Subproject commit bd6add296362557cbaad90acec7dce2d5f6486c3 From cd8c73a72f4693c599a6aa6f7ecc3e4d72628203 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Mon, 11 Jan 2016 16:53:12 +0100 Subject: [PATCH 35/46] Updating linphone submodule with bug fix on rtp port set to 0 and audio stream inactive when all audio codecs are disabled. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index bd6add296..2130afe5f 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit bd6add296362557cbaad90acec7dce2d5f6486c3 +Subproject commit 2130afe5f90108d9885af79c25c3ce506ce6f7b5 From 7b414fb192340c55fcea9c634175b6dd4f39ebd0 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 12 Jan 2016 10:31:04 +0100 Subject: [PATCH 36/46] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 2130afe5f..9b216dadc 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 2130afe5f90108d9885af79c25c3ce506ce6f7b5 +Subproject commit 9b216dadc9bfbaf6611e262b3a8c4def4f5bd709 From b0eb2cd903e40039f2ea38e9c8410d6696c48690 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 12 Jan 2016 10:38:48 +0100 Subject: [PATCH 37/46] Update linphone submodule. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 9b216dadc..207dddc8e 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 9b216dadc9bfbaf6611e262b3a8c4def4f5bd709 +Subproject commit 207dddc8e1824cf47f6f636120a4f8858ab2132b From dc1a6d76b7d18c0e27f300b24d460285f9819932 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 12 Jan 2016 10:53:41 +0100 Subject: [PATCH 38/46] Specify Visual Studio 2013 as the default generator on Windows. --- prepare.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/prepare.py b/prepare.py index fd47b66a6..34a0b9e52 100755 --- a/prepare.py +++ b/prepare.py @@ -47,6 +47,8 @@ class DesktopTarget(prepare.Target): if platform.system() == 'Windows': current_path = current_path.replace('\\', '/') self.config_file = 'configs/config-desktop.cmake' + if platform.system() == 'Windows': + self.generator = 'Visual Studio 12 2013' self.additional_args = [ '-DCMAKE_INSTALL_MESSAGE=LAZY', '-DLINPHONE_BUILDER_EXTERNAL_SOURCE_PATH=' + From 4937f87b1c35531edb85d88664658d415c99dcd8 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 12 Jan 2016 11:02:10 +0100 Subject: [PATCH 39/46] Prevent overwriting target generator with default argument value. --- prepare.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/prepare.py b/prepare.py index 34a0b9e52..b1ceba6a9 100755 --- a/prepare.py +++ b/prepare.py @@ -180,7 +180,6 @@ def main(argv=None): args, additional_args = argparser.parse_known_args() - additional_args += ["-G", args.generator] additional_args += ["-DLINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS=YES"] if args.only_submodules: @@ -227,6 +226,8 @@ def main(argv=None): target = PythonRaspberryTarget() else: target = DesktopTarget() + if target.generator is None: + additional_args += ["-G", args.generator] if args.clean or args.veryclean: if args.veryclean: target.veryclean() From 490ceb07dcfcee04f1197c2744debd176258cb58 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 12 Jan 2016 11:10:23 +0100 Subject: [PATCH 40/46] Really fix handling of generator. --- prepare.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/prepare.py b/prepare.py index b1ceba6a9..abd4e3cd0 100755 --- a/prepare.py +++ b/prepare.py @@ -164,7 +164,7 @@ def main(argv=None): argparser.add_argument( '-f', '--force', help="Force preparation, even if working directory already exist.", action='store_true') argparser.add_argument( - '-G', '--generator', help="CMake build system generator (default: Unix Makefiles, use cmake -h to get the complete list).", default='Unix Makefiles', dest='generator') + '-G', '--generator', help="CMake build system generator (default: let CMake choose, use cmake -h to get the complete list).", default=None, dest='generator') argparser.add_argument( '-L', '--list-cmake-variables', help="List non-advanced CMake cache variables.", action='store_true', dest='list_cmake_variables') argparser.add_argument( @@ -226,8 +226,9 @@ def main(argv=None): target = PythonRaspberryTarget() else: target = DesktopTarget() - if target.generator is None: - additional_args += ["-G", args.generator] + if args.generator is not None: + target.generator = args.generator + if args.clean or args.veryclean: if args.veryclean: target.veryclean() From 354b175a6b584f47bae5d5ace80342d1b31d1fc7 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Tue, 12 Jan 2016 16:11:26 +0100 Subject: [PATCH 41/46] Fix prepare.py error related to generator. --- prepare.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/prepare.py b/prepare.py index abd4e3cd0..9383bb81d 100755 --- a/prepare.py +++ b/prepare.py @@ -244,18 +244,18 @@ def main(argv=None): retcode = 0 return retcode # only generated makefile if we are using Ninja or Makefile - if args.generator.endswith('Ninja'): + if target.generator.endswith('Ninja'): if not check_is_installed("ninja", "it"): return 1 generate_makefile('ninja -C') info("You can now run 'make' to build.") - elif args.generator.endswith("Unix Makefiles"): + elif target.generator.endswith("Unix Makefiles"): generate_makefile('$(MAKE) -C') info("You can now run 'make' to build.") - elif args.generator == "Xcode": + elif target.generator == "Xcode": info("You can now open Xcode project with: open WORK/cmake/Project.xcodeproj") else: - warning("Not generating meta-makefile for generator {}.".format(args.generator)) + warning("Not generating meta-makefile for generator {}.".format(target.generator)) return 0 From a994a40c784b3b9dce70ccb55eca958abc6c8b79 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Tue, 12 Jan 2016 16:12:05 +0100 Subject: [PATCH 42/46] Porpagating bug fix in linphone for calls with audio and video codecs disabled. --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 2130afe5f..10c41db79 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 2130afe5f90108d9885af79c25c3ce506ce6f7b5 +Subproject commit 10c41db79fb6121a4c5f29fbeb2457d0027ded63 From 50ddc9826dcc95b856f67ead2077b8bb07e85164 Mon Sep 17 00:00:00 2001 From: Sandrine Avakian Date: Tue, 12 Jan 2016 17:10:53 +0100 Subject: [PATCH 43/46] Formating correction (tabs vs spaces). --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 10c41db79..511d97746 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 10c41db79fb6121a4c5f29fbeb2457d0027ded63 +Subproject commit 511d97746210ee8caef02ec3eda8f82934212cd6 From c9412d35fbc5d2f5df9a2d656aed6455d7c81a29 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 13 Jan 2016 10:10:09 +0100 Subject: [PATCH 44/46] Default to "Unix Makefiles" generator if none is set. --- prepare.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/prepare.py b/prepare.py index 9383bb81d..b2e8decb4 100755 --- a/prepare.py +++ b/prepare.py @@ -228,6 +228,9 @@ def main(argv=None): target = DesktopTarget() if args.generator is not None: target.generator = args.generator + if target.generator is None: + # Default to "Unix Makefiles" if no target specific generator is set and the user has not defined one + target.generator = "Unix Makefiles" if args.clean or args.veryclean: if args.veryclean: From a52bcb12ec5dd0edb1587613b995ef4fc38b4cfd Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Thu, 14 Jan 2016 17:47:49 +0100 Subject: [PATCH 45/46] 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 ebd953331..347b5b3b2 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit ebd95333197731ca6f174a69a4127ad54a6684af +Subproject commit 347b5b3b289053d77d83386cc97dc6140133b4ac From 91f0269bbbc86b6bfed010f0e018f8c375975a1a Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Fri, 15 Jan 2016 10:43:31 +0100 Subject: [PATCH 46/46] 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 347b5b3b2..ce4fd715c 160000 --- a/submodules/cmake-builder +++ b/submodules/cmake-builder @@ -1 +1 @@ -Subproject commit 347b5b3b289053d77d83386cc97dc6140133b4ac +Subproject commit ce4fd715cca79c20cb00b9e94bbdef2f7c3b85c8