diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 0995ff7036..64820246ea 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -765,7 +765,7 @@ COPY --link --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 8198c4d8b91e22d68eb5c7327fd408e3b6abcc79 \ + && git fetch --depth=1 origin c4192e8e2e10ccb72704daa79fa108becfa57b01 \ && git reset --hard FETCH_HEAD \ && git submodule update --init --recursive --depth=1 \ && rm -rf .git \ diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 6640650b55..9eb72b7fce 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -1738,9 +1738,8 @@ win: stage('tg_owt', """ git clone https://github.com/desktop-app/tg_owt.git cd tg_owt - git checkout 4a60ce1ab9 - git submodule init - git submodule update + git checkout c4192e8 + git submodule update --init --recursive win: SET MOZJPEG_PATH=$LIBS_DIR/mozjpeg SET OPUS_PATH=$USED_PREFIX/include/opus @@ -1754,6 +1753,7 @@ win: cd Debug cmake -G Ninja \ -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$:Debug>" \ -DTG_OWT_BUILD_AUDIO_BACKENDS=OFF \ -DTG_OWT_SPECIAL_TARGET=$SPECIAL_TARGET \ -DTG_OWT_LIBJPEG_INCLUDE_PATH=$MOZJPEG_PATH \ @@ -1769,6 +1769,7 @@ release: cd Release cmake -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_MSVC_RUNTIME_LIBRARY="MultiThreaded$<$:Debug>" \ -DTG_OWT_BUILD_AUDIO_BACKENDS=OFF \ -DTG_OWT_SPECIAL_TARGET=$SPECIAL_TARGET \ -DTG_OWT_LIBJPEG_INCLUDE_PATH=$MOZJPEG_PATH \ @@ -1790,6 +1791,7 @@ mac: cd Debug.x86_64 cmake -G Ninja \ -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=$MACOSX_DEPLOYMENT_TARGET \ -DCMAKE_OSX_ARCHITECTURES=x86_64 \ -DTG_OWT_BUILD_AUDIO_BACKENDS=OFF \ -DTG_OWT_SPECIAL_TARGET=$SPECIAL_TARGET \ @@ -1805,6 +1807,7 @@ mac: cd Debug.arm64 cmake -G Ninja \ -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=$MACOSX_DEPLOYMENT_TARGET \ -DCMAKE_OSX_ARCHITECTURES=arm64 \ -DTG_OWT_BUILD_AUDIO_BACKENDS=OFF \ -DTG_OWT_SPECIAL_TARGET=$SPECIAL_TARGET \ @@ -1823,6 +1826,7 @@ release: cd Release.x86_64 cmake -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=$MACOSX_DEPLOYMENT_TARGET \ -DCMAKE_OSX_ARCHITECTURES=x86_64 \ -DTG_OWT_SPECIAL_TARGET=$SPECIAL_TARGET \ -DTG_OWT_LIBJPEG_INCLUDE_PATH=$MOZJPEG_PATH \ @@ -1837,6 +1841,7 @@ release: cd Release.arm64 cmake -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=$MACOSX_DEPLOYMENT_TARGET \ -DCMAKE_OSX_ARCHITECTURES=arm64 \ -DTG_OWT_SPECIAL_TARGET=$SPECIAL_TARGET \ -DTG_OWT_LIBJPEG_INCLUDE_PATH=$MOZJPEG_PATH \ diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 8c86d17fa6..7fe128fb78 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -452,7 +452,7 @@ parts: webrtc: source: https://github.com/desktop-app/tg_owt.git source-depth: 1 - source-commit: 8198c4d8b91e22d68eb5c7327fd408e3b6abcc79 + source-commit: c4192e8e2e10ccb72704daa79fa108becfa57b01 plugin: cmake build-environment: - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s