void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update FFmpeg to 6.1.1: Fix AV1 videos.

Browse source
This commit is contained in:
John Preston 2024-04-05 14:42:22 +04:00
parent 8df6d9db7e
commit c5847caa91
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Telegram/build/docker/centos_env/Dockerfile
View file

@ -479,7 +479,7 @@ RUN git clone -b 1.19.0 --depth=1 {{ GIT_FREEDESKTOP }}/wayland.git \
&& rm -rf wayland && rm -rf wayland
FROM builder AS nv-codec-headers FROM builder AS nv-codec-headers
RUN git clone -b n12.0.16.0 --depth=1 {{ GIT }}/FFmpeg/nv-codec-headers.git \ RUN git clone -b n12.1.14.0 --depth=1 {{ GIT }}/FFmpeg/nv-codec-headers.git \
&& DESTDIR="{{ LibrariesPath }}/nv-codec-headers-cache" make -C nv-codec-headers install \ && DESTDIR="{{ LibrariesPath }}/nv-codec-headers-cache" make -C nv-codec-headers install \
&& rm -rf nv-codec-headers && rm -rf nv-codec-headers
@ -491,7 +491,7 @@ COPY --link --from=libXext {{ LibrariesPath }}/libXext-cache /
COPY --link --from=libXv {{ LibrariesPath }}/libXv-cache / COPY --link --from=libXv {{ LibrariesPath }}/libXv-cache /
COPY --link --from=nv-codec-headers {{ LibrariesPath }}/nv-codec-headers-cache / COPY --link --from=nv-codec-headers {{ LibrariesPath }}/nv-codec-headers-cache /
RUN git clone -b n5.1.3 --depth=1 {{ GIT }}/FFmpeg/FFmpeg.git \ RUN git clone -b n6.1.1 --depth=1 {{ GIT }}/FFmpeg/FFmpeg.git \
&& cd FFmpeg \ && cd FFmpeg \
&& ./configure \ && ./configure \
--extra-cflags="-DCONFIG_SAFE_BITSTREAM_READER=1" \ --extra-cflags="-DCONFIG_SAFE_BITSTREAM_READER=1" \

24
Telegram/build/prepare/prepare.py
View file

@ -425,7 +425,7 @@ if customRunCommand:
stage('patches', """ stage('patches', """
git clone https://github.com/desktop-app/patches.git git clone https://github.com/desktop-app/patches.git
cd patches cd patches
git checkout cc0c2f8365 git checkout 1fef4b342a
""") """)
stage('msys64', """ stage('msys64', """
@ -696,14 +696,17 @@ mac:
make install make install
""") """)
# Somehow in x86 Debug build dav1d crashes on AV1 10bpc videos.
stage('dav1d', """ stage('dav1d', """
git clone -b 1.4.1 --depth 1 https://code.videolan.org/videolan/dav1d.git git clone -b 1.4.1 https://code.videolan.org/videolan/dav1d.git
cd dav1d cd dav1d
win: win:
if "%X8664%" equ "x64" ( if "%X8664%" equ "x64" (
SET "TARGET=x86_64" SET "TARGET=x86_64"
SET "DAV1D_ASM_DISABLE="
) else ( ) else (
SET "TARGET=x86" SET "TARGET=x86"
SET "DAV1D_ASM_DISABLE=-Denable_asm=false"
) )
set FILE=cross-file.txt set FILE=cross-file.txt
echo [binaries] > %FILE% echo [binaries] > %FILE%
@ -719,7 +722,7 @@ win:
depends:python/Scripts/activate.bat depends:python/Scripts/activate.bat
%THIRDPARTY_DIR%\\python\\Scripts\\activate.bat %THIRDPARTY_DIR%\\python\\Scripts\\activate.bat
meson setup --cross-file %FILE% --prefix %LIBS_DIR%/local --default-library=static --buildtype=debug -Denable_tools=false -Denable_tests=false -Db_vscrt=mtd builddir-debug meson setup --cross-file %FILE% --prefix %LIBS_DIR%/local --default-library=static --buildtype=debug -Denable_tools=false -Denable_tests=false %DAV1D_ASM_DISABLE% -Db_vscrt=mtd builddir-debug
meson compile -C builddir-debug meson compile -C builddir-debug
meson install -C builddir-debug meson install -C builddir-debug
release: release:
@ -775,7 +778,7 @@ mac:
""") """)
stage('libavif', """ stage('libavif', """
git clone -b v1.0.4 --depth 1 https://github.com/AOMediaCodec/libavif.git git clone -b v1.0.4 https://github.com/AOMediaCodec/libavif.git
cd libavif cd libavif
win: win:
cmake . ^ cmake . ^
@ -805,7 +808,7 @@ mac:
""") """)
stage('libde265', """ stage('libde265', """
git clone --depth 1 -b v1.0.15 https://github.com/strukturag/libde265.git git clone -b v1.0.15 https://github.com/strukturag/libde265.git
cd libde265 cd libde265
win: win:
cmake . ^ cmake . ^
@ -881,7 +884,7 @@ mac:
""") """)
stage('libheif', """ stage('libheif', """
git clone --depth 1 -b v1.17.6 https://github.com/strukturag/libheif.git git clone -b v1.17.6 https://github.com/strukturag/libheif.git
cd libheif cd libheif
win: win:
%THIRDPARTY_DIR%\\msys64\\usr\\bin\\sed.exe -i 's/LIBHEIF_EXPORTS/LIBDE265_STATIC_BUILD/g' libheif/CMakeLists.txt %THIRDPARTY_DIR%\\msys64\\usr\\bin\\sed.exe -i 's/LIBHEIF_EXPORTS/LIBDE265_STATIC_BUILD/g' libheif/CMakeLists.txt
@ -933,7 +936,7 @@ mac:
""") """)
stage('libjxl', """ stage('libjxl', """
git clone -b v0.8.2 --depth 1 --recursive --shallow-submodules https://github.com/libjxl/libjxl.git git clone -b v0.8.2 --recursive --shallow-submodules https://github.com/libjxl/libjxl.git
cd libjxl cd libjxl
""" + setVar("cmake_defines", """ """ + setVar("cmake_defines", """
-DBUILD_SHARED_LIBS=OFF -DBUILD_SHARED_LIBS=OFF
@ -1052,9 +1055,7 @@ depends:yasm/yasm
stage('nv-codec-headers', """ stage('nv-codec-headers', """
win: win:
git clone https://github.com/FFmpeg/nv-codec-headers.git git clone -b n12.1.14.0 https://github.com/FFmpeg/nv-codec-headers.git
cd nv-codec-headers
git checkout n11.1.5.1
""") """)
stage('regex', """ stage('regex', """
@ -1062,9 +1063,8 @@ stage('regex', """
""") """)
stage('ffmpeg', """ stage('ffmpeg', """
git clone https://github.com/FFmpeg/FFmpeg.git ffmpeg git clone -b n6.1.1 https://github.com/FFmpeg/FFmpeg.git ffmpeg
cd ffmpeg cd ffmpeg
git checkout 7268323193
win: win:
SET PATH_BACKUP_=%PATH% SET PATH_BACKUP_=%PATH%
SET PATH=%ROOT_DIR%\\ThirdParty\\msys64\\usr\\bin;%PATH% SET PATH=%ROOT_DIR%\\ThirdParty\\msys64\\usr\\bin;%PATH%