135 changed files with 524 additions and 893 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 "name=ghcr.io/${GITHUB_REPOSITORY,,}/base" >> $GITHUB_OUTPUT
      - 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 "name=ghcr.io/${GITHUB_REPOSITORY,,}/base-${{ matrix.target }}" >> $GITHUB_OUTPUT
      - 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 "name=${IMG/ /-}" >> $GITHUB_OUTPUT
+          echo "gh_repo=${GITHUB_REPOSITORY,,}" >> $GITHUB_OUTPUT
      - 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
@ -286,7 +199,7 @@ jobs:
          TAGNAME="latest"
          hub release delete "$TAGNAME" || true
          git push --delete origin "$TAGNAME" || true
-          sleep 15
+          sleep 5
          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
@ -64,6 +64,8 @@ Available variants:
 * `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.
+* `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.
+* `5.1` to build from the 5.1 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/build.sh
+++ b/build.sh
@ -90,10 +90,10 @@ 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 -

--- a/generate.sh
+++ b/generate.sh
@ -3,83 +3,29 @@ 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"

--- a/images/base-linux64/Dockerfile
+++ b/images/base-linux64/Dockerfile
@ -54,8 +54,8 @@ ENV PATH="/opt/ct-ng/bin:${PATH}" \
    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/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.90_cf9beb1 Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@ -13,9 +13,9 @@ 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
@ -28,7 +28,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.90_cf9beb1"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@ -46,7 +46,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 +64,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
@ -128,6 +126,7 @@ CT_CONFIG_SHELL="${bash}"
 CT_LOG_DEBUG=y
 CT_LOG_LEVEL_MAX="DEBUG"
 # 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,7 +137,6 @@ 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
@ -165,7 +163,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 LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
 CT_ARCH_SUFFIX=""
 # CT_OMIT_TARGET_VENDOR is not set

@ -269,9 +267,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
@ -377,8 +372,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_39=y
 # CT_BINUTILS_V_2_38 is not set
 # CT_BINUTILS_V_2_37 is not set
 # CT_BINUTILS_V_2_36 is not set
@ -392,14 +386,14 @@ 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.39"
 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_2_39_or_older=y
 CT_BINUTILS_later_than_2_30=y
 CT_BINUTILS_2_30_or_later=y
 CT_BINUTILS_later_than_2_27=y
@ -454,7 +448,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
@ -477,8 +470,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
@ -534,7 +525,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 +545,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 +573,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 +582,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.2.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
@ -674,7 +661,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 +759,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 +770,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 +867,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}"
@ -922,29 +905,7 @@ 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 +914,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 +922,6 @@ CT_ISL=y
 CT_MPC=y
 CT_NCURSES=y
 CT_ZLIB=y
-CT_ZSTD=y
 # end of Companion libraries

 #
--- a/images/base-linuxarm64/Dockerfile
+++ b/images/base-linuxarm64/Dockerfile
@ -56,8 +56,8 @@ ENV PATH="/opt/ct-ng/bin:${PATH}" \
    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/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.90_cf9beb1 Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@ -13,9 +13,9 @@ 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
@ -28,7 +28,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.90_cf9beb1"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@ -46,7 +46,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 +64,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
@ -128,6 +126,7 @@ CT_CONFIG_SHELL="${bash}"
 CT_LOG_DEBUG=y
 CT_LOG_LEVEL_MAX="DEBUG"
 # 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,7 +137,6 @@ 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
@ -165,7 +163,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 LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
 CT_ARCH_SUFFIX=""
 # CT_OMIT_TARGET_VENDOR is not set

@ -276,9 +274,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
@ -383,8 +378,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_39=y
 # CT_BINUTILS_V_2_38 is not set
 # CT_BINUTILS_V_2_37 is not set
 # CT_BINUTILS_V_2_36 is not set
@ -398,14 +392,14 @@ 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.39"
 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_2_39_or_older=y
 CT_BINUTILS_later_than_2_30=y
 CT_BINUTILS_2_30_or_later=y
 CT_BINUTILS_later_than_2_27=y
@ -460,7 +454,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
@ -483,8 +476,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
@ -546,7 +537,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 +557,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 +585,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 +594,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.2.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
@ -686,7 +673,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 +771,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 +782,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 +879,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}"
@ -934,29 +917,7 @@ 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 +926,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 +934,6 @@ CT_ISL=y
 CT_MPC=y
 CT_NCURSES=y
 CT_ZLIB=y
-CT_ZSTD=y
 # end of Companion libraries

 #
--- a/images/base-win32/cross.meson
+++ b/images/base-win32/cross.meson
@ -5,7 +5,6 @@ ar = 'i686-w64-mingw32-gcc-ar'
 ranlib = 'i686-w64-mingw32-gcc-ranlib'
 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.90_cf9beb1 Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@ -13,9 +13,9 @@ 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
