From 972ffee2f85183edbd55a839187c38d665ffb7be Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Fri, 20 Jan 2023 10:52:00 +0100 Subject: [PATCH] CI: AOM AV1 U18.04 build fix --- .github/scripts/Linux/download_build_ffmpeg.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/scripts/Linux/download_build_ffmpeg.sh b/.github/scripts/Linux/download_build_ffmpeg.sh index c54d2f416..fa568a445 100755 --- a/.github/scripts/Linux/download_build_ffmpeg.sh +++ b/.github/scripts/Linux/download_build_ffmpeg.sh @@ -1,5 +1,18 @@ #!/bin/bash -eux +install_aom() {( + git clone --depth 1 https://aomedia.googlesource.com/aom + mkdir -p aom/build + cd aom/build + if [ "$(lsb_release -rs)" = 18.04 ]; then + CC=gcc-10 CXX=g++-10 cmake -DBUILD_SHARED_LIBS=1 .. + else + cmake -DBUILD_SHARED_LIBS=1 .. + fi + cmake --build . --parallel + sudo cmake --install . +)} + install_libvpx() { ( git clone --depth 1 https://github.com/webmproject/libvpx.git @@ -39,8 +52,8 @@ install_onevpl() {( rm -rf /var/tmp/ffmpeg git clone --depth $FFMPEG_GIT_DEPTH https://git.ffmpeg.org/ffmpeg.git /var/tmp/ffmpeg cd /var/tmp/ffmpeg +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 ) -( git clone --depth 1 https://aomedia.googlesource.com/aom && mkdir -p aom/build && cd aom/build && cmake -DBUILD_SHARED_LIBS=1 .. && cmake --build . --parallel && sudo cmake --install . || exit 1 ) install_libvpx install_nv_codec_headers install_onevpl