Switch to a more direct Dockerfile.dl generation

Otherwise the entire build cache effectively invalidates the moment one
script changes..

generate.sh

@@ -16,6 +16,10 @@ to_df() {
     echo >> "$_of"
 }
 
+default_dl() {
+    to_df "RUN git-mini-clone \"$SCRIPT_REPO\" \"$SCRIPT_COMMIT\" \"$1\""
+}
+
 ###
 ### Generate download Dockerfile
 ###
@@ -26,7 +30,7 @@ exec_dockerstage_dl() {
         SELF="$SCRIPT"
         SELFLAYER="$(layername "$STAGE")"
         source "$SCRIPT"
-        ffbuild_dockerstage_dl || exit $?
+        ffbuild_dockerdl || exit $?
         TODF="Dockerfile.dl.final" ffbuild_dockerlayer_dl || exit $?
     )
 }
@@ -35,6 +39,7 @@ 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"
 
 PREVLAYER="base"
 for ID in $(ls -1d scripts.d/??-* | sed -s 's|^.*/\(..\).*|\1|' | sort -u); do

scripts.d/10-mingw-std-threads.sh

@@ -8,12 +8,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" mingw-std-threads
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/mingw-std-threads
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir -p "$FFBUILD_PREFIX"/include
     cp *.h "$FFBUILD_PREFIX"/include

scripts.d/10-mingw.sh