@ -28,7 +28,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.90_cf9beb1"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@ -46,7 +46,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 +64,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
@ -128,6 +126,7 @@ CT_CONFIG_SHELL="${bash}"
 CT_LOG_DEBUG=y
 CT_LOG_LEVEL_MAX="DEBUG"
 # 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,7 +137,6 @@ 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
@ -165,7 +163,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 LOONGARCH 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 +173,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
@ -295,8 +292,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_39=y
 # CT_BINUTILS_V_2_38 is not set
 # CT_BINUTILS_V_2_37 is not set
 # CT_BINUTILS_V_2_36 is not set
@ -310,14 +306,14 @@ 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.39"
 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_2_39_or_older=y
 CT_BINUTILS_later_than_2_30=y
 CT_BINUTILS_2_30_or_later=y
 CT_BINUTILS_later_than_2_27=y
@ -368,29 +364,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
@ -412,7 +403,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 +431,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 +440,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.2.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
@ -529,7 +516,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 +614,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 +624,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}"
@ -724,29 +708,7 @@ 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 +716,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/cross.meson
+++ b/images/base-win64/cross.meson
@ -5,7 +5,6 @@ ar = 'x86_64-w64-mingw32-gcc-ar'
 ranlib = 'x86_64-w64-mingw32-gcc-ranlib'
 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.90_cf9beb1 Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=y
@ -13,9 +13,9 @@ 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
@ -28,7 +28,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.90_cf9beb1"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@ -46,7 +46,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 +64,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
@ -128,6 +126,7 @@ CT_CONFIG_SHELL="${bash}"
 CT_LOG_DEBUG=y
 CT_LOG_LEVEL_MAX="DEBUG"
 # 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,7 +137,6 @@ 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
@ -165,7 +163,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 LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA"
 CT_ARCH_SUFFIX=""
 # CT_OMIT_TARGET_VENDOR is not set

@ -295,8 +293,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_39=y
 # CT_BINUTILS_V_2_38 is not set
 # CT_BINUTILS_V_2_37 is not set
 # CT_BINUTILS_V_2_36 is not set
@ -310,14 +307,14 @@ 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.39"
 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_2_39_or_older=y
 CT_BINUTILS_later_than_2_30=y
 CT_BINUTILS_2_30_or_later=y
 CT_BINUTILS_later_than_2_27=y
@ -368,29 +365,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
@ -412,7 +404,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 +432,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 +441,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.2.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
@ -529,7 +517,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 +615,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 +625,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}"
@ -724,29 +709,7 @@ 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 +717,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/Dockerfile
+++ b/images/base/Dockerfile
@ -1,20 +1,17 @@
-FROM ubuntu:23.04
-
-ENV FFBUILD_DLDIR="/opt/ffdl"
+FROM ubuntu:22.10

 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/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
 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

+if [[ -z "$QUICKBUILD" ]]; then
    docker container inspect ffbuildreg &>/dev/null || \
-    docker run --rm -d -p 127.0.0.1:64647:5000 --name ffbuildreg registry:2
+        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

-export REGISTRY_OVERRIDE_DL="127.0.0.1:${LOCAL_REG_PORT}" GITHUB_REPOSITORY_DL="local"
-
-if [[ -z "$QUICKBUILD" ]]; then
    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="13f9449c11e8c2ceadde1e7f405db117055bb1d0"

 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="a24937211244f3a33ff6f3e64f3ab2c294f095dc"

 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
@ -8,7 +8,8 @@ ffbuild_enabled() {
 }

 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,15 @@
 #!/bin/bash

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

 ffbuild_enabled() {
    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="ae4eb996ab1ed43a52fac19461de3bdcaf1a1742"

 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="a6a4defff24aabf9195f462f9a7736f3d9e9c120"

 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="3ac5afa36be5"

 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
@ -8,7 +8,8 @@ ffbuild_enabled() {
 }

 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_1s"
+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
@ -56,20 +51,15 @@ ffbuild_dockerbuild() {
    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}/}"
+    export CC="gcc"
+    export CXX="g++"
+    export AR="gcc-ar"
+    export RANLIB="gcc-ranlib"

    ./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,16 +1,17 @@
 #!/bin/bash

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

 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"
