Merge pull request #186 from simlar/pullrequest/liblinphone-5.3.5

Pullrequest liblinphone 5.3.5

Podfile

@@ -14,7 +14,7 @@ target 'Simlar' do
   if File.exist?($PODFILE_PATH)
     pod 'linphone-sdk', :path => $PODFILE_PATH
   else
-    pod 'linphone-sdk', '5.2.102'
+    pod 'linphone-sdk', '5.3.5'
   end
 
   target 'SimlarTests' do

Podfile.lock

@@ -3,12 +3,12 @@ PODS:
     - CocoaLumberjack/Core (= 3.8.2)
   - CocoaLumberjack/Core (3.8.2)
   - libPhoneNumber-iOS (1.0.4)
-  - linphone-sdk (5.2.102)
+  - linphone-sdk (5.3.5)
 
 DEPENDENCIES:
   - CocoaLumberjack (= 3.8.2)
   - libPhoneNumber-iOS (from `https://github.com/iziz/libPhoneNumber-iOS`, tag `1.1`)
-  - linphone-sdk (= 5.2.102)
+  - linphone-sdk (= 5.3.5)
 
 SPEC REPOS:
   https://gitlab.linphone.org/BC/public/podspec.git:
@@ -29,8 +29,8 @@ CHECKOUT OPTIONS:
 SPEC CHECKSUMS:
   CocoaLumberjack: f8d89a516e7710fdb2e9b8f1560b16ec6040eef0
   libPhoneNumber-iOS: fcea72ef3dba81f9da2e6f7c4557b64022f3632b
-  linphone-sdk: 9f6270409956b5c455e1763590085e84ddf60306
+  linphone-sdk: ad63951213a3190310822bcd09eb8d59a688279c
 
-PODFILE CHECKSUM: 0cb4b9e43889e832c2055e542c9c2b6615d452a7
+PODFILE CHECKSUM: d32dfd780f91bf7c3b4601038ac272fbf59a4a6f
 
 COCOAPODS: 1.14.3

Simlar/src/SMLRLinphoneHandler.m

@@ -242,12 +242,12 @@ - (void)initLibLinphone
 
     /// create linphone account
     LinphoneAccountParams *const accountParams = linphone_account_params_new(_linphoneCore);
-    const LinphoneAddress *const identity = linphone_address_new([NSString stringWithFormat:@"sip:%@@" SIMLAR_DOMAIN, [SMLRCredentials getSimlarId]].UTF8String);
+    LinphoneAddress *const identity = linphone_address_new([NSString stringWithFormat:@"sip:%@@" SIMLAR_DOMAIN, [SMLRCredentials getSimlarId]].UTF8String);
     linphone_account_params_set_identity_address(accountParams, identity);
-    linphone_account_params_set_server_addr(accountParams, (@"sips:" SIMLAR_DOMAIN @":5062").UTF8String);
-    linphone_account_params_set_register_enabled(accountParams, TRUE);
+    linphone_account_params_set_server_address(accountParams, linphone_address_new((@"sips:" SIMLAR_DOMAIN @":5062").UTF8String));
+    linphone_account_params_enable_register(accountParams, TRUE);
     linphone_account_params_set_expires(accountParams, 60);
-    linphone_account_params_set_publish_enabled(accountParams, FALSE);
+    linphone_account_params_enable_publish(accountParams, FALSE);
     linphone_account_params_set_push_notification_allowed(accountParams, FALSE);
 
     LinphoneAccount *const account = linphone_account_new(_linphoneCore, accountParams);
@@ -797,6 +797,7 @@ + (NSString *)getCallEndReasonFromCall:(LinphoneCall *const) call
         case LinphoneReasonBadEvent:
         case LinphoneReasonUnknown:
         case LinphoneReasonTransferred:
+        case LinphoneReasonConditionalRequestFailed:
             return [NSString stringWithFormat:@"Error: %s", linphone_reason_to_string(reason)];
     }
 }
@@ -833,6 +834,7 @@ - (void)registrationStateChanged:(const LinphoneAccount *const)account state:(co
         case LinphoneRegistrationProgress:
             // registration progress => ignore
             break;
+        case LinphoneRegistrationRefreshing:
         case LinphoneRegistrationOk:
             // if going down => ignore updates
             if (_linphoneHandlerStatus != SMLRLinphoneHandlerStatusGoingDown) {

bootstrap-liblinphone.sh

@@ -3,7 +3,7 @@
 ## exit if an error occurs or on unset variables
 set -eu -o pipefail
 
-declare -r BRANCH=${1:-"5.2.102"} ## use master to build current git revision
+declare -r BRANCH=${1:-"5.3.5"} ## use master to build current git revision
 
 declare -r PROJECT_DIR="$(dirname $(greadlink -f $0))"
 

compile-liblinphone.sh

@@ -8,30 +8,31 @@ declare -r  GIT_HASH=${2:-"unknown"}
 
 declare -r DEST_DIR="$(dirname $(greadlink -f $0))/liblinphone"
 
-declare -r CMAKE_BUILD_DIR="${BUILD_DIR}/linphone-sdk-build_$(date '+%Y%m%d_%H%M%S')"
-mkdir "${CMAKE_BUILD_DIR}"
-cd "${CMAKE_BUILD_DIR}"
+declare -r CMAKE_BUILD_DIR="${BUILD_DIR}/linphone-sdk/linphone-sdk-build_$(date '+%Y%m%d_%H%M%S')"
+cd "${BUILD_DIR}/linphone-sdk"
 
-cmake "${BUILD_DIR}/linphone-sdk" \
+cmake \
+    --preset=ios-sdk \
     -G Ninja \
-    -DLINPHONESDK_PLATFORM=IOS \
+    -B "${CMAKE_BUILD_DIR}" \
     -DLINPHONESDK_IOS_ARCHS="arm64, x86_64" \
     -DENABLE_AAUDIO=OFF \
     -DENABLE_GPL_THIRD_PARTIES=ON \
+    -DENABLE_NON_FREE_FEATURES=ON \
     -DENABLE_PQCRYPTO=ON \
     -DENABLE_GSM=OFF \
     -DENABLE_ILBC=OFF \
     -DENABLE_ISAC=OFF \
     -DENABLE_MKV=OFF \
     -DENABLE_VCARD=OFF
 
-cmake --build . --config RelWithDebInfo
+cmake --build "${CMAKE_BUILD_DIR}" --config RelWithDebInfo
 
 ## copy sdk
 rm -rf "${DEST_DIR}"
 mkdir "${DEST_DIR}"
-gcp linphone-sdk.podspec "${DEST_DIR}/"
-unzip -o $(gfind . -maxdepth 1 -name linphone-sdk-ios\*.zip) -d "${DEST_DIR}/"
+gcp "${CMAKE_BUILD_DIR}"/linphone-sdk.podspec "${DEST_DIR}/"
+unzip -o $(gfind "${CMAKE_BUILD_DIR}" -maxdepth 1 -name linphone-sdk-ios\*.zip) -d "${DEST_DIR}/"
 
 echo "liblinphone build successfull with git hash: ${GIT_HASH}"
 echo "integrate it with:"