diff --git a/.github/scripts/Linux/download_build_ffmpeg.sh b/.github/scripts/Linux/download_build_ffmpeg.sh index 079f8ddde..3ca34ce30 100755 --- a/.github/scripts/Linux/download_build_ffmpeg.sh +++ b/.github/scripts/Linux/download_build_ffmpeg.sh @@ -55,7 +55,6 @@ 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 -( 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 install_onevpl diff --git a/.github/scripts/Linux/install_ffmpeg.sh b/.github/scripts/Linux/install_ffmpeg.sh index 3884bcaa1..b14f135aa 100755 --- a/.github/scripts/Linux/install_ffmpeg.sh +++ b/.github/scripts/Linux/install_ffmpeg.sh @@ -2,7 +2,6 @@ cd /var/tmp/ffmpeg ( cd libvpx && sudo make install ) -( cd x264 && sudo make install ) ( cd nv-codec-headers && sudo make install ) ( cd aom/build && sudo cmake --install . ) sudo cmake --install SVT-AV1/Build diff --git a/.github/scripts/Linux/prepare.sh b/.github/scripts/Linux/prepare.sh index b44a6d16f..fcdb4823c 100755 --- a/.github/scripts/Linux/prepare.sh +++ b/.github/scripts/Linux/prepare.sh @@ -53,9 +53,7 @@ sudo add-apt-repository ppa:savoury1/vlc3 # new x265 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-get -y remove 'libavcodec*' 'libavutil*' 'libswscale*' libvpx-dev 'libx264*' nginx -# own x264 build -sudo apt --no-install-recommends install asciidoc xmlto +sudo apt-get -y remove 'libavcodec*' 'libavutil*' 'libswscale*' libvpx-dev nginx sudo apt install qtbase5-dev