Move iconv submodule fetch to cache

Don't depend on zip
Closes #284
2023-07-25 14:39:11 +02:00 · 2023-07-22 15:46:57 +02:00 · 2023-07-20 15:54:19 +02:00 · 2023-07-20 15:29:53 +02:00 · 2023-07-10 22:40:41 +02:00 · 2023-07-09 19:44:10 +02:00
130 changed files with 581 additions and 413 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -25,9 +25,24 @@ 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
@ -46,8 +61,11 @@ 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
@ -59,6 +77,22 @@ 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
@ -70,6 +104,18 @@ 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' }}
@ -98,6 +144,7 @@ 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
@ -109,6 +156,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
@ -151,7 +200,6 @@ 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
@ -163,8 +211,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
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,4 @@
-/Dockerfile
+/Dockerfile*
 /ffbuild/
 /artifacts/
 /.cache/
--- 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"
-    zip -9 -r "${ARTIFACTS_PATH}/${OUTPUT_FNAME}" "$BUILD_NAME"
+    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"
 else
    OUTPUT_FNAME="${BUILD_NAME}.tar.xz"
-    tar cJf "${ARTIFACTS_PATH}/${OUTPUT_FNAME}" "$BUILD_NAME"
+    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"
 fi
 cd -

--- a/generate.sh
+++ b/generate.sh
@ -3,29 +3,83 @@ set -e
 cd "$(dirname "$0")"
 source util/vars.sh

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

 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/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.152_89671bf Configuration
+# crosstool-NG 1.25.0.196_227d99d 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.152_89671bf"
+CT_VERSION="1.25.0.196_227d99d"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@ -269,6 +269,8 @@ 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
@ -475,6 +477,8 @@ 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
@ -579,7 +583,8 @@ 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_12=y
+CT_GCC_V_13=y
+# CT_GCC_V_12 is not set
 # CT_GCC_V_11 is not set
 # CT_GCC_V_10 is not set
 # CT_GCC_V_9 is not set
@ -588,12 +593,14 @@ CT_GCC_V_12=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="12.2.0"
+CT_GCC_VERSION="13.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_GCC_SIGNATURE_FORMAT=""
+CT_GCC_later_than_13=y
+CT_GCC_13_or_later=y
 CT_GCC_later_than_12=y
 CT_GCC_12_or_later=y
 CT_GCC_later_than_11=y
@ -766,7 +773,8 @@ 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_25=y
+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_23 is not set
 # CT_ISL_V_0_22 is not set
@ -778,7 +786,7 @@ CT_ISL_V_0_25=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.25"
+CT_ISL_VERSION="0.26"
 CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@ -875,10 +883,11 @@ 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_2=y
+CT_NCURSES_V_6_4=y
+# CT_NCURSES_V_6_2 is not set
 # CT_NCURSES_V_6_1 is not set
 # CT_NCURSES_V_6_0 is not set
-CT_NCURSES_VERSION="6.2"
+CT_NCURSES_VERSION="6.4"
 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}"
@ -927,8 +936,9 @@ 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_2=y
-CT_ZSTD_VERSION="1.5.2"
+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}"
--- 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.152_89671bf Configuration
+# crosstool-NG 1.25.0.196_227d99d 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.152_89671bf"
+CT_VERSION="1.25.0.196_227d99d"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@ -276,6 +276,8 @@ 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
@ -481,6 +483,8 @@ 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
@ -591,7 +595,8 @@ 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_12=y
+CT_GCC_V_13=y
+# CT_GCC_V_12 is not set
 # CT_GCC_V_11 is not set
 # CT_GCC_V_10 is not set
 # CT_GCC_V_9 is not set
@ -600,12 +605,14 @@ CT_GCC_V_12=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="12.2.0"
+CT_GCC_VERSION="13.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_GCC_SIGNATURE_FORMAT=""
+CT_GCC_later_than_13=y
+CT_GCC_13_or_later=y
 CT_GCC_later_than_12=y
 CT_GCC_12_or_later=y
 CT_GCC_later_than_11=y
@ -778,7 +785,8 @@ 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_25=y
+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_23 is not set
 # CT_ISL_V_0_22 is not set
@ -790,7 +798,7 @@ CT_ISL_V_0_25=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.25"
+CT_ISL_VERSION="0.26"
 CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@ -887,10 +895,11 @@ 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_2=y
