145 changed files with 627 additions and 1196 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -22,27 +22,11 @@ on:

 env:
  DOCKER_BUILDKIT: 1
-  HAVE_CLEANUP_PAT: ${{ secrets.CLEANUP_PAT != '' }}

 jobs:
-  pre_check:
-    name: Pre Checks
-    if: ${{ github.event.inputs.buildOnly != 'true' }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Repo Check
-        run: |
-          if [[ "$GITHUB_REPOSITORY" != "BtbN/FFmpeg-Builds" ]]; then
-            echo "When forking this repository to make your own builds, you have to adjust this check."
-            echo "When doing so make sure to randomize the scheduled cron time above, in order to spread out the various build times as much as possible."
-            echo "This has been put in place due to the enormous amounts of traffic hundreds/thousands of parallel builds can cause on external infrastructure."
-            exit 1
-          fi
-          exit 0
  build_base:
    name: Build base image
    if: ${{ github.event.inputs.buildOnly != 'true' }}
-    needs: pre_check
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
@ -59,13 +43,7 @@ jobs:
          password: ${{ github.token }}
      - name: Image Name
        id: imagename
-        run: |
-          IMG="${GITHUB_REPOSITORY,,}/base"
-          DLIMG="${GITHUB_REPOSITORY,,}/dl_cache"
-          echo "name=ghcr.io/${IMG/ /-}" >> $GITHUB_OUTPUT
-          echo "rawname=${IMG/ /-}" >> $GITHUB_OUTPUT
-          echo "dlname=ghcr.io/${DLIMG/ /-}" >> $GITHUB_OUTPUT
-          echo "dlrawname=${DLIMG/ /-}" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=name::ghcr.io/${GITHUB_REPOSITORY,,}/base"
      - name: Stop Commands
        run: T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
      - name: Build target base image
@ -77,45 +55,6 @@ jobs:
          tags: ${{ steps.imagename.outputs.name }}:latest
          cache-to: type=registry,mode=max,ref=${{ steps.imagename.outputs.name }}:cache
          cache-from: type=registry,ref=${{ steps.imagename.outputs.name }}:cache
-      - name: Generate download cache Dockerfile
-        id: dl_cache
-        run: |
-          ./generate.sh dl only
-          echo "dltagname=$(./util/get_dl_cache_tag.sh)" >> $GITHUB_OUTPUT
-          cat Dockerfile.dl
-      - name: Build download cache image
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: Dockerfile.dl
-          pull: true
-          push: true
-          tags: ${{ steps.imagename.outputs.dlname }}:${{ steps.dl_cache.outputs.dltagname }}
-          cache-to: type=registry,mode=max,ref=${{ steps.imagename.outputs.dlname }}:cache
-          cache-from: type=registry,ref=${{ steps.imagename.outputs.dlname }}:cache
-      - name: Cleanup
-        if: ${{ env.HAVE_CLEANUP_PAT == 'true' }}
-        continue-on-error: true
-        uses: BtbN/delete-untagged-ghcr-action@main
-        with:
-          token: ${{ secrets.CLEANUP_PAT }}
-          package_name: ${{ steps.imagename.outputs.rawname }}
-          repository_owner: ${{ github.repository_owner }}
-          repository: ${{ github.repository }}
-          owner_type: user
-          untagged_only: true
-      - name: Cleanup Download Cache
-        if: ${{ env.HAVE_CLEANUP_PAT == 'true' }}
-        continue-on-error: true
-        uses: BtbN/delete-untagged-ghcr-action@main
-        with:
-          token: ${{ secrets.CLEANUP_PAT }}
-          package_name: ${{ steps.imagename.outputs.dlrawname }}
-          repository_owner: ${{ github.repository_owner }}
-          repository: ${{ github.repository }}
-          owner_type: user
-          untagged_only: false
-          keep_latest: 20
  build_target_bases:
    name: Build target base image
    if: ${{ github.event.inputs.buildOnly != 'true' }}
@ -140,11 +79,7 @@ jobs:
          password: ${{ github.token }}
      - name: Image Name
        id: imagename
-        run: |
-          IMG="${GITHUB_REPOSITORY,,}/base-${{ matrix.target }}"
-          echo "name=ghcr.io/${IMG/ /-}" >> $GITHUB_OUTPUT
-          echo "rawname=${IMG/ /-}" >> $GITHUB_OUTPUT
-          echo "gh_repo=${GITHUB_REPOSITORY,,}" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=name::ghcr.io/${GITHUB_REPOSITORY,,}/base-${{ matrix.target }}"
      - name: Stop Commands
        run: T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
      - name: Build target base image
@ -156,19 +91,6 @@ jobs:
          tags: ${{ steps.imagename.outputs.name }}:latest
          cache-to: type=registry,mode=max,ref=${{ steps.imagename.outputs.name }}:cache
          cache-from: type=registry,ref=${{ steps.imagename.outputs.name }}:cache
-          build-args: |
-            GH_REPO=ghcr.io/${{ steps.imagename.outputs.gh_repo }}
-      - name: Cleanup
-        if: ${{ env.HAVE_CLEANUP_PAT == 'true' }}
-        continue-on-error: true
-        uses: BtbN/delete-untagged-ghcr-action@main
-        with:
-          token: ${{ secrets.CLEANUP_PAT }}
-          package_name: ${{ steps.imagename.outputs.rawname }}
-          repository_owner: ${{ github.repository_owner }}
-          repository: ${{ github.repository }}
-          owner_type: user
-          untagged_only: true
  build_targets:
    name: Build target-variant image
    if: ${{ github.event.inputs.buildOnly != 'true' }}
@ -178,7 +100,7 @@ jobs:
      fail-fast: false
      matrix:
        target: [win64,linux64,linuxarm64]
-        variant: [gpl,lgpl,gpl 4.4,gpl 5.1,gpl 6.0,lgpl 4.4,lgpl 5.1,lgpl 6.0,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.1,gpl-shared 6.0,lgpl-shared 4.4,lgpl-shared 5.1,lgpl-shared 6.0]
+        variant: [gpl,lgpl,gpl 4.4,gpl 5.1,lgpl 4.4,lgpl 5.1,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.1,lgpl-shared 4.4,lgpl-shared 5.1]
    steps:
      - name: Checkout
        uses: actions/checkout@v3
@ -197,9 +119,9 @@ jobs:
      - name: Image Name
        id: imagename
        run: |
-          IMG="${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}"
-          echo "name=ghcr.io/${IMG/ /-}" >> $GITHUB_OUTPUT
-          echo "rawname=${IMG/ /-}" >> $GITHUB_OUTPUT
+          IMG="ghcr.io/${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}"
+          echo "::set-output name=name::${IMG/ /-}"
+          echo "::set-output name=gh_repo::${GITHUB_REPOSITORY,,}"
      - name: Stop Commands
        run: T="$(echo -n ${{ github.token }} | sha256sum | head -c 64)" && echo -e "::add-mask::${T}\n::stop-commands::${T}"
      - name: Build target base image
@ -211,17 +133,8 @@ jobs:
          tags: ${{ steps.imagename.outputs.name }}:latest
          cache-to: type=registry,mode=max,ref=${{ steps.imagename.outputs.name }}:cache
          cache-from: type=registry,ref=${{ steps.imagename.outputs.name }}:cache
-      - name: Cleanup
-        if: ${{ env.HAVE_CLEANUP_PAT == 'true' }}
-        continue-on-error: true
-        uses: BtbN/delete-untagged-ghcr-action@main
-        with:
-          token: ${{ secrets.CLEANUP_PAT }}
-          package_name: ${{ steps.imagename.outputs.rawname }}
-          repository_owner: ${{ github.repository_owner }}
-          repository: ${{ github.repository }}
-          owner_type: user
-          untagged_only: true
+          build-args: |
+            GH_REPO=ghcr.io/${{ steps.imagename.outputs.gh_repo }}
  build_ffmpeg:
    name: Build ffmpeg
    if: ${{ ( github.event.inputs.buildOnly == 'true' && !cancelled() ) || success() }}
@ -231,7 +144,7 @@ jobs:
      fail-fast: false
      matrix:
        target: [win64,linux64,linuxarm64]
-        variant: [gpl,lgpl,gpl 4.4,gpl 5.1,gpl 6.0,lgpl 4.4,lgpl 5.1,lgpl 6.0,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.1,gpl-shared 6.0,lgpl-shared 4.4,lgpl-shared 5.1,lgpl-shared 6.0]
+        variant: [gpl,lgpl,gpl 4.4,gpl 5.1,lgpl 4.4,lgpl 5.1,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.1,lgpl-shared 4.4,lgpl-shared 5.1]
    steps:
      - name: Checkout
        uses: actions/checkout@v3
@ -272,8 +185,8 @@ jobs:
          NAME="Auto-Build $RELDATE"
          TAGNAME="autobuild-$(date +'%Y-%m-%d-%H-%M')"
          hub release create $(for a in artifacts/*.{zip,tar.xz}; do echo -a $a; done) -m "$NAME" -t "master" "$TAGNAME"
-          echo "tag_name=${TAGNAME}" >> $GITHUB_OUTPUT
-          echo "rel_date=${RELDATE}" >> $GITHUB_OUTPUT
+          echo "::set-output name=tag_name::${TAGNAME}"
+          echo "::set-output name=rel_date::${RELDATE}"
        env:
          GITHUB_TOKEN: ${{ github.token }}
      - name: Update Latest
@ -286,7 +199,7 @@ jobs:
          TAGNAME="latest"
          hub release delete "$TAGNAME" || true
          git push --delete origin "$TAGNAME" || true
-          sleep 15
+          sleep 30
          hub release create $(for a in latest_artifacts/*; do echo -a $a; done) -m "$NAME" -t "master" "$TAGNAME"
        env:
          GITHUB_TOKEN: ${{ github.token }}
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@ -18,7 +18,7 @@ jobs:
      fail-fast: false
      matrix:
        target: [win64,linux64,linuxarm64]
-        variant: [lgpl,gpl 6.0,gpl 5.1,lgpl 6.0,lgpl 5.1,gpl-shared,lgpl-shared,gpl-shared 6.0,gpl-shared 5.1,lgpl-shared 6.0,lgpl-shared 5.1]
+        variant: [lgpl,gpl 4.4,gpl 5.1,lgpl 4.4,lgpl 5.1,gpl-shared,lgpl-shared,gpl-shared 4.4,gpl-shared 5.1,lgpl-shared 4.4,lgpl-shared 5.1]
        quickbuild: [1]
        include:
          - target: win64
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,4 @@
-/Dockerfile*
+/Dockerfile
 /ffbuild/
 /artifacts/
 /.cache/
--- a/README.md
+++ b/README.md
@ -34,11 +34,11 @@ Every file corresponds to its respective package.

 ### Build Image

-* `./makeimage.sh target variant [addin [addin] [addin] ...]`
+* `./makeimage.sh target variant [addins]`

 ### Build FFmpeg

-* `./build.sh target variant [addin [addin] [addin] ...]`
+* `./build.sh target variant [addins]`

 On success, the resulting zip file will be in the `artifacts` subdir.

@ -55,7 +55,7 @@ The linuxarm64 target will not build some dependencies due to lack of arm64 (aar
 * `davs2` and `xavs2`: aarch64 support is broken.
 * `libmfx` and `libva`: Library for Intel QSV, so there is no aarch64 support.

-Available variants:
+Available:
 * `gpl` Includes all dependencies, even those that require full GPL instead of just LGPL.
 * `lgpl` Lacking libraries that are GPL-only. Most prominently libx264 and libx265.
 * `nonfree` Includes fdk-aac in addition to all the dependencies of the gpl variant.
@ -63,7 +63,7 @@ Available variants:
 * `lgpl-shared` Same again, but with the lgpl set of dependencies.
 * `nonfree-shared` Same again, but with the nonfree set of dependencies.

-All of those can be optionally combined with any combination of addins:
-* `4.4`/`5.0`/`5.1`/`6.0` to build from the respective release branch instead of master.
+All of those can be optionally combined with any combination of addins.
+* `4.4` to build from the 4.4 release branch instead of master.
+* `5.0` to build from the 5.0 release branch instead of master.
 * `debug` to not strip debug symbols from the binaries. This increases the output size by about 250MB.
-* `lto` build all dependencies and ffmpeg with -flto=auto (HIGHLY EXPERIMENTAL, broken for Windows, sometimes works for Linux)
--- a/addins/6.0.sh
+++ b/addins/6.0.sh
@ -1,2 +0,0 @@
-#!/bin/bash
-GIT_BRANCH="release/6.0"
--- a/addins/lto.sh
+++ b/addins/lto.sh
@ -1,7 +0,0 @@
-#!/bin/bash
-FF_CONFIGURE="$FF_CONFIGURE --enable-lto"
-
-ffbuild_dockeraddin() {
-    to_df 'ENV CFLAGS="$CFLAGS -flto=auto" CXXFLAGS="$CXXFLAGS -flto=auto" LDFLAGS="$LDFLAGS -flto=auto"'
-    to_df 'ENV FFBUILD_TARGET_FLAGS="$FFBUILD_TARGET_FLAGS --ar=${FFBUILD_TOOLCHAIN}-gcc-ar --nm=${FFBUILD_TOOLCHAIN}-gcc-nm --ranlib=${FFBUILD_TOOLCHAIN}-gcc-ranlib"'
-}
--- a/variants/dl-only.sh
+++ b/variants/dl-only.sh
--- a/build.sh
+++ b/build.sh
@ -90,16 +90,16 @@ package_variant ffbuild/prefix "ffbuild/pkgroot/$BUILD_NAME"
 cd ffbuild/pkgroot
 if [[ "${TARGET}" == win* ]]; then
    OUTPUT_FNAME="${BUILD_NAME}.zip"
-    docker run --rm -i $TTY_ARG "${UIDARGS[@]}" -v "${ARTIFACTS_PATH}":/out -v "${PWD}/${BUILD_NAME}":"/${BUILD_NAME}" -w / "$IMAGE" zip -9 -r "/out/${OUTPUT_FNAME}" "$BUILD_NAME"
+    zip -9 -r "${ARTIFACTS_PATH}/${OUTPUT_FNAME}" "$BUILD_NAME"
 else
    OUTPUT_FNAME="${BUILD_NAME}.tar.xz"
-    docker run --rm -i $TTY_ARG "${UIDARGS[@]}" -v "${ARTIFACTS_PATH}":/out -v "${PWD}/${BUILD_NAME}":"/${BUILD_NAME}" -w / "$IMAGE" tar cJf "/out/${OUTPUT_FNAME}" "$BUILD_NAME"
+    tar cJf "${ARTIFACTS_PATH}/${OUTPUT_FNAME}" "$BUILD_NAME"
 fi
 cd -

 rm -rf ffbuild

 if [[ -n "$GITHUB_ACTIONS" ]]; then
-    echo "build_name=${BUILD_NAME}" >> "$GITHUB_OUTPUT"
+    echo "::set-output name=build_name::${BUILD_NAME}"
    echo "${OUTPUT_FNAME}" > "${ARTIFACTS_PATH}/${TARGET}-${VARIANT}${ADDINS_STR:+-}${ADDINS_STR}.txt"
 fi
--- a/generate.sh
+++ b/generate.sh
@ -3,93 +3,32 @@ set -e
 cd "$(dirname "$0")"
 source util/vars.sh

-export LC_ALL=C.UTF-8
-
-rm -f Dockerfile Dockerfile.{dl,final,dl.final}
+rm -f Dockerfile

 layername() {
    printf "layer-"
    basename "$1" | sed 's/.sh$//'
 }

+exec_dockerstage() {
+    SCRIPT="$1"
+    (
+        SELF="$SCRIPT"
+        source "$SCRIPT"
+        ffbuild_enabled || exit 0
+        ffbuild_dockerstage || exit $?
+    )
+}
+
 to_df() {
    _of="${TODF:-Dockerfile}"
    printf "$@" >> "$_of"
    echo >> "$_of"
 }

-default_dl() {
-    to_df "RUN git-mini-clone \"$SCRIPT_REPO\" \"$SCRIPT_COMMIT\" \"$1\""
-}
-
-###
-### Generate download Dockerfile
-###
-
-exec_dockerstage_dl() {
-    SCRIPT="$1"
-    (
-        SELF="$SCRIPT"
-        SELFLAYER="$(layername "$STAGE")"
-        source "$SCRIPT"
-        ffbuild_dockerdl || exit $?
-        TODF="Dockerfile.dl.final" ffbuild_dockerlayer_dl || exit $?
-    )
-}
-
-export TODF="Dockerfile.dl"
-
-to_df "FROM ${REGISTRY}/${REPO}/base:latest AS base"
-to_df "ENV TARGET=$TARGET VARIANT=$VARIANT REPO=$REPO ADDINS_STR=$ADDINS_STR"
-to_df "WORKDIR \$FFBUILD_DLDIR"
-
-for STAGE in scripts.d/*.sh scripts.d/*/*.sh; do
-    to_df "FROM base AS $(layername "$STAGE")"
-    exec_dockerstage_dl "$STAGE"
-done
-
-to_df "FROM base AS intermediate"
-cat Dockerfile.dl.final >> "$TODF"
-rm Dockerfile.dl.final
-
-to_df "FROM scratch"
-to_df "COPY --from=intermediate /opt/ffdl/. /"
-
-if [[ "$TARGET" == "dl" && "$VARIANT" == "only" ]]; then
-    exit 0
-fi
-
-DL_IMAGE="${DL_IMAGE_RAW}:$(./util/get_dl_cache_tag.sh)"
-
-###
-### Generate main Dockerfile
-###
-
-exec_dockerstage() {
-    SCRIPT="$1"
-    (
-        SELF="$SCRIPT"
-        source "$SCRIPT"
-
-        ffbuild_enabled || exit 0
-
-        to_df "ENV SELF=\"$SELF\""
-        ffbuild_dockerstage || exit $?
-    )
-}
-
-export TODF="Dockerfile"
-
 to_df "FROM ${REGISTRY}/${REPO}/base-${TARGET}:latest AS base"
 to_df "ENV TARGET=$TARGET VARIANT=$VARIANT REPO=$REPO ADDINS_STR=$ADDINS_STR"

-for addin in "${ADDINS[@]}"; do
-(
-    source addins/"${addin}.sh"
-    type ffbuild_dockeraddin &>/dev/null && ffbuild_dockeraddin || true
-)
-done
-
 PREVLAYER="base"
 for ID in $(ls -1d scripts.d/??-* | sed -s 's|^.*/\(..\).*|\1|' | sort -u); do
    LAYER="layer-$ID"
--- a/images/base-linux64/Dockerfile
+++ b/images/base-linux64/Dockerfile
@ -39,23 +39,17 @@ ADD cross.meson /cross.meson
 ADD gen-implib.sh /usr/bin/gen-implib
 RUN git clone --filter=blob:none --depth=1 https://github.com/yugr/Implib.so /opt/implib

-ENV FFBUILD_TOOLCHAIN=x86_64-ffbuild-linux-gnu
 ENV PATH="/opt/ct-ng/bin:${PATH}" \
-    FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=${FFBUILD_TOOLCHAIN}- --arch=x86_64 --target-os=linux" \
-    FFBUILD_CROSS_PREFIX="${FFBUILD_TOOLCHAIN}-" \
+    FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=x86_64-ffbuild-linux-gnu- --arch=x86_64 --target-os=linux" \
+    FFBUILD_TOOLCHAIN=x86_64-ffbuild-linux-gnu \
+    FFBUILD_CROSS_PREFIX="x86_64-ffbuild-linux-gnu-" \
    FFBUILD_RUST_TARGET="x86_64-unknown-linux-gnu" \
    FFBUILD_PREFIX=/opt/ffbuild \
    FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \
    PKG_CONFIG=pkg-config \
    PKG_CONFIG_LIBDIR=/opt/ffbuild/lib/pkgconfig:/opt/ffbuild/share/pkgconfig \
-    CC="${FFBUILD_TOOLCHAIN}-gcc" \
-    CXX="${FFBUILD_TOOLCHAIN}-g++" \
-    LD="${FFBUILD_TOOLCHAIN}-ld" \
-    AR="${FFBUILD_TOOLCHAIN}-gcc-ar" \
-    RANLIB="${FFBUILD_TOOLCHAIN}-gcc-ranlib" \
-    NM="${FFBUILD_TOOLCHAIN}-gcc-nm" \
-    CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fstack-clash-protection -pthread" \
-    CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fstack-clash-protection -pthread" \
-    LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong -fstack-clash-protection -Wl,-z,relro,-z,now -pthread -lm" \
+    CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -pthread" \
+    CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -pthread" \
+    LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong -Wl,-z,relro,-z,now -pthread -lm" \
    STAGE_CFLAGS="-fvisibility=hidden -fno-semantic-interposition" \
    STAGE_CXXFLAGS="-fvisibility=hidden -fno-semantic-interposition"
--- a/images/base-linux64/cross.meson
+++ b/images/base-linux64/cross.meson
@ -2,8 +2,7 @@
 c = 'x86_64-ffbuild-linux-gnu-gcc'
 cpp = 'x86_64-ffbuild-linux-gnu-g++'
 ld = 'x86_64-ffbuild-linux-gnu-ld'
-ar = 'x86_64-ffbuild-linux-gnu-gcc-ar'
-ranlib = 'x86_64-ffbuild-linux-gnu-gcc-ranlib'
+ar = 'x86_64-ffbuild-linux-gnu-ar'
 strip = 'x86_64-ffbuild-linux-gnu-strip'

 [host_machine]
--- a/images/base-linux64/ct-ng-config
+++ b/images/base-linux64/ct-ng-config
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.25.0.196_227d99d Configuration
+# crosstool-NG 1.25.0.55_3defb7b Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@ -13,13 +13,12 @@ CT_CONFIGURE_has_make_3_81_or_newer=y
 CT_CONFIGURE_has_make_4_0_or_newer=y
 CT_CONFIGURE_has_libtool_2_4_or_newer=y
 CT_CONFIGURE_has_libtoolize_2_4_or_newer=y
-CT_CONFIGURE_has_autoconf_2_71_or_newer=y
-CT_CONFIGURE_has_autoreconf_2_71_or_newer=y
-CT_CONFIGURE_has_automake_1_16_or_newer=y
+CT_CONFIGURE_has_autoconf_2_65_or_newer=y
+CT_CONFIGURE_has_autoreconf_2_65_or_newer=y
+CT_CONFIGURE_has_automake_1_15_or_newer=y
 CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y
 CT_CONFIGURE_has_python_3_4_or_newer=y
 CT_CONFIGURE_has_bison_2_7_or_newer=y
-CT_CONFIGURE_has_bison_3_0_4_or_newer=y
 CT_CONFIGURE_has_python=y
 CT_CONFIGURE_has_svn=y
 CT_CONFIGURE_has_git=y
@ -28,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y
 CT_CONFIGURE_has_sha256sum=y
 CT_CONFIGURE_has_sha512sum=y
 CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.25.0.196_227d99d"
+CT_VERSION="1.25.0.55_3defb7b"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@ -46,7 +45,6 @@ CT_OBSOLETE=y
 CT_EXPERIMENTAL=y
 CT_ALLOW_BUILD_AS_ROOT=y
 CT_ALLOW_BUILD_AS_ROOT_SURE=y
-# CT_ENABLE_EXPERIMENTAL_BUNDLED_PATCHES is not set
 # CT_DEBUG_CT is not set

 #
@ -65,7 +63,6 @@ CT_REMOVE_DOCS=y
 # CT_PREFIX_DIR_RO is not set
 CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y
 CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y
-# CT_TARBALL_RESULT is not set

 #
 # Downloading
@ -123,11 +120,12 @@ CT_CONFIG_SHELL="${bash}"
 # CT_LOG_ERROR is not set
 # CT_LOG_WARN is not set
 # CT_LOG_INFO is not set
-# CT_LOG_EXTRA is not set
+CT_LOG_EXTRA=y
 # CT_LOG_ALL is not set
-CT_LOG_DEBUG=y
-CT_LOG_LEVEL_MAX="DEBUG"
+# CT_LOG_DEBUG is not set
+CT_LOG_LEVEL_MAX="EXTRA"
 # CT_LOG_SEE_TOOLS_WARN is not set
+# CT_LOG_PROGRESS_BAR is not set
 # CT_LOG_TO_FILE is not set
 # end of Paths and misc options

@ -138,9 +136,7 @@ CT_LOG_LEVEL_MAX="DEBUG"
 # CT_ARCH_ARC is not set
 # CT_ARCH_ARM is not set
 # CT_ARCH_AVR is not set
-# CT_ARCH_BPF is not set
 # CT_ARCH_C6X is not set
-# CT_ARCH_LOONGARCH is not set
 # CT_ARCH_M68K is not set
 # CT_ARCH_MICROBLAZE is not set
 # CT_ARCH_MIPS is not set
@ -165,7 +161,7 @@ CT_ARCH_X86_SHOW=y
 # Options for x86
 #
 CT_ARCH_X86_PKG_KSYM=""
-CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
+CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
 CT_ARCH_SUFFIX=""
 # CT_OMIT_TARGET_VENDOR is not set

@ -175,7 +171,6 @@ CT_ARCH_SUFFIX=""
 # CT_MULTILIB is not set
 CT_DEMULTILIB=y
 CT_ARCH_USE_MMU=y
-CT_ARCH_SUPPORTS_LIBSANITIZER=y
 CT_ARCH_SUPPORTS_32=y
 CT_ARCH_SUPPORTS_64=y
 CT_ARCH_DEFAULT_32=y
@ -269,11 +264,6 @@ CT_LINUX_PATCH_GLOBAL=y
 # CT_LINUX_PATCH_LOCAL_BUNDLED is not set
 # CT_LINUX_PATCH_NONE is not set
 CT_LINUX_PATCH_ORDER="global"
-# CT_LINUX_V_6_3 is not set
-# CT_LINUX_V_6_2 is not set
-# CT_LINUX_V_6_1 is not set
-# CT_LINUX_V_6_0 is not set
-# CT_LINUX_V_5_19 is not set
 # CT_LINUX_V_5_18 is not set
 # CT_LINUX_V_5_17 is not set
 # CT_LINUX_V_5_16 is not set
@ -320,8 +310,6 @@ CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_LINUX_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_LINUX_SIGNATURE_FORMAT="unpacked/.sign"
-CT_LINUX_5_19_or_older=y
-CT_LINUX_older_than_5_19=y
 CT_LINUX_5_12_or_older=y
 CT_LINUX_older_than_5_12=y
 CT_LINUX_5_5_or_older=y
@ -377,9 +365,7 @@ CT_BINUTILS_PATCH_GLOBAL=y
 # CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set
 # CT_BINUTILS_PATCH_NONE is not set
 CT_BINUTILS_PATCH_ORDER="global"
-CT_BINUTILS_V_2_40=y
-# CT_BINUTILS_V_2_39 is not set
-# CT_BINUTILS_V_2_38 is not set
+CT_BINUTILS_V_2_38=y
 # CT_BINUTILS_V_2_37 is not set
 # CT_BINUTILS_V_2_36 is not set
 # CT_BINUTILS_V_2_35 is not set
@ -392,14 +378,12 @@ CT_BINUTILS_V_2_40=y
 # CT_BINUTILS_V_2_28 is not set
 # CT_BINUTILS_V_2_27 is not set
 # CT_BINUTILS_V_2_26 is not set
-CT_BINUTILS_VERSION="2.40"
+CT_BINUTILS_VERSION="2.38"
 CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
 CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
 CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig"
-CT_BINUTILS_later_than_2_39=y
-CT_BINUTILS_2_39_or_later=y
 CT_BINUTILS_later_than_2_30=y
 CT_BINUTILS_2_30_or_later=y
 CT_BINUTILS_later_than_2_27=y
@ -454,8 +438,6 @@ CT_GLIBC_PATCH_GLOBAL=y
 # CT_GLIBC_PATCH_LOCAL_BUNDLED is not set
 # CT_GLIBC_PATCH_NONE is not set
 CT_GLIBC_PATCH_ORDER="global"
-# CT_GLIBC_V_2_37 is not set
-# CT_GLIBC_V_2_36 is not set
 # CT_GLIBC_V_2_35 is not set
 # CT_GLIBC_V_2_34 is not set
 # CT_GLIBC_V_2_33 is not set
@ -477,10 +459,6 @@ CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_GLIBC_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
 CT_GLIBC_SIGNATURE_FORMAT="packed/.sig"
-CT_GLIBC_2_37_or_older=y
-CT_GLIBC_older_than_2_37=y
-CT_GLIBC_2_36_or_older=y
-CT_GLIBC_older_than_2_36=y
 CT_GLIBC_2_34_or_older=y
 CT_GLIBC_older_than_2_34=y
 CT_GLIBC_2_32_or_older=y
@ -522,7 +500,7 @@ CT_GLIBC_HAS_OBSOLETE_RPC=y
 CT_GLIBC_EXTRA_CONFIG_ARRAY="--with-pic"
 CT_GLIBC_CONFIGPARMS=""
 # CT_GLIBC_ENABLE_DEBUG is not set
-CT_GLIBC_EXTRA_CFLAGS="-fPIC -DPIC -no-pie"
+CT_GLIBC_EXTRA_CFLAGS="-fPIC -DPIC"
 CT_GLIBC_ENABLE_OBSOLETE_RPC=y
 # CT_GLIBC_ENABLE_FORTIFIED_BUILD is not set
 # CT_GLIBC_DISABLE_VERSIONING is not set
@ -534,7 +512,7 @@ CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y
 # CT_GLIBC_KERNEL_VERSION_CHOSEN is not set
 CT_GLIBC_MIN_KERNEL="4.4.302"
 CT_GLIBC_ENABLE_COMMON_FLAG=y
-CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE PICOLIBC UCLIBC_NG"
+CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG"
 CT_LIBC_SUPPORT_THREADS_ANY=y
 CT_LIBC_SUPPORT_THREADS_NATIVE=y

@ -554,7 +532,6 @@ CT_CC_SUPPORT_CXX=y
 CT_CC_SUPPORT_FORTRAN=y
 CT_CC_SUPPORT_ADA=y
 CT_CC_SUPPORT_D=y
-CT_CC_SUPPORT_JIT=y
 CT_CC_SUPPORT_OBJC=y
 CT_CC_SUPPORT_OBJCXX=y
 CT_CC_SUPPORT_GOLANG=y
@ -583,8 +560,7 @@ CT_GCC_PATCH_GLOBAL=y
 # CT_GCC_PATCH_LOCAL_BUNDLED is not set
 # CT_GCC_PATCH_NONE is not set
 CT_GCC_PATCH_ORDER="global"
-CT_GCC_V_13=y
-# CT_GCC_V_12 is not set
+CT_GCC_V_12=y
 # CT_GCC_V_11 is not set
 # CT_GCC_V_10 is not set
 # CT_GCC_V_9 is not set
@ -593,14 +569,12 @@ CT_GCC_V_13=y
 # CT_GCC_V_6 is not set
 # CT_GCC_V_5 is not set
 # CT_GCC_V_4_9 is not set
-CT_GCC_VERSION="13.1.0"
+CT_GCC_VERSION="12.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_GCC_SIGNATURE_FORMAT=""
-CT_GCC_later_than_13=y
-CT_GCC_13_or_later=y
 CT_GCC_later_than_12=y
 CT_GCC_12_or_later=y
 CT_GCC_later_than_11=y
@ -623,7 +597,7 @@ CT_CC_GCC_ENABLE_PLUGINS=y
 CT_CC_GCC_HAS_LIBMPX=y
 CT_CC_GCC_ENABLE_CXX_FLAGS=""
 CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--enable-host-shared --enable-default-ssp"
-CT_CC_GCC_EXTRA_CONFIG_ARRAY="--enable-host-shared --enable-default-ssp --with-build-config=bootstrap-lto-lean --enable-link-serialization=2"
+CT_CC_GCC_EXTRA_CONFIG_ARRAY="--enable-host-shared --enable-default-ssp"
 # CT_CC_GCC_STATIC_LIBSTDCXX is not set
 # CT_CC_GCC_SYSTEM_ZLIB is not set
 CT_CC_GCC_CONFIG_TLS=m
@ -638,7 +612,6 @@ CT_CC_GCC_LTO_ZSTD=m
 #
 # Settings for libraries running on target
 #
-CT_CC_GCC_ENABLE_DEFAULT_PIE=y
 # CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set
 # CT_CC_GCC_LIBMUDFLAP is not set
 CT_CC_GCC_LIBGOMP=y
@ -646,7 +619,6 @@ CT_CC_GCC_LIBSSP=m
 # CT_CC_GCC_LIBQUADMATH is not set
 # CT_CC_GCC_LIBSANITIZER is not set
 # CT_CC_GCC_LIBMPX is not set
-# CT_CC_GCC_LIBSTDCXX_VERBOSE is not set

 #
 # Misc. obscure options.
@ -674,7 +646,6 @@ CT_ALL_CC_CHOICES="GCC"
 #
 CT_CC_LANG_CXX=y
 # CT_CC_LANG_FORTRAN is not set
-# CT_CC_LANG_JIT is not set
 # CT_CC_LANG_ADA is not set
 # CT_CC_LANG_D is not set
 # CT_CC_LANG_OBJC is not set
@ -773,9 +744,7 @@ CT_ISL_PATCH_GLOBAL=y
 # CT_ISL_PATCH_LOCAL_BUNDLED is not set
 # CT_ISL_PATCH_NONE is not set
 CT_ISL_PATCH_ORDER="global"
-CT_ISL_V_0_26=y
-# CT_ISL_V_0_25 is not set
-# CT_ISL_V_0_24 is not set
+CT_ISL_V_0_24=y
 # CT_ISL_V_0_23 is not set
 # CT_ISL_V_0_22 is not set
 # CT_ISL_V_0_21 is not set
@ -786,7 +755,7 @@ CT_ISL_V_0_26=y
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
 # CT_ISL_V_0_11 is not set
-CT_ISL_VERSION="0.26"
+CT_ISL_VERSION="0.24"
 CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@ -883,11 +852,10 @@ CT_NCURSES_PATCH_GLOBAL=y
 # CT_NCURSES_PATCH_LOCAL_BUNDLED is not set
 # CT_NCURSES_PATCH_NONE is not set
 CT_NCURSES_PATCH_ORDER="global"
-CT_NCURSES_V_6_4=y
-# CT_NCURSES_V_6_2 is not set
+CT_NCURSES_V_6_2=y
 # CT_NCURSES_V_6_1 is not set
 # CT_NCURSES_V_6_0 is not set
-CT_NCURSES_VERSION="6.4"
+CT_NCURSES_VERSION="6.2"
 CT_NCURSES_MIRRORS="https://invisible-mirror.net/archives/ncurses $(CT_Mirrors GNU ncurses)"
 CT_NCURSES_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_NCURSES_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@ -914,37 +882,14 @@ CT_ZLIB_PATCH_GLOBAL=y
 # CT_ZLIB_PATCH_LOCAL_BUNDLED is not set
 # CT_ZLIB_PATCH_NONE is not set
 CT_ZLIB_PATCH_ORDER="global"
-CT_ZLIB_V_1_2_13=y
-# CT_ZLIB_V_1_2_12 is not set
-CT_ZLIB_VERSION="1.2.13"
-CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION} https://www.zlib.net/"
+CT_ZLIB_V_1_2_12=y
+CT_ZLIB_VERSION="1.2.12"
+CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/"
 CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_ZLIB_SIGNATURE_FORMAT="packed/.asc"
-CT_COMP_LIBS_ZSTD=y
-CT_COMP_LIBS_ZSTD_PKG_KSYM="ZSTD"
-CT_ZSTD_DIR_NAME="zstd"
-CT_ZSTD_PKG_NAME="zstd"
-CT_ZSTD_SRC_RELEASE=y
-# CT_ZSTD_SRC_DEVEL is not set
-# CT_ZSTD_SRC_CUSTOM is not set
-CT_ZSTD_PATCH_GLOBAL=y
-# CT_ZSTD_PATCH_BUNDLED is not set
-# CT_ZSTD_PATCH_LOCAL is not set
-# CT_ZSTD_PATCH_BUNDLED_LOCAL is not set
-# CT_ZSTD_PATCH_LOCAL_BUNDLED is not set
-# CT_ZSTD_PATCH_NONE is not set
-CT_ZSTD_PATCH_ORDER="global"
-CT_ZSTD_V_1_5_5=y
-# CT_ZSTD_V_1_5_2 is not set
-CT_ZSTD_VERSION="1.5.5"
-CT_ZSTD_MIRRORS="https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://www.zstd.net/"
-CT_ZSTD_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_ZSTD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_ZSTD_ARCHIVE_FORMATS=".tar.gz"
-CT_ZSTD_SIGNATURE_FORMAT="packed/.sig"
-CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB ZSTD"
+CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB"
 CT_LIBICONV_NEEDED=y
 CT_GETTEXT_NEEDED=y
 CT_GMP_NEEDED=y
@ -953,7 +898,6 @@ CT_ISL_NEEDED=y
 CT_MPC_NEEDED=y
 CT_NCURSES_NEEDED=y
 CT_ZLIB_NEEDED=y
-CT_ZSTD_NEEDED=y
 CT_LIBICONV=y
 CT_GETTEXT=y
 CT_GMP=y
@ -962,7 +906,6 @@ CT_ISL=y
 CT_MPC=y
 CT_NCURSES=y
 CT_ZLIB=y
-CT_ZSTD=y
 # end of Companion libraries

 #
--- a/images/base-linux64/toolchain.cmake
+++ b/images/base-linux64/toolchain.cmake
@ -5,8 +5,8 @@ set(triple x86_64-ffbuild-linux-gnu)

 set(CMAKE_C_COMPILER ${triple}-gcc)
 set(CMAKE_CXX_COMPILER ${triple}-g++)
-set(CMAKE_RANLIB ${triple}-gcc-ranlib)
-set(CMAKE_AR ${triple}-gcc-ar)
+set(CMAKE_RANLIB ${triple}-ranlib)
+set(CMAKE_AR ${triple}-ar)

 set(CMAKE_SYSROOT /opt/ct-ng/${triple}/sysroot)
 set(CMAKE_FIND_ROOT_PATH /opt/ct-ng /opt/ct-ng/${triple}/sysroot /opt/ffbuild)
--- a/images/base-linuxarm64/Dockerfile
+++ b/images/base-linuxarm64/Dockerfile
@ -41,23 +41,17 @@ ADD cross.meson /cross.meson
 ADD gen-implib.sh /usr/bin/gen-implib
 RUN git clone --filter=blob:none --depth=1 https://github.com/yugr/Implib.so /opt/implib

-ENV FFBUILD_TOOLCHAIN=aarch64-ffbuild-linux-gnu
 ENV PATH="/opt/ct-ng/bin:${PATH}" \
-    FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=${FFBUILD_TOOLCHAIN}- --arch=aarch64 --target-os=linux" \
-    FFBUILD_CROSS_PREFIX="${FFBUILD_TOOLCHAIN}-" \
+    FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=aarch64-ffbuild-linux-gnu- --arch=aarch64 --target-os=linux" \
+    FFBUILD_TOOLCHAIN=aarch64-ffbuild-linux-gnu \
+    FFBUILD_CROSS_PREFIX="aarch64-ffbuild-linux-gnu-" \
    FFBUILD_RUST_TARGET="aarch64-unknown-linux-gnu" \
    FFBUILD_PREFIX=/opt/ffbuild \
    FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \
    PKG_CONFIG=pkg-config \
    PKG_CONFIG_LIBDIR=/opt/ffbuild/lib/pkgconfig:/opt/ffbuild/share/pkgconfig \
-    CC="${FFBUILD_TOOLCHAIN}-gcc" \
-    CXX="${FFBUILD_TOOLCHAIN}-g++" \
-    LD="${FFBUILD_TOOLCHAIN}-ld" \
-    AR="${FFBUILD_TOOLCHAIN}-gcc-ar" \
-    RANLIB="${FFBUILD_TOOLCHAIN}-gcc-ranlib" \
-    NM="${FFBUILD_TOOLCHAIN}-gcc-nm" \
-    CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fstack-clash-protection -pthread" \
-    CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -fstack-clash-protection -pthread" \
-    LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong -fstack-clash-protection -Wl,-z,relro,-z,now -pthread -lm" \
+    CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -pthread" \
+    CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -fPIC -DPIC -D_FORTIFY_SOURCE=2 -fstack-protector-strong -pthread" \
+    LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong -Wl,-z,relro,-z,now -pthread -lm" \
    STAGE_CFLAGS="-fvisibility=hidden -fno-semantic-interposition" \
    STAGE_CXXFLAGS="-fvisibility=hidden -fno-semantic-interposition"
--- a/images/base-linuxarm64/cross.meson
+++ b/images/base-linuxarm64/cross.meson
@ -2,8 +2,7 @@
 c = 'aarch64-ffbuild-linux-gnu-gcc'
 cpp = 'aarch64-ffbuild-linux-gnu-g++'
 ld = 'aarch64-ffbuild-linux-gnu-ld'
-ar = 'aarch64-ffbuild-linux-gnu-gcc-ar'
-ranlib = 'x86_64-ffbuild-linux-gnu-gcc-ranlib'
+ar = 'aarch64-ffbuild-linux-gnu-ar'
 strip = 'aarch64-ffbuild-linux-gnu-strip'

 [host_machine]
--- a/images/base-linuxarm64/ct-ng-config
+++ b/images/base-linuxarm64/ct-ng-config
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.25.0.196_227d99d Configuration
+# crosstool-NG 1.25.0.55_3defb7b Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@ -13,13 +13,12 @@ CT_CONFIGURE_has_make_3_81_or_newer=y
 CT_CONFIGURE_has_make_4_0_or_newer=y
 CT_CONFIGURE_has_libtool_2_4_or_newer=y
 CT_CONFIGURE_has_libtoolize_2_4_or_newer=y
-CT_CONFIGURE_has_autoconf_2_71_or_newer=y
-CT_CONFIGURE_has_autoreconf_2_71_or_newer=y
-CT_CONFIGURE_has_automake_1_16_or_newer=y
+CT_CONFIGURE_has_autoconf_2_65_or_newer=y
+CT_CONFIGURE_has_autoreconf_2_65_or_newer=y
+CT_CONFIGURE_has_automake_1_15_or_newer=y
 CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y
 CT_CONFIGURE_has_python_3_4_or_newer=y
 CT_CONFIGURE_has_bison_2_7_or_newer=y
-CT_CONFIGURE_has_bison_3_0_4_or_newer=y
 CT_CONFIGURE_has_python=y
 CT_CONFIGURE_has_svn=y
 CT_CONFIGURE_has_git=y
@ -28,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y
 CT_CONFIGURE_has_sha256sum=y
 CT_CONFIGURE_has_sha512sum=y
 CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.25.0.196_227d99d"
+CT_VERSION="1.25.0.55_3defb7b"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@ -46,7 +45,6 @@ CT_OBSOLETE=y
 CT_EXPERIMENTAL=y
 CT_ALLOW_BUILD_AS_ROOT=y
 CT_ALLOW_BUILD_AS_ROOT_SURE=y
-# CT_ENABLE_EXPERIMENTAL_BUNDLED_PATCHES is not set
 # CT_DEBUG_CT is not set

 #
@ -65,7 +63,6 @@ CT_REMOVE_DOCS=y
 # CT_PREFIX_DIR_RO is not set
 CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y
 CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y
-# CT_TARBALL_RESULT is not set

 #
 # Downloading
@ -123,11 +120,12 @@ CT_CONFIG_SHELL="${bash}"
 # CT_LOG_ERROR is not set
 # CT_LOG_WARN is not set
 # CT_LOG_INFO is not set
-# CT_LOG_EXTRA is not set
+CT_LOG_EXTRA=y
 # CT_LOG_ALL is not set
-CT_LOG_DEBUG=y
-CT_LOG_LEVEL_MAX="DEBUG"
+# CT_LOG_DEBUG is not set
+CT_LOG_LEVEL_MAX="EXTRA"
 # CT_LOG_SEE_TOOLS_WARN is not set
+# CT_LOG_PROGRESS_BAR is not set
 # CT_LOG_TO_FILE is not set
 # end of Paths and misc options

@ -138,9 +136,7 @@ CT_LOG_LEVEL_MAX="DEBUG"
 # CT_ARCH_ARC is not set
 CT_ARCH_ARM=y
 # CT_ARCH_AVR is not set
-# CT_ARCH_BPF is not set
 # CT_ARCH_C6X is not set
-# CT_ARCH_LOONGARCH is not set
 # CT_ARCH_M68K is not set
 # CT_ARCH_MICROBLAZE is not set
 # CT_ARCH_MIPS is not set
@ -165,7 +161,7 @@ CT_ARCH_ARM_SHOW=y
 # Options for arm
 #
 CT_ARCH_ARM_PKG_KSYM=""
-CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
+CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
 CT_ARCH_SUFFIX=""
 # CT_OMIT_TARGET_VENDOR is not set

@ -178,7 +174,6 @@ CT_ARCH_SUPPORTS_BOTH_MMU=y
 CT_ARCH_DEFAULT_HAS_MMU=y
 CT_ARCH_USE_MMU=y
 CT_ARCH_SUPPORTS_FLAT_FORMAT=y
-CT_ARCH_SUPPORTS_LIBSANITIZER=y
 CT_ARCH_SUPPORTS_EITHER_ENDIAN=y
 CT_ARCH_DEFAULT_LE=y
 # CT_ARCH_BE is not set
@ -276,11 +271,6 @@ CT_LINUX_PATCH_GLOBAL=y
 # CT_LINUX_PATCH_LOCAL_BUNDLED is not set
 # CT_LINUX_PATCH_NONE is not set
 CT_LINUX_PATCH_ORDER="global"
-# CT_LINUX_V_6_3 is not set
-# CT_LINUX_V_6_2 is not set
-# CT_LINUX_V_6_1 is not set
-# CT_LINUX_V_6_0 is not set
-# CT_LINUX_V_5_19 is not set
 # CT_LINUX_V_5_18 is not set
 # CT_LINUX_V_5_17 is not set
 # CT_LINUX_V_5_16 is not set
@ -324,8 +314,6 @@ CT_LINUX_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_LINUX_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_LINUX_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_LINUX_SIGNATURE_FORMAT="unpacked/.sign"
-CT_LINUX_5_19_or_older=y
-CT_LINUX_older_than_5_19=y
 CT_LINUX_5_12_or_older=y
 CT_LINUX_older_than_5_12=y
 CT_LINUX_5_5_or_older=y
@ -383,9 +371,7 @@ CT_BINUTILS_PATCH_GLOBAL=y
 # CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set
 # CT_BINUTILS_PATCH_NONE is not set
 CT_BINUTILS_PATCH_ORDER="global"
-CT_BINUTILS_V_2_40=y
-# CT_BINUTILS_V_2_39 is not set
-# CT_BINUTILS_V_2_38 is not set
+CT_BINUTILS_V_2_38=y
 # CT_BINUTILS_V_2_37 is not set
 # CT_BINUTILS_V_2_36 is not set
 # CT_BINUTILS_V_2_35 is not set
@ -398,14 +384,12 @@ CT_BINUTILS_V_2_40=y
 # CT_BINUTILS_V_2_28 is not set
 # CT_BINUTILS_V_2_27 is not set
 # CT_BINUTILS_V_2_26 is not set
-CT_BINUTILS_VERSION="2.40"
+CT_BINUTILS_VERSION="2.38"
 CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
 CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
 CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig"
-CT_BINUTILS_later_than_2_39=y
-CT_BINUTILS_2_39_or_later=y
 CT_BINUTILS_later_than_2_30=y
 CT_BINUTILS_2_30_or_later=y
 CT_BINUTILS_later_than_2_27=y
@ -460,8 +444,6 @@ CT_GLIBC_PATCH_GLOBAL=y
 # CT_GLIBC_PATCH_LOCAL_BUNDLED is not set
 # CT_GLIBC_PATCH_NONE is not set
 CT_GLIBC_PATCH_ORDER="global"
-# CT_GLIBC_V_2_37 is not set
-# CT_GLIBC_V_2_36 is not set
 # CT_GLIBC_V_2_35 is not set
 # CT_GLIBC_V_2_34 is not set
 # CT_GLIBC_V_2_33 is not set
@ -483,10 +465,6 @@ CT_GLIBC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GLIBC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_GLIBC_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
 CT_GLIBC_SIGNATURE_FORMAT="packed/.sig"
-CT_GLIBC_2_37_or_older=y
-CT_GLIBC_older_than_2_37=y
-CT_GLIBC_2_36_or_older=y
-CT_GLIBC_older_than_2_36=y
 CT_GLIBC_2_34_or_older=y
 CT_GLIBC_older_than_2_34=y
 CT_GLIBC_2_32_or_older=y
@ -546,7 +524,7 @@ CT_GLIBC_SSP_DEFAULT=y
 # CT_GLIBC_SSP_ALL is not set
 # CT_GLIBC_SSP_STRONG is not set
 CT_GLIBC_ENABLE_COMMON_FLAG=y
-CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE PICOLIBC UCLIBC_NG"
+CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG"
 CT_LIBC_SUPPORT_THREADS_ANY=y
 CT_LIBC_SUPPORT_THREADS_NATIVE=y

@ -566,7 +544,6 @@ CT_CC_SUPPORT_CXX=y
 CT_CC_SUPPORT_FORTRAN=y
 CT_CC_SUPPORT_ADA=y
 CT_CC_SUPPORT_D=y
-CT_CC_SUPPORT_JIT=y
 CT_CC_SUPPORT_OBJC=y
 CT_CC_SUPPORT_OBJCXX=y
 CT_CC_SUPPORT_GOLANG=y
@ -595,8 +572,7 @@ CT_GCC_PATCH_GLOBAL=y
 # CT_GCC_PATCH_LOCAL_BUNDLED is not set
 # CT_GCC_PATCH_NONE is not set
 CT_GCC_PATCH_ORDER="global"
-CT_GCC_V_13=y
-# CT_GCC_V_12 is not set
+CT_GCC_V_12=y
 # CT_GCC_V_11 is not set
 # CT_GCC_V_10 is not set
 # CT_GCC_V_9 is not set
@ -605,14 +581,12 @@ CT_GCC_V_13=y
 # CT_GCC_V_6 is not set
 # CT_GCC_V_5 is not set
 # CT_GCC_V_4_9 is not set
-CT_GCC_VERSION="13.1.0"
+CT_GCC_VERSION="12.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_GCC_SIGNATURE_FORMAT=""
-CT_GCC_later_than_13=y
-CT_GCC_13_or_later=y
 CT_GCC_later_than_12=y
 CT_GCC_12_or_later=y
 CT_GCC_later_than_11=y
@ -636,7 +610,7 @@ CT_CC_GCC_ENABLE_PLUGINS=y
 CT_CC_GCC_HAS_LIBMPX=y
 CT_CC_GCC_ENABLE_CXX_FLAGS=""
 CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--enable-host-shared --enable-default-ssp"
-CT_CC_GCC_EXTRA_CONFIG_ARRAY="--enable-host-shared --enable-default-ssp --with-build-config=bootstrap-lto-lean --enable-link-serialization=2"
+CT_CC_GCC_EXTRA_CONFIG_ARRAY="--enable-host-shared --enable-default-ssp"
 # CT_CC_GCC_STATIC_LIBSTDCXX is not set
 # CT_CC_GCC_SYSTEM_ZLIB is not set
 CT_CC_GCC_CONFIG_TLS=m
@ -651,14 +625,12 @@ CT_CC_GCC_LTO_ZSTD=m
 #
 # Settings for libraries running on target
 #
-CT_CC_GCC_ENABLE_DEFAULT_PIE=y
 # CT_CC_GCC_ENABLE_TARGET_OPTSPACE is not set
 # CT_CC_GCC_LIBMUDFLAP is not set
 CT_CC_GCC_LIBGOMP=y
 CT_CC_GCC_LIBSSP=m
 # CT_CC_GCC_LIBQUADMATH is not set
 # CT_CC_GCC_LIBSANITIZER is not set
-# CT_CC_GCC_LIBSTDCXX_VERBOSE is not set

 #
 # Misc. obscure options.
@ -686,7 +658,6 @@ CT_ALL_CC_CHOICES="GCC"
 #
 CT_CC_LANG_CXX=y
 # CT_CC_LANG_FORTRAN is not set
-# CT_CC_LANG_JIT is not set
 # CT_CC_LANG_ADA is not set
 # CT_CC_LANG_D is not set
 # CT_CC_LANG_OBJC is not set
@ -785,9 +756,7 @@ CT_ISL_PATCH_GLOBAL=y
 # CT_ISL_PATCH_LOCAL_BUNDLED is not set
 # CT_ISL_PATCH_NONE is not set
 CT_ISL_PATCH_ORDER="global"
-CT_ISL_V_0_26=y
-# CT_ISL_V_0_25 is not set
-# CT_ISL_V_0_24 is not set
+CT_ISL_V_0_24=y
 # CT_ISL_V_0_23 is not set
 # CT_ISL_V_0_22 is not set
 # CT_ISL_V_0_21 is not set
@ -798,7 +767,7 @@ CT_ISL_V_0_26=y
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
 # CT_ISL_V_0_11 is not set
-CT_ISL_VERSION="0.26"
+CT_ISL_VERSION="0.24"
 CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@ -895,11 +864,10 @@ CT_NCURSES_PATCH_GLOBAL=y
 # CT_NCURSES_PATCH_LOCAL_BUNDLED is not set
 # CT_NCURSES_PATCH_NONE is not set
 CT_NCURSES_PATCH_ORDER="global"
-CT_NCURSES_V_6_4=y
-# CT_NCURSES_V_6_2 is not set
+CT_NCURSES_V_6_2=y
 # CT_NCURSES_V_6_1 is not set
 # CT_NCURSES_V_6_0 is not set
-CT_NCURSES_VERSION="6.4"
+CT_NCURSES_VERSION="6.2"
 CT_NCURSES_MIRRORS="https://invisible-mirror.net/archives/ncurses $(CT_Mirrors GNU ncurses)"
 CT_NCURSES_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_NCURSES_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@ -926,37 +894,14 @@ CT_ZLIB_PATCH_GLOBAL=y
 # CT_ZLIB_PATCH_LOCAL_BUNDLED is not set
 # CT_ZLIB_PATCH_NONE is not set
 CT_ZLIB_PATCH_ORDER="global"
-CT_ZLIB_V_1_2_13=y
-# CT_ZLIB_V_1_2_12 is not set
-CT_ZLIB_VERSION="1.2.13"
-CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION} https://www.zlib.net/"
+CT_ZLIB_V_1_2_12=y
+CT_ZLIB_VERSION="1.2.12"
+CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/"
 CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_ZLIB_SIGNATURE_FORMAT="packed/.asc"
