.github/workflows/build.yml

@@ -25,24 +25,9 @@ env:
   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
@@ -61,11 +46,8 @@ jobs:
         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
       - 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,22 +59,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
@@ -104,18 +70,6 @@ jobs:
           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' }}
@@ -144,7 +98,6 @@ jobs:
           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
       - 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,8 +109,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
@@ -200,6 +151,7 @@ jobs:
           IMG="${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}"
           echo "name=ghcr.io/${IMG/ /-}" >> $GITHUB_OUTPUT
           echo "rawname=${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,6 +163,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
+          build-args: |
+            GH_REPO=ghcr.io/${{ steps.imagename.outputs.gh_repo }}
       - name: Cleanup
         if: ${{ env.HAVE_CLEANUP_PAT == 'true' }}
         continue-on-error: true

.gitignore

@@ -1,4 +1,4 @@
-/Dockerfile*
+/Dockerfile
 /ffbuild/
 /artifacts/
 /.cache/

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 -
 

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"
 

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.152_89671bf Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=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.152_89671bf"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@@ -269,8 +269,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
@@ -477,8 +475,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
@@ -583,8 +579,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 +588,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
@@ -773,8 +766,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_25=y
 # CT_ISL_V_0_24 is not set
 # CT_ISL_V_0_23 is not set
 # CT_ISL_V_0_22 is not set
@@ -786,7 +778,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.25"
 CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -883,11 +875,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}"
@@ -936,9 +927,8 @@ CT_ZSTD_PATCH_GLOBAL=y
 # 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_V_1_5_2=y
+CT_ZSTD_VERSION="1.5.2"
 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}"

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.152_89671bf Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=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.152_89671bf"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@@ -276,8 +276,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
@@ -483,8 +481,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
@@ -595,8 +591,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 +600,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
@@ -785,8 +778,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_25=y
 # CT_ISL_V_0_24 is not set
 # CT_ISL_V_0_23 is not set
 # CT_ISL_V_0_22 is not set
@@ -798,7 +790,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.25"
 CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -895,11 +887,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}"
@@ -948,9 +939,8 @@ CT_ZSTD_PATCH_GLOBAL=y
 # 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_V_1_5_2=y
+CT_ZSTD_VERSION="1.5.2"
 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}"

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]

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.152_89671bf Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=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.152_89671bf"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@@ -175,7 +175,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
@@ -382,10 +381,6 @@ 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
@@ -441,8 +436,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 +445,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
@@ -628,8 +620,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_25=y
 # CT_ISL_V_0_24 is not set
 # CT_ISL_V_0_23 is not set
 # CT_ISL_V_0_22 is not set
@@ -640,7 +631,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.25"
 CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -738,9 +729,8 @@ CT_ZSTD_PATCH_GLOBAL=y
 # 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_V_1_5_2=y
+CT_ZSTD_VERSION="1.5.2"
 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}"

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]

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.152_89671bf Configuration
 #
 CT_CONFIGURE_has_static_link=y
 CT_CONFIGURE_has_cxx11=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.152_89671bf"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@@ -382,10 +382,6 @@ 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
@@ -441,8 +437,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 +446,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
@@ -628,8 +621,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_25=y
 # CT_ISL_V_0_24 is not set
 # CT_ISL_V_0_23 is not set
 # CT_ISL_V_0_22 is not set
@@ -640,7 +632,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.25"
 CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@@ -738,9 +730,8 @@ CT_ZSTD_PATCH_GLOBAL=y
 # 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_V_1_5_2=y
+CT_ZSTD_VERSION="1.5.2"
 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}"

images/base/Dockerfile

@@ -1,14 +1,11 @@
-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 \

images/base/run_stage.sh

@@ -11,12 +11,5 @@ export RAW_LDFLAGS="$LDFLAGS"
 mkdir -p /stage
 source "$1"
 cd /stage
-if [[ -n "$3" ]]; then
-    cd "$3"
-fi
-if [[ -z "$2" ]]; then
-    ffbuild_dockerbuild
-else
-    "$2"
-fi
+ffbuild_dockerbuild
 rm -rf /stage "$FFBUILD_PREFIX"/bin

makeimage.sh

@@ -18,14 +18,13 @@ docker buildx inspect ffbuilder &>/dev/null || docker buildx create \
     --driver-opt env.BUILDKIT_STEP_LOG_MAX_SIZE=-1 \
     --driver-opt env.BUILDKIT_STEP_LOG_MAX_SPEED=-1
 
