From 609f7a232d11af082c0b3d5030595b671b765b8e Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Tue, 13 Jul 2021 09:22:00 +0200 Subject: [PATCH] GitHub CI [Linux, FFmpeg]: use 3-way merge to apply SVT HEVC patch Now it applies cleanly. --- .github/scripts/Linux/download_build_ffmpeg.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/Linux/download_build_ffmpeg.sh b/.github/scripts/Linux/download_build_ffmpeg.sh index beaf47771..aafcc5cde 100755 --- a/.github/scripts/Linux/download_build_ffmpeg.sh +++ b/.github/scripts/Linux/download_build_ffmpeg.sh @@ -13,7 +13,7 @@ install_libvpx() { install_svt() { ( git clone --depth 1 https://github.com/OpenVisualCloud/SVT-HEVC && cd SVT-HEVC/Build/linux && ./build.sh release && cd Release && make -j $(nproc) && sudo make install || exit 1 ) ( git clone --depth 1 https://github.com/OpenVisualCloud/SVT-AV1 && cd SVT-AV1 && cd Build && cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release && make -j $(nproc) && sudo make install || exit 1 ) - git apply SVT-HEVC/ffmpeg_plugin/master-*.patch + git apply -3 SVT-HEVC/ffmpeg_plugin/master-*.patch } # The NVENC API implies respective driver version (see libavcodec/nvenc.c), consider capping the version for backward compatibility @@ -23,7 +23,7 @@ install_nv_codec_headers() { } rm -rf /var/tmp/ffmpeg -git clone --depth 1 https://git.ffmpeg.org/ffmpeg.git /var/tmp/ffmpeg +git clone --depth 1000 https://git.ffmpeg.org/ffmpeg.git /var/tmp/ffmpeg # depth 1000 useful for 3-way merges cd /var/tmp/ffmpeg ( git clone --depth 1 -b nasm-2.13.xx https://github.com/sezero/nasm.git && cd nasm && ./autogen.sh && ./configure && make nasm.1 && make ndisasm.1 && make -j $(nproc) && sudo make install || exit 1 ) ( git clone --depth 1 http://git.videolan.org/git/x264.git && cd x264 && ./configure --disable-static --enable-shared && make -j $(nproc) && sudo make install || exit 1 )