-CT_COMP_LIBS_ZSTD=y
-CT_COMP_LIBS_ZSTD_PKG_KSYM="ZSTD"
-CT_ZSTD_DIR_NAME="zstd"
-CT_ZSTD_PKG_NAME="zstd"
-CT_ZSTD_SRC_RELEASE=y
-# CT_ZSTD_SRC_DEVEL is not set
-# CT_ZSTD_SRC_CUSTOM is not set
-CT_ZSTD_PATCH_GLOBAL=y
-# CT_ZSTD_PATCH_BUNDLED is not set
-# CT_ZSTD_PATCH_LOCAL is not set
-# CT_ZSTD_PATCH_BUNDLED_LOCAL is not set
-# CT_ZSTD_PATCH_LOCAL_BUNDLED is not set
-# CT_ZSTD_PATCH_NONE is not set
-CT_ZSTD_PATCH_ORDER="global"
-CT_ZSTD_V_1_5_5=y
-# CT_ZSTD_V_1_5_2 is not set
-CT_ZSTD_VERSION="1.5.5"
-CT_ZSTD_MIRRORS="https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://www.zstd.net/"
-CT_ZSTD_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_ZSTD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_ZSTD_ARCHIVE_FORMATS=".tar.gz"
-CT_ZSTD_SIGNATURE_FORMAT="packed/.sig"
-CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB ZSTD"
+CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB"
 CT_LIBICONV_NEEDED=y
 CT_GETTEXT_NEEDED=y
 CT_GMP_NEEDED=y
