diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh index 42fcf3c..ebc02ec 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="7af31efbf2f639ab900a59e224f0366d6cdb73be" +MINGW_COMMIT="ea40a87ad09703b4cc0a47b83a5c4ed2a8276482" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 diff --git a/scripts.d/21-libxml2.sh b/scripts.d/21-libxml2.sh index fb882c4..b12eb44 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="79301d3d5e553d46fc3201f48dcec3a93068c5a2" +LIBXML2_COMMIT="cbe1212db6e22fa92c33242c3ce089476585f872" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh index b236f57..f04d8e0 100755 --- a/scripts.d/25-openssl.sh +++ b/scripts.d/25-openssl.sh @@ -1,7 +1,7 @@ #!/bin/bash OPENSSL_REPO="https://github.com/openssl/openssl.git" -OPENSSL_COMMIT="OpenSSL_1_1_1i" +OPENSSL_COMMIT="OpenSSL_1_1_1j" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh index 8958c45..58fa52e 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="ea4476d7389b8b5d30f1d969787c752856c32088" +HARFBUZZ_COMMIT="cf203936d7ba74dfb567a92378476c3125010023" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-libsamplerate.sh b/scripts.d/45-libsamplerate.sh index 9481929..33fe9e2 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="27efea7d0eebb6aacb87719030f1072ba2a3f0bf" +LIBSR_COMMIT="3fd1232ceb8a7cc44b16e0f01bcd75c9c7b4651a" ffbuild_enabled() { # Dependency of GPL-Only librubberband diff --git a/scripts.d/45-libudfread.sh b/scripts.d/45-libudfread.sh index 0e58ab0..18fc570 100755 --- a/scripts.d/45-libudfread.sh +++ b/scripts.d/45-libudfread.sh @@ -1,7 +1,7 @@ #!/bin/bash LIBUDFREAD_REPO="https://code.videolan.org/videolan/libudfread.git" -LIBUDFREAD_COMMIT="34d762c0a71f99d3840d558b3a8794c7f9f49ed3" +LIBUDFREAD_COMMIT="2ba6fa9a0acfcb1c65284d4e923be57982841b39" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh index 4757f0a..f7e0ed0 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="7edca72746c9fc5de5db0acd1fc245cb8ef1b29d" +HEADERS_COMMIT="d1b936b72b9610626ecab8a991cec18348fba047" LOADER_REPO="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git" -LOADER_COMMIT="1d5315c3ed30d026acb79a1aa53a276fc833ffa7" +LOADER_COMMIT="99df8d88f7509739be7849da03a9fb1fb8bcbfa4" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh index 45cd1fa..21003a8 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="8fd3acb4d6fda78b12f6cbd37674d15971ba7f9f" +VMAF_COMMIT="7138a0b8f9834ca33a7712c174cad68dc2b770f8" ffbuild_enabled() { return 0 @@ -42,13 +42,6 @@ ffbuild_dockerbuild() { sed -i 's/Libs.private:/Libs.private: -lstdc++/' "$FFBUILD_PREFIX"/lib/pkgconfig/libvmaf.pc - if [[ $TARGET == win* ]]; then - rm "$FFBUILD_PREFIX"/bin/libvmaf* "$FFBUILD_PREFIX"/lib/libvmaf.dll.a - else - echo "Unknown target" - return -1 - fi - cd ../.. rm -rf vmaf } diff --git a/scripts.d/45-vulkan.sh b/scripts.d/45-vulkan.sh index 4bf4972..8009073 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="9429e24b60dcf074a3ad2e68856fca9fb53d3434" +LOADER_COMMIT="8697146b15fe9accbd38527687e2059eebbab495" ffbuild_enabled() { [[ $ADDINS_STR != *vulkan* ]] && return -1 diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh index 3beb53e..591b12d 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="2366f74d0038e575828daab501632984de9295e6" +AMF_COMMIT="c7f58ee7853a3736670873e068180f6d83a81c7b" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh index 9d546c5..3b2a81c 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="4ce7d13e1416a076c8b6cca53a081bd74fc00b54" +AOM_COMMIT="08eb1d45f2f8c5dbeb2b77ba211c33c32b0fbe53" ffbuild_enabled() { return 0 @@ -18,6 +18,9 @@ ffbuild_dockerbuild() { mkdir cmbuild && cd cmbuild + # Workaround broken build system + export CFLAGS="$CFLAGS -pthread -I/opt/ffbuild/include/libvmaf" + 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 c90e9eb..37e092c 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="187edc92e5dfa4cd0673b165f5c81028e0b546c0" +AVISYNTH_COMMIT="ae2e995f3abc4fe88b30c666498086d7f20d7659" ffbuild_enabled() { [[ $VARIANT == gpl* ]] || return -1 diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh index 018b895..3f1f0ea 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="7424f8e896b229ee07e828b3ad995e846e49a024" +DAV1D_COMMIT="be5200c4f072265add3f578f0b6f1a4ebc117000" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-glslang.sh b/scripts.d/50-glslang.sh index 3fbb3cc..8ccfbe7 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="f426f652299d69bfb5a6eec9a433c6407a709ccd" +GLSLANG_COMMIT="e56beaee736863ce48455955158f1839e6e4c1a1" ffbuild_enabled() { [[ $ADDINS_STR != *vulkan* ]] && return -1 diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh index b271b68..81d3738 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="fba8af5e3f1d1cc2775cd766c962166002604b9d" +ASS_COMMIT="d0634f4a669c86063e2765891bfdec17719f40c2" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libbluray.sh b/scripts.d/50-libbluray.sh index 466ad3c..603180f 100755 --- a/scripts.d/50-libbluray.sh +++ b/scripts.d/50-libbluray.sh @@ -1,7 +1,7 @@ #!/bin/bash LIBBLURAY_REPO="https://code.videolan.org/videolan/libbluray.git" -LIBBLURAY_COMMIT="a798b0533f024d9168e37a8e72e5bdeeac4b7d30" +LIBBLURAY_COMMIT="79429a524a1f339f4c2e6c90bb14939ab767ab00" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh index 71a99b7..fd4c9cb 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="a923218e9ba59231fe898f305b91076c32209667" +OPUS_COMMIT="d633f523e36e3b6d01cc6d57386458d770d618be" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh index 18a2afe..a51705a 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="3a38edea2cd114d53914cab017cab2e43a600031" +LIBVPX_COMMIT="02392eecccde436a76aca6c86a6fdf643e98eb38" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh index 6fc516b..bd5813c 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="9eb2638119f5d663ae684b7875138f2b7df0a669" +WEBP_COMMIT="fae416179e0ad59dcce962a1e92d8fa3feeff0e9" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh index fd32a2a..4c7bdfa 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="98a4c5c3709e0cc43b0a1c151ed5bd85a2d607fa" +OPENJPEG_COMMIT="0bda7188b7b545232a341f1d978b1e4feda46fc2" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh index 82f4cf7..12344b6 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/p20201215" +RAV1E_SRC_PREFIX="https://github.com/xiph/rav1e/releases/download/p20210216" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh index 94f63dd..c216ffd 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="de57eca687aa68fde5d488ada6fb9f4b23741038" +SRT_COMMIT="030b0d4f791313229fbd80ff5d4199d87afe7d18" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh index 03cb5df..8873fd3 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="b6e11146f249042a6ac67fb3c53ca780434fb753" +SVTAV1_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git" +SVTAV1_COMMIT="6870e6cadc166235b8fb5aa286564e0fb5039e4f" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/scripts.d/50-uavs3d.sh b/scripts.d/50-uavs3d.sh index aeb6ed1..e552fc7 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="2087f6c189913f0cc85400e1139aa5f0268d0ea0" +UAVS3D_COMMIT="85a165fadca9e2d8bd0d25febc1fed96cdcf8351" ffbuild_enabled() { [[ $ADDINS_STR == *4.3* ]] && return -1 diff --git a/scripts.d/50-x264.sh b/scripts.d/50-x264.sh index 54d433e..b0717ad 100755 --- a/scripts.d/50-x264.sh +++ b/scripts.d/50-x264.sh @@ -1,7 +1,7 @@ #!/bin/bash -X264_REPO="https://code.videolan.org/videolan/x264.git" -X264_COMMIT="4121277b40a667665d4eea1726aefdc55d12d110" +X264_REPO="https://github.com/mirror/x264.git" +X264_COMMIT="b86ae3c66f51ac9eab5ab7ad09a9d62e67961b8a" ffbuild_enabled() { [[ $VARIANT == gpl* ]] || return -1 diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh index 341dbf9..3f46809 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="419182243fb2e2dfbe91dfc45a51778cf704f849" +X265_REPO="https://bitbucket.org/multicoreware/x265_git.git" +X265_COMMIT="b2445965714d4b94ac41da3a15b7a4bf63d1fe3a" ffbuild_enabled() { [[ $VARIANT == gpl* ]] || return -1 diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh index fc9e884..8a87962 100755 --- a/scripts.d/50-zimg.sh +++ b/scripts.d/50-zimg.sh @@ -1,7 +1,7 @@ #!/bin/bash ZIMG_REPO="https://github.com/sekrit-twc/zimg.git" -ZIMG_COMMIT="e17ee6cf72509c32c15067b32615849e69486367" +ZIMG_COMMIT="c0d9c49ec157fc0708129a2bb6ca8906e85eb0f0" ffbuild_enabled() { return 0