From e0e878cbb11d0e6435b0899fa290e69b79b9116c Mon Sep 17 00:00:00 2001 From: John Preston Date: Tue, 18 May 2021 10:01:35 +0400 Subject: [PATCH] Update tg_owt to webrtc m90. --- Telegram/ThirdParty/tgcalls | 2 +- Telegram/build/docker/centos_env/Dockerfile | 15 +++++++++++---- docs/building-msvc-x64.md | 5 ++++- docs/building-msvc.md | 5 ++++- docs/building-xcode.md | 5 ++++- snap/snapcraft.yaml | 2 +- 6 files changed, 25 insertions(+), 9 deletions(-) diff --git a/Telegram/ThirdParty/tgcalls b/Telegram/ThirdParty/tgcalls index a362d24ee9..1777fdf141 160000 --- a/Telegram/ThirdParty/tgcalls +++ b/Telegram/ThirdParty/tgcalls @@ -1 +1 @@ -Subproject commit a362d24ee97ed1a5c2e3a82656e897adf3354613 +Subproject commit 1777fdf141ffa31bda158627345518b91834bab8 diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 78b7fc6b5a..97817e52ae 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -733,13 +733,20 @@ COPY --from=ffmpeg ${LibrariesPath}/ffmpeg-cache / COPY --from=openssl ${LibrariesPath}/openssl-cache / COPY --from=libXtst ${LibrariesPath}/libXtst-cache / -ADD https://api.github.com/repos/desktop-app/tg_owt/git/refs/heads/master tg_owt-version.json -RUN git clone --depth=1 --recursive $GIT/desktop-app/tg_owt.git +# Shallow clone on a specific commit. +RUN mkdir tg_owt +WORKDIR tg_owt +RUN git init +RUN git remote add origin $GIT/desktop-app/tg_owt.git +RUN git fetch --depth=1 origin 80c1c625332cb056aae50794c107700edc3b71d2 +RUN git reset --hard FETCH_HEAD +RUN git submodule init +RUN git submodule update -WORKDIR tg_owt/src/third_party/pipewire +WORKDIR src/third_party/pipewire RUN meson build -WORKDIR $LibrariesPath/tg_owt +WORKDIR ../../.. RUN cmake3 -B out/Release . \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/docs/building-msvc-x64.md b/docs/building-msvc-x64.md index a1bd707227..f501e5e72d 100644 --- a/docs/building-msvc-x64.md +++ b/docs/building-msvc-x64.md @@ -207,8 +207,11 @@ Open **x64 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** jom -j8 install cd .. - git clone --recursive https://github.com/desktop-app/tg_owt.git + git clone https://github.com/desktop-app/tg_owt.git cd tg_owt + git checkout 80c1c62533 + git submodule init + git submodule update mkdir out cd out mkdir Debug diff --git a/docs/building-msvc.md b/docs/building-msvc.md index c89d13ae6b..37cb263d24 100644 --- a/docs/building-msvc.md +++ b/docs/building-msvc.md @@ -207,8 +207,11 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** jom -j8 install cd .. - git clone --recursive https://github.com/desktop-app/tg_owt.git + git clone https://github.com/desktop-app/tg_owt.git cd tg_owt + git checkout 80c1c62533 + git submodule init + git submodule update mkdir out cd out mkdir Debug diff --git a/docs/building-xcode.md b/docs/building-xcode.md index 9a8269a644..3b98a626ca 100644 --- a/docs/building-xcode.md +++ b/docs/building-xcode.md @@ -302,8 +302,11 @@ Go to ***BuildPath*** and run sudo make install cd .. - git clone --recursive https://github.com/desktop-app/tg_owt.git + git clone https://github.com/desktop-app/tg_owt.git cd tg_owt + git checkout 80c1c62533 + git submodule init + git submodule update mkdir out cd out mkdir Debug diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index c31e0ab3b9..9ca7656e5c 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -424,7 +424,7 @@ parts: webrtc: source: https://github.com/desktop-app/tg_owt.git source-depth: 1 - source-commit: 18cb4cd9bb4c2f5f5f5e760ec808f74c302bc1bf + source-commit: 80c1c625332cb056aae50794c107700edc3b71d2 plugin: cmake build-packages: - yasm