diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 44c34ecb..bcfef912 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -204,6 +204,8 @@ jobs: variant: gpl 5.0 - target: win64 variant: gpl 4.4 + - target: win64 + variant: gpl 4.3 steps: - name: Free Disk-Space run: df -h && sudo apt-get clean && docker system prune -a -f && sudo rm -rf /opt/ghc /usr/local/.ghcup /usr/local/lib/android && df -h diff --git a/addins/4.3.sh b/addins/4.3.sh new file mode 100644 index 00000000..8f3bcc08 --- /dev/null +++ b/addins/4.3.sh @@ -0,0 +1,2 @@ +#!/bin/bash +GIT_BRANCH="release/4.3" diff --git a/generate.sh b/generate.sh index dd204398..22a1dfe4 100755 --- a/generate.sh +++ b/generate.sh @@ -135,7 +135,7 @@ export TODF="Dockerfile" BASELAYER="base-layer" to_df "FROM ${REGISTRY}/${REPO}/base-${TARGET}:latest AS ${BASELAYER}" -to_df "ENV TARGET=$TARGET VARIANT=$VARIANT REPO=$REPO ADDINS_STR=$ADDINS_STR" +to_df "ENV TARGET=$TARGET VARIANT=$VARIANT REPO=$REPO ADDINS_STR=$ADDINS_STR FFVER=$(ffbuild_ffver)" to_df "COPY --link util/run_stage.sh /usr/bin/run_stage" for addin in "${ADDINS[@]}"; do diff --git a/images/base/Dockerfile b/images/base/Dockerfile index 027d44a0..a408fef0 100644 --- a/images/base/Dockerfile +++ b/images/base/Dockerfile @@ -16,8 +16,8 @@ RUN \ gperf itstool ragel libc6-dev zlib1g-dev libssl-dev \ gtk-doc-tools gobject-introspection gawk \ ocaml ocaml-findlib ocamlbuild libnum-ocaml-dev indent p7zip-full zstd \ - python3-setuptools python3-pip python3-venv python3-jinja2 python3-jsonschema python3-apt python-is-python3 && \ - curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \ + python3-setuptools python3-pip python3-venv python3-jinja2 python3-jsonschema python3-apt python3-dev python-is-python3 && \ + curl -fsSL https://deb.nodesource.com/setup_24.x | bash - && \ apt-get -y install nodejs && \ apt-get -y autoremove && \ apt-get -y clean autoclean && \ diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh index dab1788c..d08dc8a5 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="f6a7b25bc70e9c3f5d0a8535ad112b08de564b33" +SCRIPT_COMMIT="8d02d610f707b5f6af74653c6ebb0cdfa4df9212" ffbuild_depends() { return 0 diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh index 3c44e4c8..ca08c014 100755 --- a/scripts.d/20-libiconv.sh +++ b/scripts.d/20-libiconv.sh @@ -2,11 +2,11 @@ SCRIPT_REPO="https://https.git.savannah.gnu.org/git/libiconv.git" SCRIPT_MIRROR="git://git.git.savannah.gnu.org/libiconv.git" -SCRIPT_COMMIT="b66b2f548166b667a7c48777ded7506a43971b21" +SCRIPT_COMMIT="30fc26493e4c6457000172d49b526be0919e34c6" SCRIPT_REPO2="https://https.git.savannah.gnu.org/git/gnulib.git" SCRIPT_MIRROR2="https://github.com/coreutils/gnulib.git" -SCRIPT_COMMIT2="6a9227219c093b9f8c2a22f69c876ade7269e8dd" +SCRIPT_COMMIT2="075df63ae24e351535a5f2c7b6b3b3acb2ed9a1a" ffbuild_enabled() { return 0 diff --git a/scripts.d/20-zlib.sh b/scripts.d/20-zlib.sh index a474d88b..9324c697 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="5a82f71ed1dfc0bec044d9702463dbdf84ea3b71" +SCRIPT_COMMIT="570720b0c24f9686c33f35a1b3165c1f568b96be" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-libxml2.sh b/scripts.d/25-libxml2.sh index 0c4f34d4..f1259417 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="22f9d730898d2dfcc03a484e65e1f8fc3675225f" +SCRIPT_COMMIT="9827e6e44652555992e168609abf94e4237ca944" ffbuild_depends() { echo base diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh index 6d5cf5eb..a2ad4f25 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="f57b1716cd0853474980c90a892204dee9bdea1a" +SCRIPT_COMMIT="9f4c5a0d4817c9c7011cdfd00cfbe0ddda66a455" ffbuild_depends() { echo base diff --git a/scripts.d/45-fonts/25-freetype.sh b/scripts.d/45-fonts/25-freetype.sh index 4afdf2da..342e35da 100755 --- a/scripts.d/45-fonts/25-freetype.sh +++ b/scripts.d/45-fonts/25-freetype.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git" -SCRIPT_COMMIT="fc9cc5038e05edceec3d0f605415540ac76163e9" +SCRIPT_COMMIT="23b6cd27ff19b70cbf98e058cd2cf0647d5284ff" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-fonts/35-fontconfig.sh b/scripts.d/45-fonts/35-fontconfig.sh index aae1e14e..6b17436d 100755 --- a/scripts.d/45-fonts/35-fontconfig.sh +++ b/scripts.d/45-fonts/35-fontconfig.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git" -SCRIPT_COMMIT="a9fd30d226322f7f9b674a74d3782eea03c29453" +SCRIPT_COMMIT="80e8895293c68d88ca4cabfcc582f76b1e28fc87" ffbuild_depends() { echo base @@ -20,6 +20,7 @@ ffbuild_dockerbuild() { ./autogen.sh --noconf local myconf=( + ac_cv_va_copy="C99" --prefix="$FFBUILD_PREFIX" --disable-docs --enable-libxml2 diff --git a/scripts.d/45-fonts/45-harfbuzz.sh b/scripts.d/45-fonts/45-harfbuzz.sh index 479c55c5..3f4b3426 100755 --- a/scripts.d/45-fonts/45-harfbuzz.sh +++ b/scripts.d/45-fonts/45-harfbuzz.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git" -SCRIPT_COMMIT="80311aa92390ae9b5a782568302e531d378b6b01" +SCRIPT_COMMIT="e3d0aeab7a0657e99667291ae6f75bab3455244f" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-fonts/50-freetype.sh b/scripts.d/45-fonts/50-freetype.sh index 9d7c1537..fd1b5716 100755 --- a/scripts.d/45-fonts/50-freetype.sh +++ b/scripts.d/45-fonts/50-freetype.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git" -SCRIPT_COMMIT="fc9cc5038e05edceec3d0f605415540ac76163e9" +SCRIPT_COMMIT="23b6cd27ff19b70cbf98e058cd2cf0647d5284ff" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-libvorbis.sh b/scripts.d/45-libvorbis.sh index 9f430837..7a01b40b 100755 --- a/scripts.d/45-libvorbis.sh +++ b/scripts.d/45-libvorbis.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/xiph/vorbis.git" -SCRIPT_COMMIT="851cce991da34adf5e1f3132588683758a6369ec" +SCRIPT_COMMIT="2d79800b6751dddd4b8b4ad50832faa5ae2a00d9" ffbuild_depends() { echo base diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh index 520a6116..7131012f 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="be2efb69b97ee49ba81094d49a1b8d7be0c588c2" +SCRIPT_COMMIT="b096704c0d42c5e784deb781a07b23cfb5286a82" ffbuild_depends() { echo base diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh index f7dd2960..e7a3c977 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="e0d9b82d3b55de55927f1e7e7bd11f40a35de3e0" +SCRIPT_COMMIT="6b75f37728b2eb70c11508ece93afaacc6572b45" ffbuild_enabled() { return 0 @@ -41,8 +41,7 @@ ffbuild_dockerbuild() { } ffbuild_configure() { - [[ $ADDINS_STR == *4.4* ]] && return 0 - [[ $ADDINS_STR == *5.0* ]] && return 0 + (( $(ffbuild_ffver) >= 501 )) || return 0 echo --enable-libvmaf } diff --git a/scripts.d/45-x11/10-xcbproto.sh b/scripts.d/45-x11/10-xcbproto.sh index 23dca41c..60538ab4 100755 --- a/scripts.d/45-x11/10-xcbproto.sh +++ b/scripts.d/45-x11/10-xcbproto.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git" -SCRIPT_COMMIT="2ec66abb885801f9d5944ef7b830c24401592b49" +SCRIPT_COMMIT="283ead0904eb8c6350cef67dd638bb4a6b014c3a" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh index 10ac7e57..3de0e230 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="f973f7db89571f61e96cb0a55f416d3e67a75663" +SCRIPT_COMMIT="c18d2bc22813793bba7f0e4e603c0104d7724802" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/47-vulkan/40-vulkan-headers.sh b/scripts.d/47-vulkan/40-vulkan-headers.sh index 454eb39e..4f99c287 100755 --- a/scripts.d/47-vulkan/40-vulkan-headers.sh +++ b/scripts.d/47-vulkan/40-vulkan-headers.sh @@ -1,11 +1,11 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git" -SCRIPT_COMMIT="v1.4.332" +SCRIPT_COMMIT="v1.4.337" SCRIPT_TAGFILTER="v?.*.*" ffbuild_enabled() { - [[ $ADDINS_STR == *4.4* ]] && return -1 + (( $(ffbuild_ffver) > 404 )) || return -1 return 0 } diff --git a/scripts.d/47-vulkan/45-vulkan-loader.sh b/scripts.d/47-vulkan/45-vulkan-loader.sh index 3dcbeda6..fa94de4c 100755 --- a/scripts.d/47-vulkan/45-vulkan-loader.sh +++ b/scripts.d/47-vulkan/45-vulkan-loader.sh @@ -4,11 +4,11 @@ SCRIPT_REPO="https://github.com/BtbN/Vulkan-Shim-Loader.git" SCRIPT_COMMIT="9657ca8e395ef16c79b57c8bd3f4c1aebb319137" SCRIPT_REPO2="https://github.com/KhronosGroup/Vulkan-Headers.git" -SCRIPT_COMMIT2="v1.4.332" +SCRIPT_COMMIT2="v1.4.337" SCRIPT_TAGFILTER2="v?.*.*" ffbuild_enabled() { - [[ $ADDINS_STR == *4.4* ]] && return -1 + (( $(ffbuild_ffver) > 404 )) || return -1 return 0 } @@ -31,5 +31,6 @@ ffbuild_configure() { } ffbuild_unconfigure() { + (( $(ffbuild_ffver) >= 404 )) || return 0 echo --disable-vulkan } diff --git a/scripts.d/47-vulkan/50-shaderc.sh b/scripts.d/47-vulkan/50-shaderc.sh index 8e0f7a2b..52c799bd 100755 --- a/scripts.d/47-vulkan/50-shaderc.sh +++ b/scripts.d/47-vulkan/50-shaderc.sh @@ -1,10 +1,10 @@ #!/bin/bash SCRIPT_REPO="https://github.com/google/shaderc.git" -SCRIPT_COMMIT="73743588fe9c39f2f1c780a087d94afac691a189" +SCRIPT_COMMIT="e0a5092b4b05dbcc448b0883f3575163634f8e86" ffbuild_enabled() { - [[ $ADDINS_STR == *4.4* ]] && return -1 + (( $(ffbuild_ffver) > 404 )) || return -1 return 0 } @@ -62,6 +62,6 @@ ffbuild_configure() { } ffbuild_unconfigure() { - [[ $ADDINS_STR == *4.4* ]] && return 0 + (( $(ffbuild_ffver) > 404 )) || return 0 echo --disable-libshaderc } diff --git a/scripts.d/47-vulkan/55-spirv-cross.sh b/scripts.d/47-vulkan/55-spirv-cross.sh index abd42fa6..7dfac002 100755 --- a/scripts.d/47-vulkan/55-spirv-cross.sh +++ b/scripts.d/47-vulkan/55-spirv-cross.sh @@ -1,10 +1,10 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git" -SCRIPT_COMMIT="adec7acbf41a988713cdb85f93f26c8ca5ea863e" +SCRIPT_COMMIT="28184c1e138f18c330256eeb2f56b9f9fbc53921" ffbuild_enabled() { - [[ $ADDINS_STR == *4.4* ]] && return -1 + (( $(ffbuild_ffver) > 404 )) || return -1 return 0 } diff --git a/scripts.d/47-vulkan/99-enable.sh b/scripts.d/47-vulkan/99-enable.sh index b195abc8..8216e766 100755 --- a/scripts.d/47-vulkan/99-enable.sh +++ b/scripts.d/47-vulkan/99-enable.sh @@ -3,7 +3,7 @@ SCRIPT_SKIP="1" ffbuild_enabled() { - [[ $ADDINS_STR == *4.4* ]] && return -1 + (( $(ffbuild_ffver) > 404 )) || return -1 return 0 } @@ -12,6 +12,11 @@ ffbuild_dockerlayer() { to_df "COPY --link --from=${SELFLAYER} /opt/glslc /usr/bin/glslc" } +ffbuild_dockerfinal() { + to_df "COPY --link --from=${PREVLAYER} \$FFBUILD_PREFIX/. \$FFBUILD_PREFIX" + to_df "COPY --link --from=${SELFLAYER} /opt/glslc /usr/bin/glslc" +} + ffbuild_dockerdl() { true } diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh index 5e85cd2c..d9062b42 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="1e900cac01098ba2b996dab9683193daec971e2e" +SCRIPT_COMMIT="0dfe179f80da866a291728590fd1bbc3b5e6fe0a" ffbuild_depends() { echo base diff --git a/scripts.d/50-aribb24/25-libpng.sh b/scripts.d/50-aribb24/25-libpng.sh index 3a8d8c38..2c068b72 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="1ebf432e85b53bf111a4585b410592727dd40a5a" +SCRIPT_COMMIT="0f07f70aa55e4771d00b0f8a238dca992fbb60e4" ffbuild_depends() { echo base diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh index 14cc760e..eea1a9a2 100755 --- a/scripts.d/50-avisynth.sh +++ b/scripts.d/50-avisynth.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/AviSynth/AviSynthPlus.git" -SCRIPT_COMMIT="b6d79944a59cf066fa00466ee02edb08e3ca214f" +SCRIPT_COMMIT="ab03a3cedb1167909246d5c7a9c0645a4308dfdf" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-chromaprint.sh b/scripts.d/50-chromaprint.sh index 6070871f..c0b4dca9 100755 --- a/scripts.d/50-chromaprint.sh +++ b/scripts.d/50-chromaprint.sh @@ -9,10 +9,7 @@ ffbuild_depends() { } ffbuild_enabled() { - # pkg-config check is currently only available in master - [[ $ADDINS_STR == *4.4* ]] && return -1 - [[ $ADDINS_STR == *5.0* ]] && return -1 - [[ $ADDINS_STR == *5.1* ]] && return -1 + (( $(ffbuild_ffver) >= 600 )) || return -1 return 0 } diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh index 785e372b..80e973d9 100755 --- a/scripts.d/50-dav1d.sh +++ b/scripts.d/50-dav1d.sh @@ -1,9 +1,10 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git" -SCRIPT_COMMIT="e7c280e4cde445589c875dbd97da61579483f605" +SCRIPT_COMMIT="5e8c380e4b70f62ab7c7d881394ecb891e200a5c" ffbuild_enabled() { + (( $(ffbuild_ffver) >= 404 )) || return -1 return 0 } @@ -35,5 +36,6 @@ ffbuild_configure() { } ffbuild_unconfigure() { + (( $(ffbuild_ffver) >= 404 )) || return 0 echo --disable-libdav1d } diff --git a/scripts.d/50-dvd/30-libdvdcss.sh b/scripts.d/50-dvd/30-libdvdcss.sh index 8e6f2220..ed0fe061 100755 --- a/scripts.d/50-dvd/30-libdvdcss.sh +++ b/scripts.d/50-dvd/30-libdvdcss.sh @@ -1,15 +1,11 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/libdvdcss.git" -SCRIPT_COMMIT="c838ca97553aeb8505b7baf02b9a90f8505de212" +SCRIPT_COMMIT="64ff7c56f0ae4b8a87306a1e6b33ba1327a57e1d" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 - [[ $ADDINS_STR == *4.4* ]] && return -1 - [[ $ADDINS_STR == *5.0* ]] && return -1 - [[ $ADDINS_STR == *5.1* ]] && return -1 - [[ $ADDINS_STR == *6.0* ]] && return -1 - [[ $ADDINS_STR == *6.1* ]] && return -1 + (( $(ffbuild_ffver) >= 700 )) || return -1 return 0 } diff --git a/scripts.d/50-dvd/40-libdvdread.sh b/scripts.d/50-dvd/40-libdvdread.sh index 4080588b..2ecd9712 100755 --- a/scripts.d/50-dvd/40-libdvdread.sh +++ b/scripts.d/50-dvd/40-libdvdread.sh @@ -1,15 +1,11 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/libdvdread.git" -SCRIPT_COMMIT="c7f373951bae9642e1ce1fbb2cd02f92c09756e0" +SCRIPT_COMMIT="935042af3e7b28f636895a2917307ac6f5931e6c" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 - [[ $ADDINS_STR == *4.4* ]] && return -1 - [[ $ADDINS_STR == *5.0* ]] && return -1 - [[ $ADDINS_STR == *5.1* ]] && return -1 - [[ $ADDINS_STR == *6.0* ]] && return -1 - [[ $ADDINS_STR == *6.1* ]] && return -1 + (( $(ffbuild_ffver) >= 700 )) || return -1 return 0 } @@ -45,10 +41,6 @@ ffbuild_configure() { } ffbuild_unconfigure() { - [[ $ADDINS_STR == *4.4* ]] && return 0 - [[ $ADDINS_STR == *5.0* ]] && return 0 - [[ $ADDINS_STR == *5.1* ]] && return 0 - [[ $ADDINS_STR == *6.0* ]] && return 0 - [[ $ADDINS_STR == *6.1* ]] && return 0 + (( $(ffbuild_ffver) >= 700 )) || return 0 echo --disable-libdvdread } diff --git a/scripts.d/50-dvd/50-libdvdnav.sh b/scripts.d/50-dvd/50-libdvdnav.sh index 110d608a..34fe5f9c 100755 --- a/scripts.d/50-dvd/50-libdvdnav.sh +++ b/scripts.d/50-dvd/50-libdvdnav.sh @@ -1,15 +1,11 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/libdvdnav.git" -SCRIPT_COMMIT="38238caf599dc9405eddf1531c858c725015f776" +SCRIPT_COMMIT="cf112772bf626f76a913efca5b883a381e4c123a" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 - [[ $ADDINS_STR == *4.4* ]] && return -1 - [[ $ADDINS_STR == *5.0* ]] && return -1 - [[ $ADDINS_STR == *5.1* ]] && return -1 - [[ $ADDINS_STR == *6.0* ]] && return -1 - [[ $ADDINS_STR == *6.1* ]] && return -1 + (( $(ffbuild_ffver) >= 700 )) || return -1 return 0 } @@ -46,10 +42,6 @@ ffbuild_configure() { } ffbuild_unconfigure() { - [[ $ADDINS_STR == *4.4* ]] && return 0 - [[ $ADDINS_STR == *5.0* ]] && return 0 - [[ $ADDINS_STR == *5.1* ]] && return 0 - [[ $ADDINS_STR == *6.0* ]] && return 0 - [[ $ADDINS_STR == *6.1* ]] && return 0 + (( $(ffbuild_ffver) >= 700 )) || return 0 echo --disable-libdvdnav } diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh index c3f17407..2913fad1 100755 --- a/scripts.d/50-ffnvcodec.sh +++ b/scripts.d/50-ffnvcodec.sh @@ -17,6 +17,7 @@ SCRIPT_BRANCH4="sdk/12.2" ffbuild_enabled() { [[ $TARGET == winarm64 ]] && return -1 + (( $(ffbuild_ffver) >= 404 )) || return -1 return 0 } @@ -28,11 +29,11 @@ ffbuild_dockerdl() { } ffbuild_dockerbuild() { - if [[ $ADDINS_STR == *4.4* || $ADDINS_STR == *5.0* || $ADDINS_STR == *5.1* || $ADDINS_STR == *6.0* || $ADDINS_STR == *6.1* ]]; then + if (( $FFVER < 700 )); then cd ffnvcodec2 - elif [[ $ADDINS_STR == *7.0* ]]; then + elif (( $FFVER < 701 )); then cd ffnvcodec3 - elif [[ $ADDINS_STR == *7.1* ]]; then + elif (( $FFVER < 800 )); then cd ffnvcodec4 else cd ffnvcodec diff --git a/scripts.d/50-frei0r.sh b/scripts.d/50-frei0r.sh index 3490ae21..9aa075fc 100755 --- a/scripts.d/50-frei0r.sh +++ b/scripts.d/50-frei0r.sh @@ -1,11 +1,11 @@ #!/bin/bash SCRIPT_REPO="https://github.com/dyne/frei0r.git" -SCRIPT_COMMIT="40a50bec63efebdff6cc315ccf9e6b5674cb8c57" +SCRIPT_COMMIT="6d272815f25baa6daafacdd132a43e36a94ff21c" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 - [[ $ADDINS_STR == *4.4* ]] && return -1 + (( $(ffbuild_ffver) >= 500 )) || return -1 return 0 } @@ -27,5 +27,6 @@ ffbuild_configure() { } ffbuild_unconfigure() { + (( $(ffbuild_ffver) >= 404 )) || return 0 echo --disable-frei0r } diff --git a/scripts.d/50-gme.sh b/scripts.d/50-gme.sh index eb8f7706..360e38e1 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="bd7b3604dee43084aae0a2b4457ba7bf48554030" +SCRIPT_COMMIT="184dac64cd556f435c309bb83ed4a31fe14e1cc5" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libaribcaption.sh b/scripts.d/50-libaribcaption.sh index a011b9c1..4bafee87 100755 --- a/scripts.d/50-libaribcaption.sh +++ b/scripts.d/50-libaribcaption.sh @@ -9,11 +9,7 @@ ffbuild_depends() { } ffbuild_enabled() { - [[ $ADDINS_STR == *4.4* ]] && return -1 - [[ $ADDINS_STR == *5.0* ]] && return -1 - [[ $ADDINS_STR == *5.1* ]] && return -1 - [[ $ADDINS_STR == *6.0* ]] && return -1 - + (( $(ffbuild_ffver) > 600 )) || return -1 return 0 } @@ -37,10 +33,6 @@ ffbuild_configure() { } ffbuild_unconfigure() { - [[ $ADDINS_STR == *4.4* ]] && return 0 - [[ $ADDINS_STR == *5.0* ]] && return 0 - [[ $ADDINS_STR == *5.1* ]] && return 0 - [[ $ADDINS_STR == *6.0* ]] && return 0 - + (( $(ffbuild_ffver) > 600 )) || return 0 echo --disable-libaribcaption } diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh index dfc6426d..af83f9e8 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="e60dddb7db62cc009175843bdb0b0dfedceebedb" +SCRIPT_COMMIT="cbb743215bad0fe202477e569fe8005545258ccd" ffbuild_depends() { echo base diff --git a/scripts.d/50-libbluray.sh b/scripts.d/50-libbluray.sh index e73d51a4..95312257 100755 --- a/scripts.d/50-libbluray.sh +++ b/scripts.d/50-libbluray.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/libbluray.git" -SCRIPT_COMMIT="6155d6512d21ff9b19ee8ad9cb6a53bfccdd85a5" +SCRIPT_COMMIT="71c5324e78dc7a159cad67ea7967300db54ec21c" ffbuild_depends() { echo base diff --git a/scripts.d/50-libjxl/45-brotli.sh b/scripts.d/50-libjxl/45-brotli.sh index b48e842f..c071ec5f 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="fa925d0c1559a582d654a9fd2adfd83e317145fa" +SCRIPT_COMMIT="5fa73e23bee34f84148719576a7a434f0fc43dc8" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/45-lcms2.sh b/scripts.d/50-libjxl/45-lcms2.sh index 701a22c6..fe46d1ee 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="8888d842a7556a0aac093808f10d49c4141c354a" +SCRIPT_COMMIT="23994d72c6323ca466cff85765b08011a2ec0bac" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh index c412fc6e..5cba31ca 100755 --- a/scripts.d/50-libjxl/50-libjxl.sh +++ b/scripts.d/50-libjxl/50-libjxl.sh @@ -1,13 +1,10 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libjxl/libjxl.git" -SCRIPT_COMMIT="9174e635cd5980e96fcf50d37873cf40045ce2df" +SCRIPT_COMMIT="53042ec537712e0df08709524f4df097d42174bc" ffbuild_enabled() { - [[ $ADDINS_STR == *4.4* ]] && return -1 - [[ $ADDINS_STR == *5.0* ]] && return -1 - [[ $ADDINS_STR == *5.1* ]] && return -1 - [[ $ADDINS_STR == *6.0* ]] && return -1 + (( $(ffbuild_ffver) > 600 )) || return -1 return 0 } @@ -52,7 +49,6 @@ ffbuild_configure() { } ffbuild_unconfigure() { - [[ $ADDINS_STR == *4.4* ]] && return 0 - [[ $ADDINS_STR == *5.0* ]] && return 0 + (( $(ffbuild_ffver) > 500 )) || return 0 echo --disable-libjxl } diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh index 1c06dcc5..1f9e442b 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="285ef69edd68a3799e6759d8f2d455e3bcffcbb9" +SCRIPT_COMMIT="59f13a3eb0eed3a56cf46bd68cc2f29f18d83ba2" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libplacebo.sh b/scripts.d/50-libplacebo.sh index 6e0d287d..22a7fb87 100755 --- a/scripts.d/50-libplacebo.sh +++ b/scripts.d/50-libplacebo.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git" -SCRIPT_COMMIT="2e5a392b7f1e4c25d5a3f931e253d71ab566757f" +SCRIPT_COMMIT="bc90ef94944a3dcaab324b86d3e3769ad1d8698b" ffbuild_depends() { echo base @@ -65,6 +65,6 @@ ffbuild_configure() { } ffbuild_unconfigure() { - [[ $ADDINS_STR == *4.4* ]] && return 0 + (( $(ffbuild_ffver) >= 500 )) || return 0 echo --disable-libplacebo } diff --git a/scripts.d/50-librist/50-librist.sh b/scripts.d/50-librist/50-librist.sh index ea999763..a641a9b5 100755 --- a/scripts.d/50-librist/50-librist.sh +++ b/scripts.d/50-librist/50-librist.sh @@ -4,6 +4,7 @@ SCRIPT_REPO="https://code.videolan.org/rist/librist.git" SCRIPT_COMMIT="1a5013b59ce098465e835a0510cd395872bb1c24" ffbuild_enabled() { + (( $(ffbuild_ffver) >= 404 )) || return -1 return 0 } @@ -47,5 +48,6 @@ ffbuild_configure() { } ffbuild_unconfigure() { + (( $(ffbuild_ffver) >= 404 )) || return 0 echo --disable-librist } diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh index d4b60489..52d56153 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="63fbf00efef84f1591c3c82911c6a92e77ca8d2c" +SCRIPT_COMMIT="163373c9d95ebb0ca7721ea7a85f3fd56244eb9c" ffbuild_depends() { echo base diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh index e22e042e..001c2789 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="9a7674e1a83d1261a49776c8794b87c9bccc85d7" +SCRIPT_COMMIT="d5399cdd6abea1169a246f28c5ca9a50975d7ba9" ffbuild_enabled() { [[ $TARGET == winarm64 ]] && return -1 diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh index 6ad9c260..1048d6a4 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="2760d8782718256ce0157ee7fac841ed1c69bdc8" +SCRIPT_COMMIT="d52b9ee34d6bb8fb7a190fe359d8560cfc2afc91" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh index 5c99dae9..32aaefa7 100755 --- a/scripts.d/50-lilv/96-lv2.sh +++ b/scripts.d/50-lilv/96-lv2.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/lv2/lv2.git" -SCRIPT_COMMIT="7cb031f12795a3f4a62428322e30a7ce60358a5c" +SCRIPT_COMMIT="ad458dbffa7429a3c57310e3774730880a855620" ffbuild_enabled() { return 0 @@ -15,7 +15,6 @@ ffbuild_dockerbuild() { --buildtype=release --default-library=static -Ddocs=disabled - -Dplugins=disabled -Dtests=disabled -Donline_docs=false ) diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh index 0881e7ab..5da1688b 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="45663a8e150909ba43bb4a62d8476dda0ccbfacc" +SCRIPT_COMMIT="e7135dbf9ef7dad133aa0e71c787e664a64cc6e1" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-zix.sh b/scripts.d/50-lilv/96-zix.sh index 7b467ac3..4a7a5a7c 100755 --- a/scripts.d/50-lilv/96-zix.sh +++ b/scripts.d/50-lilv/96-zix.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/drobilla/zix.git" -SCRIPT_COMMIT="dfa757a80c51e50deb375fd4f1d05948c95dfe0f" +SCRIPT_COMMIT="55c448c024f14b96f1412592b96905575d382b95" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh index 58ac6ebb..d6805f71 100755 --- a/scripts.d/50-lilv/99-lilv.sh +++ b/scripts.d/50-lilv/99-lilv.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/lv2/lilv.git" -SCRIPT_COMMIT="51652d79d998864c94950335ce777a22bf4fb5eb" +SCRIPT_COMMIT="56e12245ea09c94680be75aeb930edf62882ad8c" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-onevpl.sh b/scripts.d/50-onevpl.sh index 09d24b26..944ca5d7 100755 --- a/scripts.d/50-onevpl.sh +++ b/scripts.d/50-onevpl.sh @@ -1,13 +1,11 @@ #!/bin/bash SCRIPT_REPO="https://github.com/intel/libvpl.git" -SCRIPT_COMMIT="3591aa94dfbdf4566cd19f3e976ae5b769ab4fa2" +SCRIPT_COMMIT="778a66d6c6537f08eabb91955dbbf1bce3812894" ffbuild_enabled() { [[ $TARGET == *arm64 ]] && return -1 - [[ $ADDINS_STR == *4.4* ]] && return -1 - [[ $ADDINS_STR == *5.0* ]] && return -1 - [[ $ADDINS_STR == *5.1* ]] && return -1 + (( $(ffbuild_ffver) >= 600 )) || return -1 return 0 } @@ -33,9 +31,6 @@ ffbuild_configure() { } ffbuild_unconfigure() { - [[ $ADDINS_STR == *4.4* ]] && return 0 - [[ $ADDINS_STR == *5.0* ]] && return 0 - [[ $ADDINS_STR == *5.1* ]] && return 0 - + (( $(ffbuild_ffver) >= 600 )) || return 0 echo --disable-libvpl } diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh index 78483517..46860b13 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="9f6fa42d902609bb9f77e4831d9183effad546f5" +SCRIPT_COMMIT="78a2ddb791163ae0d603937c88613523d27fa22d" ffbuild_enabled() { (( $(ffbuild_ffver) > 501 )) || return -1 diff --git a/scripts.d/50-openapv.sh b/scripts.d/50-openapv.sh index cf121ffd..447f8ac3 100755 --- a/scripts.d/50-openapv.sh +++ b/scripts.d/50-openapv.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/AcademySoftwareFoundation/openapv.git" -SCRIPT_COMMIT="8d2e3577223bd9e809df1e8ad2ffdc3e124c3deb" +SCRIPT_COMMIT="192317a0c848ba6797ef196dad3da3338a0d474f" ffbuild_enabled() { (( $(ffbuild_ffver) > 701 )) || return -1 diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh index d197082e..d1ad4cd0 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="1ad9bec2c12ee445ce23e660f5e4fe870b9d5e09" +SCRIPT_COMMIT="8ac526236416b9c28f73d4684cf9e8a66f1d134e" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh index 5db7279b..bd2c3f0a 100755 --- a/scripts.d/50-openmpt.sh +++ b/scripts.d/50-openmpt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/OpenMPT/openmpt.git" -SCRIPT_COMMIT="8bdd1523514984eea9a56c69048326e6df5fcc78" +SCRIPT_COMMIT="1637253026cc4e3e4d69b1287ff6c3e1b60e571f" ffbuild_depends() { echo base diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh index 2dc137b1..39298fda 100755 --- a/scripts.d/50-rav1e.sh +++ b/scripts.d/50-rav1e.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/xiph/rav1e.git" -SCRIPT_COMMIT="b7bf39066ec4f004c9b9cdb81c91734ec2edfac7" +SCRIPT_COMMIT="564ae3b0007ae2b06893fd7166bf88c5a84c5b63" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh index 75096dc1..4537ead8 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="f36d683b610857c4382a6b241a2038199d371243" +SCRIPT_COMMIT="c795b08567c4c030d0771c4ecccc4ee05a7831e4" SCRIPT_BRANCH="SDL2" ffbuild_depends() { diff --git a/scripts.d/50-snappy.sh b/scripts.d/50-snappy.sh index 6db92e2e..ec038d1f 100755 --- a/scripts.d/50-snappy.sh +++ b/scripts.d/50-snappy.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/google/snappy.git" -SCRIPT_COMMIT="cbea40d40c61c442be7ee0c9695b45ea1b5a3c8c" +SCRIPT_COMMIT="25e52c58fbf83ee40f4c9284f757f777f691f76f" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh index f3a13b73..cdb5ad49 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="c09532f8edf28de91854f975bb16e643e8085ed9" +SCRIPT_COMMIT="72f0c6e0e9a186adec428a145f4e085412d96796" ffbuild_depends() { echo base diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh index 2654b3a6..1873df23 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="f0057e34d1656fd2c1e1f349d8281459272cc5cb" +SCRIPT_COMMIT="b7328c60c417ede0d3673119eeee305cce82c215" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 @@ -27,5 +27,6 @@ ffbuild_configure() { } ffbuild_unconfigure() { + (( $(ffbuild_ffver) >= 404 )) || return 0 echo --disable-libsvtav1 } diff --git a/scripts.d/50-twolame.sh b/scripts.d/50-twolame.sh index 9eabc8f3..3d0c5f3e 100755 --- a/scripts.d/50-twolame.sh +++ b/scripts.d/50-twolame.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/njh/twolame.git" -SCRIPT_COMMIT="90b694b6125dbe23a346bd5607a7fb63ad2785dc" +SCRIPT_COMMIT="3c7d49d95be71c26afdbaef14def92f3460c7373" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-uavs3d.sh b/scripts.d/50-uavs3d.sh index 58afe9b7..9fcca675 100755 --- a/scripts.d/50-uavs3d.sh +++ b/scripts.d/50-uavs3d.sh @@ -1,11 +1,12 @@ #!/bin/bash SCRIPT_REPO="https://github.com/uavs3/uavs3d.git" -SCRIPT_COMMIT="1fd04917cff50fac72ae23e45f82ca6fd9130bd8" +SCRIPT_COMMIT="0e20d2c291853f196c68922a264bcd8471d75b68" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 [[ $TARGET == winarm64 ]] && return -1 + (( $(ffbuild_ffver) >= 404 )) || return -1 return 0 } @@ -28,5 +29,6 @@ ffbuild_configure() { } ffbuild_unconfigure() { + (( $(ffbuild_ffver) >= 404 )) || return 0 echo --disable-libuavs3d } diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh index ec620610..921a6273 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="35a21916c8f621b35a67f3c5994280ae59a4981a" +SCRIPT_COMMIT="369990d9660a387f618d0eedc341eb285016243b" 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 f37a5bf0..ca501dc9 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="161f3b51e282cd6d2bc146b2755f14dab73ca014" +SCRIPT_COMMIT="9b1db46a3a11b6152a4fa2c3b3f1e93da2cb5edf" ffbuild_depends() { echo base diff --git a/scripts.d/50-vidstab.sh b/scripts.d/50-vidstab.sh index d0448794..20cb0fef 100755 --- a/scripts.d/50-vidstab.sh +++ b/scripts.d/50-vidstab.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/georgmartius/vid.stab.git" -SCRIPT_COMMIT="4bd81e3cdd778e2e0edc591f14bba158ec40cfa1" +SCRIPT_COMMIT="6686ba880a3506f9c701b640f67f5cad48f07959" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-vvenc.sh b/scripts.d/50-vvenc.sh index e1127db3..5cccfb8e 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="45e89ef9f33294d13e7d8d3bef8fdac487e3f2f8" +SCRIPT_COMMIT="6627583b7d2b607a7fb04b97ab29d66bdcb113cf" ffbuild_enabled() { [[ $TARGET != *32 ]] || return -1 diff --git a/scripts.d/50-whisper.sh b/scripts.d/50-whisper.sh index 65e54d10..342a3d14 100755 --- a/scripts.d/50-whisper.sh +++ b/scripts.d/50-whisper.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/ggml-org/whisper.cpp.git" -SCRIPT_COMMIT="d9b7613b34a343848af572cc14467fc5e82fc788" +SCRIPT_COMMIT="6114e692136bea917dc88a5eb2e532c3d133d963" ffbuild_depends() { echo base diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh index d035e809..603ada4b 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="ffba52bab55dce9b1b3a97dd08d12e70297e2180" +SCRIPT_COMMIT="9e551a994f970a24f0e49bcebe3d43ef08448b01" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/util/vars.sh b/util/vars.sh index 314e4efd..deade425 100644 --- a/util/vars.sh +++ b/util/vars.sh @@ -39,6 +39,9 @@ IMAGE="${REGISTRY}/${REPO}/${TARGET}-${VARIANT}${ADDINS_STR:+-}${ADDINS_STR}:lat ffbuild_ffver() { case "$ADDINS_STR" in + *4.3*) + echo 403 + ;; *4.4*) echo 404 ;;