+CT_NCURSES_V_6_4=y
+# CT_NCURSES_V_6_2 is not set
 # CT_NCURSES_V_6_1 is not set
 # CT_NCURSES_V_6_0 is not set
-CT_NCURSES_VERSION="6.2"
+CT_NCURSES_VERSION="6.4"
 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}"
@ -939,8 +948,9 @@ 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_2=y
-CT_ZSTD_VERSION="1.5.2"
+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}"
--- a/images/base-win32/cross.meson
+++ b/images/base-win32/cross.meson
@ -5,6 +5,7 @@ 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.152_89671bf Configuration
+# crosstool-NG 1.25.0.196_227d99d 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.152_89671bf"
+CT_VERSION="1.25.0.196_227d99d"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@ -175,6 +175,7 @@ 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
@ -381,6 +382,10 @@ 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
@ -436,7 +441,8 @@ 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_12=y
+CT_GCC_V_13=y
+# CT_GCC_V_12 is not set
 # CT_GCC_V_11 is not set
 # CT_GCC_V_10 is not set
 # CT_GCC_V_9 is not set
@ -445,12 +451,14 @@ CT_GCC_V_12=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="12.2.0"
+CT_GCC_VERSION="13.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_GCC_SIGNATURE_FORMAT=""
+CT_GCC_later_than_13=y
+CT_GCC_13_or_later=y
 CT_GCC_later_than_12=y
 CT_GCC_12_or_later=y
 CT_GCC_later_than_11=y
@ -620,7 +628,8 @@ 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_25=y
+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_23 is not set
 # CT_ISL_V_0_22 is not set
@ -631,7 +640,7 @@ CT_ISL_V_0_25=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.25"
+CT_ISL_VERSION="0.26"
 CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@ -729,8 +738,9 @@ 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_2=y
-CT_ZSTD_VERSION="1.5.2"
+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}"
--- a/images/base-win64/cross.meson
+++ b/images/base-win64/cross.meson
@ -5,6 +5,7 @@ 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.152_89671bf Configuration
+# crosstool-NG 1.25.0.196_227d99d 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.152_89671bf"
+CT_VERSION="1.25.0.196_227d99d"
 CT_VCHECK=""
 CT_CONFIG_VERSION_ENV="4"
 CT_CONFIG_VERSION_CURRENT="4"
@ -382,6 +382,10 @@ 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
@ -437,7 +441,8 @@ 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_12=y
+CT_GCC_V_13=y
+# CT_GCC_V_12 is not set
 # CT_GCC_V_11 is not set
 # CT_GCC_V_10 is not set
 # CT_GCC_V_9 is not set
@ -446,12 +451,14 @@ CT_GCC_V_12=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="12.2.0"
+CT_GCC_VERSION="13.1.0"
 CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})"
 CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
 CT_GCC_ARCHIVE_FORMATS=".tar.xz .tar.gz"
 CT_GCC_SIGNATURE_FORMAT=""
+CT_GCC_later_than_13=y
+CT_GCC_13_or_later=y
 CT_GCC_later_than_12=y
 CT_GCC_12_or_later=y
 CT_GCC_later_than_11=y
@ -621,7 +628,8 @@ 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_25=y
+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_23 is not set
 # CT_ISL_V_0_22 is not set
@ -632,7 +640,7 @@ CT_ISL_V_0_25=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.25"
+CT_ISL_VERSION="0.26"
 CT_ISL_MIRRORS="https://libisl.sourceforge.io"
 CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
 CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
@ -730,8 +738,9 @@ 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_2=y
-CT_ZSTD_VERSION="1.5.2"
+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}"
--- a/images/base/Dockerfile
+++ b/images/base/Dockerfile
@ -1,11 +1,14 @@
-FROM ubuntu:22.10
+FROM ubuntu:23.04
+
+ENV FFBUILD_DLDIR="/opt/ffdl"

 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 git subversion mercurial \
+        xxd pkgconf curl wget unzip zip 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 \
--- a/images/base/run_stage.sh
+++ b/images/base/run_stage.sh
@ -11,5 +11,12 @@ export RAW_LDFLAGS="$LDFLAGS"
 mkdir -p /stage
 source "$1"
 cd /stage
