From 72c79e8eaab9edbece57baf129ffe889e53721ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Turnel?= Date: Fri, 10 Aug 2018 09:31:33 +0200 Subject: [PATCH 01/10] Update submodule belle-sip, linphone (cherry picked from commit c98fa55dba1e1ded75c0f6d34cc862773f3ed849) # Conflicts: # submodules/linphone --- 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 0f999ecc3..7a750d63b 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 0f999ecc3d304923b6338d3f48d44ac8ddfd9be8 +Subproject commit 7a750d63bbb930b899738bcaf1af21f0785bee1c diff --git a/submodules/linphone b/submodules/linphone index 61e38e370..ebf1d1195 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 61e38e3704e1a37c9e884897ca5597158725b202 +Subproject commit ebf1d1195f22091371894b0c3e66063bce98bb96 From 85db9025a63604fcf0b8e14cdf7fd85042db1cc4 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 13 Aug 2018 11:56:49 +0200 Subject: [PATCH 02/10] Update ortp (required after upgrading linphone submodule) --- submodules/ortp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/ortp b/submodules/ortp index 1fcd6fd15..6e13ef49a 160000 --- a/submodules/ortp +++ b/submodules/ortp @@ -1 +1 @@ -Subproject commit 1fcd6fd1558f26255ae9dac687191ddf988bfd5b +Subproject commit 6e13ef49a55cdd19dae395c38cfff7ffa518a089 From 6c7c599aac118468f4f9b7086475e3456f9dc862 Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Fri, 5 Oct 2018 08:53:02 +0200 Subject: [PATCH 03/10] backport fix for bluetooth --- submodules/externals/libvpx | 2 +- submodules/mediastreamer2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/externals/libvpx b/submodules/externals/libvpx index d2b4742a0..e30f71938 160000 --- a/submodules/externals/libvpx +++ b/submodules/externals/libvpx @@ -1 +1 @@ -Subproject commit d2b4742a04da011adf05a4ea63d041f60e50195a +Subproject commit e30f719387857056a45a6722bf4f3a55203d812b diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index 54a79f731..ef107b526 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit 54a79f731fea61d345dfff4f8fcb2fc390c2fed7 +Subproject commit ef107b52630aa0e84e40ce6948b922052df9d89c From 061a7799b9a2796f56afe472750e6115280f31b3 Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Wed, 19 Sep 2018 11:24:45 +0200 Subject: [PATCH 04/10] fix crash when calls --- Classes/LinphoneManager.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 8fec2f9a8..359169c0b 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -2466,7 +2466,7 @@ static int comp_call_state_paused(const LinphoneCall *call, const void *param) { } AVAudioSessionRouteDescription *newRoute = [AVAudioSession sharedInstance].currentRoute; - if (newRoute) { + if (newRoute && newRoute.outputs.count > 0) { NSString *route = newRoute.outputs[0].portType; LOGI(@"Current audio route is [%s]", [route UTF8String]); From eaae6b72d645d1c26b99f021dc69eaea613354fa Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Fri, 28 Sep 2018 09:59:57 +0200 Subject: [PATCH 05/10] fix crash --- Classes/LinphoneManager.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 359169c0b..62899ff88 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -2442,7 +2442,7 @@ static int comp_call_state_paused(const LinphoneCall *call, const void *param) { bool allow = true; AVAudioSessionRouteDescription *newRoute = [AVAudioSession sharedInstance].currentRoute; - if (newRoute) { + if (newRoute && newRoute.outputs.count > 0) { NSString *route = newRoute.outputs[0].portType; allow = !([route isEqualToString:AVAudioSessionPortLineOut] || [route isEqualToString:AVAudioSessionPortHeadphones] || From f37a75de717d76711275b672acc9bf5427b548b3 Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Fri, 5 Oct 2018 11:22:29 +0200 Subject: [PATCH 06/10] remove useless include on ios12 --- linphone.xcodeproj/project.pbxproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index bf4c98ccf..0168defb0 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -58,7 +58,6 @@ 340751E7150F38FD00B89C47 /* UIVideoButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 340751E6150F38FD00B89C47 /* UIVideoButton.m */; }; 34216F401547EBCD00EA9777 /* VideoZoomHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 34216F3F1547EBCD00EA9777 /* VideoZoomHandler.m */; }; 344ABDF114850AE9007420B6 /* libc++.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDEF14850AE9007420B6 /* libc++.1.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; - 344ABDF214850AE9007420B6 /* libstdc++.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDF014850AE9007420B6 /* libstdc++.6.dylib */; settings = {ATTRIBUTES = (Weak, ); }; }; 570742581D5A0691004B9C84 /* ShopView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 570742561D5A0691004B9C84 /* ShopView.xib */; }; 570742611D5A09B8004B9C84 /* ShopView.m in Sources */ = {isa = PBXBuildFile; fileRef = 5707425F1D5A09B8004B9C84 /* ShopView.m */; }; 570742671D5A63DB004B9C84 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 570742661D5A63DB004B9C84 /* StoreKit.framework */; }; @@ -1987,7 +1986,6 @@ F05BAA621A5D594E00411815 /* libz.dylib in Frameworks */, 344ABDF114850AE9007420B6 /* libc++.1.dylib in Frameworks */, 8C5BCEDC1EB3859300A9AAEF /* ortp.framework in Frameworks */, - 344ABDF214850AE9007420B6 /* libstdc++.6.dylib in Frameworks */, 22D1B68112A3E0BE001AE361 /* libresolv.dylib in Frameworks */, 8C5BCED01EB3859200A9AAEF /* bctoolbox.framework in Frameworks */, ); From 0b2979a843a8362e7b082ed245033530f4c160b0 Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Fri, 12 Oct 2018 15:36:37 +0200 Subject: [PATCH 07/10] Revert "Update ortp (required after upgrading linphone submodule)" This reverts commit 85db9025a63604fcf0b8e14cdf7fd85042db1cc4. --- submodules/ortp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/ortp b/submodules/ortp index 6e13ef49a..1fcd6fd15 160000 --- a/submodules/ortp +++ b/submodules/ortp @@ -1 +1 @@ -Subproject commit 6e13ef49a55cdd19dae395c38cfff7ffa518a089 +Subproject commit 1fcd6fd1558f26255ae9dac687191ddf988bfd5b From 7aa0172d4260a4c21fd20a3b84d11644cf59e790 Mon Sep 17 00:00:00 2001 From: Benjamin Reis Date: Fri, 12 Oct 2018 15:37:14 +0200 Subject: [PATCH 08/10] Revert "Update submodule belle-sip, linphone" This reverts commit 72c79e8eaab9edbece57baf129ffe889e53721ec. --- 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 7a750d63b..0f999ecc3 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 7a750d63bbb930b899738bcaf1af21f0785bee1c +Subproject commit 0f999ecc3d304923b6338d3f48d44ac8ddfd9be8 diff --git a/submodules/linphone b/submodules/linphone index ebf1d1195..61e38e370 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit ebf1d1195f22091371894b0c3e66063bce98bb96 +Subproject commit 61e38e3704e1a37c9e884897ca5597158725b202 From f5dfc387bebc14b182fe98a4804389bb2668c94c Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 15 Oct 2018 16:08:04 +0200 Subject: [PATCH 09/10] update belle-sip/ms2 with some mandatory fixes, update changelog --- CHANGELOG.md | 7 +++++++ linphone-Info.plist | 4 ++-- submodules/belle-sip | 2 +- submodules/mediastreamer2 | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a9729a86..e627ecbff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,13 @@ Group changes to describe their impact on the project, as follows: Fixed for any bug fixes. Security to invite users to upgrade in case of vulnerabilities. +## [4.0.2] - 2018-10-15 + +### Fixed +- fix IOS12 crash +- fix bluethooth issue with some cars +- fix nat helper (sdk) + ## [4.0.1] - 2018-06-26 ### Fixed diff --git a/linphone-Info.plist b/linphone-Info.plist index 35ee38442..35db4566e 100644 --- a/linphone-Info.plist +++ b/linphone-Info.plist @@ -24,7 +24,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 4.0.1 + 4.0.2 CFBundleURLTypes @@ -53,7 +53,7 @@ CFBundleVersion - 1 + 6 ITSAppUsesNonExemptEncryption ITSEncryptionExportComplianceCode diff --git a/submodules/belle-sip b/submodules/belle-sip index 0f999ecc3..8de2fb272 160000 --- a/submodules/belle-sip +++ b/submodules/belle-sip @@ -1 +1 @@ -Subproject commit 0f999ecc3d304923b6338d3f48d44ac8ddfd9be8 +Subproject commit 8de2fb272928d5be5a0700deaba76799cc235afb diff --git a/submodules/mediastreamer2 b/submodules/mediastreamer2 index ef107b526..ac5794754 160000 --- a/submodules/mediastreamer2 +++ b/submodules/mediastreamer2 @@ -1 +1 @@ -Subproject commit ef107b52630aa0e84e40ce6948b922052df9d89c +Subproject commit ac5794754012398d8035f4aff788071b9d30de79 From 86db25c8b6e69edaa8a7ff285d33e2a528828218 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Mon, 22 Oct 2018 13:25:27 +0200 Subject: [PATCH 10/10] update linphone submodule --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 61e38e370..35d613fae 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 61e38e3704e1a37c9e884897ca5597158725b202 +Subproject commit 35d613fae9cfb712914a2a14ca9f281801769ad2