@ -965,7 +910,6 @@ CT_ISL_NEEDED=y
 CT_MPC_NEEDED=y
 CT_NCURSES_NEEDED=y
 CT_ZLIB_NEEDED=y
-CT_ZSTD_NEEDED=y
 CT_LIBICONV=y
 CT_GETTEXT=y
 CT_GMP=y
@ -974,7 +918,6 @@ CT_ISL=y
 CT_MPC=y
 CT_NCURSES=y
 CT_ZLIB=y
-CT_ZSTD=y
 # end of Companion libraries

 #
--- a/images/base-linuxarm64/toolchain.cmake
+++ b/images/base-linuxarm64/toolchain.cmake
@ -5,8 +5,8 @@ set(triple aarch64-ffbuild-linux-gnu)

 set(CMAKE_C_COMPILER ${triple}-gcc)
 set(CMAKE_CXX_COMPILER ${triple}-g++)
-set(CMAKE_RANLIB ${triple}-gcc-ranlib)
-set(CMAKE_AR ${triple}-gcc-ar)
+set(CMAKE_RANLIB ${triple}-ranlib)
+set(CMAKE_AR ${triple}-ar)

 set(CMAKE_SYSROOT /opt/ct-ng/${triple}/sysroot)
 set(CMAKE_FIND_ROOT_PATH /opt/ct-ng /opt/ct-ng/${triple}/sysroot /opt/ffbuild)
