diff --git a/.github/scripts/Linux/download_build_ffmpeg.sh b/.github/scripts/Linux/download_build_ffmpeg.sh index 720ae5c42..589cda30d 100755 --- a/.github/scripts/Linux/download_build_ffmpeg.sh +++ b/.github/scripts/Linux/download_build_ffmpeg.sh @@ -13,8 +13,8 @@ install_libvpx() { FFMPEG_GIT_DEPTH=5000 # greater depth is useful for 3-way merges 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://gitlab.com/AOMediaCodec/SVT-AV1.git && cd SVT-AV1 && cd Build && cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release && make -j "$(nproc)" && sudo make install || exit 1 ) - ( git clone --depth 1 https://github.com/OpenVisualCloud/SVT-VP9.git && cd SVT-VP9/Build && cmake .. -DCMAKE_BUILD_TYPE=Release && make -j "$(nproc)" && sudo make install || exit 1 ) + ( git clone --depth 1 https://gitlab.com/AOMediaCodec/SVT-AV1.git && cd SVT-AV1 && cd Build && cmake .. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release && cmake --build . --parallel && sudo cmake --install . || exit 1 ) + ( git clone --depth 1 https://github.com/OpenVisualCloud/SVT-VP9.git && cd SVT-VP9/Build && cmake .. -DCMAKE_BUILD_TYPE=Release && cmake --build . --parallel && sudo cmake --install . || exit 1 ) # if patch apply fails, try increasing $FFMPEG_GIT_DEPTH patch SVT-HEVC/ffmpeg_plugin/master-*.patch < "$GITHUB_WORKSPACE/.github/scripts/Linux/tmp/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch.patch" git apply -3 SVT-HEVC/ffmpeg_plugin/master-*.patch diff --git a/.github/scripts/Linux/install_ffmpeg.sh b/.github/scripts/Linux/install_ffmpeg.sh index c284fb6c5..e17522386 100755 --- a/.github/scripts/Linux/install_ffmpeg.sh +++ b/.github/scripts/Linux/install_ffmpeg.sh @@ -5,8 +5,9 @@ cd /var/tmp/ffmpeg ( cd x264 && sudo make install ) ( cd nv-codec-headers && sudo make install ) ( cd aom/build && sudo cmake --install . ) -( cd SVT-AV1/Build && sudo make install ) +sudo cmake --install SVT-AV1/Build ( cd SVT-HEVC/Build/linux/Release && sudo make install || exit 1 ) -( cd SVT-VP9/Build && sudo make install || exit 1 ) +sudo cmake --install SVT-VP9/Build + sudo make install sudo ldconfig