-ffbuild_dockerbuild
+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,13 +18,14 @@ 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: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
+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
    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/:/_}" \
@ -38,14 +39,29 @@ if [[ -z "$QUICKBUILD" ]]; then
        --push --tag "${LOCAL_ROOT}/base-${TARGET}:latest" \
        --build-arg GH_REPO="$LOCAL_ROOT" "images/base-${TARGET}"

-    export REGISTRY_OVERRIDE="127.0.0.1:${LOCAL_REG_PORT}" GITHUB_REPOSITORY="local"
+    export REGISTRY_OVERRIDE="$REGISTRY_OVERRIDE_DL" GITHUB_REPOSITORY="$GITHUB_REPOSITORY_DL"
 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,8 +9,7 @@ ffbuild_enabled() {
 }

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

    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://github.com/mirror/mingw-w64.git"
-SCRIPT_COMMIT="eff726c461e09f35eeaed125a3570fa5f807f02b"
+SCRIPT_REPO="https://git.code.sf.net/p/mingw-w64/mingw-w64.git"
+SCRIPT_COMMIT="3638d5e9a6f28354bc3e18f04ba0d97e2cc3b44c"

 ffbuild_enabled() {
    [[ $TARGET == win* ]] || return -1
@ -17,9 +17,12 @@ 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() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" mingw
-    cd mingw
+    cd "$FFBUILD_DLDIR/mingw"

    cd mingw-w64-headers

@ -34,6 +37,7 @@ 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
@ -14,8 +14,7 @@ ffbuild_dockerlayer() {
 }

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

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

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

 ffbuild_enabled() {
    return 0
 }

-ffbuild_dockerbuild() {
-    retry-tool sh -c "rm -rf iconv && git clone '$SCRIPT_REPO' iconv"
-    cd iconv
-    git checkout "$SCRIPT_COMMIT"
+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"
+}

-    ./gitsub.sh pull
-    ./autogen.sh
+ffbuild_dockerbuild() {
+    cd "$FFBUILD_DLDIR/$SELF"
+
+    (unset CC CFLAGS GMAKE && ./autogen.sh)

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

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

 ffbuild_enabled() {
    return 0
 }

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

    local myconf=(
        --prefix="$FFBUILD_PREFIX"
--- a/scripts.d/20-zlib.sh
+++ b/scripts.d/20-zlib.sh
@ -8,8 +8,7 @@ ffbuild_enabled() {
 }

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

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

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

 ffbuild_enabled() {
    return 0
 }

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

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

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

 ffbuild_enabled() {
    return 0
 }

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

    ./autogen.sh

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

 SCRIPT_REPO="https://github.com/fribidi/fribidi.git"
-SCRIPT_COMMIT="2c2a014bf7161d43ed9f0f23f383be176a4f9df3"
+SCRIPT_COMMIT="b54871c339dabb7434718da3fed2fa63320997e5"

 ffbuild_enabled() {
    return 0
 }

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

    mkdir build && cd build

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

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

 ffbuild_enabled() {
    return 0
 }

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

    ./.bootstrap

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

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

    ./autogen.sh

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

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

 ffbuild_enabled() {
    return 0
 }

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

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

    if [[ $TARGET == win64 ]]; then
@ -51,15 +56,20 @@ ffbuild_dockerbuild() {
    export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"

    # OpenSSL build system prepends the cross prefix itself
-    export CC="gcc"
-    export CXX="g++"
-    export AR="gcc-ar"
-    export RANLIB="gcc-ranlib"
+    export CC="${CC/${FFBUILD_CROSS_PREFIX}/}"
+    export CXX="${CXX/${FFBUILD_CROSS_PREFIX}/}"
+    export AR="${AR/${FFBUILD_CROSS_PREFIX}/}"
+    export RANLIB="${RANLIB/${FFBUILD_CROSS_PREFIX}/}"

    ./Configure "${myconf[@]}"

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

-    make -j$(nproc)
+    make -j$(nproc) build_sw
    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,17 +1,16 @@
 #!/bin/bash

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

 ffbuild_enabled() {
    return 0
 }

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

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

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

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

 ffbuild_enabled() {
    return 0
 }

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

    ./autogen.sh --noconf

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

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

 ffbuild_enabled() {
    return 0
 }

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

    local myconf=(
        --prefix="$FFBUILD_PREFIX"
--- a/scripts.d/45-libsamplerate.sh
+++ b/scripts.d/45-libsamplerate.sh
@ -8,8 +8,7 @@ ffbuild_enabled() {
 }

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

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

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

    ./bootstrap

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

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

    ./autogen.sh

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

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

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

 ffbuild_enabled() {
    return 0
 }

-ffbuild_dockerbuild() {
-    mkdir opencl && cd opencl
+ffbuild_dockerdl() {
+    default_dl opencl/headers
+    to_df "RUN git-mini-clone \"$SCRIPT_REPO2\" \"$SCRIPT_COMMIT2\" opencl/loader"
+}
+
+ffbuild_dockerbuild() {
+    cd "$FFBUILD_DLDIR"/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" \
--- a/scripts.d/45-pulseaudio.sh
+++ b/scripts.d/45-pulseaudio.sh
@ -1,17 +1,19 @@
 #!/bin/bash

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

 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() {
-    git clone --filter=blob:none "$SCRIPT_REPO" pa
-    cd pa
-    git checkout "$SCRIPT_COMMIT"
+    cd "$FFBUILD_DLDIR/$SELF"

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

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

 ffbuild_enabled() {
    return 0
 }

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

    # 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="cfcc51836c1f2c174b67073cc8bed92e7e9c9569"
+SCRIPT_COMMIT="91178913c25b19e0457cdf6d21e00e6a613823e2"

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

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

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

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

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

    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="9d77996f9f972da63c06099fd8c0f0529159b98f"
+SCRIPT_COMMIT="3b3a3bd75d86aec78f6ef893b198c3efc378bc64"

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

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

    autoreconf -i

--- a/scripts.d/45-x11/20-libxau.sh
+++ b/scripts.d/45-x11/20-libxau.sh
@ -9,8 +9,7 @@ ffbuild_enabled() {
 }

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

    autoreconf -i

--- a/scripts.d/45-x11/30-libxcb.sh
+++ b/scripts.d/45-x11/30-libxcb.sh
@ -9,8 +9,7 @@ ffbuild_enabled() {
 }

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

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

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

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

    autoreconf -i

--- a/scripts.d/45-x11/50-libxext.sh
+++ b/scripts.d/45-x11/50-libxext.sh
@ -9,8 +9,7 @@ ffbuild_enabled() {
 }

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

    autoreconf -i

--- a/scripts.d/45-x11/50-libxfixes.sh
+++ b/scripts.d/45-x11/50-libxfixes.sh
@ -9,8 +9,7 @@ ffbuild_enabled() {
 }

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

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

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

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

    autoreconf -i

--- a/scripts.d/45-x11/50-libxinerama.sh
+++ b/scripts.d/45-x11/50-libxinerama.sh
@ -9,8 +9,7 @@ ffbuild_enabled() {
 }

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

    autoreconf -i

--- a/scripts.d/45-x11/50-libxrender.sh
+++ b/scripts.d/45-x11/50-libxrender.sh
@ -9,8 +9,7 @@ ffbuild_enabled() {
 }

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

    autoreconf -i

--- a/scripts.d/45-x11/50-libxscrnsaver.sh
+++ b/scripts.d/45-x11/50-libxscrnsaver.sh
@ -9,8 +9,7 @@ ffbuild_enabled() {
 }

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

    autoreconf -i

--- a/scripts.d/45-x11/50-libxxf86vm.sh
+++ b/scripts.d/45-x11/50-libxxf86vm.sh
@ -9,8 +9,7 @@ ffbuild_enabled() {
 }

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

    autoreconf -i

--- a/scripts.d/45-x11/60-libglvnd.sh
+++ b/scripts.d/45-x11/60-libglvnd.sh
@ -9,8 +9,7 @@ ffbuild_enabled() {
 }

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

    mkdir build && cd build

--- a/scripts.d/45-x11/60-libxcursor.sh
+++ b/scripts.d/45-x11/60-libxcursor.sh
@ -9,8 +9,7 @@ ffbuild_enabled() {
 }

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

    autoreconf -i

--- a/scripts.d/45-x11/60-libxrandr.sh
+++ b/scripts.d/45-x11/60-libxrandr.sh
@ -9,8 +9,7 @@ ffbuild_enabled() {
 }

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

    autoreconf -i

--- a/scripts.d/45-x11/60-libxv.sh
+++ b/scripts.d/45-x11/60-libxv.sh
@ -10,8 +10,7 @@ ffbuild_enabled() {
 }

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

    autoreconf -i

--- a/scripts.d/45-x11/99-finalize.sh
+++ b/scripts.d/45-x11/99-finalize.sh
@ -12,6 +12,10 @@ 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,15 +1,14 @@
 #!/bin/bash

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

 ffbuild_enabled() {
    return 0
 }

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

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

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

 ffbuild_enabled() {
    return 0
 }

 ffbuild_dockerstage() {
-    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=patches/aom,dst=/patches run_stage /stage.sh"
+    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"
 }

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

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

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

 ffbuild_enabled() {
    return 0
 }

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

    autoreconf -i

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

 ffbuild_dockerstage() {
-    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=patches/aribb24,dst=/patches run_stage /stage.sh"
+    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"
 }

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

    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="35706f838a7f6bdda422891c875e60d503d9bdb4"
+SCRIPT_COMMIT="fc5b9bc41fd47001b7da39ea777d29c0ede2a2a7"

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

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

    mkdir build && cd build

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

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

    mkdir build && cd build

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

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

 ffbuild_enabled() {
    return 0
 }

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

    mkdir build && cd build

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

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

    local myconf=(
--- a/scripts.d/50-fdk-aac.sh
+++ b/scripts.d/50-fdk-aac.sh
@ -9,8 +9,7 @@ ffbuild_enabled() {
 }

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

    ./autogen.sh

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

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

 SCRIPT_REPO2="https://github.com/FFmpeg/nv-codec-headers.git"
-SCRIPT_COMMIT2="2055784e5d5bfb3df78d4d3645f345f19062dce2"
+SCRIPT_COMMIT2="dc3e4484dc83485734e503991fe5ed3bdf256fba"
 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
-        SCRIPT_COMMIT="$SCRIPT_COMMIT2"
+        cd "$FFBUILD_DLDIR"/ffnvcodec2
+    else
+        cd "$FFBUILD_DLDIR"/ffnvcodec
    fi

-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" ffnvcodec
-    cd ffnvcodec
-
    make PREFIX="$FFBUILD_PREFIX" install
 }

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

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

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

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

    mkdir build && cd build

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

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

    mkdir build && cd build

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

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

 ffbuild_enabled() {
    return 0
 }

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

    ./autogen.sh

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

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

 ffbuild_enabled() {
    return 0
 }

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

    ./autogen.sh

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

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

    ./bootstrap

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

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

 ffbuild_enabled() {
    return 0
 }

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

    mkdir build && cd build

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

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

 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() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" jxl
-    cd jxl
-    git submodule update --init --recursive --depth 1 --recommend-shallow third_party/{highway,skcms}
+    cd "$FFBUILD_DLDIR/$SELF"

    mkdir build && cd build

@ -27,7 +32,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 \
-        -DBUILD_TESTING=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF -DJPEGXL_ENABLE_MANPAGES=OFF -DJPEGXL_ENABLE_JNI=OFF -DJPEGXL_ENABLE_PLUGINS=OFF \
+        -DJPEGXL_ENABLE_JPEGLI=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,9 +7,12 @@ 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() {
-    retry-tool sh -c "rm -rf lame && svn checkout '${SCRIPT_REPO}@${SCRIPT_REV}' lame"
-    cd lame
+    cd "$FFBUILD_DLDIR"/lame

    autoreconf -i

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

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

 ffbuild_enabled() {
    return 0
 }

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

    ./autogen.sh

--- a/scripts.d/50-librist/40-mbedtls.sh
+++ b/scripts.d/50-librist/40-mbedtls.sh
@ -9,8 +9,7 @@ ffbuild_enabled() {
 }

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

    mkdir build && cd build

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

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

 ffbuild_enabled() {
    return 0
 }

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

    mkdir build && cd build

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

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

 ffbuild_enabled() {
    return 0
 }

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

    mkdir build && cd build

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

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

    ./autogen.sh

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

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

 ffbuild_enabled() {
    return 0
 }

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

    local myconf=(
        --disable-shared
--- a/scripts.d/50-libwebp.sh
+++ b/scripts.d/50-libwebp.sh
@ -1,15 +1,14 @@
 #!/bin/bash

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

 ffbuild_enabled() {
    return 0
 }

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

    ./autogen.sh

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

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

 ffbuild_enabled() {
    return 0
 }

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

    mkdir build && cd build

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

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

 ffbuild_enabled() {
    return 0
 }

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

    mkdir build && cd build

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

 SCRIPT_REPO="https://github.com/drobilla/zix.git"
-SCRIPT_COMMIT="262d4a1522c38be0588746e874159da5c7bb457d"
+SCRIPT_COMMIT="a5c18d52a5351430d370084f25aaf7d166f7afd5"

 ffbuild_enabled() {
    return 0
 }

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

    mkdir build && cd build

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

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

 ffbuild_enabled() {
    return 0
 }

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

    mkdir build && cd build

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

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

 ffbuild_enabled() {
    return 0
 }

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

    mkdir build && cd build

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

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

 ffbuild_enabled() {
    return 0
 }

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

    mkdir build && cd build

--- a/scripts.d/50-mfx.sh
+++ b/scripts.d/50-mfx.sh
@ -1,47 +0,0 @@
-#!/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
-}
--- 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="fcabffb463299a8792c6baed69afbb69236ba6cb"
+SCRIPT_COMMIT="e12ace9761bb52786409e830f619916b86e87fc5"

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

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

    mkdir build && cd build

--- 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="d9fed51aa6391debc31dbbca550f055c980afe70"
+SCRIPT_COMMIT="05f9ce8b978239cebecef1a60f0d451a118fa3df"

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

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

    mkdir cm_build && cd cm_build

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

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

    autoreconf -i

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

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

 ffbuild_enabled() {
    return 0
 }

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

    local myconf=(
        PREFIX="$FFBUILD_PREFIX"
--- a/scripts.d/50-openjpeg.sh
+++ b/scripts.d/50-openjpeg.sh
@ -8,8 +8,7 @@ ffbuild_enabled() {
 }

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

    mkdir build && cd build

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

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

 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() {
-    retry-tool sh -c "rm -rf openmpt && svn checkout '${SCRIPT_REPO}@${SCRIPT}' openmpt"
-    cd openmpt
+    cd "$FFBUILD_DLDIR"/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="80d0ff2df4785e0d3b0050205541914faffd583d"
+SCRIPT_COMMIT="5ec4f95d9fe1a9295fe8239e2860c8f84e5e2336"

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

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

    local myconf=(
        --prefix="$FFBUILD_PREFIX"
--- 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="b04b731a954fab2cdbe18e11b372a6d0f4114387"
+SCRIPT_COMMIT="1eddafd7a7c8b64e377d64ee5e87ead881a32a48"

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

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

    mkdir build && cd build

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

+ffbuild_dockerdl() {
+    return 0
+}
+
 ffbuild_dockerstage() {
    return 0
 }
@ -14,6 +18,10 @@ 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,7 +1,7 @@
 #!/bin/bash

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

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

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

    mkdir build && cd build

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

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

    mkdir build && cd build

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

 SCRIPT_REPO="https://github.com/Haivision/srt.git"
-SCRIPT_COMMIT="4c9a4178d77543aa816cdb09b382e5163bc40a18"
+SCRIPT_COMMIT="61c7bedf27a2edbcf6e6fdc179612980bae53c6a"

 ffbuild_enabled() {
    return 0
 }

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

    mkdir build && cd build

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

 SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git"
-SCRIPT_COMMIT="fca45816bb70e431b2e664374d93c39afecb2783"
+SCRIPT_COMMIT="08c18ba0768ed3dbbff0903adc326fb3a7549bd9"

 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() {
-    git clone "$SCRIPT_REPO" svtav1
-    cd svtav1
-    git checkout "$SCRIPT_COMMIT"
+    cd "$FFBUILD_DLDIR/$SELF"

    mkdir build && cd build

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

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

    NOCONFIGURE=1 ./autogen.sh
    touch doc/twolame.1
--- a/scripts.d/50-uavs3d.sh
+++ b/scripts.d/50-uavs3d.sh
@ -8,10 +8,12 @@ ffbuild_enabled() {
    return 0
 }

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

    mkdir build/linux
    cd build/linux
--- a/scripts.d/50-vaapi/30-libpciaccess.sh
+++ b/scripts.d/50-vaapi/30-libpciaccess.sh
@ -9,8 +9,7 @@ ffbuild_enabled() {
 }

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

    autoreconf -fi

--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
BtbN	0a5e19d524	Move iconv submodule fetch to cache	2023-07-25 14:39:11 +02:00
BtbN	336c8909c8	Don't depend on zip Closes #284	2023-07-22 15:46:57 +02:00
BtbN	c07b573acd	Avisynth insist on a tag to exist	2023-07-20 15:54:19 +02:00
BtbN	2fe73c5aab	Bump avisynth	2023-07-20 15:29:53 +02:00
BtbN	683e3a4dc9	Bump libjxl	2023-07-10 22:40:41 +02:00
BtbN	7a5bf0c0bb	Switch to gmplib github mirror	2023-07-09 19:44:10 +02:00
BtbN	a7ae13efb7	Fix cache invalidation on commit update	2023-07-08 20:11:09 +02:00
BtbN	6c86fdaad0	Downgrade libjxl, they removed deprecated stuff	2023-07-08 19:26:54 +02:00
BtbN	49684930d2	Jxl has a new submodule	2023-07-08 19:26:54 +02:00
BtbN	71c3a919b8	Update dependencies	2023-07-08 19:26:54 +02:00
Chad Kimes	20172ca00a	Use GH_REPO build-arg in target-base builds	2023-06-30 22:26:18 +02:00
nihil-admirari	0e9c6f8e4d	Package man	2023-06-23 21:11:59 +02:00
BtbN	0071c270bb	Specify dlltool in meson cross files	2023-06-21 14:04:39 +02:00
BtbN	9465728b3b	Disable doxgen for xz	2023-06-21 13:50:46 +02:00
BtbN	547eee9db4	Update dependencies	2023-06-21 13:44:00 +02:00
BtbN	be992fa253	Be more generous with cache image retention Avoid pointless rebuilds on revert or other situations.	2023-06-21 00:55:45 +02:00
BtbN	0598fb3dba	Make final dl cache image FROM scratch	2023-06-21 00:38:32 +02:00
BtbN	73f17b7213	Force C locale in Dockerfile generation Turns out bash sorting behaviour differs between locales, causing cache mismatches...	2023-06-21 00:06:33 +02:00
BtbN	91b977f84d	Simplify download Dockerfile generation	2023-06-20 23:58:06 +02:00
BtbN	8c336b4dec	Add more explicit cache image name	2023-06-20 23:44:31 +02:00
BtbN	3e75fcc0e4	Enable new DL-Cache in Workflow	2023-06-18 21:47:40 +02:00
BtbN	61debb00e5	Switch to a more direct Dockerfile.dl generation Otherwise the entire build cache effectively invalidates the moment one script changes..	2023-06-18 21:25:52 +02:00
BtbN	c3fec1bd50	Add infrastructure for caching downloads in separate image	2023-06-18 19:57:13 +02:00
BtbN	78191a73a6	Add fork-guard into workflow	2023-06-18 12:20:47 +02:00
BtbN	d75466340a	Use old release version of gmp again Their hg server is way too flakey to rely on, download a release tarball from GNU mirror instead. I hope no important fixes are missed due to the loss of update automation this causes.	2023-06-16 20:36:29 +02:00
BtbN	1ae971430e	Update ct-ng configs	2023-06-04 01:29:42 +02:00
BtbN	a197b3f9ca	Do full clone for mingw SF's git server seems to be incapable of bandwidth saving single-commit clones.	2023-06-02 17:42:44 +02:00
BtbN	915d6e0afa	Switch mingw-w64 to official git repo The Github mirror seems to be broken, maybe switch back once it's revived. Closes #276	2023-05-29 23:09:09 +02:00
BtbN	ccda3224ff	Update Ubuntu base version	2023-05-29 15:29:46 +02:00
BtbN	67723fc5c2	iconv: Force autogen to use hostcc to build its stuff	2023-05-29 15:29:31 +02:00
BtbN	0d1bf557c8	Update dependencies	2023-05-29 14:10:36 +02:00
BtbN	9f930118ab	Remove libmfx support Intel discontinued support for it. There will be no security fixes and updates for it anymore. Unfortunately this means that older versions of ffmpeg will be losing support for QSV hardware acceleration, but it's either that or knowingly leaving people open to security issues.	2023-05-29 14:07:27 +02:00
BtbN	94dcf28fad	Fix vidstab commit variable	2023-05-15 18:55:30 +02:00
bitraid	c02dbf2722	Fix variable name of fftw3 build script	2023-05-15 13:26:59 +02:00
BtbN	5ab621cb66	Update OpenSSL to 3.0	2023-04-30 23:46:30 +02:00