--- a/images/base-win32/Dockerfile
+++ b/images/base-win32/Dockerfile
@ -24,24 +24,18 @@ RUN rustup target add i686-pc-windows-gnu
 ADD toolchain.cmake /toolchain.cmake
 ADD cross.meson /cross.meson

-ENV FFBUILD_TOOLCHAIN=i686-w64-mingw32
 ENV PATH="/opt/ct-ng/bin:${PATH}" \
-    FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=${FFBUILD_TOOLCHAIN}- --arch=i686 --target-os=mingw32" \
-    FFBUILD_CROSS_PREFIX=${FFBUILD_TOOLCHAIN}- \
+    FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=i686-w64-mingw32- --arch=i686 --target-os=mingw32" \
+    FFBUILD_TOOLCHAIN=i686-w64-mingw32 \
+    FFBUILD_CROSS_PREFIX=i686-w64-mingw32- \
    FFBUILD_RUST_TARGET=i686-pc-windows-gnu \
    FFBUILD_PREFIX=/opt/ffbuild \
    FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \
    PKG_CONFIG=pkg-config \
    PKG_CONFIG_LIBDIR=/opt/ffbuild/lib/pkgconfig:/opt/ffbuild/share/pkgconfig \
-    CC="${FFBUILD_TOOLCHAIN}-gcc" \
-    CXX="${FFBUILD_TOOLCHAIN}-g++" \
-    LD="${FFBUILD_TOOLCHAIN}-ld" \
-    AR="${FFBUILD_TOOLCHAIN}-gcc-ar" \
-    RANLIB="${FFBUILD_TOOLCHAIN}-gcc-ranlib" \
-    NM="${FFBUILD_TOOLCHAIN}-gcc-nm" \
-    DLLTOOL="${FFBUILD_TOOLCHAIN}-dlltool" \
    CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
    CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
    LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong" \
+    DLLTOOL="i686-w64-mingw32-dlltool" \
    STAGE_CFLAGS="-fno-semantic-interposition" \
    STAGE_CXXFLAGS="-fno-semantic-interposition"
--- a/images/base-win32/cross.meson
+++ b/images/base-win32/cross.meson
@ -1,11 +1,9 @@
 [binaries]
 c = 'i686-w64-mingw32-gcc'
 cpp = 'i686-w64-mingw32-g++'
-ar = 'i686-w64-mingw32-gcc-ar'
-ranlib = 'i686-w64-mingw32-gcc-ranlib'
+ar = 'i686-w64-mingw32-ar'
 strip = 'i686-w64-mingw32-strip'
 windres = 'i686-w64-mingw32-windres'
-dlltool = 'i686-w64-mingw32-dlltool'
 exe_wrapper = ['wine']

 [properties]
--- a/images/base-win32/ct-ng-config
+++ b/images/base-win32/ct-ng-config
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.25.0.196_227d99d Configuration
+# crosstool-NG 1.25.0.55_3defb7b Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@ -13,13 +13,12 @@ CT_CONFIGURE_has_make_3_81_or_newer=y
 CT_CONFIGURE_has_make_4_0_or_newer=y
 CT_CONFIGURE_has_libtool_2_4_or_newer=y
 CT_CONFIGURE_has_libtoolize_2_4_or_newer=y
-CT_CONFIGURE_has_autoconf_2_71_or_newer=y
-CT_CONFIGURE_has_autoreconf_2_71_or_newer=y
-CT_CONFIGURE_has_automake_1_16_or_newer=y
+CT_CONFIGURE_has_autoconf_2_65_or_newer=y
+CT_CONFIGURE_has_autoreconf_2_65_or_newer=y
+CT_CONFIGURE_has_automake_1_15_or_newer=y
 CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y
 CT_CONFIGURE_has_python_3_4_or_newer=y
 CT_CONFIGURE_has_bison_2_7_or_newer=y
-CT_CONFIGURE_has_bison_3_0_4_or_newer=y
 CT_CONFIGURE_has_python=y
 CT_CONFIGURE_has_svn=y
 CT_CONFIGURE_has_git=y
@ -28,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y
 CT_CONFIGURE_has_sha256sum=y
 CT_CONFIGURE_has_sha512sum=y
 CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.25.0.196_227d99d"
+CT_VERSION="1.25.0.55_3defb7b"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@ -46,7 +45,6 @@ CT_MODULES=y
 CT_EXPERIMENTAL=y
 CT_ALLOW_BUILD_AS_ROOT=y
 CT_ALLOW_BUILD_AS_ROOT_SURE=y
-# CT_ENABLE_EXPERIMENTAL_BUNDLED_PATCHES is not set
 # CT_DEBUG_CT is not set

 #
@ -65,7 +63,6 @@ CT_REMOVE_DOCS=y
 # CT_PREFIX_DIR_RO is not set
 CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y
 CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y
-# CT_TARBALL_RESULT is not set

 #
 # Downloading
@ -123,11 +120,12 @@ CT_CONFIG_SHELL="${bash}"
 # CT_LOG_ERROR is not set
 # CT_LOG_WARN is not set
 # CT_LOG_INFO is not set
-# CT_LOG_EXTRA is not set
+CT_LOG_EXTRA=y
 # CT_LOG_ALL is not set
-CT_LOG_DEBUG=y
-CT_LOG_LEVEL_MAX="DEBUG"
+# CT_LOG_DEBUG is not set
+CT_LOG_LEVEL_MAX="EXTRA"
 # CT_LOG_SEE_TOOLS_WARN is not set
+# CT_LOG_PROGRESS_BAR is not set
 # CT_LOG_TO_FILE is not set
 # end of Paths and misc options

@ -138,9 +136,7 @@ CT_LOG_LEVEL_MAX="DEBUG"
 # CT_ARCH_ARC is not set
 # CT_ARCH_ARM is not set
 # CT_ARCH_AVR is not set
-# CT_ARCH_BPF is not set
 # CT_ARCH_C6X is not set
-# CT_ARCH_LOONGARCH is not set
 # CT_ARCH_M68K is not set
 # CT_ARCH_MICROBLAZE is not set
 # CT_ARCH_MIPS is not set
@ -165,7 +161,7 @@ CT_ARCH_X86_SHOW=y
 # Options for x86
 #
 CT_ARCH_X86_PKG_KSYM=""
-CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
+CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
 CT_ARCH_SUFFIX=""
 # CT_OMIT_TARGET_VENDOR is not set

@ -175,7 +171,6 @@ CT_ARCH_SUFFIX=""
 # CT_MULTILIB is not set
 CT_DEMULTILIB=y
 CT_ARCH_USE_MMU=y
-CT_ARCH_SUPPORTS_LIBSANITIZER=y
 CT_ARCH_SUPPORTS_32=y
 CT_ARCH_SUPPORTS_64=y
 CT_ARCH_DEFAULT_32=y
@ -246,7 +241,6 @@ CT_BUILD_SUFFIX=""
 # Operating System
 #
 CT_WINDOWS=y
-CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 # CT_KERNEL_BARE_METAL is not set
 # CT_KERNEL_LINUX is not set
 CT_KERNEL_WINDOWS=y
@ -263,7 +257,6 @@ CT_ALL_KERNEL_CHOICES="BARE_METAL LINUX WINDOWS"
 #
 # Common kernel options
 #
-CT_SHARED_LIBS=y
 # end of Operating System

 #
@ -295,9 +288,7 @@ CT_BINUTILS_PATCH_GLOBAL=y
 # CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set
 # CT_BINUTILS_PATCH_NONE is not set
 CT_BINUTILS_PATCH_ORDER="global"
-CT_BINUTILS_V_2_40=y
-# CT_BINUTILS_V_2_39 is not set
-# CT_BINUTILS_V_2_38 is not set
+CT_BINUTILS_V_2_38=y
 # CT_BINUTILS_V_2_37 is not set
 # CT_BINUTILS_V_2_36 is not set
 # CT_BINUTILS_V_2_35 is not set
@ -310,14 +301,12 @@ CT_BINUTILS_V_2_40=y
 # CT_BINUTILS_V_2_28 is not set
 # CT_BINUTILS_V_2_27 is not set
 # CT_BINUTILS_V_2_26 is not set
-CT_BINUTILS_VERSION="2.40"
+CT_BINUTILS_VERSION="2.38"
 CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
 CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
 CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig"
-CT_BINUTILS_later_than_2_39=y
-CT_BINUTILS_2_39_or_later=y
 CT_BINUTILS_later_than_2_30=y
 CT_BINUTILS_2_30_or_later=y
 CT_BINUTILS_later_than_2_27=y
@ -368,29 +357,24 @@ CT_MINGW_W64_PATCH_GLOBAL=y
 # CT_MINGW_W64_PATCH_LOCAL_BUNDLED is not set
 # CT_MINGW_W64_PATCH_NONE is not set
 CT_MINGW_W64_PATCH_ORDER="global"
-CT_MINGW_W64_V_V10_0=y
-# CT_MINGW_W64_V_V9_0 is not set
+CT_MINGW_W64_V_V9_0=y
 # CT_MINGW_W64_V_V8_0 is not set
 # CT_MINGW_W64_V_V7_0 is not set
 # CT_MINGW_W64_V_V6_0 is not set
 # CT_MINGW_W64_V_V5_0 is not set
 # CT_MINGW_W64_V_V4_0 is not set
-CT_MINGW_W64_VERSION="v10.0.0"
+CT_MINGW_W64_VERSION="v9.0.0"
 CT_MINGW_W64_MIRRORS="http://downloads.sourceforge.net/sourceforge/mingw-w64 https://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/"
 CT_MINGW_W64_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_MINGW_W64_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_MINGW_W64_ARCHIVE_FORMATS=".tar.bz2 .zip"
 CT_MINGW_W64_SIGNATURE_FORMAT="packed/.sig"
 CT_MINGW_SECURE_API=y
-# CT_MINGW_DEFAULT_MSVCRT_DEFAULT is not set
-# CT_MINGW_DEFAULT_MSVCRT_MSVCRT is not set
-CT_MINGW_DEFAULT_MSVCRT_UCRT=y
-# CT_MINGW_DEFAULT_MSVCRT_CUSTOM is not set
 CT_MINGW_DIRECTX=y
 CT_MINGW_DDK=y
 CT_MINGW_TOOLS=y
 CT_MINGW_TOOL_LIST_ARRAY="gendef genidl genlib genpeimg widl"
-CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE PICOLIBC UCLIBC_NG"
+CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG"
 CT_LIBC_SUPPORT_THREADS_ANY=y
 CT_LIBC_SUPPORT_THREADS_NATIVE=y
 CT_LIBC_SUPPORT_THREADS_POSIX=y
@ -400,8 +384,6 @@ CT_LIBC_SUPPORT_THREADS_POSIX=y
 #
 # CT_THREADS_NATIVE is not set
 CT_THREADS_POSIX=y
-# CT_CREATE_LDSO_CONF is not set
-CT_LIBC_XLDD=y
 # end of C-library

 #
@ -412,7 +394,6 @@ CT_CC_SUPPORT_CXX=y
 CT_CC_SUPPORT_FORTRAN=y
 CT_CC_SUPPORT_ADA=y
 CT_CC_SUPPORT_D=y
-CT_CC_SUPPORT_JIT=y
 CT_CC_SUPPORT_OBJC=y
 CT_CC_SUPPORT_OBJCXX=y
 CT_CC_SUPPORT_GOLANG=y
@ -441,8 +422,7 @@ CT_GCC_PATCH_GLOBAL=y
 # CT_GCC_PATCH_LOCAL_BUNDLED is not set
 # CT_GCC_PATCH_NONE is not set
 CT_GCC_PATCH_ORDER="global"
-CT_GCC_V_13=y
-# CT_GCC_V_12 is not set
+CT_GCC_V_12=y
 # CT_GCC_V_11 is not set
 # CT_GCC_V_10 is not set
 # CT_GCC_V_9 is not set
@ -451,14 +431,12 @@ CT_GCC_V_13=y
 # CT_GCC_V_6 is not set
 # CT_GCC_V_5 is not set
 # CT_GCC_V_4_9 is not set
-CT_GCC_VERSION="13.1.0"
+CT_GCC_VERSION="12.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_GCC_SIGNATURE_FORMAT=""
-CT_GCC_later_than_13=y
-CT_GCC_13_or_later=y
 CT_GCC_later_than_12=y
 CT_GCC_12_or_later=y
 CT_GCC_later_than_11=y
@ -480,8 +458,8 @@ CT_GCC_4_9_or_later=y
 CT_CC_GCC_ENABLE_PLUGINS=y
 CT_CC_GCC_HAS_LIBMPX=y
 CT_CC_GCC_ENABLE_CXX_FLAGS=""
-CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--enable-default-ssp"
-CT_CC_GCC_EXTRA_CONFIG_ARRAY="--enable-default-ssp --with-build-config=bootstrap-lto-lean --enable-link-serialization=2"
+CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY=""
+CT_CC_GCC_EXTRA_CONFIG_ARRAY=""
 CT_CC_GCC_STATIC_LIBSTDCXX=y
 CT_CC_GCC_SYSTEM_ZLIB=y
 CT_CC_GCC_CONFIG_TLS=m
@ -501,7 +479,6 @@ CT_CC_GCC_LTO_ZSTD=m
 CT_CC_GCC_LIBGOMP=y
 CT_CC_GCC_LIBSSP=m
 # CT_CC_GCC_LIBQUADMATH is not set
-# CT_CC_GCC_LIBSTDCXX_VERBOSE is not set

 #
 # Misc. obscure options.
@ -529,7 +506,6 @@ CT_ALL_CC_CHOICES="GCC"
 #
 CT_CC_LANG_CXX=y
 # CT_CC_LANG_FORTRAN is not set
-# CT_CC_LANG_JIT is not set
 # CT_CC_LANG_ADA is not set
 # CT_CC_LANG_D is not set
 # CT_CC_LANG_OBJC is not set
@ -628,9 +604,7 @@ CT_ISL_PATCH_GLOBAL=y
 # CT_ISL_PATCH_LOCAL_BUNDLED is not set
 # CT_ISL_PATCH_NONE is not set
 CT_ISL_PATCH_ORDER="global"
-CT_ISL_V_0_26=y
-# CT_ISL_V_0_25 is not set
-# CT_ISL_V_0_24 is not set
+CT_ISL_V_0_24=y
 # CT_ISL_V_0_23 is not set
 # CT_ISL_V_0_22 is not set
 # CT_ISL_V_0_21 is not set
@ -640,7 +614,7 @@ CT_ISL_V_0_26=y
 # CT_ISL_V_0_17 is not set
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
-CT_ISL_VERSION="0.26"
+CT_ISL_VERSION="0.24"
 CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@ -717,36 +691,14 @@ CT_ZLIB_PATCH_GLOBAL=y
 # CT_ZLIB_PATCH_LOCAL_BUNDLED is not set
 # CT_ZLIB_PATCH_NONE is not set
 CT_ZLIB_PATCH_ORDER="global"
-CT_ZLIB_V_1_2_13=y
-CT_ZLIB_VERSION="1.2.13"
-CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION} https://www.zlib.net/"
+CT_ZLIB_V_1_2_12=y
+CT_ZLIB_VERSION="1.2.12"
+CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/"
 CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_ZLIB_SIGNATURE_FORMAT="packed/.asc"
-CT_COMP_LIBS_ZSTD=y
-CT_COMP_LIBS_ZSTD_PKG_KSYM="ZSTD"
-CT_ZSTD_DIR_NAME="zstd"
-CT_ZSTD_PKG_NAME="zstd"
-CT_ZSTD_SRC_RELEASE=y
-# CT_ZSTD_SRC_DEVEL is not set
-# CT_ZSTD_SRC_CUSTOM is not set
-CT_ZSTD_PATCH_GLOBAL=y
-# CT_ZSTD_PATCH_BUNDLED is not set
-# CT_ZSTD_PATCH_LOCAL is not set
-# CT_ZSTD_PATCH_BUNDLED_LOCAL is not set
-# CT_ZSTD_PATCH_LOCAL_BUNDLED is not set
-# CT_ZSTD_PATCH_NONE is not set
-CT_ZSTD_PATCH_ORDER="global"
-CT_ZSTD_V_1_5_5=y
-# CT_ZSTD_V_1_5_2 is not set
-CT_ZSTD_VERSION="1.5.5"
-CT_ZSTD_MIRRORS="https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://www.zstd.net/"
-CT_ZSTD_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_ZSTD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_ZSTD_ARCHIVE_FORMATS=".tar.gz"
-CT_ZSTD_SIGNATURE_FORMAT="packed/.sig"
-CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB ZSTD"
+CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB"
 # CT_LIBICONV_NEEDED is not set
 # CT_GETTEXT_NEEDED is not set
 CT_GMP_NEEDED=y
