diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh index 43e9173..33ec39f 100755 --- a/scripts.d/10-mingw.sh +++ b/scripts.d/10-mingw.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://git.code.sf.net/p/mingw-w64/mingw-w64.git" -SCRIPT_COMMIT="dbfdf802580c0d6b90b91995dab019f2a7787a8e" +SCRIPT_COMMIT="14315e632e362c6925737ccdf62eb11af63e2ef6" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh index fe834eb..d1df81c 100755 --- a/scripts.d/20-libxml2.sh +++ b/scripts.d/20-libxml2.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/GNOME/libxml2.git" -SCRIPT_COMMIT="6a49bb777c57209042942e8426a8928a96298aa2" +SCRIPT_COMMIT="fe3cbf897ef510ef5b4842a82106dfd7ea987ec2" ffbuild_enabled() { return 0 diff --git a/scripts.d/20-zlib.sh b/scripts.d/20-zlib.sh index 84a651f..14a3489 100755 --- a/scripts.d/20-zlib.sh +++ b/scripts.d/20-zlib.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/madler/zlib.git" -SCRIPT_COMMIT="99b229487c2997b4b22eaef90fedfbff4d8826cc" +SCRIPT_COMMIT="d201f04c72b0881220f5ba75ca19fd0e19fa848b" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-fftw3.sh b/scripts.d/25-fftw3.sh index b7b65cb..ada0f7c 100755 --- a/scripts.d/25-fftw3.sh +++ b/scripts.d/25-fftw3.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/FFTW/fftw3.git" -SCRIPT_COMMIT="d0ce926f1523d95daed48cd7c69572e068dbbfb3" +SCRIPT_COMMIT="981f553dc276b6d73a49916d503068fdb928a9a3" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-fribidi.sh b/scripts.d/25-fribidi.sh index c30f855..9cbab61 100755 --- a/scripts.d/25-fribidi.sh +++ b/scripts.d/25-fribidi.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/fribidi/fribidi.git" -SCRIPT_COMMIT="e01a424c7cef4e805879ddcdc47f163f2a2f39dc" +SCRIPT_COMMIT="bfb0385ef862cd40af7d5d33648fbb4bfe8eee65" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-gmp.sh b/scripts.d/25-gmp.sh index d55a038..30e0f01 100755 --- a/scripts.d/25-gmp.sh +++ b/scripts.d/25-gmp.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/BtbN/gmplib.git" -SCRIPT_COMMIT="09f12c42aab16ab2db5b293bfb1a2cf112bd8f19" +SCRIPT_COMMIT="b686327d7de364f7722cabe4e890b5a6b0ca1e1b" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh index 02b15ef..1d8ab73 100755 --- a/scripts.d/25-xz.sh +++ b/scripts.d/25-xz.sh @@ -1,7 +1,7 @@ #!/bin/bash -SCRIPT_REPO="https://github.com/xz-mirror/xz.git" -SCRIPT_COMMIT="74c3449d8b816a724b12ebce7417e00fb597309a" +SCRIPT_REPO="https://github.com/tukaani-project/xz.git" +SCRIPT_COMMIT="af071ef7702debef4f1d324616a0137a5001c14c" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh index 991a55d..3fe1ec1 100755 --- a/scripts.d/45-harfbuzz.sh +++ b/scripts.d/45-harfbuzz.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git" -SCRIPT_COMMIT="2b3631a866b3077d9d675caa4ec9010b342b5a7c" +SCRIPT_COMMIT="63973005bc07aba599b47fdd4cf788647b601ccd" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh index 6e21173..ea0951c 100755 --- a/scripts.d/45-pulseaudio.sh +++ b/scripts.d/45-pulseaudio.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git" -SCRIPT_COMMIT="26ccd1167a6188fb28745f3f5c9940657f64343c" +SCRIPT_COMMIT="84f5b742e39ba3e375bac9144e0243b7331f4019" ffbuild_enabled() { [[ $TARGET == linux* ]] || return 1 diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh index 3287787..3f36e08 100755 --- a/scripts.d/45-vmaf.sh +++ b/scripts.d/45-vmaf.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/Netflix/vmaf.git" -SCRIPT_COMMIT="71f0f8d2b60c2bfbae53719b84eae6a7ea89255a" +SCRIPT_COMMIT="dea9a7704a976d19aa13dc8b3d47759ce7105a85" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh index 24abcd1..c6df234 100755 --- a/scripts.d/45-x11/10-xproto.sh +++ b/scripts.d/45-x11/10-xproto.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git" -SCRIPT_COMMIT="db56b508f25629ab1022038131758ce48e6daf82" +SCRIPT_COMMIT="67469711055522b8adb2d795b01e7ba98cb8816c" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh index 3a3c680..e06f25b 100755 --- a/scripts.d/45-x11/40-libx11.sh +++ b/scripts.d/45-x11/40-libx11.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git" -SCRIPT_COMMIT="4ab58f26d388c82ffe46ef1c7dd1cee6259eec8a" +SCRIPT_COMMIT="9afd55ada5d7a3c1d3ed23ff8451629a1d989a7f" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh index 62640bc..28da0ae 100755 --- a/scripts.d/50-aom.sh +++ b/scripts.d/50-aom.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://aomedia.googlesource.com/aom" -SCRIPT_COMMIT="158761dfb40e77f3a54c3b14a596112837baa24b" +SCRIPT_COMMIT="d4043476019a88e108d125f4168fd0533887af56" ffbuild_enabled() { [[ $TARGET == winarm64 ]] && return -1 diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh index 59a94b8..432b915 100755 --- a/scripts.d/50-dav1d.sh +++ b/scripts.d/50-dav1d.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git" -SCRIPT_COMMIT="645da277857ddff8ed5566af71be3dfa3a819863" +SCRIPT_COMMIT="abc8a1689fbefec880bb3c0064c66afcb1e9d4b9" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-gme.sh b/scripts.d/50-gme.sh index 2b938ed..d6d79d0 100755 --- a/scripts.d/50-gme.sh +++ b/scripts.d/50-gme.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libgme/game-music-emu.git" -SCRIPT_COMMIT="6b676192d98302e698ac78fe3c00833eae6a74e5" +SCRIPT_COMMIT="c2c31572947840ea306d623849318fbb97232d42" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh index 3669348..eb8f07d 100755 --- a/scripts.d/50-libass.sh +++ b/scripts.d/50-libass.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libass/libass.git" -SCRIPT_COMMIT="649a7c2e1fc6f4188ea1a89968560715800b883d" +SCRIPT_COMMIT="e51781341493e0312f0c7fee66372f0365f7b962" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/45-brotli.sh b/scripts.d/50-libjxl/45-brotli.sh index 52beb27..5223707 100755 --- a/scripts.d/50-libjxl/45-brotli.sh +++ b/scripts.d/50-libjxl/45-brotli.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/google/brotli.git" -SCRIPT_COMMIT="9717649c317d2d8c4e235454d666572f504a4ae9" +SCRIPT_COMMIT="9351fa7ffb9d5aa133dc8f8b14e175cace52d9e4" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/45-lcms2.sh b/scripts.d/50-libjxl/45-lcms2.sh index 49db9d1..7ac17ac 100755 --- a/scripts.d/50-libjxl/45-lcms2.sh +++ b/scripts.d/50-libjxl/45-lcms2.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/mm2/Little-CMS.git" -SCRIPT_COMMIT="b2aeb18e3fbc68192025f860bc9e97633d321c03" +SCRIPT_COMMIT="46355888b823b563db928faec59b0312a05e1143" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh index 34aa78d..e06a481 100755 --- a/scripts.d/50-libjxl/50-libjxl.sh +++ b/scripts.d/50-libjxl/50-libjxl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libjxl/libjxl.git" -SCRIPT_COMMIT="b49cdd52d94b49556b936b66136169b1528e2819" +SCRIPT_COMMIT="5e689eb20b9967d589035f7bffd516490670fb5f" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-librist/40-mbedtls.sh b/scripts.d/50-librist/40-mbedtls.sh index b3da1bd..bcdb451 100755 --- a/scripts.d/50-librist/40-mbedtls.sh +++ b/scripts.d/50-librist/40-mbedtls.sh @@ -1,13 +1,18 @@ #!/bin/bash SCRIPT_REPO="https://github.com/ARMmbed/mbedtls.git" -SCRIPT_COMMIT="v3.5.2" +SCRIPT_COMMIT="v3.6.0" SCRIPT_TAGFILTER="v3.*" ffbuild_enabled() { return 0 } +ffbuild_dockerdl() { + default_dl . + echo "git submodule update --init --recursive --depth=1" +} + ffbuild_dockerbuild() { if [[ $TARGET == win32 ]]; then python3 scripts/config.py unset MBEDTLS_AESNI_C @@ -21,4 +26,8 @@ ffbuild_dockerbuild() { .. make -j$(nproc) make install + + if [[ $TARGET == win* ]]; then + echo "Libs.private: -lws2_32 -lbcrypt -lwinmm -lgdi32" >> "$FFBUILD_PREFIX"/lib/pkgconfig/mbedcrypto.pc + fi } diff --git a/scripts.d/50-librist/50-librist.sh b/scripts.d/50-librist/50-librist.sh index 4955fd3..705991d 100755 --- a/scripts.d/50-librist/50-librist.sh +++ b/scripts.d/50-librist/50-librist.sh @@ -38,11 +38,6 @@ ffbuild_dockerbuild() { meson "${myconf[@]}" .. ninja -j"$(nproc)" ninja install - - if [[ $TARGET == win* ]]; then - # This works around mbedtls not having pkg-config, while recently having added a new dependency. - echo "Libs.private: -lbcrypt -lws2_32" >> "$FFBUILD_PREFIX"/lib/pkgconfig/librist.pc - fi } ffbuild_configure() { diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh index ba2dbb9..c39f63c 100755 --- a/scripts.d/50-libssh.sh +++ b/scripts.d/50-libssh.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://git.libssh.org/projects/libssh.git" -SCRIPT_COMMIT="81f9b000054d64a9a80617caa7ace463272fa06f" +SCRIPT_COMMIT="07cb0be12f4a3d5691f6a580343cb94d658decf5" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh index 2e5dce2..256bbc4 100755 --- a/scripts.d/50-libvpx.sh +++ b/scripts.d/50-libvpx.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx" -SCRIPT_COMMIT="c29e63728316486082dd6083c2062434b441b77d" +SCRIPT_COMMIT="ccefddef33a0d8c7d9101b7c01e4b6259858ae6a" ffbuild_enabled() { [[ $TARGET == winarm64 ]] && return -1 diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh index 2558763..058eb99 100755 --- a/scripts.d/50-libwebp.sh +++ b/scripts.d/50-libwebp.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp" -SCRIPT_COMMIT="eba03acb05383c4cd8ff9a3d18a213fbdcda865d" +SCRIPT_COMMIT="6c484cbf92e81a5673b24485ac02d211f69be5b7" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh index ef4f974..9606a3f 100755 --- a/scripts.d/50-lilv/96-serd.sh +++ b/scripts.d/50-lilv/96-serd.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/drobilla/serd.git" -SCRIPT_COMMIT="e85a6342217997905db42de5bb66a597c4d690cf" +SCRIPT_COMMIT="59e77405df9a3af3ccfdd9b3d26f6a43ef922dc5" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh index b4392b9..dede4ff 100755 --- a/scripts.d/50-openal.sh +++ b/scripts.d/50-openal.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/kcat/openal-soft.git" -SCRIPT_COMMIT="44f691e138a15974f1e67c36208de7c18e92bd8e" +SCRIPT_COMMIT="e95c370435ba3757ab3dce44b57eb18e23aef7b8" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh index c1a1c14..305b3b4 100755 --- a/scripts.d/50-openmpt.sh +++ b/scripts.d/50-openmpt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT" -SCRIPT_REV="20417" +SCRIPT_REV="20481" ffbuild_enabled() { [[ $TARGET == winarm64 ]] && return -1 diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh index d6e69e5..855c666 100755 --- a/scripts.d/50-sdl.sh +++ b/scripts.d/50-sdl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libsdl-org/SDL.git" -SCRIPT_COMMIT="c17d2246fb0ed2fa5b16acbf1f2b3aa7e5ddd3cf" +SCRIPT_COMMIT="4d91f0e796b146c3bcf2cda22251b1e56cc0ebfb" SCRIPT_BRANCH="SDL2" ffbuild_enabled() { diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh index 4cbeba9..3731219 100755 --- a/scripts.d/50-svtav1.sh +++ b/scripts.d/50-svtav1.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git" -SCRIPT_COMMIT="7960afd122a257620cd592da66425ac2edaa736b" +SCRIPT_COMMIT="a2312121b5547200a5eb62eac49b7abc53613867" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/scripts.d/50-vaapi/30-libpciaccess.sh b/scripts.d/50-vaapi/30-libpciaccess.sh index 6a453d6..19c1da4 100755 --- a/scripts.d/50-vaapi/30-libpciaccess.sh +++ b/scripts.d/50-vaapi/30-libpciaccess.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libpciaccess.git" -SCRIPT_COMMIT="ad7e9cb4b291a46812eea321f0634cfc46fb94e2" +SCRIPT_COMMIT="2ec2576cabefef1eaa5dd9307c97de2e887fc347" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh index 6a75643..f9f8890 100755 --- a/scripts.d/50-vaapi/40-libdrm.sh +++ b/scripts.d/50-vaapi/40-libdrm.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git" -SCRIPT_COMMIT="c8f327ce9cb504a6c2185487d576be3d5254556a" +SCRIPT_COMMIT="764ed8b91632276bc0d77461a62316b3bcb0cccf" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh index b234ee5..505ba47 100755 --- a/scripts.d/50-vaapi/50-libva.sh +++ b/scripts.d/50-vaapi/50-libva.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/intel/libva.git" -SCRIPT_COMMIT="6f3e0684ff039be347b076e7c2f2a0b8a967778c" +SCRIPT_COMMIT="1b7d71f68b6ebc7f7c3b80e3eb6b3d888b0463e1" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* && $TARGET == win* ]] && return -1 diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh index e59318b..24d6e75 100755 --- a/scripts.d/50-vulkan/45-vulkan.sh +++ b/scripts.d/50-vulkan/45-vulkan.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git" -SCRIPT_COMMIT="v1.3.280" +SCRIPT_COMMIT="v1.3.281" SCRIPT_TAGFILTER="v?.*.*" ffbuild_enabled() { diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh index 593e9c2..1eed107 100755 --- a/scripts.d/50-vulkan/55-spirv-cross.sh +++ b/scripts.d/50-vulkan/55-spirv-cross.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git" -SCRIPT_COMMIT="2a7c8184921897ff3d6c6c3f70af4099e2e00331" +SCRIPT_COMMIT="7d92d7d8794b102f550ad33dbedbd82203b755a9" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh index cf72ea3..a70047c 100755 --- a/scripts.d/50-vulkan/60-libplacebo.sh +++ b/scripts.d/50-vulkan/60-libplacebo.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git" -SCRIPT_COMMIT="4fdb9c0dc38d50cbf9ef972345090dbcca1107cf" +SCRIPT_COMMIT="7b29435072143ee8b7e131947e055d3780ae4e47" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-x264.sh b/scripts.d/50-x264.sh index 4add8b1..0a070e1 100755 --- a/scripts.d/50-x264.sh +++ b/scripts.d/50-x264.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/x264.git" -SCRIPT_COMMIT="585e01997f0c7e6d72c8ca466406d955c07de912" +SCRIPT_COMMIT="7ed753b10a61d0be95f683289dfb925b800b0676" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh index 43c564f..d099c68 100755 --- a/scripts.d/50-x265.sh +++ b/scripts.d/50-x265.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git" -SCRIPT_COMMIT="3cf6c1e53037eb9e198860365712e1bafb22f7c6" +SCRIPT_COMMIT="5a6d85d768699c36fe810c40be89db82033f6743" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-zvbi.sh b/scripts.d/50-zvbi.sh index d55b6c6..b5b6aec 100755 --- a/scripts.d/50-zvbi.sh +++ b/scripts.d/50-zvbi.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/zapping-vbi/zvbi" -SCRIPT_COMMIT="e0ff90c338500fd468c7925db85bed4b1b2d1e72" +SCRIPT_COMMIT="a48ab3a0d72efe9968ebafa34c425c892e4afa50" ffbuild_enabled() { return 0