From d4b686ff65c16ac596d172ebb5da105a33af86c1 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Tue, 1 Feb 2022 16:23:54 +0400 Subject: [PATCH] Update tg_owt --- Telegram/build/docker/centos_env/Dockerfile | 3 ++- snap/snapcraft.yaml | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 57cc12ec59..6eca77539c 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -687,6 +687,7 @@ WORKDIR .. FROM builder AS webrtc +COPY --from=libepoxy ${LibrariesPath}/libepoxy-cache / COPY --from=mozjpeg ${LibrariesPath}/mozjpeg-cache / COPY --from=opus ${LibrariesPath}/opus-cache / COPY --from=libvpx ${LibrariesPath}/libvpx-cache / @@ -699,7 +700,7 @@ 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 1fd131d37777c445b58cad3889313a7c26ffc2ee +RUN git fetch --depth=1 origin 25c8637f5975db830cc5d74477641a8b609e248d RUN git reset --hard FETCH_HEAD RUN git submodule init RUN git submodule update diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 34fadd76db..25d8a79544 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -447,10 +447,12 @@ parts: webrtc: source: https://github.com/desktop-app/tg_owt.git source-depth: 1 - source-commit: 6372a0848f8dd84013e291b44f9d1427fde3a90e + source-commit: 25c8637f5975db830cc5d74477641a8b609e248d plugin: cmake build-packages: - yasm + - libdrm-dev + - libgbm-dev - libglib2.0-dev - libopus-dev - libpipewire-0.2-dev @@ -464,6 +466,8 @@ parts: - libxrandr-dev - libxtst-dev stage-packages: + - libdrm2 + - libgbm1 - libglib2.0-0 - libopus0 - libpipewire-0.2-1 @@ -487,6 +491,7 @@ parts: - -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/cmake - -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/*.a after: + - epoxy - ffmpeg - mozjpeg - vpx