From fbb83249b8d0c729f16f2d5f1421d0f88d9e0de1 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Wed, 13 Mar 2024 10:02:36 +0100 Subject: [PATCH] Update SDK master --- .gitlab-ci-files/macosx-desktop.yml | 2 +- Linphone/model/core/CoreModel.cpp | 2 +- Linphone/model/core/CoreModel.hpp | 4 ++-- external/linphone-sdk | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci-files/macosx-desktop.yml b/.gitlab-ci-files/macosx-desktop.yml index 3a3338af4..12598f1e3 100644 --- a/.gitlab-ci-files/macosx-desktop.yml +++ b/.gitlab-ci-files/macosx-desktop.yml @@ -18,7 +18,7 @@ echo $DEFAULT_MACOS_CMAKE_OPTIONS echo $CMAKE_OPTIONS echo $ADDITIONAL_BUILD_OPTIONS - cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE $DEFAULT_MACOS_CMAKE_OPTIONS -DLINPHONE_BUILDER_SIGNING_IDENTITY="$MACOS_SIGNING_IDENTITY" $XCODE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $RELEASE_FILE + cmake .. -G "$CMAKE_GENERATOR" -DCMAKE_OSX_DEPLOYMENT_TARGET=12.3 -DCMAKE_BUILD_TYPE=$CI_BUILD_TYPE $DEFAULT_MACOS_CMAKE_OPTIONS -DLINPHONE_BUILDER_SIGNING_IDENTITY="$MACOS_SIGNING_IDENTITY" $XCODE_OPTIONS $CMAKE_OPTIONS $SCHEDULE_CMAKE_OPTIONS $RELEASE_FILE cmake --build . --target install --config $CI_BUILD_TYPE $LBC_NODEBUG_OPTIONS -- $ADDITIONAL_BUILD_OPTIONS ccache -s diff --git a/Linphone/model/core/CoreModel.cpp b/Linphone/model/core/CoreModel.cpp index 726df3f9d..eca6cd288 100644 --- a/Linphone/model/core/CoreModel.cpp +++ b/Linphone/model/core/CoreModel.cpp @@ -221,7 +221,7 @@ void CoreModel::onConferenceInfoReceived(const std::shared_ptr & emit conferenceInfoReceived(core, conferenceInfo); } void CoreModel::onConfiguringStatus(const std::shared_ptr &core, - linphone::Config::ConfiguringState status, + linphone::ConfiguringState status, const std::string &message) { emit configuringStatus(core, status, message); } diff --git a/Linphone/model/core/CoreModel.hpp b/Linphone/model/core/CoreModel.hpp index 77f08e81a..dd7ab9c0d 100644 --- a/Linphone/model/core/CoreModel.hpp +++ b/Linphone/model/core/CoreModel.hpp @@ -109,7 +109,7 @@ private: onConferenceInfoReceived(const std::shared_ptr &core, const std::shared_ptr &conferenceInfo) override; virtual void onConfiguringStatus(const std::shared_ptr &core, - linphone::Config::ConfiguringState status, + linphone::ConfiguringState status, const std::string &message) override; virtual void onDefaultAccountChanged(const std::shared_ptr &core, const std::shared_ptr &account) override; @@ -193,7 +193,7 @@ signals: void conferenceInfoReceived(const std::shared_ptr &core, const std::shared_ptr &conferenceInfo); void configuringStatus(const std::shared_ptr &core, - linphone::Config::ConfiguringState status, + linphone::ConfiguringState status, const std::string &message); void defaultAccountChanged(const std::shared_ptr &core, const std::shared_ptr &account); diff --git a/external/linphone-sdk b/external/linphone-sdk index f771d655e..8f3434663 160000 --- a/external/linphone-sdk +++ b/external/linphone-sdk @@ -1 +1 @@ -Subproject commit f771d655e30169e59d8b3736d4e2a30e52e29f18 +Subproject commit 8f34346639a69e44cc67a6363fc657f78bfbc28d