@ -754,13 +706,11 @@ CT_MPFR_NEEDED=y
 CT_ISL_NEEDED=y
 CT_MPC_NEEDED=y
 CT_ZLIB_NEEDED=y
-CT_ZSTD_NEEDED=y
 CT_GMP=y
 CT_MPFR=y
 CT_ISL=y
 CT_MPC=y
 CT_ZLIB=y
-CT_ZSTD=y
 # end of Companion libraries

 #
--- a/images/base-win32/toolchain.cmake
+++ b/images/base-win32/toolchain.cmake
@ -1,16 +1,12 @@
 set(CMAKE_SYSTEM_NAME Windows)
 set(CMAKE_SYSTEM_PROCESSOR i686)

-set(triple i686-w64-mingw32)
+set(CMAKE_C_COMPILER i686-w64-mingw32-gcc)
+set(CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
+set(CMAKE_RC_COMPILER i686-w64-mingw32-windres)
+set(CMAKE_RANLIB i686-w64-mingw32-ranlib)

-set(CMAKE_C_COMPILER ${triple}-gcc)
-set(CMAKE_CXX_COMPILER ${triple}-g++)
-set(CMAKE_RC_COMPILER ${triple}-windres)
-set(CMAKE_RANLIB ${triple}-gcc-ranlib)
-set(CMAKE_AR ${triple}-gcc-ar)
-
-set(CMAKE_SYSROOT /opt/ct-ng/${triple}/sysroot)
-set(CMAKE_FIND_ROOT_PATH /opt/ct-ng /opt/ct-ng/${triple}/sysroot /opt/ffbuild)
+set(CMAKE_FIND_ROOT_PATH /usr/i686-w64-mingw32 /opt/ffbuild)

 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
--- a/images/base-win64/Dockerfile
+++ b/images/base-win64/Dockerfile
@ -24,24 +24,18 @@ RUN rustup target add x86_64-pc-windows-gnu
 ADD toolchain.cmake /toolchain.cmake
 ADD cross.meson /cross.meson

-ENV FFBUILD_TOOLCHAIN=x86_64-w64-mingw32
 ENV PATH="/opt/ct-ng/bin:${PATH}" \
-    FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=${FFBUILD_TOOLCHAIN}- --arch=x86_64 --target-os=mingw32" \
-    FFBUILD_CROSS_PREFIX=${FFBUILD_TOOLCHAIN}- \
+    FFBUILD_TARGET_FLAGS="--pkg-config=pkg-config --cross-prefix=x86_64-w64-mingw32- --arch=x86_64 --target-os=mingw32" \
+    FFBUILD_TOOLCHAIN=x86_64-w64-mingw32 \
+    FFBUILD_CROSS_PREFIX=x86_64-w64-mingw32- \
    FFBUILD_RUST_TARGET=x86_64-pc-windows-gnu \
    FFBUILD_PREFIX=/opt/ffbuild \
    FFBUILD_CMAKE_TOOLCHAIN=/toolchain.cmake \
    PKG_CONFIG=pkg-config \
    PKG_CONFIG_LIBDIR=/opt/ffbuild/lib/pkgconfig:/opt/ffbuild/share/pkgconfig \
-    CC="${FFBUILD_TOOLCHAIN}-gcc" \
-    CXX="${FFBUILD_TOOLCHAIN}-g++" \
-    LD="${FFBUILD_TOOLCHAIN}-ld" \
-    AR="${FFBUILD_TOOLCHAIN}-gcc-ar" \
-    RANLIB="${FFBUILD_TOOLCHAIN}-gcc-ranlib" \
-    NM="${FFBUILD_TOOLCHAIN}-gcc-nm" \
-    DLLTOOL="${FFBUILD_TOOLCHAIN}-dlltool" \
    CFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
    CXXFLAGS="-static-libgcc -static-libstdc++ -I/opt/ffbuild/include -O2 -pipe -D_FORTIFY_SOURCE=2 -fstack-protector-strong" \
    LDFLAGS="-static-libgcc -static-libstdc++ -L/opt/ffbuild/lib -O2 -pipe -fstack-protector-strong" \
+    DLLTOOL="x86_64-w64-mingw32-dlltool" \
    STAGE_CFLAGS="-fno-semantic-interposition" \
    STAGE_CXXFLAGS="-fno-semantic-interposition"
--- a/images/base-win64/cross.meson
+++ b/images/base-win64/cross.meson
@ -1,11 +1,9 @@
 [binaries]
 c = 'x86_64-w64-mingw32-gcc'
 cpp = 'x86_64-w64-mingw32-g++'
-ar = 'x86_64-w64-mingw32-gcc-ar'
-ranlib = 'x86_64-w64-mingw32-gcc-ranlib'
+ar = 'x86_64-w64-mingw32-ar'
 strip = 'x86_64-w64-mingw32-strip'
 windres = 'x86_64-w64-mingw32-windres'
-dlltool = 'x86_64-w64-mingw32-dlltool'
 exe_wrapper = ['wine']

 [properties]
--- a/images/base-win64/ct-ng-config
+++ b/images/base-win64/ct-ng-config
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# crosstool-NG 1.25.0.196_227d99d Configuration
+# crosstool-NG 1.25.0.55_3defb7b Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@ -13,13 +13,12 @@ CT_CONFIGURE_has_make_3_81_or_newer=y
 CT_CONFIGURE_has_make_4_0_or_newer=y
 CT_CONFIGURE_has_libtool_2_4_or_newer=y
 CT_CONFIGURE_has_libtoolize_2_4_or_newer=y
-CT_CONFIGURE_has_autoconf_2_71_or_newer=y
-CT_CONFIGURE_has_autoreconf_2_71_or_newer=y
-CT_CONFIGURE_has_automake_1_16_or_newer=y
+CT_CONFIGURE_has_autoconf_2_65_or_newer=y
+CT_CONFIGURE_has_autoreconf_2_65_or_newer=y
+CT_CONFIGURE_has_automake_1_15_or_newer=y
 CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y
 CT_CONFIGURE_has_python_3_4_or_newer=y
 CT_CONFIGURE_has_bison_2_7_or_newer=y
-CT_CONFIGURE_has_bison_3_0_4_or_newer=y
 CT_CONFIGURE_has_python=y
 CT_CONFIGURE_has_svn=y
 CT_CONFIGURE_has_git=y
@ -28,7 +27,7 @@ CT_CONFIGURE_has_sha1sum=y
 CT_CONFIGURE_has_sha256sum=y
 CT_CONFIGURE_has_sha512sum=y
 CT_CONFIGURE_has_install_with_strip_program=y
-CT_VERSION="1.25.0.196_227d99d"
+CT_VERSION="1.25.0.55_3defb7b"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@ -46,7 +45,6 @@ CT_MODULES=y
 CT_EXPERIMENTAL=y
 CT_ALLOW_BUILD_AS_ROOT=y
 CT_ALLOW_BUILD_AS_ROOT_SURE=y
-# CT_ENABLE_EXPERIMENTAL_BUNDLED_PATCHES is not set
 # CT_DEBUG_CT is not set

 #
@ -65,7 +63,6 @@ CT_REMOVE_DOCS=y
 # CT_PREFIX_DIR_RO is not set
 CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y
 CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y
-# CT_TARBALL_RESULT is not set

 #
 # Downloading
@ -123,11 +120,12 @@ CT_CONFIG_SHELL="${bash}"
 # CT_LOG_ERROR is not set
 # CT_LOG_WARN is not set
 # CT_LOG_INFO is not set
-# CT_LOG_EXTRA is not set
+CT_LOG_EXTRA=y
 # CT_LOG_ALL is not set
-CT_LOG_DEBUG=y
-CT_LOG_LEVEL_MAX="DEBUG"
+# CT_LOG_DEBUG is not set
+CT_LOG_LEVEL_MAX="EXTRA"
 # CT_LOG_SEE_TOOLS_WARN is not set
+# CT_LOG_PROGRESS_BAR is not set
 # CT_LOG_TO_FILE is not set
 # end of Paths and misc options

@ -138,9 +136,7 @@ CT_LOG_LEVEL_MAX="DEBUG"
 # CT_ARCH_ARC is not set
 # CT_ARCH_ARM is not set
 # CT_ARCH_AVR is not set
-# CT_ARCH_BPF is not set
 # CT_ARCH_C6X is not set
-# CT_ARCH_LOONGARCH is not set
 # CT_ARCH_M68K is not set
 # CT_ARCH_MICROBLAZE is not set
 # CT_ARCH_MIPS is not set
@ -165,7 +161,7 @@ CT_ARCH_X86_SHOW=y
 # Options for x86
 #
 CT_ARCH_X86_PKG_KSYM=""
-CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
+CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
 CT_ARCH_SUFFIX=""
 # CT_OMIT_TARGET_VENDOR is not set

@ -175,7 +171,6 @@ CT_ARCH_SUFFIX=""
 # CT_MULTILIB is not set
 CT_DEMULTILIB=y
 CT_ARCH_USE_MMU=y
-CT_ARCH_SUPPORTS_LIBSANITIZER=y
 CT_ARCH_SUPPORTS_32=y
 CT_ARCH_SUPPORTS_64=y
 CT_ARCH_DEFAULT_32=y
@ -246,7 +241,6 @@ CT_BUILD_SUFFIX=""
 # Operating System
 #
 CT_WINDOWS=y
-CT_KERNEL_SUPPORTS_SHARED_LIBS=y
 # CT_KERNEL_BARE_METAL is not set
 # CT_KERNEL_LINUX is not set
 CT_KERNEL_WINDOWS=y
@ -263,7 +257,6 @@ CT_ALL_KERNEL_CHOICES="BARE_METAL LINUX WINDOWS"
 #
 # Common kernel options
 #
-CT_SHARED_LIBS=y
 # end of Operating System

 #
@ -295,9 +288,7 @@ CT_BINUTILS_PATCH_GLOBAL=y
 # CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set
 # CT_BINUTILS_PATCH_NONE is not set
 CT_BINUTILS_PATCH_ORDER="global"
-CT_BINUTILS_V_2_40=y
-# CT_BINUTILS_V_2_39 is not set
-# CT_BINUTILS_V_2_38 is not set
+CT_BINUTILS_V_2_38=y
 # CT_BINUTILS_V_2_37 is not set
 # CT_BINUTILS_V_2_36 is not set
 # CT_BINUTILS_V_2_35 is not set
@ -310,14 +301,12 @@ CT_BINUTILS_V_2_40=y
 # CT_BINUTILS_V_2_28 is not set
 # CT_BINUTILS_V_2_27 is not set
 # CT_BINUTILS_V_2_26 is not set
-CT_BINUTILS_VERSION="2.40"
+CT_BINUTILS_VERSION="2.38"
 CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
 CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz"
 CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig"
-CT_BINUTILS_later_than_2_39=y
-CT_BINUTILS_2_39_or_later=y
 CT_BINUTILS_later_than_2_30=y
 CT_BINUTILS_2_30_or_later=y
 CT_BINUTILS_later_than_2_27=y
@ -368,29 +357,24 @@ CT_MINGW_W64_PATCH_GLOBAL=y
 # CT_MINGW_W64_PATCH_LOCAL_BUNDLED is not set
 # CT_MINGW_W64_PATCH_NONE is not set
 CT_MINGW_W64_PATCH_ORDER="global"
-CT_MINGW_W64_V_V10_0=y
-# CT_MINGW_W64_V_V9_0 is not set
+CT_MINGW_W64_V_V9_0=y
 # CT_MINGW_W64_V_V8_0 is not set
 # CT_MINGW_W64_V_V7_0 is not set
 # CT_MINGW_W64_V_V6_0 is not set
 # CT_MINGW_W64_V_V5_0 is not set
 # CT_MINGW_W64_V_V4_0 is not set
-CT_MINGW_W64_VERSION="v10.0.0"
+CT_MINGW_W64_VERSION="v9.0.0"
 CT_MINGW_W64_MIRRORS="http://downloads.sourceforge.net/sourceforge/mingw-w64 https://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/"
 CT_MINGW_W64_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_MINGW_W64_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_MINGW_W64_ARCHIVE_FORMATS=".tar.bz2 .zip"
 CT_MINGW_W64_SIGNATURE_FORMAT="packed/.sig"
 CT_MINGW_SECURE_API=y
-# CT_MINGW_DEFAULT_MSVCRT_DEFAULT is not set
-# CT_MINGW_DEFAULT_MSVCRT_MSVCRT is not set
-CT_MINGW_DEFAULT_MSVCRT_UCRT=y
-# CT_MINGW_DEFAULT_MSVCRT_CUSTOM is not set
 CT_MINGW_DIRECTX=y
 CT_MINGW_DDK=y
 CT_MINGW_TOOLS=y
 CT_MINGW_TOOL_LIST_ARRAY="gendef genidl genlib genpeimg widl"
-CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE PICOLIBC UCLIBC_NG"
+CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG"
 CT_LIBC_SUPPORT_THREADS_ANY=y
 CT_LIBC_SUPPORT_THREADS_NATIVE=y
 CT_LIBC_SUPPORT_THREADS_POSIX=y
@ -400,8 +384,6 @@ CT_LIBC_SUPPORT_THREADS_POSIX=y
 #
 # CT_THREADS_NATIVE is not set
 CT_THREADS_POSIX=y
-# CT_CREATE_LDSO_CONF is not set
-CT_LIBC_XLDD=y
 # end of C-library

 #
@ -412,7 +394,6 @@ CT_CC_SUPPORT_CXX=y
 CT_CC_SUPPORT_FORTRAN=y
 CT_CC_SUPPORT_ADA=y
 CT_CC_SUPPORT_D=y
-CT_CC_SUPPORT_JIT=y
 CT_CC_SUPPORT_OBJC=y
 CT_CC_SUPPORT_OBJCXX=y
 CT_CC_SUPPORT_GOLANG=y
@ -441,8 +422,7 @@ CT_GCC_PATCH_GLOBAL=y
 # CT_GCC_PATCH_LOCAL_BUNDLED is not set
 # CT_GCC_PATCH_NONE is not set
 CT_GCC_PATCH_ORDER="global"
-CT_GCC_V_13=y
-# CT_GCC_V_12 is not set
+CT_GCC_V_12=y
 # CT_GCC_V_11 is not set
 # CT_GCC_V_10 is not set
 # CT_GCC_V_9 is not set
@ -451,14 +431,12 @@ CT_GCC_V_13=y
 # CT_GCC_V_6 is not set
 # CT_GCC_V_5 is not set
 # CT_GCC_V_4_9 is not set
-CT_GCC_VERSION="13.1.0"
+CT_GCC_VERSION="12.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_GCC_SIGNATURE_FORMAT=""
-CT_GCC_later_than_13=y
-CT_GCC_13_or_later=y
 CT_GCC_later_than_12=y
 CT_GCC_12_or_later=y
 CT_GCC_later_than_11=y
@ -480,8 +458,8 @@ CT_GCC_4_9_or_later=y
 CT_CC_GCC_ENABLE_PLUGINS=y
 CT_CC_GCC_HAS_LIBMPX=y
 CT_CC_GCC_ENABLE_CXX_FLAGS=""
-CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--enable-default-ssp"
-CT_CC_GCC_EXTRA_CONFIG_ARRAY="--enable-default-ssp --with-build-config=bootstrap-lto-lean --enable-link-serialization=2"
+CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY=""
+CT_CC_GCC_EXTRA_CONFIG_ARRAY=""
 CT_CC_GCC_STATIC_LIBSTDCXX=y
 CT_CC_GCC_SYSTEM_ZLIB=y
 CT_CC_GCC_CONFIG_TLS=m
@ -501,7 +479,6 @@ CT_CC_GCC_LTO_ZSTD=m
 CT_CC_GCC_LIBGOMP=y
 CT_CC_GCC_LIBSSP=m
 # CT_CC_GCC_LIBQUADMATH is not set
-# CT_CC_GCC_LIBSTDCXX_VERBOSE is not set

 #
 # Misc. obscure options.
@ -529,7 +506,6 @@ CT_ALL_CC_CHOICES="GCC"
 #
 CT_CC_LANG_CXX=y
 # CT_CC_LANG_FORTRAN is not set
-# CT_CC_LANG_JIT is not set
 # CT_CC_LANG_ADA is not set
 # CT_CC_LANG_D is not set
 # CT_CC_LANG_OBJC is not set
@ -628,9 +604,7 @@ CT_ISL_PATCH_GLOBAL=y
 # CT_ISL_PATCH_LOCAL_BUNDLED is not set
 # CT_ISL_PATCH_NONE is not set
 CT_ISL_PATCH_ORDER="global"
-CT_ISL_V_0_26=y
-# CT_ISL_V_0_25 is not set
-# CT_ISL_V_0_24 is not set
+CT_ISL_V_0_24=y
 # CT_ISL_V_0_23 is not set
 # CT_ISL_V_0_22 is not set
 # CT_ISL_V_0_21 is not set
@ -640,7 +614,7 @@ CT_ISL_V_0_26=y
 # CT_ISL_V_0_17 is not set
 # CT_ISL_V_0_16 is not set
 # CT_ISL_V_0_15 is not set
-CT_ISL_VERSION="0.26"
+CT_ISL_VERSION="0.24"
 CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@ -717,36 +691,14 @@ CT_ZLIB_PATCH_GLOBAL=y
 # CT_ZLIB_PATCH_LOCAL_BUNDLED is not set
 # CT_ZLIB_PATCH_NONE is not set
 CT_ZLIB_PATCH_ORDER="global"
-CT_ZLIB_V_1_2_13=y
-CT_ZLIB_VERSION="1.2.13"
-CT_ZLIB_MIRRORS="https://github.com/madler/zlib/releases/download/v${CT_ZLIB_VERSION} https://www.zlib.net/"
+CT_ZLIB_V_1_2_12=y
+CT_ZLIB_VERSION="1.2.12"
+CT_ZLIB_MIRRORS="http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION} https://www.zlib.net/"
 CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_ZLIB_SIGNATURE_FORMAT="packed/.asc"
-CT_COMP_LIBS_ZSTD=y
-CT_COMP_LIBS_ZSTD_PKG_KSYM="ZSTD"
-CT_ZSTD_DIR_NAME="zstd"
-CT_ZSTD_PKG_NAME="zstd"
-CT_ZSTD_SRC_RELEASE=y
-# CT_ZSTD_SRC_DEVEL is not set
-# CT_ZSTD_SRC_CUSTOM is not set
-CT_ZSTD_PATCH_GLOBAL=y
-# CT_ZSTD_PATCH_BUNDLED is not set
-# CT_ZSTD_PATCH_LOCAL is not set
-# CT_ZSTD_PATCH_BUNDLED_LOCAL is not set
-# CT_ZSTD_PATCH_LOCAL_BUNDLED is not set
-# CT_ZSTD_PATCH_NONE is not set
-CT_ZSTD_PATCH_ORDER="global"
-CT_ZSTD_V_1_5_5=y
-# CT_ZSTD_V_1_5_2 is not set
-CT_ZSTD_VERSION="1.5.5"
-CT_ZSTD_MIRRORS="https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://www.zstd.net/"
-CT_ZSTD_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
-CT_ZSTD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
-CT_ZSTD_ARCHIVE_FORMATS=".tar.gz"
-CT_ZSTD_SIGNATURE_FORMAT="packed/.sig"
-CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB ZSTD"
+CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB"
 # CT_LIBICONV_NEEDED is not set
 # CT_GETTEXT_NEEDED is not set
 CT_GMP_NEEDED=y
@ -754,13 +706,11 @@ CT_MPFR_NEEDED=y
 CT_ISL_NEEDED=y
 CT_MPC_NEEDED=y
 CT_ZLIB_NEEDED=y
-CT_ZSTD_NEEDED=y
 CT_GMP=y
 CT_MPFR=y
 CT_ISL=y
 CT_MPC=y
 CT_ZLIB=y
-CT_ZSTD=y
 # end of Companion libraries

 #
--- a/images/base-win64/toolchain.cmake
+++ b/images/base-win64/toolchain.cmake
@ -1,16 +1,12 @@
 set(CMAKE_SYSTEM_NAME Windows)
 set(CMAKE_SYSTEM_PROCESSOR x86_64)

-set(triple x86_64-w64-mingw32)
+set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
+set(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++)
+set(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres)
+set(CMAKE_RANLIB x86_64-w64-mingw32-ranlib)

-set(CMAKE_C_COMPILER ${triple}-gcc)
-set(CMAKE_CXX_COMPILER ${triple}-g++)
-set(CMAKE_RC_COMPILER ${triple}-windres)
-set(CMAKE_RANLIB ${triple}-gcc-ranlib)
-set(CMAKE_AR ${triple}-gcc-ar)
-
-set(CMAKE_SYSROOT /opt/ct-ng/${triple}/sysroot)
-set(CMAKE_FIND_ROOT_PATH /opt/ct-ng /opt/ct-ng/${triple}/sysroot /opt/ffbuild)
+set(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32 /opt/ffbuild)

 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
--- a/images/base/Dockerfile
+++ b/images/base/Dockerfile
@ -1,20 +1,17 @@
-FROM ubuntu:23.04
-
-ENV FFBUILD_DLDIR="/opt/ffdl"
+FROM ubuntu:22.04

 ENV DEBIAN_FRONTEND noninteractive
 RUN \
-    mkdir -p "$FFBUILD_DLDIR" && \
    apt-get -y update && \
    apt-get -y dist-upgrade && \
    apt-get -y install build-essential yasm nasm \
-        xxd pkgconf curl wget unzip zip git subversion mercurial \
+        xxd pkgconf curl wget unzip git subversion mercurial \
        autoconf automake libtool libtool-bin autopoint gettext cmake clang meson ninja-build \
        texinfo texi2html help2man flex bison groff \
        gperf itstool ragel libc6-dev libssl-dev \
        gtk-doc-tools gobject-introspection gawk \
        ocaml ocamlbuild libnum-ocaml-dev indent p7zip-full \
-        python3-distutils python3-jinja2 python3-jsonschema python3-apt python-is-python3 && \
+        python3-distutils python3-jinja2 python3-apt python-is-python3 && \
    apt-get -y clean && \
    git config --global user.email "builder@localhost" && \
    git config --global user.name "Builder" && \
--- a/images/base/retry-tool.sh
+++ b/images/base/retry-tool.sh
@ -2,12 +2,10 @@
 set -xe

 RETRY_COUNTER=0
-MAX_RETRY=10
-CUR_TIMEOUT=120
+MAX_RETRY=15
 while [[ $RETRY_COUNTER -lt $MAX_RETRY ]]; do
-    timeout $CUR_TIMEOUT "$@" && break || sleep $(shuf -i 5-90 -n 1)
+    timeout 120 "$@" && break || sleep 10
    RETRY_COUNTER=$(( $RETRY_COUNTER + 1 ))
-    CUR_TIMEOUT=$(( $CUR_TIMEOUT + 60 ))
    echo "Retry $RETRY_COUNTER..."
 done
 if [[ $RETRY_COUNTER -ge $MAX_RETRY ]]; then
--- a/images/base/run_stage.sh
+++ b/images/base/run_stage.sh
@ -11,12 +11,5 @@ export RAW_LDFLAGS="$LDFLAGS"
 mkdir -p /stage
 source "$1"
 cd /stage
-if [[ -n "$3" ]]; then
-    cd "$3"
-fi
-if [[ -z "$2" ]]; then
-    ffbuild_dockerbuild
-else
-    "$2"
-fi
+ffbuild_dockerbuild
 rm -rf /stage "$FFBUILD_PREFIX"/bin
--- a/makeimage.sh
+++ b/makeimage.sh
@ -18,14 +18,13 @@ docker buildx inspect ffbuilder &>/dev/null || docker buildx create \
    --driver-opt env.BUILDKIT_STEP_LOG_MAX_SIZE=-1 \
    --driver-opt env.BUILDKIT_STEP_LOG_MAX_SPEED=-1

-docker container inspect ffbuildreg &>/dev/null || \
-    docker run --rm -d -p 127.0.0.1:64647:5000 --name ffbuildreg registry:2
-LOCAL_REG_PORT="$(docker container inspect --format='{{range $p, $conf := .NetworkSettings.Ports}}{{(index $conf 0).HostPort}}{{end}}' ffbuildreg)"
-LOCAL_ROOT="127.0.0.1:${LOCAL_REG_PORT}/local"
-
-export REGISTRY_OVERRIDE_DL="127.0.0.1:${LOCAL_REG_PORT}" GITHUB_REPOSITORY_DL="local"
-
 if [[ -z "$QUICKBUILD" ]]; then
+    docker container inspect ffbuildreg &>/dev/null || \
+        docker run --rm -d -p 127.0.0.1:0:5000 --name ffbuildreg registry:2
+    LOCAL_REG_PORT="$(docker container inspect --format='{{range $p, $conf := .NetworkSettings.Ports}}{{(index $conf 0).HostPort}}{{end}}' ffbuildreg)"
+    LOCAL_ROOT="127.0.0.1:${LOCAL_REG_PORT}/local"
+    trap "rm -f '$TMPCFG'; docker container stop ffbuildreg" EXIT
+
    if grep "FROM.*base.*" "images/base-${TARGET}/Dockerfile" >/dev/null 2>&1; then
        docker buildx --builder ffbuilder build \
            --cache-from=type=local,src=.cache/"${BASE_IMAGE/:/_}" \
@ -39,29 +38,14 @@ if [[ -z "$QUICKBUILD" ]]; then
        --push --tag "${LOCAL_ROOT}/base-${TARGET}:latest" \
        --build-arg GH_REPO="$LOCAL_ROOT" "images/base-${TARGET}"

-    export REGISTRY_OVERRIDE="$REGISTRY_OVERRIDE_DL" GITHUB_REPOSITORY="$GITHUB_REPOSITORY_DL"
+    export REGISTRY_OVERRIDE="127.0.0.1:${LOCAL_REG_PORT}" GITHUB_REPOSITORY="local"
 fi

 ./generate.sh "$TARGET" "$VARIANT" "${ADDINS[@]}"
-DL_CACHE_TAG="$(./util/get_dl_cache_tag.sh)"
-DL_IMAGE="${DL_IMAGE_RAW}:${DL_CACHE_TAG}"
-
-if docker pull "${DL_IMAGE}"; then
-    export REGISTRY_OVERRIDE_DL="$REGISTRY" GITHUB_REPOSITORY_DL="$REPO"
-    ./generate.sh "$TARGET" "$VARIANT" "${ADDINS[@]}"
-else
-    DL_IMAGE="${LOCAL_ROOT}/dl_cache:${DL_CACHE_TAG}"
-    docker manifest inspect --insecure "${DL_IMAGE}" >/dev/null ||
-        docker buildx --builder ffbuilder build -f Dockerfile.dl \
-            --cache-from=type=local,src=.cache/dl_image_cache \
-            --cache-to=type=local,mode=max,dest=.cache/dl_image_cache \
-            --push --tag "${DL_IMAGE}" .
-fi

 docker buildx --builder ffbuilder build \
    --cache-from=type=local,src=.cache/"${IMAGE/:/_}" \
    --cache-to=type=local,mode=max,dest=.cache/"${IMAGE/:/_}" \
    --load --tag "$IMAGE" .

-docker container stop ffbuildreg
 docker buildx rm -f ffbuilder
--- a/scripts.d/10-mingw-std-threads.sh
+++ b/scripts.d/10-mingw-std-threads.sh
@ -9,7 +9,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" mingw-std-threads
+    cd mingw-std-threads

    mkdir -p "$FFBUILD_PREFIX"/include
    cp *.h "$FFBUILD_PREFIX"/include
--- 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="3638d5e9a6f28354bc3e18f04ba0d97e2cc3b44c"
+SCRIPT_REPO="https://github.com/mirror/mingw-w64.git"
+SCRIPT_COMMIT="fcbc39cf846c12c898998b82fe8126601884b4e2"

 ffbuild_enabled() {
    [[ $TARGET == win* ]] || return -1
@ -17,12 +17,9 @@ ffbuild_dockerfinal() {
    to_df "COPY --from=${PREVLAYER} /opt/mingw/. /"
 }

-ffbuild_dockerdl() {
-    to_df "RUN retry-tool sh -c \"rm -rf mingw && git clone '$SCRIPT_REPO' mingw\" && cd mingw && git checkout \"$SCRIPT_COMMIT\""
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/mingw"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" mingw
+    cd mingw

    cd mingw-w64-headers

@ -37,7 +34,6 @@ ffbuild_dockerbuild() {
        --prefix="$GCC_SYSROOT/usr/$FFBUILD_TOOLCHAIN"
        --host="$FFBUILD_TOOLCHAIN"
        --with-default-win32-winnt="0x601"
-        --with-default-msvcrt=ucrt
        --enable-idl
    )

--- a/scripts.d/10-xorg-macros.sh
+++ b/scripts.d/10-xorg-macros.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/util/macros.git"
-SCRIPT_COMMIT="cb147377e9341af05232f95814022abdecf14024"
+SCRIPT_COMMIT="0326ba3c4caa34116c0e7e4af98661858cf25d1c"

 ffbuild_enabled() {
    [[ $TARGET != linux* ]] && return -1
@ -14,7 +14,8 @@ ffbuild_dockerlayer() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xorg-macros
+    cd xorg-macros

    autoreconf -i
    ./configure --prefix="$FFBUILD_PREFIX"
--- a/scripts.d/20-libiconv.sh
+++ b/scripts.d/20-libiconv.sh
@ -1,21 +1,18 @@
 #!/bin/bash

 SCRIPT_REPO="https://git.savannah.gnu.org/git/libiconv.git"
-SCRIPT_COMMIT="6e2b31f6d66739c5abd850338ea68c6bd2012812"
+SCRIPT_COMMIT="2582e7bb06f1638877713400e2d11db547798a49"

 ffbuild_enabled() {
    return 0
 }

-ffbuild_dockerdl() {
-    to_df "RUN retry-tool sh -c \"rm -rf $SELF && git clone '$SCRIPT_REPO' $SELF\" && git -C $SELF checkout \"$SCRIPT_COMMIT\""
-    to_df "RUN cd $SELF && retry-tool ./autopull.sh --one-time"
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" iconv
+    cd iconv

-    (unset CC CFLAGS GMAKE && ./autogen.sh)
+    ./gitsub.sh pull
+    ./autogen.sh

    local myconf=(
        --prefix="$FFBUILD_PREFIX"
--- a/scripts.d/20-libxml2.sh
+++ b/scripts.d/20-libxml2.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://gitlab.gnome.org/GNOME/libxml2.git"
-SCRIPT_COMMIT="884474477284474e0151280aaa275a18e3d7a036"
+SCRIPT_COMMIT="a09c89545d3ed5b56701abcc5d638faa01c5c903"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxml2
+    cd libxml2

    local myconf=(
        --prefix="$FFBUILD_PREFIX"
--- a/scripts.d/20-zlib.sh
+++ b/scripts.d/20-zlib.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/madler/zlib.git"
-SCRIPT_COMMIT="04f42ceca40f73e2978b50e93806c2a18c1281fc"
+SCRIPT_COMMIT="21767c654d31d2dccdde4330529775c6c5fd5389"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" zlib
+    cd zlib

    local myconf=(
        --prefix="$FFBUILD_PREFIX"
--- a/scripts.d/25-fftw3.sh
+++ b/scripts.d/25-fftw3.sh
@ -1,14 +1,17 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/FFTW/fftw3.git"
-SCRIPT_COMMIT="69f6c1a6ebd7ac5af33e7074134fb79fbc729c3d"
+SCRIPT_COMMIT="619564efbf84199f87e1a3047da00b600208fca2"

 ffbuild_enabled() {
+    # Dependency of GPL-Only librubberband
+    [[ $VARIANT == lgpl* ]] && return -1
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT_PINNED" fftw3
+    cd fftw3

    local myconf=(
        --prefix="$FFBUILD_PREFIX"
--- a/scripts.d/25-freetype.sh
+++ b/scripts.d/25-freetype.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git"
-SCRIPT_COMMIT="dec2743e6a2a40cddfc8a9892895cb4f861e1eeb"
+SCRIPT_COMMIT="7cd3f19f21cc9d600e3b765ef2058474d20233e2"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" freetype
+    cd freetype

    ./autogen.sh

--- a/scripts.d/25-fribidi.sh
+++ b/scripts.d/25-fribidi.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/fribidi/fribidi.git"
-SCRIPT_COMMIT="b54871c339dabb7434718da3fed2fa63320997e5"
+SCRIPT_COMMIT="6428d8469e536bcbb6e12c7b79ba6659371c435a"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fribidi
+    cd fribidi

    mkdir build && cd build

--- a/scripts.d/25-gmp.sh
+++ b/scripts.d/25-gmp.sh
@ -1,14 +1,15 @@
 #!/bin/bash

-SCRIPT_REPO="https://github.com/BtbN/gmplib.git"
-SCRIPT_COMMIT="1d7f62515fc8f5109fabace9592d863417f17c37"
+SCRIPT_REPO="https://gmplib.org/repo/gmp/"
+SCRIPT_HGREV="d337756619a0"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    retry-tool sh -c "rm -rf gmp && hg clone -r '$SCRIPT_HGREV' -u '$SCRIPT_HGREV' '$SCRIPT_REPO' gmp"
+    cd gmp

    ./.bootstrap

--- a/scripts.d/25-libogg.sh
+++ b/scripts.d/25-libogg.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/xiph/ogg.git"
-SCRIPT_COMMIT="db5c7a49ce7ebda47b15b78471e78fb7f2483e22"
+SCRIPT_COMMIT="3069cc2bb44160982cdb21b2b8f0660c76b17572"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" ogg
+    cd ogg

    ./autogen.sh

--- a/scripts.d/25-openssl.sh
+++ b/scripts.d/25-openssl.sh
@ -1,20 +1,16 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/openssl/openssl.git"
-SCRIPT_COMMIT="openssl-3.0.9"
-SCRIPT_TAGFILTER="openssl-3.0.*"
+SCRIPT_COMMIT="OpenSSL_1_1_1q"
+SCRIPT_TAGFILTER="OpenSSL_1_1_1*"

 ffbuild_enabled() {
    return 0
 }

-ffbuild_dockerdl() {
-    default_dl "$SELF"
-    to_df "RUN git -C \"$SELF\" submodule update --init --recursive --depth=1"
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openssl
+    cd openssl

    local myconf=(
        threads
@ -24,7 +20,6 @@ ffbuild_dockerbuild() {
        enable-ec
        enable-srp
        --prefix="$FFBUILD_PREFIX"
-        --libdir=lib
    )

    if [[ $TARGET == win64 ]]; then
@ -52,24 +47,10 @@ ffbuild_dockerbuild() {
        return -1
    fi

-    export CFLAGS="$CFLAGS -fno-strict-aliasing"
-    export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
-
-    # OpenSSL build system prepends the cross prefix itself
-    export CC="${CC/${FFBUILD_CROSS_PREFIX}/}"
-    export CXX="${CXX/${FFBUILD_CROSS_PREFIX}/}"
-    export AR="${AR/${FFBUILD_CROSS_PREFIX}/}"
-    export RANLIB="${RANLIB/${FFBUILD_CROSS_PREFIX}/}"
-
    ./Configure "${myconf[@]}"

    sed -i -e "/^CFLAGS=/s|=.*|=${CFLAGS}|" -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" Makefile

-    make -j$(nproc) build_sw
+    make -j$(nproc)
    make install_sw
 }
-
-ffbuild_configure() {
-    [[ $TARGET == win* ]] && return 0
-    echo --enable-openssl
-}
--- a/scripts.d/25-xz.sh
+++ b/scripts.d/25-xz.sh
@ -1,20 +1,20 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/xz-mirror/xz.git"
-SCRIPT_COMMIT="66bdcfa85fef2911cc80f5f30fed3f9610faccb4"
+SCRIPT_COMMIT="4773608554d1b684a05ff9c1d879cf5c42266d33"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xz
+    cd xz

-    ./autogen.sh --no-po4a --no-doxygen
+    ./autogen.sh --no-po4a

    local myconf=(
        --prefix="$FFBUILD_PREFIX"
-        --disable-symbol-versions
        --disable-shared
        --enable-static
        --with-pic
--- a/scripts.d/35-fontconfig.sh
+++ b/scripts.d/35-fontconfig.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git"
-SCRIPT_COMMIT="7e2a1b2577e8d90ea5be3f14091e809ac7742438"
+SCRIPT_COMMIT="fd0753af88f746fd3d729bf6e1df08eefeeaa3ac"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fc
+    cd fc

    ./autogen.sh --noconf

@ -21,13 +22,7 @@ ffbuild_dockerbuild() {
        --enable-static
    )

-    if [[ $TARGET == linux* ]]; then
-        myconf+=(
-            --sysconfdir=/etc
-            --localstatedir=/var
-            --host="$FFBUILD_TOOLCHAIN"
-        )
-    elif [[ $TARGET == win* ]]; then
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
        myconf+=(
            --host="$FFBUILD_TOOLCHAIN"
        )
--- a/scripts.d/45-harfbuzz.sh
+++ b/scripts.d/45-harfbuzz.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
-SCRIPT_COMMIT="73ee9c346f3acccbe14a4caf258b636de7c459be"
+SCRIPT_COMMIT="4ab7e579cb8f4fd4f5ee2e1c0404e58edf8eb8e6"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" harfbuzz
+    cd harfbuzz

    local myconf=(
        --prefix="$FFBUILD_PREFIX"
--- a/scripts.d/45-libsamplerate.sh
+++ b/scripts.d/45-libsamplerate.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/libsndfile/libsamplerate.git"
-SCRIPT_COMMIT="22bd06eb114850ebe31981eb794d150a95439fef"
+SCRIPT_COMMIT="aee38d0bc797d0d1a3774ef574af1d5d248d2398"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libsr
+    cd libsr

    mkdir build
    cd build
--- a/scripts.d/45-libudfread.sh
+++ b/scripts.d/45-libudfread.sh
@ -8,7 +8,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libudfread
+    cd libudfread

    ./bootstrap

--- a/scripts.d/45-libvorbis.sh
+++ b/scripts.d/45-libvorbis.sh
@ -8,7 +8,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vorbis
+    cd vorbis

    ./autogen.sh

--- a/scripts.d/45-opencl.sh
+++ b/scripts.d/45-opencl.sh
@ -1,33 +1,28 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git"
-SCRIPT_COMMIT="e049b16b5f157e2f28e7b5c301e71e1ccb3fe288"
+SCRIPT_COMMIT="7f216e8aa5317a71d91bed7edc83f3620dff763d"

 SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
-SCRIPT_COMMIT2="229410f86a8c8c9e0f86f195409e5481a2bae067"
+SCRIPT_COMMIT2="7072cf2ae9d9acb6be8f4fc956f1cdbf0675695b"

 ffbuild_enabled() {
    return 0
 }

-ffbuild_dockerdl() {
-    default_dl opencl/headers
-    to_df "RUN git-mini-clone \"$SCRIPT_REPO2\" \"$SCRIPT_COMMIT2\" opencl/loader"
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/opencl
+    mkdir opencl && cd opencl

+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" headers
    mkdir -p "$FFBUILD_PREFIX"/include/CL
    cp -r headers/CL/* "$FFBUILD_PREFIX"/include/CL/.

+    git-mini-clone "$SCRIPT_REPO2" "$SCRIPT_COMMIT2" loader
    cd loader
+
    mkdir build && cd build

-    cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
-        -DOPENCL_ICD_LOADER_HEADERS_DIR="$FFBUILD_PREFIX"/include -DOPENCL_ICD_LOADER_BUILD_SHARED_LIBS=OFF \
-        -DOPENCL_ICD_LOADER_DISABLE_OPENCLON12=ON -DOPENCL_ICD_LOADER_PIC=ON \
-        -DOPENCL_ICD_LOADER_BUILD_TESTING=OFF -DBUILD_TESTING=OFF ..
+    cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DOPENCL_ICD_LOADER_HEADERS_DIR="$FFBUILD_PREFIX"/include -DOPENCL_ICD_LOADER_BUILD_SHARED_LIBS=OFF -DOPENCL_ICD_LOADER_DISABLE_OPENCLON12=ON -DOPENCL_ICD_LOADER_PIC=ON -DOPENCL_ICD_LOADER_BUILD_TESTING=OFF -DBUILD_TESTING=OFF ..
    make -j$(nproc)
    make install

@ -39,13 +34,12 @@ ffbuild_dockerbuild() {
    echo "Name: OpenCL" >> OpenCL.pc
    echo "Description: OpenCL ICD Loader" >> OpenCL.pc
    echo "Version: 9999" >> OpenCL.pc
+    echo "Libs: -L\${libdir} -lOpenCL" >> OpenCL.pc
    echo "Cflags: -I\${includedir}" >> OpenCL.pc

    if [[ $TARGET == linux* ]]; then
-        echo "Libs: -L\${libdir} -lOpenCL" >> OpenCL.pc
        echo "Libs.private: -ldl" >> OpenCL.pc
    elif [[ $TARGET == win* ]]; then
-        echo "Libs: -L\${libdir} -l:OpenCL.a" >> OpenCL.pc
        echo "Libs.private: -lole32 -lshlwapi -lcfgmgr32" >> OpenCL.pc
    fi

--- a/scripts.d/45-pulseaudio.sh
+++ b/scripts.d/45-pulseaudio.sh
@ -1,19 +1,17 @@
 #!/bin/bash

 SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git"
-SCRIPT_COMMIT="e96d278bfc514f290b60c9e924fabc1c772e1689"
+SCRIPT_COMMIT="8188b49bed7be08e23abcf92b098f62c1fc5c2ec"

 ffbuild_enabled() {
    [[ $TARGET == linux* ]] || return 1
    return 0
 }

-ffbuild_dockerdl() {
-    to_df "RUN git clone --filter=blob:none \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git clone --filter=blob:none "$SCRIPT_REPO" pa
+    cd pa
+    git checkout "$SCRIPT_COMMIT"

    # Kill build of utils and their sndfile dep
    echo > src/utils/meson.build
--- a/scripts.d/45-vmaf.sh
+++ b/scripts.d/45-vmaf.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/Netflix/vmaf.git"
-SCRIPT_COMMIT="98bdd77b296da207ab42c3113ec8f30de58db197"
+SCRIPT_COMMIT="905b07fccd1243f70eff2a264cc21493591c77bf"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vmaf
+    cd vmaf

    # Kill build of unused and broken tools
    echo > libvmaf/tools/meson.build
--- 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="91178913c25b19e0457cdf6d21e00e6a613823e2"
+SCRIPT_COMMIT="23865049477f44a6b2fdc9580ee6e857a7f99854"

 ffbuild_enabled() {
    [[ $TARGET != linux* ]] && return -1
@ -9,7 +9,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xcbproto
+    cd xcbproto

    autoreconf -i

--- 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="766967322209f2dcb72e6a8edea0c651f586201d"
+SCRIPT_COMMIT="824001c947cb1962209c6a8f2c63c2637877220d"

 ffbuild_enabled() {
    [[ $TARGET != linux* ]] && return -1
@ -9,7 +9,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xproto
+    cd xproto

    autoreconf -i

--- 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="3b3a3bd75d86aec78f6ef893b198c3efc378bc64"
+SCRIPT_COMMIT="3309c75906a56de86607f59481304b3a2812162f"

 ffbuild_enabled() {
    [[ $TARGET != linux* ]] && return -1
@ -9,7 +9,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxtrans
+    cd libxtrans

    autoreconf -i

--- 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="df1bf4fe528a5a9eef420f78efb225e4696ac467"
+SCRIPT_COMMIT="83f33926d43f6ae4cf9734e3aedbef23fb0d6b74"

 ffbuild_enabled() {
    [[ $TARGET != linux* ]] && return -1
@ -9,7 +9,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxau
+    cd libxau

    autoreconf -i

--- a/scripts.d/45-x11/30-libxcb.sh
+++ b/scripts.d/45-x11/30-libxcb.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git"
-SCRIPT_COMMIT="8935793f1f3751a6aa9d78955c7d6236177986de"
+SCRIPT_COMMIT="9dcb08170898d3bd5ddb3bc26c514a6bfccf3fae"

 ffbuild_enabled() {
    [[ $TARGET != linux* ]] && return -1
@ -9,7 +9,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxcb
+    cd libxcb

    autoreconf -i

--- 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="af2b6dfab1616dc85be9c9b196e4c56d00447851"
+SCRIPT_COMMIT="1272879074ad9612314858a75cf844783c1963b2"

 ffbuild_enabled() {
    [[ $TARGET != linux* ]] && return -1
@ -9,7 +9,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libx11
+    cd libx11

    autoreconf -i

--- a/scripts.d/45-x11/50-libxext.sh
+++ b/scripts.d/45-x11/50-libxext.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxext.git"
-SCRIPT_COMMIT="de2ebd62c1eb8fe16c11aceac4a6981bda124cf4"
+SCRIPT_COMMIT="c6eded76e212419518bd955cad58c96b8653840e"

 ffbuild_enabled() {
    [[ $TARGET != linux* ]] && return -1
@ -9,7 +9,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxext
+    cd libxext

    autoreconf -i

--- a/scripts.d/45-x11/50-libxfixes.sh
+++ b/scripts.d/45-x11/50-libxfixes.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxfixes.git"
-SCRIPT_COMMIT="c1cab28e27dd1c5a81394965248b57e490ccf2ca"
+SCRIPT_COMMIT="d10ec36c81a6b488d1f700a28c5bff4714287b78"

 ffbuild_enabled() {
    [[ $TARGET != linux* ]] && return -1
@ -9,7 +9,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxfixes
+    cd libxfixes

    autoreconf -i

--- 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="3a7503ec7703f10de17c622ea22b7bff736cea74"
+SCRIPT_COMMIT="bca3474a8622fde5815260461784282f78a4efb5"

 ffbuild_enabled() {
    [[ $TARGET != linux* ]] && return -1
@ -9,7 +9,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxi
+    cd libxi

    autoreconf -i

--- a/scripts.d/45-x11/50-libxinerama.sh
+++ b/scripts.d/45-x11/50-libxinerama.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxinerama.git"
-SCRIPT_COMMIT="51c28095951676a5896437c4c3aa40fb1972bad2"
+SCRIPT_COMMIT="f7c9b2cdd92cfcc1fcf0eb94c7fc5daaed2786f4"

 ffbuild_enabled() {
    [[ $TARGET != linux* ]] && return -1
@ -9,7 +9,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxinerama
+    cd libxinerama

    autoreconf -i

--- a/scripts.d/45-x11/50-libxrender.sh
+++ b/scripts.d/45-x11/50-libxrender.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrender.git"
-SCRIPT_COMMIT="07efd80468f6b595e6432edd28b8560ca7695ba0"
+SCRIPT_COMMIT="e314946813bcb96e8baedc1a290c48a2aa6ef162"

 ffbuild_enabled() {
    [[ $TARGET != linux* ]] && return -1
@ -9,7 +9,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxrender
+    cd libxrender

    autoreconf -i

--- a/scripts.d/45-x11/50-libxscrnsaver.sh
+++ b/scripts.d/45-x11/50-libxscrnsaver.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxscrnsaver.git"
-SCRIPT_COMMIT="9b4e000c6c4ae213a3e52345751d885543f17929"
+SCRIPT_COMMIT="d39f92be6b513c28546ebb0baf335f32ab154a89"

 ffbuild_enabled() {
    [[ $TARGET != linux* ]] && return -1
@ -9,7 +9,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxscrnsaver
+    cd libxscrnsaver

    autoreconf -i

--- a/scripts.d/45-x11/50-libxxf86vm.sh
+++ b/scripts.d/45-x11/50-libxxf86vm.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxxf86vm.git"
-SCRIPT_COMMIT="cfda59347e3a04415340a99f925a9cd85c0531b2"
+SCRIPT_COMMIT="2e27589966d6653e63b56e29b0bea83f722c4c33"

 ffbuild_enabled() {
    [[ $TARGET != linux* ]] && return -1
@ -9,7 +9,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxxf86vm
+    cd libxxf86vm

    autoreconf -i

--- a/scripts.d/45-x11/60-libglvnd.sh
+++ b/scripts.d/45-x11/60-libglvnd.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 SCRIPT_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-SCRIPT_COMMIT="179d7278d7485ceea2d440807be9d677d32aedc4"
+SCRIPT_COMMIT="5e289fbceca18bf2145c121814a690b1a1fa276c"

 ffbuild_enabled() {
    [[ $TARGET != linux* ]] && return -1
@ -9,7 +9,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" glvnd
+    cd glvnd

    mkdir build && cd build

--- a/scripts.d/45-x11/60-libxcursor.sh
+++ b/scripts.d/45-x11/60-libxcursor.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcursor.git"
-SCRIPT_COMMIT="a353f02a7ac4504ad5edb5407278c7a03c507aef"
+SCRIPT_COMMIT="27adb16027fa99d83818a0ed9f6623cb03f0c574"

 ffbuild_enabled() {
    [[ $TARGET != linux* ]] && return -1
@ -9,7 +9,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxcursor
+    cd libxcursor

    autoreconf -i

--- a/scripts.d/45-x11/60-libxrandr.sh
+++ b/scripts.d/45-x11/60-libxrandr.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrandr.git"
-SCRIPT_COMMIT="5b96863cf2a34ee9e72ffc4ec6415bc59b6121fc"
+SCRIPT_COMMIT="d66693441f688867e6fd4a5d4a4bdade9a338755"

 ffbuild_enabled() {
    [[ $TARGET != linux* ]] && return -1
@ -9,7 +9,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxrandr
+    cd libxrandr

    autoreconf -i

--- a/scripts.d/45-x11/60-libxv.sh
+++ b/scripts.d/45-x11/60-libxv.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxv.git"
-SCRIPT_COMMIT="b022c9cf7004fe6f794c4c00dd519a2e4c74eca0"
+SCRIPT_COMMIT="ee48980aca0bc9deb61458fdb5ebda3928d944a0"

 ffbuild_enabled() {
    [[ $TARGET != linux* ]] && return -1
@ -10,7 +10,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxv
+    cd libxv

    autoreconf -i

--- a/scripts.d/45-x11/99-finalize.sh
+++ b/scripts.d/45-x11/99-finalize.sh
@ -12,10 +12,6 @@ ffbuild_dockerlayer() {
    to_df "COPY --from=${SELFLAYER} \$FFBUILD_PREFIX/share/aclocal/. /usr/share/aclocal"
 }

-ffbuild_dockerdl() {
-    return 0
-}
-
 ffbuild_dockerbuild() {
    rm "$FFBUILD_PREFIX"/lib/lib*.so* || true
    rm "$FFBUILD_PREFIX"/lib/*.la || true
--- a/scripts.d/50-amf.sh
+++ b/scripts.d/50-amf.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
-SCRIPT_COMMIT="68f2396f1a55a5b12767f5433411bb4093ea65ed"
+SCRIPT_COMMIT="5c78f194a396938ff0e72128712252151238e372"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" amf
+    cd amf

    mkdir -p "$FFBUILD_PREFIX"/include
    mv amf/public/include "$FFBUILD_PREFIX"/include/AMF
--- a/scripts.d/50-aom.sh
+++ b/scripts.d/50-aom.sh
@ -1,18 +1,19 @@
 #!/bin/bash

 SCRIPT_REPO="https://aomedia.googlesource.com/aom"
-SCRIPT_COMMIT="83ccc009eade321c8723ae0da8655fc68ce6a128"
+SCRIPT_COMMIT="b86730bfae5c9d3f09cd709d8a852da31641b2fa"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerstage() {
-    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=/,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw --mount=src=patches/aom,dst=/patches run_stage /stage.sh"
+    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=patches/aom,dst=/patches run_stage /stage.sh"
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" aom
+    cd aom

    for patch in /patches/*.patch; do
        echo "Applying $patch"
--- a/scripts.d/50-aribb24/25-libpng.sh
+++ b/scripts.d/50-aribb24/25-libpng.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/glennrp/libpng.git"
-SCRIPT_COMMIT="82414985c1085737bccd3eedb0aaa997451f5d32"
+SCRIPT_COMMIT="a37d4836519517bdce6cb9d956092321eca3e73b"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libpng
+    cd libpng

    autoreconf -i

--- a/scripts.d/50-aribb24/50-libaribb24.sh
+++ b/scripts.d/50-aribb24/50-libaribb24.sh
@ -8,11 +8,12 @@ ffbuild_enabled() {
 }

 ffbuild_dockerstage() {
-    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=/,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw --mount=src=patches/aribb24,dst=/patches run_stage /stage.sh"
+    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=patches/aribb24,dst=/patches run_stage /stage.sh"
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" aribb24
+    cd aribb24

    for patch in /patches/*.patch; do
        echo "Applying $patch"
--- 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="fc5b9bc41fd47001b7da39ea777d29c0ede2a2a7"
+SCRIPT_COMMIT="9b55e9cd7e0f2b251b6a3d6930af08d31cd90d6e"

 ffbuild_enabled() {
    [[ $VARIANT == lgpl* ]] && return -1
@ -9,10 +9,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
-
-    # their version check is insistant on a tag to exist, so make one
-    git tag -a ffbuild -m "FFbuild Version"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" avisynth
+    cd avisynth

    mkdir build && cd build

--- a/scripts.d/50-chromaprint.sh
+++ b/scripts.d/50-chromaprint.sh
@ -1,33 +0,0 @@
-#!/bin/bash
-
-SCRIPT_REPO="https://github.com/acoustid/chromaprint.git"
-SCRIPT_COMMIT="aa67c95b9e486884a6d3ee8b0c91207d8c2b0551"
-
-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
-    return 0
-}
-
-ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
-
-    mkdir build && cd build
-
-    cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DBUILD_SHARED_LIBS=OFF -DBUILD_TOOLS=OFF -DBUILD_TESTS=OFF -DFFT_LIB=fftw3 ..
-    make -j$(nproc)
-    make install
-
-    echo "Libs.private: -lfftw3 -lstdc++" >> "$FFBUILD_PREFIX"/lib/pkgconfig/libchromaprint.pc
-    echo "Cflags.private: -DCHROMAPRINT_NODLL" >> "$FFBUILD_PREFIX"/lib/pkgconfig/libchromaprint.pc
-}
-
-ffbuild_configure() {
-    echo --enable-chromaprint
-}
-
-ffbuild_unconfigure() {
-    echo --disable-chromaprint
-}
--- a/scripts.d/50-dav1d.sh
+++ b/scripts.d/50-dav1d.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git"
-SCRIPT_COMMIT="a7e12b628472516718d37108fde7d438b14a0372"
+SCRIPT_COMMIT="a029d6892c5c39f4cda629d4a3b676ef2e8288f6"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" dav1d
+    cd dav1d

    mkdir build && cd build

--- a/scripts.d/50-davs2.sh
+++ b/scripts.d/50-davs2.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/pkuvcl/davs2.git"
-SCRIPT_COMMIT="b41cf117452e2d73d827f02d3e30aa20f1c721ac"
+SCRIPT_COMMIT="b06d7585620f4e90a6d19a2926bb4e59793b8942"

 ffbuild_enabled() {
    [[ $VARIANT == lgpl* ]] && return -1
@ -11,12 +11,10 @@ ffbuild_enabled() {
    return 0
 }

-ffbuild_dockerdl() {
-    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git clone "$SCRIPT_REPO" davs2
+    cd davs2
+    git checkout "$SCRIPT_COMMIT"
    cd build/linux

    local myconf=(
@ -35,10 +33,6 @@ ffbuild_dockerbuild() {
        return -1
    fi

-    # Work around configure endian check failing on modern gcc/binutils.
-    # Assumes all supported archs are little endian.
-    sed -i -e 's/EGIB/bss/g' -e 's/naidnePF/bss/g' configure
-
    ./configure "${myconf[@]}"
    make -j$(nproc)
    make install
--- a/scripts.d/50-fdk-aac.sh
+++ b/scripts.d/50-fdk-aac.sh
@ -9,7 +9,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fdk
+    cd fdk

    ./autogen.sh

--- a/scripts.d/50-ffnvcodec.sh
+++ b/scripts.d/50-ffnvcodec.sh
@ -1,27 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/FFmpeg/nv-codec-headers.git"
-SCRIPT_COMMIT="855f8263d97bbdcaeabaaaa2997e1ccad7c52dc3"
-
-SCRIPT_REPO2="https://github.com/FFmpeg/nv-codec-headers.git"
-SCRIPT_COMMIT2="dc3e4484dc83485734e503991fe5ed3bdf256fba"
-SCRIPT_BRANCH2="sdk/11.1"
+SCRIPT_COMMIT="3ed7c9a0a2c0b698b83088e13008f3ec983219b2"

 ffbuild_enabled() {
    return 0
 }

-ffbuild_dockerdl() {
-    default_dl ffnvcodec
-    to_df "RUN git-mini-clone \"$SCRIPT_REPO2\" \"$SCRIPT_COMMIT2\" ffnvcodec2"
-}
-
 ffbuild_dockerbuild() {
-    if [[ $ADDINS_STR == *4.4* || $ADDINS_STR == *5.0* || $ADDINS_STR == *5.1* ]]; then
-        cd "$FFBUILD_DLDIR"/ffnvcodec2
-    else
-        cd "$FFBUILD_DLDIR"/ffnvcodec
-    fi
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" ffnvcodec
+    cd ffnvcodec

    make PREFIX="$FFBUILD_PREFIX" install
 }
--- a/scripts.d/50-frei0r.sh
+++ b/scripts.d/50-frei0r.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/dyne/frei0r.git"
-SCRIPT_COMMIT="c3f987c4cc8c1a7f6928e574f4cb272a7770ca6f"
+SCRIPT_COMMIT="a9d15ff07e130baf3408da6e1f1b22f82e7c62b6"

 ffbuild_enabled() {
    [[ $VARIANT == lgpl* ]] && return -1
@ -10,19 +10,32 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" frei0r
+    cd frei0r

-    mkdir build && cd build
+    ./autogen.sh

-    cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" ..
+    local myconf=(
+        --prefix="$FFBUILD_PREFIX"
+        --disable-shared
+        --enable-static
+        --with-pic
+        --enable-cpuflags
+    )

-    mkdir -p "$FFBUILD_PREFIX"/lib/pkgconfig
-    cp frei0r.pc "$FFBUILD_PREFIX"/lib/pkgconfig
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
+        myconf+=(
+            --host="$FFBUILD_TOOLCHAIN"
+        )
+    else
+        echo "Unknown target"
+        return -1
+    fi

-    mkdir -p "$FFBUILD_PREFIX"/include
-    cp ../include/frei0r.h "$FFBUILD_PREFIX"/include
-
-    cat frei0r.pc
+    ./configure "${myconf[@]}"
+    make -C include -j$(nproc)
+    make -C include install
+    make install-pkgconfigDATA
 }

 ffbuild_configure() {
--- a/scripts.d/50-gme.sh
+++ b/scripts.d/50-gme.sh
@ -7,12 +7,10 @@ ffbuild_enabled() {
    return 0
 }

-ffbuild_dockerdl() {
-    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git clone "$SCRIPT_REPO" gme
+    cd gme
+    git checkout "$SCRIPT_COMMIT"

    mkdir build && cd build

--- a/scripts.d/50-kvazaar.sh
+++ b/scripts.d/50-kvazaar.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/ultravideo/kvazaar.git"
-SCRIPT_COMMIT="aaae5b0f4926065136f287876c6bc41631bae692"
+SCRIPT_COMMIT="76ce0c7716f593b5f4614aa864603684dd4fae3d"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" kvazaar
+    cd kvazaar

    ./autogen.sh

--- a/scripts.d/50-libass.sh
+++ b/scripts.d/50-libass.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/libass/libass.git"
-SCRIPT_COMMIT="1a599b1db748dfc07df98cd37d8603edb87da2fd"
+SCRIPT_COMMIT="b890df23eb8931728acdf240fd5d29e53401b4f2"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" ass
+    cd ass

    ./autogen.sh

@ -28,8 +29,6 @@ ffbuild_dockerbuild() {
        return -1
    fi

-    export CFLAGS="$CFLAGS -Dread_file=libass_internal_read_file"
-
    ./configure "${myconf[@]}"
    make -j$(nproc)
    make install
--- a/scripts.d/50-libbluray.sh
+++ b/scripts.d/50-libbluray.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://code.videolan.org/videolan/libbluray.git"
-SCRIPT_COMMIT="bb5bc108ec695889855f06df338958004ff289ef"
+SCRIPT_COMMIT="e99df3adeb07420b72690ac09a147c8f34876eb8"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libbluray
+    cd libbluray

    ./bootstrap

--- a/scripts.d/50-libjxl/45-brotli.sh
+++ b/scripts.d/50-libjxl/45-brotli.sh
@ -1,19 +1,34 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/google/brotli.git"
-SCRIPT_COMMIT="413b098564a90a2e6cae192d30642d33a9197a39"
+SCRIPT_COMMIT="9801a2c5d6c67c467ffad676ac301379bb877fc3"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" brotli
+    cd brotli

    mkdir build && cd build

-    cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
-        -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DBUILD_SHARED_LIBS=OFF ..
+    cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DCMAKE_POSITION_INDEPENDENT_CODE=ON ..
    ninja -j$(nproc)
    ninja install
+
+    # Build system is severely lacking in options, clean up after it
+    rm -r "${FFBUILD_PREFIX}"/bin
+    mv "${FFBUILD_PREFIX}"/lib/libbrotlienc{-static,}.a
+    mv "${FFBUILD_PREFIX}"/lib/libbrotlidec{-static,}.a
+    mv "${FFBUILD_PREFIX}"/lib/libbrotlicommon{-static,}.a
+
+    if [[ $TARGET == win* ]]; then
+        rm "${FFBUILD_PREFIX}"/lib/libbrotli*.dll.a
+    elif [[ $TARGET == linux* ]]; then
+        rm "${FFBUILD_PREFIX}"/lib/libbrotli*.so*
+    else
+        echo "Unknown target"
+        return -1
+    fi
 }
--- a/scripts.d/50-libjxl/50-libjxl.sh
+++ b/scripts.d/50-libjxl/50-libjxl.sh
@ -1,23 +1,18 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/libjxl/libjxl.git"
-SCRIPT_COMMIT="c3a4f9ca89ae59c6265a2f1bf2a6d2a87a71fc16"
+SCRIPT_COMMIT="ee80799d9e79511cb1597d6e94d69a4baddb8acc"

 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
    return 0
 }

-ffbuild_dockerdl() {
-    default_dl "$SELF"
-    to_df "RUN git -C \"$SELF\" submodule update --init --recursive --depth 1 --recommend-shallow third_party/highway third_party/skcms"
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" jxl
+    cd jxl
+    git submodule update --init --recursive --depth 1 --recommend-shallow third_party/{highway,skcms}

    mkdir build && cd build

@ -32,7 +27,7 @@ ffbuild_dockerbuild() {

    cmake -G Ninja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
        -DBUILD_SHARED_LIBS=OFF -DJPEGXL_STATIC=OFF -DJPEGXL_ENABLE_TOOLS=OFF -DJPEGXL_ENABLE_VIEWERS=OFF -DJPEGXL_EMSCRIPTEN=OFF -DJPEGXL_ENABLE_DOXYGEN=OFF \
-        -DJPEGXL_ENABLE_JPEGLI=OFF -DBUILD_TESTING=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF -DJPEGXL_ENABLE_MANPAGES=OFF -DJPEGXL_ENABLE_JNI=OFF -DJPEGXL_ENABLE_PLUGINS=OFF \
+        -DBUILD_TESTING=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF -DJPEGXL_ENABLE_MANPAGES=OFF -DJPEGXL_ENABLE_JNI=OFF -DJPEGXL_ENABLE_PLUGINS=OFF \
        -DJPEGXL_ENABLE_DEVTOOLS=OFF -DJPEGXL_ENABLE_BENCHMARK=OFF -DJPEGXL_BUNDLE_LIBPNG=OFF -DJPEGXL_ENABLE_SJPEG=OFF -DJPEGXL_FORCE_SYSTEM_BROTLI=ON ..
    ninja -j$(nproc)
    ninja install
--- a/scripts.d/50-libmp3lame.sh
+++ b/scripts.d/50-libmp3lame.sh
@ -7,12 +7,9 @@ ffbuild_enabled() {
    return 0
 }

-ffbuild_dockerdl() {
-    to_df "RUN retry-tool sh -c \"rm -rf lame && svn checkout '${SCRIPT_REPO}@${SCRIPT_REV}' lame\""
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/lame
+    retry-tool sh -c "rm -rf lame && svn checkout '${SCRIPT_REPO}@${SCRIPT_REV}' lame"
+    cd lame

    autoreconf -i

@ -36,8 +33,6 @@ ffbuild_dockerbuild() {
        return -1
    fi

-    export CFLAGS="$CFLAGS -DNDEBUG"
-
    ./configure "${myconf[@]}"
    make -j$(nproc)
    make install
--- a/scripts.d/50-libopus.sh
+++ b/scripts.d/50-libopus.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/xiph/opus.git"
-SCRIPT_COMMIT="9fc8fc4cf432640f284113ba502ee027268b0d9f"
+SCRIPT_COMMIT="997fdf54e781ae1c04dee42018f35388a04fe483"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" opus
+    cd opus

    ./autogen.sh

--- 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.4.0"
+SCRIPT_COMMIT="v3.2.1"
 SCRIPT_TAGFILTER="v3.*"

 ffbuild_enabled() {
@ -9,7 +9,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" mbedtls
+    cd mbedtls

    mkdir build && cd build

@ -20,3 +21,8 @@ ffbuild_dockerbuild() {
    make -j$(nproc)
    make install
 }
+
+ffbuild_configure() {
+    [[ $TARGET == win* ]] && return -1
+    echo --enable-mbedtls
+}
--- a/scripts.d/50-librist/50-librist.sh
+++ b/scripts.d/50-librist/50-librist.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://code.videolan.org/rist/librist.git"
-SCRIPT_COMMIT="04ba78abb6f8f673da0cc75056df876178e504fb"
+SCRIPT_COMMIT="809390b3b75a259a704079d0fb4d8f1b5f7fa956"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" librist
+    cd librist

    mkdir build && cd build

--- a/scripts.d/50-libssh.sh
+++ b/scripts.d/50-libssh.sh
@ -1,17 +1,23 @@
 #!/bin/bash

 SCRIPT_REPO="https://git.libssh.org/projects/libssh.git"
-SCRIPT_COMMIT="a7f85944c8c04cd1aba1a122b766f5d04db51050"
+SCRIPT_COMMIT="ac6d2fad4a8bf07277127736367e90387646363f"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libssh
+    cd libssh

    mkdir build && cd build

+    if [[ $TARGET == win* ]]; then
+        export CFLAGS="$CFLAGS -Dgettimeofday=ssh_gettimeofday"
+        export CXXFLAGS="$CFLAGS -Dgettimeofday=ssh_gettimeofday"
+    fi
+
    cmake -GNinja -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \
        -DBUILD_SHARED_LIBS=OFF \
        -DWITH_EXAMPLES=OFF -DWITH_SERVER=OFF \
--- a/scripts.d/50-libtheora.sh
+++ b/scripts.d/50-libtheora.sh
@ -8,7 +8,8 @@ ffbuild_enabled() {
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" theora
+    cd theora

    ./autogen.sh

--- a/scripts.d/50-libvpx.sh
+++ b/scripts.d/50-libvpx.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
-SCRIPT_COMMIT="b2c2955c8200ff434f178009df41a1e1e1623156"
+SCRIPT_COMMIT="2f2ede692e8af4f9b59183d6bd8e7fefe8d8cffc"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libvpx
+    cd libvpx

    local myconf=(
        --disable-shared
@ -17,7 +18,6 @@ ffbuild_dockerbuild() {
        --disable-examples
        --disable-tools
        --disable-docs
-        --disable-unit-tests
        --enable-vp9-highbitdepth
        --prefix="$FFBUILD_PREFIX"
    )
@ -50,9 +50,6 @@ ffbuild_dockerbuild() {
    ./configure "${myconf[@]}"
    make -j$(nproc)
    make install
-
-    # Work around strip breaking LTO symbol index
-    "$RANLIB" "$FFBUILD_PREFIX"/lib/libvpx.a
 }

 ffbuild_configure() {
--- a/scripts.d/50-libwebp.sh
+++ b/scripts.d/50-libwebp.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
-SCRIPT_COMMIT="eac3bd5c53da8bec55a635c6f4234c9cd5753820"
+SCRIPT_COMMIT="9b902cbacedd0fb19de5ce4475d7a8345d7fe9cf"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" webp
+    cd webp

    ./autogen.sh

--- a/scripts.d/50-lilv/96-lv2.sh
+++ b/scripts.d/50-lilv/96-lv2.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/lv2/lv2.git"
-SCRIPT_COMMIT="bb6a2103c7adf3c1339728915d7f1497ee98dcbf"
+SCRIPT_COMMIT="c8fb4d21901a4de2c822df537202b6a313e89edd"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" lv2
+    cd lv2

    mkdir build && cd build

--- a/scripts.d/50-lilv/96-serd.sh
+++ b/scripts.d/50-lilv/96-serd.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/drobilla/serd.git"
-SCRIPT_COMMIT="dbf48d099a78d2075e224549a28e690d56a6d503"
+SCRIPT_COMMIT="f4f9c9ec4c1031fc42af80642760a9138c3eaabc"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" serd
+    cd serd

    mkdir build && cd build

--- a/scripts.d/50-lilv/96-zix.sh
+++ b/scripts.d/50-lilv/96-zix.sh
@ -1,37 +0,0 @@
-#!/bin/bash
-
-SCRIPT_REPO="https://github.com/drobilla/zix.git"
-SCRIPT_COMMIT="a5c18d52a5351430d370084f25aaf7d166f7afd5"
-
-ffbuild_enabled() {
-    return 0
-}
-
-ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
-
-    mkdir build && cd build
-
-    local myconf=(
-        --prefix="$FFBUILD_PREFIX"
-        --buildtype=release
-        --default-library=static
-        -Ddocs=disabled
-        -Dbenchmarks=disabled
-        -Dtests=disabled
-        -Dtests_cpp=disabled
-    )
-
-    if [[ $TARGET == win* || $TARGET == linux* ]]; then
-        myconf+=(
-            --cross-file=/cross.meson
-        )
-    else
-        echo "Unknown target"
-        return -1
-    fi
-
-    meson "${myconf[@]}" ..
-    ninja -j"$(nproc)"
-    ninja install
-}
--- a/scripts.d/50-lilv/97-sord.sh
+++ b/scripts.d/50-lilv/97-sord.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/drobilla/sord.git"
-SCRIPT_COMMIT="46f4bcbe04330645a11d00e56a7754cc1386bc45"
+SCRIPT_COMMIT="9960380c5581b02e927e39c51cb1c38d020a30b6"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" sord
+    cd sord

    mkdir build && cd build

--- a/scripts.d/50-lilv/98-sratom.sh
+++ b/scripts.d/50-lilv/98-sratom.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/lv2/sratom.git"
-SCRIPT_COMMIT="b97b447d77fbf172260b4b40f184959f59c3623e"
+SCRIPT_COMMIT="0713ba20a26c3eb6ae2574b2a23be87ff496f552"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" sratom
+    cd sratom

    mkdir build && cd build

--- a/scripts.d/50-lilv/99-lilv.sh
+++ b/scripts.d/50-lilv/99-lilv.sh
@ -1,14 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/lv2/lilv.git"
-SCRIPT_COMMIT="54b32c1949d60225602a7161d5d6c4853230307a"
+SCRIPT_COMMIT="96d897c5981d60ac52c33a9f9ac66753998fa4ed"

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" lilv
+    cd lilv

    mkdir build && cd build

--- a/scripts.d/50-mfx.sh
+++ b/scripts.d/50-mfx.sh
@ -0,0 +1,46 @@
+#!/bin/bash
+
+SCRIPT_REPO="https://github.com/lu-zero/mfx_dispatch.git"
+SCRIPT_COMMIT="7e4d221c36c630c1250b23a5dfa15657bc04c10c"
+
+ffbuild_enabled() {
+    [[ $TARGET == linuxarm64 ]] && return -1
+    return 0
+}
+
+ffbuild_dockerbuild() {
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" mfx
+    cd mfx
+
+    autoreconf -i
+
+    local myconf=(
+        --prefix="$FFBUILD_PREFIX"
+        --disable-shared
+        --enable-static
+        --with-pic
+    )
+
+    if [[ $TARGET == win* || $TARGET == linux* ]]; then
+        myconf+=(
+            --host="$FFBUILD_TOOLCHAIN"
+        )
+    else
+        echo "Unknown target"
+        return -1
+    fi
+
+    ./configure "${myconf[@]}"
+    make -j$(nproc)
+    make install
+
+    ln -s libmfx.pc "$FFBUILD_PREFIX"/lib/pkgconfig/mfx.pc
+}
+
+ffbuild_configure() {
+    [[ $ADDINS_STR == *onevpl* ]] || echo --enable-libmfx
+}
+
+ffbuild_unconfigure() {
+    echo --disable-libmfx
+}
--- a/Show more
+++ b/Show more