-docker container inspect ffbuildreg &>/dev/null || \
-    docker run --rm -d -p 127.0.0.1:64647:5000 --name ffbuildreg registry:2
-LOCAL_REG_PORT="$(docker container inspect --format='{{range $p, $conf := .NetworkSettings.Ports}}{{(index $conf 0).HostPort}}{{end}}' ffbuildreg)"
-LOCAL_ROOT="127.0.0.1:${LOCAL_REG_PORT}/local"
-
-export REGISTRY_OVERRIDE_DL="127.0.0.1:${LOCAL_REG_PORT}" GITHUB_REPOSITORY_DL="local"
-
 if [[ -z "$QUICKBUILD" ]]; then
+    docker container inspect ffbuildreg &>/dev/null || \
+        docker run --rm -d -p 127.0.0.1:0:5000 --name ffbuildreg registry:2
+    LOCAL_REG_PORT="$(docker container inspect --format='{{range $p, $conf := .NetworkSettings.Ports}}{{(index $conf 0).HostPort}}{{end}}' ffbuildreg)"
+    LOCAL_ROOT="127.0.0.1:${LOCAL_REG_PORT}/local"
+    trap "rm -f '$TMPCFG'; docker container stop ffbuildreg" EXIT
+
     if grep "FROM.*base.*" "images/base-${TARGET}/Dockerfile" >/dev/null 2>&1; then
         docker buildx --builder ffbuilder build \
             --cache-from=type=local,src=.cache/"${BASE_IMAGE/:/_}" \
@@ -39,29 +38,14 @@ if [[ -z "$QUICKBUILD" ]]; then
         --push --tag "${LOCAL_ROOT}/base-${TARGET}:latest" \
         --build-arg GH_REPO="$LOCAL_ROOT" "images/base-${TARGET}"
 
-    export REGISTRY_OVERRIDE="$REGISTRY_OVERRIDE_DL" GITHUB_REPOSITORY="$GITHUB_REPOSITORY_DL"
+    export REGISTRY_OVERRIDE="127.0.0.1:${LOCAL_REG_PORT}" GITHUB_REPOSITORY="local"
 fi
 
 ./generate.sh "$TARGET" "$VARIANT" "${ADDINS[@]}"
-DL_CACHE_TAG="$(./util/get_dl_cache_tag.sh)"
-DL_IMAGE="${DL_IMAGE_RAW}:${DL_CACHE_TAG}"
-
-if docker pull "${DL_IMAGE}"; then
-    export REGISTRY_OVERRIDE_DL="$REGISTRY" GITHUB_REPOSITORY_DL="$REPO"
-    ./generate.sh "$TARGET" "$VARIANT" "${ADDINS[@]}"
-else
-    DL_IMAGE="${LOCAL_ROOT}/dl_cache:${DL_CACHE_TAG}"
-    docker manifest inspect --insecure "${DL_IMAGE}" >/dev/null ||
-        docker buildx --builder ffbuilder build -f Dockerfile.dl \
-            --cache-from=type=local,src=.cache/dl_image_cache \
-            --cache-to=type=local,mode=max,dest=.cache/dl_image_cache \
-            --push --tag "${DL_IMAGE}" .
-fi
 
 docker buildx --builder ffbuilder build \
     --cache-from=type=local,src=.cache/"${IMAGE/:/_}" \
     --cache-to=type=local,mode=max,dest=.cache/"${IMAGE/:/_}" \
     --load --tag "$IMAGE" .
 
-docker container stop ffbuildreg
 docker buildx rm -f ffbuilder

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

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="eff726c461e09f35eeaed125a3570fa5f807f02b"
 
 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
     )
 

scripts.d/10-xorg-macros.sh

@@ -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"

scripts.d/20-libiconv.sh

@@ -1,21 +1,19 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://git.savannah.gnu.org/git/libiconv.git"
-SCRIPT_COMMIT="6e2b31f6d66739c5abd850338ea68c6bd2012812"
+SCRIPT_COMMIT="33f08ec1e0fc1e8203a3d81e9161894dc5793908"
 
 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"
+    retry-tool sh -c "rm -rf iconv && git clone '$SCRIPT_REPO' iconv"
+    cd iconv
+    git checkout "$SCRIPT_COMMIT"
 
-    (unset CC CFLAGS GMAKE && ./autogen.sh)
+    ./gitsub.sh pull
+    ./autogen.sh
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"

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

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"

