diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh index 1da8af5..42fcf3c 100755 --- a/scripts.d/10-mingw.sh +++ b/scripts.d/10-mingw.sh @@ -1,7 +1,7 @@ #!/bin/bash MINGW_REPO="https://github.com/mirror/mingw-w64.git" -MINGW_COMMIT="b4da620ea9f159db0018d243d21fdf4fa8752f32" +MINGW_COMMIT="7af31efbf2f639ab900a59e224f0366d6cdb73be" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 diff --git a/scripts.d/21-libxml2.sh b/scripts.d/21-libxml2.sh index 56ab01e..fb882c4 100755 --- a/scripts.d/21-libxml2.sh +++ b/scripts.d/21-libxml2.sh @@ -1,7 +1,7 @@ #!/bin/bash LIBXML2_REPO="https://gitlab.gnome.org/GNOME/libxml2.git" -LIBXML2_COMMIT="7c06d99e1f4f853e3c5b307c0dc79c8a32a09855" +LIBXML2_COMMIT="79301d3d5e553d46fc3201f48dcec3a93068c5a2" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-gmp.sh b/scripts.d/25-gmp.sh index 165ddbf..070b3db 100755 --- a/scripts.d/25-gmp.sh +++ b/scripts.d/25-gmp.sh @@ -1,6 +1,6 @@ #!/bin/bash -GMP_SRC="https://ftp.gnu.org/gnu/gmp/gmp-6.2.0.tar.xz" +GMP_SRC="https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz" ffbuild_enabled() { return 0 diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh index 61b578c..34de6d6 100755 --- a/scripts.d/35-fontconfig.sh +++ b/scripts.d/35-fontconfig.sh @@ -1,6 +1,6 @@ #!/bin/bash -FONTCONFIG_SRC="https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.92.tar.xz" +FONTCONFIG_SRC="https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.13.93.tar.xz" ffbuild_enabled() { return 0 @@ -22,7 +22,9 @@ ffbuild_dockerbuild() { local myconf=( --prefix="$FFBUILD_PREFIX" + --disable-docs --enable-libxml2 + --enable-iconv --disable-shared --enable-static ) diff --git a/scripts.d/40-fftw3.sh b/scripts.d/40-fftw3.sh index ac6b15f..8e9cf46 100755 --- a/scripts.d/40-fftw3.sh +++ b/scripts.d/40-fftw3.sh @@ -1,8 +1,8 @@ #!/bin/bash # http://fftw.org/download.html -FFTW3_SRC="http://fftw.org/fftw-3.3.8.tar.gz" -FFTW3_SHA512="ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38" +FFTW3_SRC="http://fftw.org/fftw-3.3.9.tar.gz" +FFTW3_SHA512="52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf" ffbuild_enabled() { # Dependency of GPL-Only librubberband diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh index 409fbf6..8958c45 100755 --- a/scripts.d/45-harfbuzz.sh +++ b/scripts.d/45-harfbuzz.sh @@ -1,7 +1,7 @@ #!/bin/bash HARFBUZZ_REPO="https://github.com/harfbuzz/harfbuzz.git" -HARFBUZZ_COMMIT="5091ea7e247b118009c719076650a93b3e2dde6d" +HARFBUZZ_COMMIT="ea4476d7389b8b5d30f1d969787c752856c32088" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-libsamplerate.sh b/scripts.d/45-libsamplerate.sh index bb23674..9481929 100755 --- a/scripts.d/45-libsamplerate.sh +++ b/scripts.d/45-libsamplerate.sh @@ -1,7 +1,7 @@ #!/bin/bash LIBSR_REPO="https://github.com/libsndfile/libsamplerate.git" -LIBSR_COMMIT="c28af3dece9b149341ec8020259fc46b9a314740" +LIBSR_COMMIT="27efea7d0eebb6aacb87719030f1072ba2a3f0bf" ffbuild_enabled() { # Dependency of GPL-Only librubberband diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh index 45d057e..4757f0a 100755 --- a/scripts.d/45-opencl.sh +++ b/scripts.d/45-opencl.sh @@ -1,10 +1,10 @@ #!/bin/bash HEADERS_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git" -HEADERS_COMMIT="9fac4e9866a961f66bdd72fa2bff50145512f972" +HEADERS_COMMIT="7edca72746c9fc5de5db0acd1fc245cb8ef1b29d" LOADER_REPO="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git" -LOADER_COMMIT="b3b483303b160db080857288c1b53e8152f62b98" +LOADER_COMMIT="1d5315c3ed30d026acb79a1aa53a276fc833ffa7" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh index 0db999b..45cd1fa 100755 --- a/scripts.d/45-vmaf.sh +++ b/scripts.d/45-vmaf.sh @@ -1,7 +1,7 @@ #!/bin/bash VMAF_REPO="https://github.com/Netflix/vmaf.git" -VMAF_COMMIT="027b5825f92c8a6c960e75f468cc2efe8ac8fd57" +VMAF_COMMIT="8fd3acb4d6fda78b12f6cbd37674d15971ba7f9f" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-vulkan.sh b/scripts.d/45-vulkan.sh index 0d1894c..4bf4972 100755 --- a/scripts.d/45-vulkan.sh +++ b/scripts.d/45-vulkan.sh @@ -1,7 +1,7 @@ #!/bin/bash LOADER_REPO="https://github.com/BtbN/Vulkan-Loader.git" -LOADER_COMMIT="0cecc6397e7c0c588066f697f95253060b602b9e" +LOADER_COMMIT="9429e24b60dcf074a3ad2e68856fca9fb53d3434" ffbuild_enabled() { [[ $ADDINS_STR != *vulkan* ]] && return -1 diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh index 35ebd40..3beb53e 100755 --- a/scripts.d/50-amf.sh +++ b/scripts.d/50-amf.sh @@ -1,7 +1,7 @@ #!/bin/bash AMF_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git" -AMF_COMMIT="802f92ee52b9efa77bf0d3ea8bfaed6040cdd35e" +AMF_COMMIT="2366f74d0038e575828daab501632984de9295e6" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh index f55b4a6..9d546c5 100755 --- a/scripts.d/50-aom.sh +++ b/scripts.d/50-aom.sh @@ -1,7 +1,7 @@ #!/bin/bash AOM_REPO="https://aomedia.googlesource.com/aom" -AOM_COMMIT="f49873dfc300bcaa5a40233a256a5a518364bf2a" +AOM_COMMIT="4ce7d13e1416a076c8b6cca53a081bd74fc00b54" ffbuild_enabled() { return 0 @@ -18,7 +18,7 @@ ffbuild_dockerbuild() { mkdir cmbuild && cd cmbuild - cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=OFF -DCONFIG_TUNE_VMAF=1 .. || return -1 + cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=OFF -DENABLE_EXAMPLES=NO -DENABLE_TESTS=NO -DENABLE_TOOLS=NO -DCONFIG_TUNE_VMAF=1 .. || return -1 make -j$(nproc) || return -1 make install || return -1 diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh index 20226c5..c90e9eb 100755 --- a/scripts.d/50-avisynth.sh +++ b/scripts.d/50-avisynth.sh @@ -1,7 +1,7 @@ #!/bin/bash AVISYNTH_REPO="https://github.com/AviSynth/AviSynthPlus.git" -AVISYNTH_COMMIT="c377916aa4146d2f4386852d91dc177d49103c16" +AVISYNTH_COMMIT="187edc92e5dfa4cd0673b165f5c81028e0b546c0" ffbuild_enabled() { [[ $VARIANT == gpl* ]] || return -1 diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh index 8aa5cfd..018b895 100755 --- a/scripts.d/50-dav1d.sh +++ b/scripts.d/50-dav1d.sh @@ -1,7 +1,7 @@ #!/bin/bash DAV1D_REPO="https://code.videolan.org/videolan/dav1d.git" -DAV1D_COMMIT="ffd052bdf513f3284f0a07403caed24035612b3f" +DAV1D_COMMIT="7424f8e896b229ee07e828b3ad995e846e49a024" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh index 0bc7fba..560fed9 100755 --- a/scripts.d/50-ffnvcodec.sh +++ b/scripts.d/50-ffnvcodec.sh @@ -1,7 +1,7 @@ #!/bin/bash FFNVCODEC_REPO="https://github.com/FFmpeg/nv-codec-headers.git" -FFNVCODEC_COMMIT="f85a70af7100a4a302a1562abdb96d8e8db87ff4" +FFNVCODEC_COMMIT="315ad740ac77282c7cea67ba31f2e4b373132919" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-glslang.sh b/scripts.d/50-glslang.sh index 83a9c1e..3fbb3cc 100755 --- a/scripts.d/50-glslang.sh +++ b/scripts.d/50-glslang.sh @@ -1,7 +1,7 @@ #!/bin/bash GLSLANG_REPO="https://github.com/KhronosGroup/glslang.git" -GLSLANG_COMMIT="74e8f05b9fc7229a7c42015889aba12c7f9554b1" +GLSLANG_COMMIT="f426f652299d69bfb5a6eec9a433c6407a709ccd" ffbuild_enabled() { [[ $ADDINS_STR != *vulkan* ]] && return -1 diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh index 05760d4..b271b68 100755 --- a/scripts.d/50-libass.sh +++ b/scripts.d/50-libass.sh @@ -1,7 +1,7 @@ #!/bin/bash ASS_REPO="https://github.com/libass/libass.git" -ASS_COMMIT="c65b2f8fa81182ee6a36912d33b4929347335e9e" +ASS_COMMIT="fba8af5e3f1d1cc2775cd766c962166002604b9d" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh index 82912f8..71a99b7 100755 --- a/scripts.d/50-libopus.sh +++ b/scripts.d/50-libopus.sh @@ -1,7 +1,7 @@ #!/bin/bash OPUS_REPO="https://github.com/xiph/opus.git" -OPUS_COMMIT="c2b542b6c02bafbe7a83b2eeec6cb5a0bfa3ed0d" +OPUS_COMMIT="a923218e9ba59231fe898f305b91076c32209667" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh index 368631b..18a2afe 100755 --- a/scripts.d/50-libvpx.sh +++ b/scripts.d/50-libvpx.sh @@ -1,7 +1,7 @@ #!/bin/bash LIBVPX_REPO="https://chromium.googlesource.com/webm/libvpx" -LIBVPX_COMMIT="220e4331bd4896e1cefabc713326ab28bc781f90" +LIBVPX_COMMIT="3a38edea2cd114d53914cab017cab2e43a600031" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh index 72b92e2..6fc516b 100755 --- a/scripts.d/50-libwebp.sh +++ b/scripts.d/50-libwebp.sh @@ -1,7 +1,7 @@ #!/bin/bash WEBP_REPO="https://chromium.googlesource.com/webm/libwebp" -WEBP_COMMIT="17fd4ba820e59899d6938d460164147999f45bf2" +WEBP_COMMIT="9eb2638119f5d663ae684b7875138f2b7df0a669" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh index 7257806..fd32a2a 100755 --- a/scripts.d/50-openjpeg.sh +++ b/scripts.d/50-openjpeg.sh @@ -1,7 +1,7 @@ #!/bin/bash OPENJPEG_REPO="https://github.com/uclouvain/openjpeg.git" -OPENJPEG_COMMIT="491299eb073c80602ca8ee333303a31a581d3fa8" +OPENJPEG_COMMIT="98a4c5c3709e0cc43b0a1c151ed5bd85a2d607fa" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh index 7fdb658..82f4cf7 100755 --- a/scripts.d/50-rav1e.sh +++ b/scripts.d/50-rav1e.sh @@ -1,6 +1,6 @@ #!/bin/bash -RAV1E_SRC_PREFIX="https://github.com/xiph/rav1e/releases/download/p20201103" +RAV1E_SRC_PREFIX="https://github.com/xiph/rav1e/releases/download/p20201215" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh index 0b81b9d..b417bc1 100755 --- a/scripts.d/50-sdl.sh +++ b/scripts.d/50-sdl.sh @@ -1,6 +1,6 @@ #!/bin/bash -SDL_SRC="https://libsdl.org/release/SDL2-2.0.12.tar.gz" +SDL_SRC="https://libsdl.org/release/SDL2-2.0.14.tar.gz" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh index ae7eade..94f63dd 100755 --- a/scripts.d/50-srt.sh +++ b/scripts.d/50-srt.sh @@ -1,7 +1,7 @@ #!/bin/bash SRT_REPO="https://github.com/Haivision/srt.git" -SRT_COMMIT="49dd2ec70d0ca64ac122c84dfc188b8abc1484f6" +SRT_COMMIT="de57eca687aa68fde5d488ada6fb9f4b23741038" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh index 41b5458..03cb5df 100755 --- a/scripts.d/50-svtav1.sh +++ b/scripts.d/50-svtav1.sh @@ -1,7 +1,7 @@ #!/bin/bash SVTAV1_REPO="https://github.com/OpenVisualCloud/SVT-AV1.git" -SVTAV1_COMMIT="2936d5756ca061ee78edc8c87fd5414f93066809" +SVTAV1_COMMIT="b6e11146f249042a6ac67fb3c53ca780434fb753" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/scripts.d/50-uavs3d.sh b/scripts.d/50-uavs3d.sh index e732011..aeb6ed1 100755 --- a/scripts.d/50-uavs3d.sh +++ b/scripts.d/50-uavs3d.sh @@ -1,7 +1,7 @@ #!/bin/bash UAVS3D_REPO="https://github.com/uavs3/uavs3d.git" -UAVS3D_COMMIT="1bd13916d524e2c1926d75fe99588428893f6987" +UAVS3D_COMMIT="2087f6c189913f0cc85400e1139aa5f0268d0ea0" ffbuild_enabled() { [[ $ADDINS_STR == *4.3* ]] && return -1 diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh index 8a84222..31fbffb 100755 --- a/scripts.d/50-x265.sh +++ b/scripts.d/50-x265.sh @@ -1,7 +1,7 @@ #!/bin/bash X265_REPO="https://github.com/videolan/x265.git" -X265_COMMIT="241342f25bd1a83678b24588712f91ca0bff99f3" +X265_COMMIT="419182243fb2e2dfbe91dfc45a51778cf704f849" ffbuild_enabled() { [[ $VARIANT == gpl* ]] || return -1 @@ -21,20 +21,29 @@ ffbuild_dockerbuild() { if [[ $TARGET != *32 ]]; then mkdir 8bit 10bit 12bit - cd 12bit - cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON -DENABLE_HDR10_PLUS=ON ../source - make -j$(nproc) - cp libx265.a ../8bit/libx265_main12.a + ( + cd 12bit + cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DMAIN12=ON -DENABLE_HDR10_PLUS=ON ../source + make -j$(nproc) + cp libx265.a ../8bit/libx265_main12.a + ) & - cd ../10bit - cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DENABLE_HDR10_PLUS=ON ../source - make -j$(nproc) - cp libx265.a ../8bit/libx265_main10.a + ( + cd 10bit + cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DHIGH_BIT_DEPTH=ON -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DENABLE_HDR10_PLUS=ON ../source + make -j$(nproc) + cp libx265.a ../8bit/libx265_main10.a + ) & - cd ../8bit - cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DEXTRA_LIB="x265_main10.a;x265_main12.a" -DEXTRA_LINK_FLAGS=-L. -DLINKED_10BIT=ON -DLINKED_12BIT=ON -DENABLE_SHARED=OFF -DENABLE_CLI=OFF ../source - make -j$(nproc) - mv libx265.a libx265_main.a + cd 8bit + + ( + cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DEXTRA_LIB="x265_main10.a;x265_main12.a" -DEXTRA_LINK_FLAGS=-L. -DLINKED_10BIT=ON -DLINKED_12BIT=ON -DENABLE_SHARED=OFF -DENABLE_CLI=OFF ../source + make -j$(nproc) + mv libx265.a libx265_main.a + ) & + + wait ${FFBUILD_CROSS_PREFIX}ar -M <