diff --git a/.github/scripts/Linux/download_build_ffmpeg.sh b/.github/scripts/Linux/download_build_ffmpeg.sh index 7f5a6f4ff..9d58db5d2 100755 --- a/.github/scripts/Linux/download_build_ffmpeg.sh +++ b/.github/scripts/Linux/download_build_ffmpeg.sh @@ -9,6 +9,14 @@ install_aom() {( sudo cmake --install . )} +install_dav1d() {( + git clone --depth 1 https://code.videolan.org/videolan/dav1d.git + mkdir -p dav1d/build && cd dav1d/build + meson .. + ninja + sudo ninja install +)} + install_libvpx() { ( git clone --depth 1 https://github.com/webmproject/libvpx.git @@ -54,6 +62,7 @@ if [ "$(lsb_release -rs)" = 20.04 ]; then git am -3 "$GITHUB_WORKSPACE/.github/scripts/Linux/ffmpeg-patches/0001-removed-bits-incompatible-with-old-vaapi.patch-noauto" fi install_aom +install_dav1d ( 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 ) install_libvpx install_nv_codec_headers diff --git a/.github/scripts/Linux/install_ffmpeg.sh b/.github/scripts/Linux/install_ffmpeg.sh index 3884bcaa1..688d5e37f 100755 --- a/.github/scripts/Linux/install_ffmpeg.sh +++ b/.github/scripts/Linux/install_ffmpeg.sh @@ -5,6 +5,7 @@ cd /var/tmp/ffmpeg ( cd x264 && sudo make install ) ( cd nv-codec-headers && sudo make install ) ( cd aom/build && sudo cmake --install . ) +( cd dav1d/build && sudo ninja install ) sudo cmake --install SVT-AV1/Build sudo cmake --install SVT-HEVC/Build/linux/Release sudo cmake --install SVT-VP9/Build diff --git a/.github/scripts/Linux/prepare.sh b/.github/scripts/Linux/prepare.sh index 85ba4b9c7..0c04b91fa 100755 --- a/.github/scripts/Linux/prepare.sh +++ b/.github/scripts/Linux/prepare.sh @@ -37,7 +37,7 @@ sudo apt install $sdl2_mix_build_dep $sdl2_ttf_build_dep # for FFmpeg - libzmq3-dev needs to be ignored (cannot be installed, see run #380) ffmpeg_build_dep=$(get_build_deps_excl ffmpeg 'libzmq3-dev\|libsdl2-dev') # shellcheck disable=SC2086 # intentional -sudo apt install $ffmpeg_build_dep libdav1d-dev libde265-dev +sudo apt install $ffmpeg_build_dep libde265-dev meson sudo apt-get -y remove 'libavcodec*' 'libavutil*' 'libswscale*' libvpx-dev 'libx264*' nginx # own x264 build sudo apt --no-install-recommends install asciidoc xmlto