@@ -18,9 +18,7 @@ ffbuild_dockerfinal() {
 }
 
 ffbuild_dockerdl() {
-    retry-tool sh -c "rm -rf mingw && git clone '$SCRIPT_REPO' mingw"
+    to_df "RUN retry-tool sh -c \"rm -rf mingw && git clone '$SCRIPT_REPO' mingw\" && cd mingw && git checkout \"$SCRIPT_COMMIT\""
-    cd mingw
-    git checkout "$SCRIPT_COMMIT"
 }
 
 ffbuild_dockerbuild() {

scripts.d/10-xorg-macros.sh

@@ -13,12 +13,8 @@ ffbuild_dockerlayer() {
     to_df "COPY --from=${SELFLAYER} \$FFBUILD_PREFIX/share/aclocal/. /usr/share/aclocal"
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xorg-macros
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/xorg-macros
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
     ./configure --prefix="$FFBUILD_PREFIX"

scripts.d/20-libiconv.sh

@@ -8,14 +8,12 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    retry-tool sh -c "rm -rf iconv && git clone '$SCRIPT_REPO' iconv"
+    to_df "RUN retry-tool sh -c \"rm -rf $SELF && git clone '$SCRIPT_REPO' $SELF\""
-    cd iconv
+    to_df "RUN git -C $SELF checkout \"$SCRIPT_COMMIT\""
-    git checkout "$SCRIPT_COMMIT"
-    retry-tool ./autopull.sh --one-time
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/iconv
+    cd "$FFBUILD_DLDIR/$SELF"
 
     retry-tool ./autopull.sh --one-time
     (unset CC CFLAGS GMAKE && ./autogen.sh)

scripts.d/20-libxml2.sh

@@ -7,12 +7,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxml2
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/libxml2
+    cd "$FFBUILD_DLDIR/$SELF"
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"

scripts.d/20-zlib.sh

@@ -7,12 +7,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" zlib
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/zlib
+    cd "$FFBUILD_DLDIR/$SELF"
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"

scripts.d/25-fftw3.sh

@@ -7,12 +7,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fftw3
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/fftw3
+    cd "$FFBUILD_DLDIR/$SELF"
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"

scripts.d/25-freetype.sh

@@ -7,12 +7,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" freetype
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/freetype
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh
 

scripts.d/25-fribidi.sh

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

scripts.d/25-gmp.sh

@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    retry-tool check-wget "gmp.tar.xz" "$SCRIPT_URL" "$SCRIPT_SHA512"
+    to_df "RUN retry-tool check-wget gmp.tar.xz \"$SCRIPT_URL\" \"$SCRIPT_SHA512\""
 }
 
 ffbuild_dockerbuild() {

scripts.d/25-libogg.sh

@@ -7,12 +7,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" ogg
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/ogg
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh
 

scripts.d/25-openssl.sh

@@ -9,13 +9,12 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openssl
+    default_dl "$SELF"
-    cd openssl
+    to_df "RUN git -C \"$SELF\" submodule update --init --recursive --depth=1"
-    git submodule update --init --recursive --depth=1
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/openssl
+    cd "$FFBUILD_DLDIR/$SELF"
 
     local myconf=(
         threads

scripts.d/25-xz.sh

@@ -7,12 +7,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xz
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/xz
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh --no-po4a
 

scripts.d/35-fontconfig.sh

@@ -7,12 +7,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fc
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/fc
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh --noconf
 

scripts.d/45-harfbuzz.sh

@@ -7,12 +7,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" harfbuzz
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/harfbuzz
+    cd "$FFBUILD_DLDIR/$SELF"
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"

scripts.d/45-libsamplerate.sh

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

scripts.d/45-libudfread.sh

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

scripts.d/45-libvorbis.sh

@@ -7,12 +7,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vorbis
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/vorbis
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh
 

scripts.d/45-opencl.sh

@@ -11,9 +11,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    mkdir opencl && cd opencl
+    default_dl opencl/headers
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" headers
+    to_df "RUN git-mini-clone \"$SCRIPT_REPO2\" \"$SCRIPT_COMMIT2\" opencl/loader"
-    git-mini-clone "$SCRIPT_REPO2" "$SCRIPT_COMMIT2" loader
 }
 
 ffbuild_dockerbuild() {

scripts.d/45-pulseaudio.sh

@@ -9,13 +9,12 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    git clone --filter=blob:none "$SCRIPT_REPO" pa
+    to_df "RUN git clone --filter=blob:none \"$SCRIPT_REPO\" \"$SELF\""
-    cd pa
+    to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
-    git checkout "$SCRIPT_COMMIT"
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/pa
+    cd "$FFBUILD_DLDIR/$SELF"
 
     # Kill build of utils and their sndfile dep
     echo > src/utils/meson.build

scripts.d/45-vmaf.sh

@@ -7,12 +7,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vmaf
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/vmaf
+    cd "$FFBUILD_DLDIR/$SELF"
 
     # Kill build of unused and broken tools
     echo > libvmaf/tools/meson.build

scripts.d/45-x11/10-xcbproto.sh

@@ -8,12 +8,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xcbproto
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/xcbproto
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 

scripts.d/45-x11/10-xproto.sh

@@ -8,12 +8,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xproto
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/xproto
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 

scripts.d/45-x11/10-xtrans.sh

@@ -8,12 +8,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxtrans
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/libxtrans
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 

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

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

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

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

scripts.d/45-x11/40-libx11.sh

@@ -8,12 +8,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libx11
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/libx11
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 

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

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

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

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

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

@@ -8,12 +8,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxi
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/libxi
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 

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

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

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

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

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

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

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

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

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

@@ -8,12 +8,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" glvnd
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/glvnd
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 

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

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

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

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

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

@@ -9,12 +9,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxv
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/libxv
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 

scripts.d/50-amf.sh

@@ -7,12 +7,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" amf
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/amf
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir -p "$FFBUILD_PREFIX"/include
     mv amf/public/include "$FFBUILD_PREFIX"/include/AMF

scripts.d/50-aom.sh

@@ -8,15 +8,11 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=\$FFBUILD_DLDIR,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=\$FFBUILD_DLDIR,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw --mount=src=patches/aom,dst=/patches SELF=\"$SELF\" run_stage /stage.sh"
-}
-
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" aom
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/aom
+    cd "$FFBUILD_DLDIR/$SELF"
 
     for patch in /patches/*.patch; do
         echo "Applying $patch"

scripts.d/50-aribb24/25-libpng.sh

@@ -7,12 +7,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libpng
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/libpng
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 

scripts.d/50-aribb24/50-libaribb24.sh

@@ -8,15 +8,11 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=\$FFBUILD_DLDIR,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=\$FFBUILD_DLDIR,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw --mount=src=patches/aribb24,dst=/patches SELF=\"$SELF\" run_stage /stage.sh"
-}
-
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" aribb24
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/aribb24
+    cd "$FFBUILD_DLDIR/$SELF"
 
     for patch in /patches/*.patch; do
         echo "Applying $patch"

scripts.d/50-avisynth.sh

@@ -8,12 +8,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" avisynth
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/avisynth
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 

scripts.d/50-chromaprint.sh

@@ -11,12 +11,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" chromaprint
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/chromaprint
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 

scripts.d/50-dav1d.sh

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

scripts.d/50-davs2.sh

@@ -12,13 +12,12 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    git clone "$SCRIPT_REPO" davs2
+    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\""
-    cd davs2
+    to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
-    git checkout "$SCRIPT_COMMIT"
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/davs2
+    cd "$FFBUILD_DLDIR/$SELF"
     cd build/linux
 
     local myconf=(

scripts.d/50-fdk-aac.sh

@@ -8,12 +8,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fdk
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/fdk
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh
 

scripts.d/50-ffnvcodec.sh

@@ -12,8 +12,8 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" ffnvcodec
+    default_dl ffnvcodec
-    git-mini-clone "$SCRIPT_REPO2" "$SCRIPT_COMMIT2" ffnvcodec2
+    to_df "RUN git-mini-clone \"$SCRIPT_REPO2\" \"$SCRIPT_COMMIT2\" ffnvcodec2"
 }
 
 ffbuild_dockerbuild() {

scripts.d/50-frei0r.sh

@@ -9,12 +9,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" frei0r
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/frei0r
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 

scripts.d/50-gme.sh

@@ -8,13 +8,12 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    git clone "$SCRIPT_REPO" gme
+    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\""
-    cd gme
+    to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
-    git checkout "$SCRIPT_COMMIT"
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/gme
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 

scripts.d/50-kvazaar.sh

@@ -7,12 +7,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" kvazaar
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/kvazaar
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh
 

scripts.d/50-libass.sh

@@ -7,12 +7,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" ass
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/ass
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh
 

scripts.d/50-libbluray.sh

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

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

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

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

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

scripts.d/50-libmp3lame.sh

@@ -8,7 +8,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    retry-tool sh -c "rm -rf lame && svn checkout '${SCRIPT_REPO}@${SCRIPT_REV}' lame"
+    to_df "RUN retry-tool sh -c \"rm -rf lame && svn checkout '${SCRIPT_REPO}@${SCRIPT_REV}' lame\""
 }
 
 ffbuild_dockerbuild() {

scripts.d/50-libopus.sh

@@ -7,12 +7,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" opus
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/opus
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh
 

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

@@ -8,12 +8,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" mbedtls
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/mbedtls
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 

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

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

scripts.d/50-libssh.sh

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

scripts.d/50-libtheora.sh

@@ -7,12 +7,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" theora
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/theora
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh
 

scripts.d/50-libvpx.sh

@@ -7,12 +7,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libvpx
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/libvpx
+    cd "$FFBUILD_DLDIR/$SELF"
 
     local myconf=(
         --disable-shared

scripts.d/50-libwebp.sh

@@ -7,12 +7,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" webp
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/webp
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh
 

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

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

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

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

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

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

scripts.d/50-lilv/97-sord.sh

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

scripts.d/50-lilv/98-sratom.sh

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

scripts.d/50-lilv/99-lilv.sh

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

scripts.d/50-onevpl.sh

@@ -11,12 +11,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" onevpl
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/onevpl
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 

scripts.d/50-openal.sh

@@ -10,12 +10,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openal
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/openal
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir cm_build && cd cm_build
 

scripts.d/50-opencore-amr.sh

@@ -7,12 +7,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" opencore
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/opencore
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 

scripts.d/50-openh264.sh

@@ -7,12 +7,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openh264
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/openh264
+    cd "$FFBUILD_DLDIR/$SELF"
 
     local myconf=(
         PREFIX="$FFBUILD_PREFIX"

scripts.d/50-openjpeg.sh

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

scripts.d/50-openmpt.sh

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

scripts.d/50-rav1e.sh

@@ -8,12 +8,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" rav1e
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/rav1e
+    cd "$FFBUILD_DLDIR/$SELF"
 
     local myconf=(
         --prefix="$FFBUILD_PREFIX"

scripts.d/50-rubberband.sh

@@ -8,12 +8,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" rubberband
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/rubberband
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 

scripts.d/50-schannel.sh

@@ -18,10 +18,6 @@ ffbuild_dockerbuild() {
     return 0
 }
 
-ffbuild_dockerstage_dl() {
-    return 0
-}
-
 ffbuild_dockerlayer_dl() {
     return 0
 }

scripts.d/50-sdl.sh

@@ -8,12 +8,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" sdl
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/sdl
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 

scripts.d/50-soxr.sh

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

scripts.d/50-srt.sh

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

scripts.d/50-svtav1.sh

@@ -9,13 +9,12 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    git clone "$SCRIPT_REPO" svtav1
+    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\""
-    cd svtav1
+    to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
-    git checkout "$SCRIPT_COMMIT"
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/svtav1
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 

scripts.d/50-twolame.sh

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

scripts.d/50-uavs3d.sh

@@ -9,13 +9,12 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    git clone "$SCRIPT_REPO" uavs3d
+    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\""
-    cd uavs3d
+    to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
-    git checkout "$SCRIPT_COMMIT"
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/uavs3d
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build/linux
     cd build/linux

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

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

scripts.d/50-vaapi/40-libdrm.sh

@@ -8,12 +8,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libdrm
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/libdrm
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 

scripts.d/50-vaapi/50-libva.sh

@@ -9,12 +9,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libva
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/libva
+    cd "$FFBUILD_DLDIR/$SELF"
 
     autoreconf -i
 

scripts.d/50-vidstab.sh

@@ -8,12 +8,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vidstab
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/vidstab
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 

scripts.d/50-vulkan/45-vulkan.sh

@@ -9,12 +9,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vkheaders
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/vkheaders
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 

scripts.d/50-vulkan/50-shaderc.sh

@@ -9,13 +9,12 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" shaderc
+    default_dl "$SELF"
-    cd shaderc
+    to_df "RUN cd \"$SELF\" && ./utils/git-sync-deps"
-    ./utils/git-sync-deps
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/shaderc
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 

scripts.d/50-vulkan/55-spirv-cross.sh

@@ -8,12 +8,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" spirv-cross
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/spirv-cross
+    cd "$FFBUILD_DLDIR/$SELF"
 
     VER_MAJ="$(grep 'set(spirv-cross-abi-major' CMakeLists.txt | sed -re 's/.* ([0-9]+)\)/\1/')"
     VER_MIN="$(grep 'set(spirv-cross-abi-minor' CMakeLists.txt | sed -re 's/.* ([0-9]+)\)/\1/')"

scripts.d/50-vulkan/60-libplacebo.sh

@@ -12,13 +12,12 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" placebo
+    default_dl "$SELF"
-    cd placebo
+    to_df "RUN git -C \"$SELF\" submodule update --init --recursive"
-    git submodule update --init --recursive
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/placebo
+    cd "$FFBUILD_DLDIR/$SELF"
 
     mkdir build && cd build
 

scripts.d/50-x264.sh

@@ -8,12 +8,8 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" x264
-}
-
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/x264
+    cd "$FFBUILD_DLDIR/$SELF"
 
     local myconf=(
         --disable-cli

scripts.d/50-x265.sh

@@ -9,13 +9,12 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    git clone "$SCRIPT_REPO" x265
+    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\""
-    cd x265
+    to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
-    git checkout "$SCRIPT_COMMIT"
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/x265
+    cd "$FFBUILD_DLDIR/$SELF"
 
     local common_config=(
         -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX"

scripts.d/50-xavs2.sh

@@ -12,13 +12,12 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    git clone "$SCRIPT_REPO" xavs2
+    to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\""
-    cd xavs2
+    to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\""
-    git checkout "$SCRIPT_COMMIT"
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/xavs2
+    cd "$FFBUILD_DLDIR/$SELF"
     cd build/linux
 
     local myconf=(

scripts.d/50-xvid.sh

@@ -9,7 +9,7 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    retry-tool sh -c "rm -rf xvid && svn checkout --username 'anonymous' --password '' '${SCRIPT_REPO}@${SCRIPT_REV}' xvid"
+    to_df "RUN retry-tool sh -c \"rm -rf xvid && svn checkout --username 'anonymous' --password '' '${SCRIPT_REPO}@${SCRIPT_REV}' xvid\""
 }
 
 ffbuild_dockerbuild() {

scripts.d/50-zimg.sh

@@ -8,13 +8,12 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerdl() {
-    git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" zimg
+    default_dl "$SELF"
-    cd zimg
+    to_df "RUN git -C \"$SELF\" submodule update --init --recursive --depth=1"
-    git submodule update --init --recursive --depth=1
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/zimg
+    cd "$FFBUILD_DLDIR/$SELF"
 
     ./autogen.sh
 

scripts.d/50-zvbi.sh

@@ -8,15 +8,15 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=\$FFBUILD_DLDIR,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw --mount=src=patches/zvbi,dst=/patches run_stage /stage.sh"
+    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=\$FFBUILD_DLDIR,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw --mount=src=patches/zvbi,dst=/patches SELF=\"$SELF\" run_stage /stage.sh"
 }
 
 ffbuild_dockerdl() {
-    retry-tool sh -c "rm -rf zvbi && svn checkout '${SCRIPT_REPO}@${SCRIPT_REV}' zvbi"
+    to_df "RUN retry-tool sh -c \"rm -rf $SELF && svn checkout '${SCRIPT_REPO}@${SCRIPT_REV}' $SELF\""
 }
 
 ffbuild_dockerbuild() {
-    cd "$FFBUILD_DLDIR"/zvbi
+    cd "$FFBUILD_DLDIR/$SELF"
 
     for patch in /patches/*.patch; do
         echo "Applying $patch"

scripts.d/99-rpath.sh

@@ -22,10 +22,6 @@ ffbuild_dockerstage() {
     return 0
 }
 
-ffbuild_dockerstage_dl() {
-    return 0
-}
-
 ffbuild_dockerlayer_dl() {
     return 0
 }