--- 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="eb0a199e0658d3ba64ff19072cb2ae39c5ca7c4c"

 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="f53ef69d5941514b06f5afbcd83709cf724eb74d"

 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="b590a6bfe034ea3a418b7b523e3490956bcb367a"

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

 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="3f9455411c90d2b2d1043c47ee24185fabb8e401"

 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="b8cbf16603e2558dc6427e0b12d3ab99732197df"

 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="842d91316243eb1f2e208231acc1512c2cf43a1f"

 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="9740bd9bfa75a858853f07b8c06dd813ef692778"

 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="c761c6505d49e8381a3eae94f2e5e118cbdf6487"

 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="4fbefa02d6c842401ff79065d364edd7087a12a6"

 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="33f3dbe3699a92e8ca18f470adac456e0b935e75"

 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="a04b84f0f7bb3a78088756759f4b9b8bb363251e"

 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="67e82cc395f44faddd83ec3d0d21624fe91c6fc0"

 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="08431d0684f9a1edf199f6c6060d2bef1ac78399"

 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="71dfee64feb84f907016940263b235a61c9e8960"

 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="e5e23272394c90731debd7e18dd167e8c25b5c15"

 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="7fe2d41f164d3015216c1079cc7fbce1eea90c98"

 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="58d49d7f1db39aa2ffb018de478bef30e2e855f6"

 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="7181160b2c32b1bb804792990783fa25c1122bae"

 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="9744d1f77b092eb4982c60e4750136fb19683545"

 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="9f558757af85029541110139586c35f8d4c6b2ad"

 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="3ed9597d23f3039202de80cbba4365bd8e5cba8e"

 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="04c016d79f97eb072c601787a4bc1b039a500025"

 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="e0a3fd0f5f4b38e94c8d84d372b9ea02177b34a5"

 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,7 +1,7 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/acoustid/chromaprint.git"
