From c715cabe8db87ca196130213b34da42e5f201547 Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Wed, 1 Jul 2020 21:46:29 +0200 Subject: [PATCH] GitHub CI: do not build static FFmpeg [Linux] --- .github/scripts/Linux/download_build_ffmpeg.sh | 2 +- .github/workflows/ccpp.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/Linux/download_build_ffmpeg.sh b/.github/scripts/Linux/download_build_ffmpeg.sh index 970e5571c..6b1d55b45 100755 --- a/.github/scripts/Linux/download_build_ffmpeg.sh +++ b/.github/scripts/Linux/download_build_ffmpeg.sh @@ -4,5 +4,5 @@ git clone --depth 1 https://git.ffmpeg.org/ffmpeg.git /var/tmp/ffmpeg cd /var/tmp/ffmpeg ( git clone https://git.videolan.org/git/ffmpeg/nv-codec-headers.git && cd nv-codec-headers && make && sudo make install ) ( git clone --depth 1 https://aomedia.googlesource.com/aom && mkdir -p aom/build && cd aom/build && cmake -DBUILD_SHARED_LIBS=1 .. && make && sudo make install ) -./configure --enable-shared --enable-gpl --enable-libx264 --enable-libopus --enable-nonfree --enable-nvenc --enable-libaom --enable-libvpx +./configure --disable-static --enable-shared --enable-gpl --enable-libx264 --enable-libopus --enable-nonfree --enable-nvenc --enable-libaom --enable-libvpx make diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 3b015eef2..f36952a6b 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -81,7 +81,7 @@ jobs: uses: actions/cache@v1 with: path: '/var/tmp/ffmpeg' - key: cache-ffmpeg-3 + key: cache-ffmpeg-4 - name: Build FFmpeg if: steps.cache-ffmpeg.outputs.cache-hit != 'true' run: .github/scripts/Linux/download_build_ffmpeg.sh