scripts.d/25-fftw3.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/FFTW/fftw3.git"
-SCRIPT_COMMIT="69f6c1a6ebd7ac5af33e7074134fb79fbc729c3d"
+SCRIPT_COMMIT="0842f00ae6b6e1f3aade155bc0edd17a7313fa6a"
 
 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"

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="c4fe77c3f072fab930267f95510562e7aeb03302"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" freetype
+    cd freetype
 
     ./autogen.sh
 

scripts.d/25-fribidi.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/fribidi/fribidi.git"
-SCRIPT_COMMIT="b54871c339dabb7434718da3fed2fa63320997e5"
+SCRIPT_COMMIT="2c2a014bf7161d43ed9f0f23f383be176a4f9df3"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fribidi
+    cd fribidi
 
     mkdir build && cd build
 

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="614a1cd8bb1d"
 
 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
 

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
 

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_1t"
+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
-}

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="1dbe12b90cff79bb51923733ac0840747b4b4131"
 
 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"

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="222d058525506e587a45368f10e45e4b80ca541f"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fc
+    cd fc
 
     ./autogen.sh --noconf
 

scripts.d/45-harfbuzz.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
-SCRIPT_COMMIT="73ee9c346f3acccbe14a4caf258b636de7c459be"
+SCRIPT_COMMIT="3db6baa20e0a4661f99654860000e74a2770c2e0"
 
 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"

scripts.d/45-libsamplerate.sh

@@ -8,7 +8,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libsr
+    cd libsr
 
     mkdir build
     cd build

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
 

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
 

scripts.d/45-opencl.sh

@@ -1,27 +1,25 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git"
-SCRIPT_COMMIT="e049b16b5f157e2f28e7b5c301e71e1ccb3fe288"
+SCRIPT_COMMIT="4fdcfb0ae675f2f63a9add9552e0af62c2b4ed30"
 
 SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
-SCRIPT_COMMIT2="229410f86a8c8c9e0f86f195409e5481a2bae067"
+SCRIPT_COMMIT2="b1bce7c3c580a8345205cf65fc1a5f55ba9cdb01"
 
 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" \

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="86e9c901289d2e1a3c2c6cb5885294a829f3eb27"
 
 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

scripts.d/45-vmaf.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/Netflix/vmaf.git"
-SCRIPT_COMMIT="98bdd77b296da207ab42c3113ec8f30de58db197"
+SCRIPT_COMMIT="bf80018c3f21151b7c90324da95ef2de80f49297"
 
 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

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

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

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

scripts.d/45-x11/20-libxau.sh

@@ -9,7 +9,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxau
+    cd libxau
 
     autoreconf -i
 

scripts.d/45-x11/30-libxcb.sh

@@ -9,7 +9,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxcb
+    cd libxcb
 
     autoreconf -i
 

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

scripts.d/45-x11/50-libxext.sh

@@ -9,7 +9,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxext
+    cd libxext
 
     autoreconf -i
 

scripts.d/45-x11/50-libxfixes.sh

@@ -9,7 +9,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxfixes
+    cd libxfixes
 
     autoreconf -i
 

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="826215af0cc46b19555063b8894de6781d4c5993"
 
 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
 

scripts.d/45-x11/50-libxinerama.sh

@@ -9,7 +9,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxinerama
+    cd libxinerama
 
     autoreconf -i
 

scripts.d/45-x11/50-libxrender.sh

@@ -9,7 +9,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxrender
+    cd libxrender
 
     autoreconf -i
 

scripts.d/45-x11/50-libxscrnsaver.sh

@@ -9,7 +9,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxscrnsaver
+    cd libxscrnsaver
 
     autoreconf -i
 

scripts.d/45-x11/50-libxxf86vm.sh

@@ -9,7 +9,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxxf86vm
+    cd libxxf86vm
 
     autoreconf -i
 

scripts.d/45-x11/60-libglvnd.sh

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

scripts.d/45-x11/60-libxcursor.sh

@@ -9,7 +9,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxcursor
+    cd libxcursor
 
     autoreconf -i
 

scripts.d/45-x11/60-libxrandr.sh

@@ -9,7 +9,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxrandr
+    cd libxrandr
 
     autoreconf -i
 

scripts.d/45-x11/60-libxv.sh

@@ -10,7 +10,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxv
+    cd libxv
 
     autoreconf -i
 

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

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