-SCRIPT_COMMIT="aa67c95b9e486884a6d3ee8b0c91207d8c2b0551"
+SCRIPT_COMMIT="b6d5f131e0c693ea877cbf49e0174be9fb0f9856"

 ffbuild_enabled() {
    # pkg-config check is currently only available in master
@ -12,7 +12,8 @@ ffbuild_enabled() {
 }

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

    mkdir build && cd build

--- 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="8f16314dba8bd1ec9d958bbb8bfba002967bd6a8"

 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
@ -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=(
--- 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,28 +1,24 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/FFmpeg/nv-codec-headers.git"
-SCRIPT_COMMIT="855f8263d97bbdcaeabaaaa2997e1ccad7c52dc3"
+SCRIPT_COMMIT="4b4dee0e27160c7ffef0d4bd7a3a7ea3b916a737"

 SCRIPT_REPO2="https://github.com/FFmpeg/nv-codec-headers.git"
-SCRIPT_COMMIT2="dc3e4484dc83485734e503991fe5ed3bdf256fba"
+SCRIPT_COMMIT2="b550d4042f1ac0990efa1fa9f0f0c08fb6b24446"
 SCRIPT_BRANCH2="sdk/11.1"

 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
+        SCRIPT_COMMIT="$SCRIPT_COMMIT2"
    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="a4005046ae2ebb3c88e92ff06736ce57b60fdcc7"

 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="52783a46c0f56ccfb66795667f069a1d2993cfcf"

 ffbuild_enabled() {
    return 0
 }

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

    ./autogen.sh

--- 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="c923cc09c274934452f795aa06d3a5aadb31d6fb"

 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="6d03dfbedda1615c4cba1211f8d81735575209c8"

 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="997069d111d4ba6c516580c218255c6f46c45c57"

 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

--- 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="bce1f392353d72d77d543bb2069a044ae1045e9d"

 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,14 +1,15 @@
 #!/bin/bash

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

 ffbuild_enabled() {
    return 0
 }

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

    mkdir build && cd build

--- 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="3f08aa0d0b2828b670073f808ae079acb35902a4"

 ffbuild_enabled() {
    return 0
 }

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

    local myconf=(
        --disable-shared
--- 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="3f73e8f7ac83e97a26346886b529b61809a839f5"

 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="778c112790ae84e7deabdac84de4147baf7937a4"

 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="655c7fcf6c7ce9f98106dfca9cff5dede749b1bd"

 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="96a865694af80227af1c5c8d96554f9d943687b2"

 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="36fd5599e7c67f9d99046aa1570e7f0d308b7092"

 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="97876806b31fedd0ebdded6ace70270277815c68"

 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,47 @@
+#!/bin/bash
+
+SCRIPT_REPO="https://github.com/lu-zero/mfx_dispatch.git"
+SCRIPT_COMMIT="7e4d221c36c630c1250b23a5dfa15657bc04c10c"
+
+ffbuild_enabled() {
+    [[ $TARGET == *arm64 ]] && return -1
+    [[ $ADDINS_STR != *4.4* && $ADDINS_STR != *5.0* && $ADDINS_STR != *5.1* ]] && 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() {
+    echo --enable-libmfx
+}
+
+ffbuild_unconfigure() {
+    echo --disable-libmfx
+}
--- a/scripts.d/50-onevpl.sh
+++ b/scripts.d/50-onevpl.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/oneapi-src/oneVPL.git"
-SCRIPT_COMMIT="e12ace9761bb52786409e830f619916b86e87fc5"
+SCRIPT_COMMIT="8b69f025de671b7bf97464f0e7fd7e2c5932dab7"

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

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

    mkdir build && cd build

@ -26,6 +27,8 @@ ffbuild_dockerbuild() {
    ninja install

    rm -rf "$FFBUILD_PREFIX"/{etc,share}
+
+    cat /opt/ffbuild/lib/pkgconfig/vpl.pc
 }

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

 SCRIPT_REPO="https://github.com/kcat/openal-soft.git"
-SCRIPT_COMMIT="05f9ce8b978239cebecef1a60f0d451a118fa3df"
+SCRIPT_COMMIT="e9ad8571ba93dd6631a9c05a05a28ede95728d9e"

 ffbuild_enabled() {
    [[ $ADDINS_STR == *4.4* ]] && return -1
@ -11,7 +11,8 @@ ffbuild_enabled() {
 }

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

    mkdir cm_build && cd cm_build

--- a/scripts.d/50-opencore-amr.sh
+++ b/scripts.d/50-opencore-amr.sh
@ -8,7 +8,8 @@ ffbuild_enabled() {
 }

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

    autoreconf -i

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

 SCRIPT_REPO="https://github.com/cisco/openh264.git"
-SCRIPT_COMMIT="986606644aca8f795fc04f76dcc758d88378e4a0"
+SCRIPT_COMMIT="db956674bbdfbaab5acdd3fdb4117c2fef5527e9"

 ffbuild_enabled() {
    return 0
 }

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

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

 SCRIPT_REPO="https://github.com/uclouvain/openjpeg.git"
-SCRIPT_COMMIT="1ee6d115e80036d1d38bad7f95a680bfc612c1bf"
+SCRIPT_COMMIT="2d606701e8b7aa83f657d113c3367508e99bd12b"

 ffbuild_enabled() {
    return 0
 }

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

    mkdir build && cd build

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

 SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT"
-SCRIPT_REV="19445"
+SCRIPT_REV="18146"

 ffbuild_enabled() {
    return 0
 }

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

    local myconf=(
        PREFIX="$FFBUILD_PREFIX"
--- a/scripts.d/50-rav1e.sh
+++ b/scripts.d/50-rav1e.sh
@ -1,7 +1,7 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/xiph/rav1e.git"
-SCRIPT_COMMIT="5ec4f95d9fe1a9295fe8239e2860c8f84e5e2336"
+SCRIPT_COMMIT="8deb5caef2579ea155798d3040c14ca2e4b9dbc8"

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

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

    local myconf=(
        --prefix="$FFBUILD_PREFIX"
@ -42,8 +43,6 @@ EOF
    fi

    cargo cinstall -v "${myconf[@]}"
-
-    chmod 644 "${FFBUILD_PREFIX}"/lib/*rav1e*
 }

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

 SCRIPT_REPO="https://github.com/breakfastquay/rubberband.git"
-SCRIPT_COMMIT="1eddafd7a7c8b64e377d64ee5e87ead881a32a48"
+SCRIPT_COMMIT="3d3cd0454b38fe1d108375a19b5baed5c2f318fd"

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

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

    mkdir build && cd build

--- a/scripts.d/50-schannel.sh
+++ b/scripts.d/50-schannel.sh
@ -6,10 +6,6 @@ ffbuild_enabled() {
    [[ $TARGET == win* ]]
 }

-ffbuild_dockerdl() {
-    return 0
-}
-
 ffbuild_dockerstage() {
    return 0
 }
@ -18,10 +14,6 @@ ffbuild_dockerbuild() {
    return 0
 }

-ffbuild_dockerlayer_dl() {
-    return 0
-}
-
 ffbuild_configure() {
    echo --enable-schannel
 }
--- a/scripts.d/50-sdl.sh
+++ b/scripts.d/50-sdl.sh
@ -1,15 +1,15 @@
 #!/bin/bash

 SCRIPT_REPO="https://github.com/libsdl-org/SDL.git"
-SCRIPT_COMMIT="e16a83d393ae1784040519f42c482e2641b971a2"
-SCRIPT_BRANCH="SDL2"
+SCRIPT_COMMIT="9d1dbd2ad86805c316cf4f2ee8ab2b361be18f4d"

 ffbuild_enabled() {
    return 0
 }

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

    mkdir build && cd build

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

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

    mkdir build && cd build

--- a/Show more
+++ b/Show more