From d1774013d8b65cdb88a26869b379b661505bf66c Mon Sep 17 00:00:00 2001 From: Florian Fetz Date: Fri, 31 Dec 2021 11:54:08 +0100 Subject: [PATCH] Reduced FFmpeg included libraries --- .github/workflows/build.yml | 8 ++++---- .github/workflows/pr.yml | 4 ++-- scripts.d/45-libvorbis.sh | 2 +- scripts.d/45-opencl.sh | 2 +- scripts.d/45-vmaf.sh | 2 +- scripts.d/50-amf.sh | 2 +- scripts.d/50-aom.sh | 2 +- scripts.d/50-avisynth.sh | 2 +- scripts.d/50-dav1d.sh | 2 +- scripts.d/50-davs2.sh | 2 +- scripts.d/50-fdk-aac.sh | 2 +- scripts.d/50-frei0r.sh | 2 +- scripts.d/50-libbluray.sh | 2 +- scripts.d/50-libmp3lame.sh | 2 +- scripts.d/50-libopus.sh | 2 +- scripts.d/50-libtheora.sh | 2 +- scripts.d/50-libwebp.sh | 2 +- scripts.d/50-openh264.sh | 2 +- scripts.d/50-rav1e.sh | 2 +- scripts.d/50-svtav1.sh | 2 +- scripts.d/50-vulkan/45-vulkan.sh | 2 +- scripts.d/50-xavs2.sh | 2 +- 22 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2f13eb4..f8a7a64 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,8 +86,8 @@ jobs: strategy: fail-fast: false matrix: - target: [win64,linux64] - variant: [gpl,lgpl,gpl 4.4,lgpl 4.4,gpl-shared,lgpl-shared,gpl-shared 4.4,lgpl-shared 4.4] + target: [win64] + variant: [gpl-shared 4.4] steps: - name: Checkout uses: actions/checkout@v2 @@ -126,8 +126,8 @@ jobs: strategy: fail-fast: false matrix: - target: [win64,linux64] - variant: [gpl,lgpl,gpl 4.4,lgpl 4.4,gpl-shared,lgpl-shared,gpl-shared 4.4,lgpl-shared 4.4] + target: [win64] + variant: [gpl-shared 4.4] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 6dafa3e..8c3027b 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -17,8 +17,8 @@ jobs: strategy: fail-fast: false matrix: - target: [win64,linux64] - variant: [gpl,lgpl,gpl 4.4,lgpl 4.4,gpl-shared,lgpl-shared,gpl-shared 4.4,lgpl-shared 4.4] + target: [win64] + variant: [gpl-shared 4.4] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/scripts.d/45-libvorbis.sh b/scripts.d/45-libvorbis.sh index d40b622..b7edfcd 100755 --- a/scripts.d/45-libvorbis.sh +++ b/scripts.d/45-libvorbis.sh @@ -4,7 +4,7 @@ VORBIS_REPO="https://github.com/xiph/vorbis.git" VORBIS_COMMIT="84c023699cdf023a32fa4ded32019f194afcdad0" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh index ac8bbe7..154e6a9 100755 --- a/scripts.d/45-opencl.sh +++ b/scripts.d/45-opencl.sh @@ -7,7 +7,7 @@ LOADER_REPO="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git" LOADER_COMMIT="3756f5f89fe20eadb5dd072970e748d0f944ae6f" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh index af96d3f..5aa10bb 100755 --- a/scripts.d/45-vmaf.sh +++ b/scripts.d/45-vmaf.sh @@ -4,7 +4,7 @@ VMAF_REPO="https://github.com/Netflix/vmaf.git" VMAF_COMMIT="865bd7107ca826fd3dd1ca10d8642710a5872ea6" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh index ee65a2b..a6fa05e 100755 --- a/scripts.d/50-amf.sh +++ b/scripts.d/50-amf.sh @@ -4,7 +4,7 @@ AMF_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git" AMF_COMMIT="55e4d844b77885cc3f7832bdb3cf41a1f16950ef" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh index d4f30ed..957bd13 100755 --- a/scripts.d/50-aom.sh +++ b/scripts.d/50-aom.sh @@ -4,7 +4,7 @@ AOM_REPO="https://aomedia.googlesource.com/aom" AOM_COMMIT="6437950bd8a4a1479fa43acde918a2a16518f617" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerstage() { diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh index ae927be..a6f01db 100755 --- a/scripts.d/50-avisynth.sh +++ b/scripts.d/50-avisynth.sh @@ -5,7 +5,7 @@ AVISYNTH_COMMIT="d1b0c47bf4a9a488c6c144601bc481761a04dc74" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh index 1ed2603..dda4dc6 100755 --- a/scripts.d/50-dav1d.sh +++ b/scripts.d/50-dav1d.sh @@ -4,7 +4,7 @@ DAV1D_REPO="https://code.videolan.org/videolan/dav1d.git" DAV1D_COMMIT="7b99b0e17fbd86f0847684798b182f9122545580" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-davs2.sh b/scripts.d/50-davs2.sh index 64b84a3..222bbc6 100755 --- a/scripts.d/50-davs2.sh +++ b/scripts.d/50-davs2.sh @@ -6,7 +6,7 @@ DAVS2_COMMIT="b06d7585620f4e90a6d19a2926bb4e59793b8942" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 [[ $TARGET == win32 ]] && return -1 - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-fdk-aac.sh b/scripts.d/50-fdk-aac.sh index 4a0f48a..c8915bd 100755 --- a/scripts.d/50-fdk-aac.sh +++ b/scripts.d/50-fdk-aac.sh @@ -5,7 +5,7 @@ FDK_COMMIT="573e93e4d0d08127dd3b2297a0ce52221527d90a" ffbuild_enabled() { [[ $VARIANT == nonfree* ]] || return -1 - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-frei0r.sh b/scripts.d/50-frei0r.sh index 2effdb7..7749b5b 100755 --- a/scripts.d/50-frei0r.sh +++ b/scripts.d/50-frei0r.sh @@ -6,7 +6,7 @@ FREI0R_COMMIT="00f8aa085a1da0c0160f54e3eaf6b32a9db75a51" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 [[ $ADDINS_STR == *4.4* ]] && return -1 - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-libbluray.sh b/scripts.d/50-libbluray.sh index eff4446..51baa30 100755 --- a/scripts.d/50-libbluray.sh +++ b/scripts.d/50-libbluray.sh @@ -4,7 +4,7 @@ LIBBLURAY_REPO="https://code.videolan.org/videolan/libbluray.git" LIBBLURAY_COMMIT="060d8f055f2ed1b4752340be5d16403bad5ccdc0" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-libmp3lame.sh b/scripts.d/50-libmp3lame.sh index eb6a4b7..e54443d 100755 --- a/scripts.d/50-libmp3lame.sh +++ b/scripts.d/50-libmp3lame.sh @@ -3,7 +3,7 @@ LAME_SRC="https://sourceforge.net/projects/lame/files/lame/3.100/lame-3.100.tar.gz/download" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh index a046a30..b0865cb 100755 --- a/scripts.d/50-libopus.sh +++ b/scripts.d/50-libopus.sh @@ -4,7 +4,7 @@ OPUS_REPO="https://github.com/xiph/opus.git" OPUS_COMMIT="a8e6a77c5fe0c37aa6788f939f24f8cd22ae2652" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-libtheora.sh b/scripts.d/50-libtheora.sh index d922288..4af55bb 100755 --- a/scripts.d/50-libtheora.sh +++ b/scripts.d/50-libtheora.sh @@ -4,7 +4,7 @@ THEORA_REPO="https://github.com/xiph/theora.git" THEORA_COMMIT="7180717276af1ebc7da15c83162d6c5d6203aabf" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh index 778549e..500e1f0 100755 --- a/scripts.d/50-libwebp.sh +++ b/scripts.d/50-libwebp.sh @@ -4,7 +4,7 @@ WEBP_REPO="https://chromium.googlesource.com/webm/libwebp" WEBP_COMMIT="b6f756e82b1325f6d29725c3b0a6b90e16f042bd" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh index bb12168..a134957 100755 --- a/scripts.d/50-openh264.sh +++ b/scripts.d/50-openh264.sh @@ -4,7 +4,7 @@ OPENH264_REPO="https://github.com/cisco/openh264.git" OPENH264_COMMIT="3b13c4cd65a8b93f779ddece7deefac5102ece5e" ffbuild_enabled() { - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh index 4e3cb31..56e2114 100755 --- a/scripts.d/50-rav1e.sh +++ b/scripts.d/50-rav1e.sh @@ -5,7 +5,7 @@ RAV1E_COMMIT="37c13ebbe198316db221869f025546f6f633d381" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh index b6be186..02f752f 100755 --- a/scripts.d/50-svtav1.sh +++ b/scripts.d/50-svtav1.sh @@ -5,7 +5,7 @@ SVTAV1_COMMIT="3758f57f756fa2f6721460ed7b2db2ac8a5f44e0" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh index 7052810..93a8455 100755 --- a/scripts.d/50-vulkan/45-vulkan.sh +++ b/scripts.d/50-vulkan/45-vulkan.sh @@ -5,7 +5,7 @@ HEADERS_VERSION="1.2.201" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 - return 0 + return -1 } ffbuild_dockerbuild() { diff --git a/scripts.d/50-xavs2.sh b/scripts.d/50-xavs2.sh index 309edd9..0fd594f 100755 --- a/scripts.d/50-xavs2.sh +++ b/scripts.d/50-xavs2.sh @@ -6,7 +6,7 @@ XAVS2_COMMIT="eae1e8b9d12468059bdd7dee893508e470fa83d8" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 [[ $TARGET == win32 ]] && return -1 - return 0 + return -1 } ffbuild_dockerbuild() {