diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 79dacf5cdb..5f4c935ce2 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -796,7 +796,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 6b7955ed542fb0bc2046a6155721dc5f9037c03a +RUN git fetch --depth=1 origin 6372a0848f8dd84013e291b44f9d1427fde3a90e RUN git reset --hard FETCH_HEAD RUN git submodule init RUN git submodule update @@ -811,7 +811,6 @@ RUN cmake -G"Ninja Multi-Config" -B out . \ -DCMAKE_C_FLAGS_DEBUG="-g $HFLAGS_DEBUG" \ -DCMAKE_CXX_FLAGS_RELEASE="-O3 -DNDEBUG $HFLAGS" \ -DCMAKE_CXX_FLAGS_DEBUG="-g $HFLAGS_DEBUG" \ - -DTG_OWT_BUILD_AUDIO_BACKENDS=OFF \ -DTG_OWT_SPECIAL_TARGET=linux \ -DTG_OWT_LIBJPEG_INCLUDE_PATH=/usr/local/include \ -DTG_OWT_OPENSSL_INCLUDE_PATH=$OPENSSL_PREFIX/include \ diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 29be785992..48a7242de3 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -1234,7 +1234,7 @@ mac: stage('tg_owt', """ git clone https://github.com/desktop-app/tg_owt.git cd tg_owt - git checkout 6b7955ed54 + git checkout 6372a0848f git submodule init git submodule update src/third_party/libyuv win: @@ -1314,7 +1314,6 @@ release: cmake -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_OSX_ARCHITECTURES=x86_64 \ - -DTG_OWT_BUILD_AUDIO_BACKENDS=OFF \ -DTG_OWT_SPECIAL_TARGET=$SPECIAL_TARGET \ -DTG_OWT_LIBJPEG_INCLUDE_PATH=$MOZJPEG_PATH \ -DTG_OWT_OPENSSL_INCLUDE_PATH=$LIBS_DIR/openssl/include \ @@ -1328,7 +1327,6 @@ release: cmake -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_OSX_ARCHITECTURES=arm64 \ - -DTG_OWT_BUILD_AUDIO_BACKENDS=OFF \ -DTG_OWT_SPECIAL_TARGET=$SPECIAL_TARGET \ -DTG_OWT_LIBJPEG_INCLUDE_PATH=$MOZJPEG_PATH \ -DTG_OWT_OPENSSL_INCLUDE_PATH=$LIBS_DIR/openssl/include \ diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index e0eb7d6e3b..34fadd76db 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -422,10 +422,32 @@ parts: - -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/librnnoise.so - -./usr/share + vpx: + source: https://github.com/webmproject/libvpx.git + source-depth: 1 + source-tag: v1.11.0 + plugin: autotools + autotools-configure-parameters: + - --prefix=/usr + - --libdir=/usr/lib/$SNAPCRAFT_ARCH_TRIPLET + - --disable-examples + - --disable-unit-tests + - --disable-tools + - --disable-docs + - --enable-shared + - --disable-static + - --enable-vp8 + - --enable-vp9 + - --enable-webm-io + prime: + - -./usr/include + - -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pkgconfig + - -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libvpx.so + webrtc: source: https://github.com/desktop-app/tg_owt.git source-depth: 1 - source-commit: b02478677baac6d563589f216800ff9cea0fd65c + source-commit: 6372a0848f8dd84013e291b44f9d1427fde3a90e plugin: cmake build-packages: - yasm @@ -458,10 +480,8 @@ parts: - -GNinja - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_INSTALL_PREFIX=/usr - - -DBUILD_SHARED_LIBS=OFF - -DJPEG_LIBRARY_RELEASE=$SNAPCRAFT_STAGE/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/libjpeg.so - -DJPEG_INCLUDE_DIR=$SNAPCRAFT_STAGE/usr/include - - -DTG_OWT_BUILD_AUDIO_BACKENDS=OFF prime: - -./usr/include - -./usr/lib/$SNAPCRAFT_ARCH_TRIPLET/cmake @@ -469,3 +489,4 @@ parts: after: - ffmpeg - mozjpeg + - vpx