From 98d71308a811d532329e306a48f4f2f68bae9dde Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 18 Apr 2025 09:01:33 +0400 Subject: [PATCH] Update tgcalls, don't link libtgvoip any more. --- Telegram/CMakeLists.txt | 5 ++-- Telegram/SourceFiles/calls/calls_call.cpp | 4 --- Telegram/ThirdParty/tgcalls | 2 +- Telegram/cmake/lib_tgcalls.cmake | 36 +++++++++++------------ 4 files changed, 21 insertions(+), 26 deletions(-) diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt index bc0d1b9016..492b181596 100644 --- a/Telegram/CMakeLists.txt +++ b/Telegram/CMakeLists.txt @@ -26,7 +26,6 @@ get_filename_component(res_loc Resources REALPATH) include(cmake/telegram_options.cmake) include(cmake/lib_ffmpeg.cmake) include(cmake/lib_stripe.cmake) -include(cmake/lib_tgvoip.cmake) include(cmake/lib_tgcalls.cmake) include(cmake/lib_prisma.cmake) include(cmake/td_export.cmake) @@ -54,9 +53,9 @@ set_target_properties(Telegram PROPERTIES AUTOMOC ON) target_link_libraries(Telegram PRIVATE - tdesktop::lib_tgcalls_legacy + # tdesktop::lib_tgcalls_legacy tdesktop::lib_tgcalls - tdesktop::lib_tgvoip + # tdesktop::lib_tgvoip # Order in this list defines the order of include paths in command line. # We need to place desktop-app::external_minizip this early to have its diff --git a/Telegram/SourceFiles/calls/calls_call.cpp b/Telegram/SourceFiles/calls/calls_call.cpp index d4d0093350..8e862fd76e 100644 --- a/Telegram/SourceFiles/calls/calls_call.cpp +++ b/Telegram/SourceFiles/calls/calls_call.cpp @@ -41,8 +41,6 @@ namespace tgcalls { class InstanceImpl; class InstanceV2Impl; class InstanceV2ReferenceImpl; -class InstanceImplLegacy; -void SetLegacyGlobalServerConfig(const std::string &serverConfig); } // namespace tgcalls namespace Calls { @@ -57,7 +55,6 @@ const auto kDefaultVersion = "2.4.4"_q; const auto Register = tgcalls::Register(); const auto RegisterV2 = tgcalls::Register(); const auto RegV2Ref = tgcalls::Register(); -const auto RegisterLegacy = tgcalls::Register(); [[nodiscard]] base::flat_set CollectEndpointIds( const QVector &list) { @@ -1637,7 +1634,6 @@ Call::~Call() { } void UpdateConfig(const std::string &data) { - tgcalls::SetLegacyGlobalServerConfig(data); } } // namespace Calls diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls index ea93dec2c8..1348de6aa6 160000 --- a/Telegram/ThirdParty/tgcalls +++ b/Telegram/ThirdParty/tgcalls @@ -1 +1 @@ -Subproject commit ea93dec2c8910197681ae785fd05a864e27d3db9 +Subproject commit 1348de6aa6c07ed32354d3e26423c45304000a39 diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake index 8453aabe26..9f59550bff 100644 --- a/Telegram/cmake/lib_tgcalls.cmake +++ b/Telegram/cmake/lib_tgcalls.cmake @@ -281,25 +281,25 @@ PRIVATE ${tgcalls_loc} ) -add_library(lib_tgcalls_legacy STATIC) -init_target(lib_tgcalls_legacy) +# add_library(lib_tgcalls_legacy STATIC) +# init_target(lib_tgcalls_legacy) -add_library(tdesktop::lib_tgcalls_legacy ALIAS lib_tgcalls_legacy) +# add_library(tdesktop::lib_tgcalls_legacy ALIAS lib_tgcalls_legacy) -nice_target_sources(lib_tgcalls_legacy ${tgcalls_loc} -PRIVATE - legacy/InstanceImplLegacy.cpp - legacy/InstanceImplLegacy.h -) +# nice_target_sources(lib_tgcalls_legacy ${tgcalls_loc} +# PRIVATE +# legacy/InstanceImplLegacy.cpp +# legacy/InstanceImplLegacy.h +# ) -target_include_directories(lib_tgcalls_legacy -PRIVATE - ${tgcalls_loc} -) +# target_include_directories(lib_tgcalls_legacy +# PRIVATE +# ${tgcalls_loc} +# ) -target_link_libraries(lib_tgcalls_legacy -PRIVATE - tdesktop::lib_tgcalls - tdesktop::lib_tgvoip - desktop-app::external_openssl -) +# target_link_libraries(lib_tgcalls_legacy +# PRIVATE +# tdesktop::lib_tgcalls +# tdesktop::lib_tgvoip +# desktop-app::external_openssl +# )