scripts.d/50-aom.sh

@@ -1,18 +1,19 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://aomedia.googlesource.com/aom"
-SCRIPT_COMMIT="83ccc009eade321c8723ae0da8655fc68ce6a128"
+SCRIPT_COMMIT="d6b8177c9e7fe0fa381afb6ed3946c492fc4d6e9"
 
 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"

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="e519af8b49f52c4ac400f50f23b48ebe36a5f4df"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libpng
+    cd libpng
 
     autoreconf -i
 

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"

scripts.d/50-avisynth.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/AviSynth/AviSynthPlus.git"
-SCRIPT_COMMIT="fc5b9bc41fd47001b7da39ea777d29c0ede2a2a7"
+SCRIPT_COMMIT="35706f838a7f6bdda422891c875e60d503d9bdb4"
 
 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
 

scripts.d/50-chromaprint.sh

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

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="0b809a9281e0a97441728ad763779e7874209d37"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" dav1d
+    cd dav1d
 
     mkdir build && cd build
 

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=(

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
 

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="450f8a634309b8f212b1a642630e164150d6a427"
 
 SCRIPT_REPO2="https://github.com/FFmpeg/nv-codec-headers.git"
-SCRIPT_COMMIT2="dc3e4484dc83485734e503991fe5ed3bdf256fba"
+SCRIPT_COMMIT2="2055784e5d5bfb3df78d4d3645f345f19062dce2"
 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
 }
 

scripts.d/50-frei0r.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/dyne/frei0r.git"
-SCRIPT_COMMIT="c3f987c4cc8c1a7f6928e574f4cb272a7770ca6f"
+SCRIPT_COMMIT="3e1234b9f2ba86b1deebdd1034735e12d706c095"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1
@@ -10,7 +10,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" frei0r
+    cd frei0r
 
     mkdir build && cd build
 

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
 

scripts.d/50-kvazaar.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/ultravideo/kvazaar.git"
-SCRIPT_COMMIT="aaae5b0f4926065136f287876c6bc41631bae692"
+SCRIPT_COMMIT="37a0404bc8ccdc39515a5aed706205dc53810019"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" kvazaar
+    cd kvazaar
 
     ./autogen.sh
 

scripts.d/50-libass.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/libass/libass.git"
-SCRIPT_COMMIT="1a599b1db748dfc07df98cd37d8603edb87da2fd"
+SCRIPT_COMMIT="32dea3434dbd85f9fb2700b6863c1bd92f00b86f"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" ass
+    cd ass
 
     ./autogen.sh
 

scripts.d/50-libbluray.sh

@@ -8,7 +8,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libbluray
+    cd libbluray
 
     ./bootstrap
 

scripts.d/50-libjxl/45-brotli.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/google/brotli.git"
-SCRIPT_COMMIT="413b098564a90a2e6cae192d30642d33a9197a39"
+SCRIPT_COMMIT="ed1995b6bda19244070ab5d331111f16f67c8054"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" brotli
+    cd brotli
 
     mkdir build && cd build
 

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

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
 

scripts.d/50-libopus.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/xiph/opus.git"
-SCRIPT_COMMIT="9fc8fc4cf432640f284113ba502ee027268b0d9f"
+SCRIPT_COMMIT="8cf872a186b96085b1bb3a547afd598354ebeb87"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" opus
+    cd opus
 
     ./autogen.sh
 

scripts.d/50-librist/40-mbedtls.sh

@@ -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
+}

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="234c2e224c1dc60276a7b427acd3cc0f8bdb3bda"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" librist
+    cd librist
 
     mkdir build && cd build
 

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="c3aa0cb18225f2f9fcefd96aad327c6ffbb2d77c"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libssh
+    cd libssh
 
     mkdir build && cd build
 

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
 

