From 3cdd8558db802841a756164592ca0844ac0485e1 Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 4 May 2022 11:42:54 +0400 Subject: [PATCH] Beta version 3.7.4: Fix build with GCC. --- Telegram/SourceFiles/core/changelogs.cpp | 2 ++ Telegram/SourceFiles/media/audio/media_audio.cpp | 5 +++++ Telegram/ThirdParty/tgcalls | 2 +- Telegram/build/docker/centos_env/Dockerfile | 2 +- Telegram/lib_ui | 2 +- Telegram/lib_webrtc | 2 +- 6 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/core/changelogs.cpp b/Telegram/SourceFiles/core/changelogs.cpp index 62a6288cc..288594a7d 100644 --- a/Telegram/SourceFiles/core/changelogs.cpp +++ b/Telegram/SourceFiles/core/changelogs.cpp @@ -124,6 +124,8 @@ std::map BetaLogs() { }, { 3007004, + "- More icons for chat folders.\n" + "- Improve some more sections design.\n" "- Update the OpenAL library to 1.22.0.\n" diff --git a/Telegram/SourceFiles/media/audio/media_audio.cpp b/Telegram/SourceFiles/media/audio/media_audio.cpp index df1371f6a..0e6bb34df 100644 --- a/Telegram/SourceFiles/media/audio/media_audio.cpp +++ b/Telegram/SourceFiles/media/audio/media_audio.cpp @@ -13,6 +13,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "media/audio/media_audio_track.h" #include "media/audio/media_openal_functions.h" #include "media/streaming/media_streaming_utility.h" +#include "webrtc/webrtc_media_devices.h" #include "data/data_document.h" #include "data/data_file_origin.h" #include "data/data_session.h" @@ -80,6 +81,10 @@ bool PlaybackErrorHappened() { } void EnumeratePlaybackDevices() { + if (!Webrtc::InitPipewireStubs()) { + LOG(("Audio Info: Failed to load pipewire 0.3 stubs.")); + } + auto deviceNames = QStringList(); auto devices = [&] { if (alcIsExtensionPresent(nullptr, "ALC_ENUMERATE_ALL_EXT")) { diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls index 0dec28031..6b99acb99 160000 --- a/Telegram/ThirdParty/tgcalls +++ b/Telegram/ThirdParty/tgcalls @@ -1 +1 @@ -Subproject commit 0dec280315cfd60d463c13cd853fc9b1a46fb337 +Subproject commit 6b99acb99d1a89051cbf363718511b510be06354 diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 1e423a2e8..a4a4f8ebf 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -604,7 +604,7 @@ COPY --from=pipewire ${LibrariesPath}/pipewire-cache / RUN git init tg_owt \ && cd tg_owt \ && git remote add origin $GIT/desktop-app/tg_owt.git \ - && git fetch --depth=1 origin c1aea3d142e0c1dbab80511d555a828f47dcbd8b \ + && git fetch --depth=1 origin 442d5bb593c0ae314960308d78f2016ad1f80c3e \ && git reset --hard FETCH_HEAD \ && git submodule update --init --recursive --depth=1 \ && rm -rf .git \ diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 9b6e11db6..9d07d6a47 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 9b6e11db62810626a56431cdc8eeb771817f6560 +Subproject commit 9d07d6a476f057c55af9392804c3e8b6246c637c diff --git a/Telegram/lib_webrtc b/Telegram/lib_webrtc index 836fdb050..5f0207426 160000 --- a/Telegram/lib_webrtc +++ b/Telegram/lib_webrtc @@ -1 +1 @@ -Subproject commit 836fdb0506ca362f08ccacc1501aa84fe68333ae +Subproject commit 5f02074263efb97224bea65f22e37dcdadc33ef5