diff --git a/build.sh b/build.sh index 55c0a547b0..7adff678bc 100755 --- a/build.sh +++ b/build.sh @@ -10,13 +10,11 @@ for addin in ${ADDINS[*]}; do source "addins/${addin}.sh" done -TESTFILE="uidtestfile" -rm -f "$TESTFILE" -docker run --rm -v "$PWD:/uidtestdir" "$IMAGE" touch "/uidtestdir/$TESTFILE" -DOCKERUID="$(stat -c "%u" "$TESTFILE")" -rm -f "$TESTFILE" -[[ "$DOCKERUID" != "$(id -u)" ]] && UIDARGS=( -u "$(id -u):$(id -g)" ) || UIDARGS=() -unset TESTFILE +if docker info -f "{{println .SecurityOptions}}" | grep rootless >/dev/null 2>&1; then + UIDARGS=() +else + UIDARGS=( -u "$(id -u):$(id -g)" ) +fi rm -rf ffbuild mkdir ffbuild diff --git a/download.sh b/download.sh index da842cb9ba..5db1b49664 100755 --- a/download.sh +++ b/download.sh @@ -3,13 +3,11 @@ set -xe cd "$(dirname "$0")" source util/vars.sh dl only -TESTFILE="uidtestfile" -rm -f "$TESTFILE" -docker run --rm -v "$PWD:/uidtestdir" "${REGISTRY}/${REPO}/base:latest" touch "/uidtestdir/$TESTFILE" -DOCKERUID="$(stat -c "%u" "$TESTFILE")" -rm -f "$TESTFILE" -[[ "$DOCKERUID" != "$(id -u)" ]] && UIDARGS=( -u "$(id -u):$(id -g)" ) || UIDARGS=() -unset TESTFILE +if docker info -f "{{println .SecurityOptions}}" | grep rootless >/dev/null 2>&1; then + UIDARGS=() +else + UIDARGS=( -u "$(id -u):$(id -g)" ) +fi [[ -t 1 ]] && TTY_ARG="-t" || TTY_ARG="" diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh index 3b0d615b9f..57ffd7563e 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="a0cac0b4a2e9a66ec46e9fe8267bd2c5af70b155" +SCRIPT_COMMIT="1b554dec06f8d3c26b856a7d1575f396d8ffa403" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh index b1b6e0bdf9..d6af66919c 100755 --- a/scripts.d/20-libiconv.sh +++ b/scripts.d/20-libiconv.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://git.savannah.gnu.org/git/libiconv.git" -SCRIPT_COMMIT="576d31d5eb4012f2feb9cc0fef25be0d3a5f45c4" +SCRIPT_COMMIT="0d94621c1e182f5a13a9504523afcb01ec546b37" ffbuild_enabled() { return 0 diff --git a/scripts.d/20-zlib.sh b/scripts.d/20-zlib.sh index 80f8c5113a..0e65a13025 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="ceadaf28dfa48dbf238a0ddb884d4c543b4170e8" +SCRIPT_COMMIT="d476828316d05d54c6fd6a068b121b30c147b5cd" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh index 4bf6f6e7a9..b9e5cfecac 100755 --- a/scripts.d/25-freetype.sh +++ b/scripts.d/25-freetype.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git" -SCRIPT_COMMIT="104f85448d4d1cbc4b07153d41ab1dfc8cf92aae" +SCRIPT_COMMIT="d2612e1c3ff839595fbf67c8263a07d6bac3aaf5" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-libxml2.sh b/scripts.d/25-libxml2.sh index 861f4ff823..f169d413e9 100755 --- a/scripts.d/25-libxml2.sh +++ b/scripts.d/25-libxml2.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/GNOME/libxml2.git" -SCRIPT_COMMIT="a530ff125dbf8ab4f297c0b91fc8fa34d4183bf5" +SCRIPT_COMMIT="40abebbc739fb4cddfc205eeb129cefe9b9f6e5b" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh index ad7e2fce2f..268aa65347 100755 --- a/scripts.d/25-openssl.sh +++ b/scripts.d/25-openssl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/openssl/openssl.git" -SCRIPT_COMMIT="openssl-3.2.2" +SCRIPT_COMMIT="openssl-3.2.3" SCRIPT_TAGFILTER="openssl-3.2.*" ffbuild_enabled() { diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh index 128339b783..62dd710a61 100755 --- a/scripts.d/25-xz.sh +++ b/scripts.d/25-xz.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/tukaani-project/xz.git" -SCRIPT_COMMIT="bf901dee5d4c46609645e50311c0cb2dfdcf9738" +SCRIPT_COMMIT="68c54e45d042add64a4cb44bfc87ca74d29b87e2" ffbuild_enabled() { return 0 diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh index 3df88573e4..4299d16db1 100755 --- a/scripts.d/35-fontconfig.sh +++ b/scripts.d/35-fontconfig.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git" -SCRIPT_COMMIT="70b60ca46107fc4774d163773febe974c76b2ee7" +SCRIPT_COMMIT="bd83c04aa6f3cb864ba60dc5eaf2b41c4c269c63" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh index 745ddcc67d..4a90b0a7a5 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="2edc371e97d6d2c5ad0e085b26e9af0123501647" +SCRIPT_COMMIT="a070f9ebbe88dc71b248af9731dd49ec93f4e6e6" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh index 4a2f4dcd46..71e1dd3b9f 100755 --- a/scripts.d/45-opencl.sh +++ b/scripts.d/45-opencl.sh @@ -4,7 +4,7 @@ SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git" SCRIPT_COMMIT="d79beab14769efdff4ff9106cdc47268575d6891" SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git" -SCRIPT_COMMIT2="c2cbdb33605ef9cfa02aa2a77e9cd7306c57e32a" +SCRIPT_COMMIT2="3d27d7ca04d29fabe608a2372ce693601bcc4e81" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh index 30df7eaf40..a1e4bf3995 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="874a609959d9db428b0aaa2be8441cc5f286e4ae" +SCRIPT_COMMIT="3e2bb8a1ece02ae4e2c217273c9c0929cb9f5cae" ffbuild_enabled() { [[ $TARGET == linux* ]] || return 1 diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh index b1728df14d..872646b308 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="e7258b3c269467b5ce188ccad7161f587d72d421" +SCRIPT_COMMIT="d95b69e03d9401ad9f3532eaab14066427761c35" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-x11/10-xtrans.sh b/scripts.d/45-x11/10-xtrans.sh index a2b14f3ee7..1405c67d5f 100755 --- a/scripts.d/45-x11/10-xtrans.sh +++ b/scripts.d/45-x11/10-xtrans.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxtrans.git" -SCRIPT_COMMIT="edd3f51328df9c621277168c9dd77b1e80ccfd7c" +SCRIPT_COMMIT="0f153064bfa4bb69e86f3f2383f2f421f2360319" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/20-libxau.sh b/scripts.d/45-x11/20-libxau.sh index ca6cf64fcd..67e0fca61a 100755 --- a/scripts.d/45-x11/20-libxau.sh +++ b/scripts.d/45-x11/20-libxau.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxau.git" -SCRIPT_COMMIT="89429bb36de409b204ef105e8b73126a639ccb03" +SCRIPT_COMMIT="6b2e9a63d8306282a2b384762bea004c19f301a1" 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 612d282246..b85d320313 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="ed9fb5535efe1e5278654b6b3994a34337b4bf1a" +SCRIPT_COMMIT="19b2f5c2d0935cbf9c17ecf30604f80592807b59" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/50-libxi.sh b/scripts.d/45-x11/50-libxi.sh index 21578a25c6..c84a9120fe 100755 --- a/scripts.d/45-x11/50-libxi.sh +++ b/scripts.d/45-x11/50-libxi.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxi.git" -SCRIPT_COMMIT="56b11459f833df8f324587847534a548b070da94" +SCRIPT_COMMIT="a5af26c654b4da5fd5eaaeaa2173c734ab9e63ec" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh index 3b4fbd6fb8..ec7854d26e 100755 --- a/scripts.d/50-amf.sh +++ b/scripts.d/50-amf.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git" -SCRIPT_COMMIT="6d7bec0469961e2891c6e1aaa5122b76ed82e1db" +SCRIPT_COMMIT="a6fca4a3bb5585bd0bca4d1a531c40e39f5f572b" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh index 78c6b98f74..5bf05c0e9a 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="5632ebed19fc472dae0cbe26a89552af0ee814dd" +SCRIPT_COMMIT="778bc191f1eecf1b3f9c68f8e3ca7857c3437f1d" ffbuild_enabled() { [[ $TARGET == winarm64 ]] && return -1 diff --git a/scripts.d/50-aribb24/25-libpng.sh b/scripts.d/50-aribb24/25-libpng.sh index 341ba87f83..92f4d62fdb 100755 --- a/scripts.d/50-aribb24/25-libpng.sh +++ b/scripts.d/50-aribb24/25-libpng.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/glennrp/libpng.git" -SCRIPT_COMMIT="e4a31f024b6158aaaf55a43502f574d5f5d1c894" +SCRIPT_COMMIT="532fec021404a5f5ceda068d176fd2ab1cd1955c" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh index e7a07a8b28..4f9ede38c9 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="2355eeb8f254a1c34dbb0241be5c70cdf6ed46d1" +SCRIPT_COMMIT="cc6eb3d53deb4c739a16230136945c1a0dca05b0" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-gme.sh b/scripts.d/50-gme.sh index 1c5cbbe065..eafedf27b6 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="b667f79dcee5c380541dc90630bb33931be378c7" +SCRIPT_COMMIT="05a2aa29e8eae29316804fdd28ceaa96c74a1531" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-kvazaar.sh b/scripts.d/50-kvazaar.sh index 17abf96188..07e81b6655 100755 --- a/scripts.d/50-kvazaar.sh +++ b/scripts.d/50-kvazaar.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/ultravideo/kvazaar.git" -SCRIPT_COMMIT="a7aeb2361f8d1e5dc575d05c9ab563f47bdcd235" +SCRIPT_COMMIT="2f9a21423a1ef666c93f15e2068bcde979d20f7e" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh index f9cb98e45c..16ecbd97ae 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="c5bb87e2f5d6c18763b4614817c206a4f4d2332a" +SCRIPT_COMMIT="3a7a9b99e75fb094f243d4b086b414556a0d9947" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/45-lcms2.sh b/scripts.d/50-libjxl/45-lcms2.sh index 6928192be4..092cd1c87f 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="54b83a4d5da3fd3bf8ad9e6fa681cb41f2495dbf" +SCRIPT_COMMIT="5c54a6dedf6bebefa3a2dbbcf0164bb5616d4ba8" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh index 2d8696cb1f..3cd0c69082 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="f7f20ce0f1485d9aab226ec31af5b4adc4fdf972" +SCRIPT_COMMIT="960d97c0b73fe081a7cd00afc3fac1bfaf441452" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh index c43b285a86..00bf329079 100755 --- a/scripts.d/50-libopus.sh +++ b/scripts.d/50-libopus.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/xiph/opus.git" -SCRIPT_COMMIT="fc96bb9cc7c59f99b03f8d1225cc708451b8bf45" +SCRIPT_COMMIT="5854a9f7de06ab3505b8fe6e8943db581c2cbe70" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-librist/40-mbedtls.sh b/scripts.d/50-librist/40-mbedtls.sh index cd42fb87ee..47e1f662ee 100755 --- a/scripts.d/50-librist/40-mbedtls.sh +++ b/scripts.d/50-librist/40-mbedtls.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/ARMmbed/mbedtls.git" -SCRIPT_COMMIT="v3.6.0" +SCRIPT_COMMIT="v3.6.1" SCRIPT_TAGFILTER="v3.*" ffbuild_enabled() { diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh index 48713a19f7..9ac39cf913 100755 --- a/scripts.d/50-libssh.sh +++ b/scripts.d/50-libssh.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.com/libssh/libssh-mirror.git" -SCRIPT_COMMIT="bd091239d3d081748d9704ec3429606901000dca" +SCRIPT_COMMIT="48d474f78c5f68471bf412a7dbf508ef52f77664" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh index b0e760b9bf..e6ea876bf0 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="cdf8da4c03cf53f2c31a9a5f4c84880ca128c608" +SCRIPT_COMMIT="fbf63dff1f528d44f24bd662abb89fd01a4a1c25" ffbuild_enabled() { [[ $TARGET == winarm64 ]] && return -1 diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh index 4bc11034e1..c7665eb75e 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="f28c837dc1351fc333af04dd1a65181438e27089" +SCRIPT_COMMIT="2e81017c7a345f687223086cbc177a8459a18b52" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libzmq.sh b/scripts.d/50-libzmq.sh index b24adec738..f3bdb744bf 100755 --- a/scripts.d/50-libzmq.sh +++ b/scripts.d/50-libzmq.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/zeromq/libzmq.git" -SCRIPT_COMMIT="fda851c8e52dd969b5c1c442c464d97edbe78259" +SCRIPT_COMMIT="0ed7a08cd946e0832ac4655b7a76c09ac221f63b" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh index 06c0037946..314de9c5d3 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="8da362e71566465b86a09ae1197abcb93f0f83be" +SCRIPT_COMMIT="ebe0b8697bca69abb7e7be1c731da4d54b10e462" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-onevpl.sh b/scripts.d/50-onevpl.sh index 34deb3c342..fda48291d3 100755 --- a/scripts.d/50-onevpl.sh +++ b/scripts.d/50-onevpl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/intel/libvpl.git" -SCRIPT_COMMIT="0c13c410095764799afea0cf645bd896378579b8" +SCRIPT_COMMIT="5f6bd8a1e753c8f63a3fd8b36894d6968b808a6d" ffbuild_enabled() { [[ $TARGET == *arm64 ]] && return -1 diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh index 79f55ff4e6..72b903f198 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="1318bea2e0f0af9430335708e65ae2ff920d98c6" +SCRIPT_COMMIT="a4e126acb856e53ed1c35a847aa3e0a4cb16c962" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh index 6e21b414c2..3252d44732 100755 --- a/scripts.d/50-openh264.sh +++ b/scripts.d/50-openh264.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/cisco/openh264.git" -SCRIPT_COMMIT="e0bbb7f1e43e4bb6075efe15a6d3bd7da5ee11f1" +SCRIPT_COMMIT="3668daf135dea7d18737b01ce32774a7a2ffba32" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh index e7dd855030..781867046d 100755 --- a/scripts.d/50-openjpeg.sh +++ b/scripts.d/50-openjpeg.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/uclouvain/openjpeg.git" -SCRIPT_COMMIT="d5544b3fae0056f57467a9f1ef8e8f05766f0d0c" +SCRIPT_COMMIT="606304d08365469d0fd685f2312791fc0feac15f" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh index 80f485f050..dc31177476 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="21309" +SCRIPT_REV="21571" ffbuild_enabled() { [[ $TARGET == winarm64 ]] && return -1 diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh index 26027769ec..8e3adb1759 100755 --- a/scripts.d/50-rubberband.sh +++ b/scripts.d/50-rubberband.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/breakfastquay/rubberband.git" -SCRIPT_COMMIT="832f577acbcdfa8c48d19a8381e73428297bec4e" +SCRIPT_COMMIT="4e8419232bd15bc1de9af2aa42ed3ac6bc8722ba" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh index b95fc30d80..8f5b7fe6b8 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="7fdf7943774d2a54e48718316ca6d55d51a37696" +SCRIPT_COMMIT="10b4a79379d226041781d0a825da79a296af715f" SCRIPT_BRANCH="SDL2" ffbuild_enabled() { diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh index 970f762352..b8a1922fdf 100755 --- a/scripts.d/50-srt.sh +++ b/scripts.d/50-srt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/Haivision/srt.git" -SCRIPT_COMMIT="5819adefe5dff74eac9555fc672b63a7b950871f" +SCRIPT_COMMIT="9c7206f0190c0c800a5ee1e71ee61ec0d4c7e216" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh index a0dbc1b4ec..2b07615b92 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="25e0d3e81dcf322abac8690e4eac7bba0cebc054" +SCRIPT_COMMIT="85e44db4b49fcbf8fea2472bdd517e8aa8e1c1a0" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh index ba66281ef8..4d94fd9090 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="11cafdd8d64e2fcb0b170a2a1df11a896231de67" +SCRIPT_COMMIT="25dec5b91fe4d2638787d033a0b22b6c1dc145e0" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh index 7eaa0db14a..8de6378885 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.292" +SCRIPT_COMMIT="v1.3.295" SCRIPT_TAGFILTER="v?.*.*" ffbuild_enabled() { diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh index 32fbdff1eb..40698d9a5d 100755 --- a/scripts.d/50-vulkan/50-shaderc.sh +++ b/scripts.d/50-vulkan/50-shaderc.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/google/shaderc.git" -SCRIPT_COMMIT="5d0f6ed6e46d3c0ccd23151c6a1486c2ec90c037" +SCRIPT_COMMIT="6d2848321250a19641800f8afb07738f3b0b7f18" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh index 56ad629bf0..21a3385cb6 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="66363ac7e8fe4465169ceb2ad5905b1657244cfe" +SCRIPT_COMMIT="6a1fb66eef1bdca14acf7d0a51a3f883499d79f0" 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 b9f6991ad8..5814a9db3d 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="82bf46ae8b4cacd2523f994da292e4d12312c026" +SCRIPT_COMMIT="efb89342b0c19b9773226624651839686172e88b" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-vvenc.sh b/scripts.d/50-vvenc.sh index d9a5a89a8a..245fbc61a6 100755 --- a/scripts.d/50-vvenc.sh +++ b/scripts.d/50-vvenc.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/fraunhoferhhi/vvenc.git" -SCRIPT_COMMIT="c306b2cfaca7a4da50b6d6195f277430524b1a7d" +SCRIPT_COMMIT="a1996a8c12593c5ce116243bed7a65dd59489a8d" ffbuild_enabled() { [[ $TARGET != *32 ]] || return -1 @@ -23,7 +23,7 @@ ffbuild_dockerbuild() { fi cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DCMAKE_BUILD_TYPE=Release \ - -DBUILD_SHARED_LIBS=OFF "${armsimd[@]}" .. + -DBUILD_SHARED_LIBS=OFF -DEXTRALIBS="-lstdc++" "${armsimd[@]}" .. make -j$(nproc) make install diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh index af98327815..d8ccd066b0 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="dd594f59d95198c6d8e4133b6002c18e47e7d6fe" +SCRIPT_COMMIT="f6735953b90e4ff74849e20156a520f5bfd410fc" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1