scripts.d/50-libvpx.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
-SCRIPT_COMMIT="b2c2955c8200ff434f178009df41a1e1e1623156"
+SCRIPT_COMMIT="8f14f66490f8bfbbf01ce809629c02631baf5b8f"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libvpx
+    cd libvpx
 
     local myconf=(
         --disable-shared

scripts.d/50-libwebp.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
-SCRIPT_COMMIT="eac3bd5c53da8bec55a635c6f4234c9cd5753820"
+SCRIPT_COMMIT="761f49c3ab1c91b8e911840a4f6f246308b7c242"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" webp
+    cd webp
 
     ./autogen.sh
 

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="bdaebafd3223551b3d9d890070ac0671b3b645c1"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" lv2
+    cd lv2
 
     mkdir build && cd build
 

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="a6cd7dd91d93015ec118286b868c3fd43133f3ac"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" serd
+    cd serd
 
     mkdir build && cd build
 

scripts.d/50-lilv/96-zix.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/drobilla/zix.git"
-SCRIPT_COMMIT="a5c18d52a5351430d370084f25aaf7d166f7afd5"
+SCRIPT_COMMIT="262d4a1522c38be0588746e874159da5c7bb457d"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" zix
+    cd zix
 
     mkdir build && cd build
 

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="f5d33a2cda7b6f498bb7e5e61e298dce5510ed5c"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" sord
+    cd sord
 
     mkdir build && cd build
 

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="f1f063c8e170b2a6350eedf68c4859b974d85d5e"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" sratom
+    cd sratom
 
     mkdir build && cd build
 

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="efb392e32da0bce28dbeb6fb728dcd9183f4611b"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" lilv
+    cd lilv
 
     mkdir build && cd build
 

scripts.d/50-mfx.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+SCRIPT_REPO="https://github.com/lu-zero/mfx_dispatch.git"
+SCRIPT_COMMIT="5a3f178be7f406cec920b9f52f46c1ae29f29bb2"
+
+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
+}

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

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

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
 

scripts.d/50-openh264.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/cisco/openh264.git"
-SCRIPT_COMMIT="986606644aca8f795fc04f76dcc758d88378e4a0"
+SCRIPT_COMMIT="09a4f3ec842a8932341b195c5b01e141c8a16eb7"
 
 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"

scripts.d/50-openjpeg.sh

@@ -8,7 +8,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openjpeg
+    cd openjpeg
 
     mkdir build && cd build
 

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

scripts.d/50-rav1e.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/xiph/rav1e.git"
-SCRIPT_COMMIT="5ec4f95d9fe1a9295fe8239e2860c8f84e5e2336"
+SCRIPT_COMMIT="80d0ff2df4785e0d3b0050205541914faffd583d"
 
 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"

scripts.d/50-rubberband.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/breakfastquay/rubberband.git"
-SCRIPT_COMMIT="1eddafd7a7c8b64e377d64ee5e87ead881a32a48"
+SCRIPT_COMMIT="b04b731a954fab2cdbe18e11b372a6d0f4114387"
 
 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
 

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
 }

scripts.d/50-sdl.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/libsdl-org/SDL.git"
-SCRIPT_COMMIT="e16a83d393ae1784040519f42c482e2641b971a2"
+SCRIPT_COMMIT="7ec9a4385a0829ef2f7b101ec93f68065ddd2571"
 SCRIPT_BRANCH="SDL2"
 
 ffbuild_enabled() {
@@ -9,7 +9,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" sdl
+    cd sdl
 
     mkdir build && cd build
 

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
 

scripts.d/50-srt.sh

@@ -1,14 +1,15 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/Haivision/srt.git"
-SCRIPT_COMMIT="61c7bedf27a2edbcf6e6fdc179612980bae53c6a"
+SCRIPT_COMMIT="4c9a4178d77543aa816cdb09b382e5163bc40a18"
 
 ffbuild_enabled() {
     return 0
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" srt
+    cd srt
 
     mkdir build && cd build
 

scripts.d/50-svtav1.sh

@@ -1,19 +1,17 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
-SCRIPT_COMMIT="08c18ba0768ed3dbbff0903adc326fb3a7549bd9"
+SCRIPT_COMMIT="fca45816bb70e431b2e664374d93c39afecb2783"
 
 ffbuild_enabled() {
     [[ $TARGET == win32 ]] && return -1
     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" svtav1
+    cd svtav1
+    git checkout "$SCRIPT_COMMIT"
 
     mkdir build && cd build
 

scripts.d/50-twolame.sh

@@ -8,7 +8,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" twolame
+    cd twolame
 
     NOCONFIGURE=1 ./autogen.sh
     touch doc/twolame.1

scripts.d/50-uavs3d.sh

@@ -8,12 +8,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" uavs3d
+    cd uavs3d
+    git checkout "$SCRIPT_COMMIT"
 
     mkdir build/linux
     cd build/linux

scripts.d/50-vaapi/30-libpciaccess.sh

@@ -9,7 +9,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR/$SELF"
+    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libpciaccess
+    cd libpciaccess
 
     autoreconf -fi