Merge branch 'master' of https://github.com/BtbN/FFmpeg-Builds

.github/workflows/build.yml

@@ -7,6 +7,9 @@ on:
   schedule:
     - cron: '0 12 * * *'
 
+env:
+  DOCKER_BUILDKIT: 1
+
 jobs:
   purge_artifacts:
     name: Purge old artifacts
@@ -26,16 +29,16 @@ jobs:
       - name: Login to Docker
         uses: docker/login-action@v1
         with:
-          registry: docker.pkg.github.com
+          registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ github.token }}
       - name: Image Name
         id: imagename
-        run: echo "::set-output name=name::docker.pkg.github.com/${GITHUB_REPOSITORY,,}/base:latest"
+        run: echo "::set-output name=name::ghcr.io/${GITHUB_REPOSITORY,,}/base:latest"
       - name: Pull latest
         run: docker pull ${{ steps.imagename.outputs.name }} || true
       - name: Build base image
-        run: docker build --pull --cache-from ${{ steps.imagename.outputs.name }} --tag ${{ steps.imagename.outputs.name }} images/base
+        run: docker build --pull --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from ${{ steps.imagename.outputs.name }} --tag ${{ steps.imagename.outputs.name }} images/base
       - name: Push base image
         run: docker push ${{ steps.imagename.outputs.name }}
   build_target_bases:
@@ -52,16 +55,16 @@ jobs:
       - name: Login to Docker
         uses: docker/login-action@v1
         with:
-          registry: docker.pkg.github.com
+          registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ github.token }}
       - name: Image Name
         id: imagename
-        run: echo "::set-output name=name::docker.pkg.github.com/${GITHUB_REPOSITORY,,}/base-${{ matrix.target }}:latest"
+        run: echo "::set-output name=name::ghcr.io/${GITHUB_REPOSITORY,,}/base-${{ matrix.target }}:latest"
       - name: Pull latest
         run: docker pull ${{ steps.imagename.outputs.name }} || true
       - name: Build target base image
-        run: docker build --pull --build-arg GH_REPO=${GITHUB_REPOSITORY,,} --cache-from ${{ steps.imagename.outputs.name }} --tag ${{ steps.imagename.outputs.name }} images/base-${{ matrix.target }}
+        run: docker build --pull --build-arg BUILDKIT_INLINE_CACHE=1 --build-arg GH_REPO=${GITHUB_REPOSITORY,,} --cache-from ${{ steps.imagename.outputs.name }} --tag ${{ steps.imagename.outputs.name }} images/base-${{ matrix.target }}
       - name: Push target base image
         run: docker push ${{ steps.imagename.outputs.name }}
   build_targets:
@@ -81,18 +84,18 @@ jobs:
       - name: Login to Docker
         uses: docker/login-action@v1
         with:
-          registry: docker.pkg.github.com
+          registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ github.token }}
       - name: Image Name
         id: imagename
         run: |
-          IMG="docker.pkg.github.com/${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}:latest"
+          IMG="ghcr.io/${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}:latest"
           echo "::set-output name=name::${IMG/ /-}"
       - name: Pull latest
         run: docker pull ${{ steps.imagename.outputs.name }} || true
       - name: Build variant image
-        run: docker build --pull --cache-from ${{ steps.imagename.outputs.name }} --tag ${{ steps.imagename.outputs.name }} .
+        run: docker build --pull --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from ${{ steps.imagename.outputs.name }} --tag ${{ steps.imagename.outputs.name }} .
       - name: Push variant image
         run: docker push ${{ steps.imagename.outputs.name }}
   build_ffmpeg:
@@ -110,7 +113,7 @@ jobs:
       - name: Login to Docker
         uses: docker/login-action@v1
         with:
-          registry: docker.pkg.github.com
+          registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ github.token }}
       - name: Build ffmpeg

.github/workflows/pr.yml

@@ -4,6 +4,9 @@ on:
     branches:
       - master
 
+env:
+  DOCKER_BUILDKIT: 1
+
 jobs:
   build:
     name: Build ffmpeg

build.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 set -xe
+shopt -s globstar
 cd "$(dirname "$0")"
 source util/vars.sh
 
@@ -23,7 +24,7 @@ done
 
 export FFBUILD_PREFIX="$(docker run --rm "$IMAGE" bash -c 'echo $FFBUILD_PREFIX')"
 
-for script in scripts.d/*.sh; do
+for script in scripts.d/**/*.sh; do
     FF_CONFIGURE+=" $(get_output $script configure)"
     FF_CFLAGS+=" $(get_output $script cflags)"
     FF_CXXFLAGS+=" $(get_output $script cxxflags)"

generate.sh

@@ -5,19 +5,69 @@ source util/vars.sh
 
 rm -f Dockerfile
 
-to_df() {
+layername() {
-    printf "$@" >> Dockerfile
+    printf "layer-"
-    echo >> Dockerfile
+    basename "$1" | sed 's/.sh$//'
 }
 
-to_df "FROM docker.pkg.github.com/${REPO}/base-${TARGET}:latest"
+exec_dockerstage() {
-to_df "ENV TARGET=$TARGET VARIANT=$VARIANT REPO=$REPO ADDINS_STR=$ADDINS_STR"
+    SCRIPT="$1"
-
-for script in scripts.d/*.sh; do
     (
-    SELF="$script"
+        SELF="$SCRIPT"
-    source $script
+        source "$SCRIPT"
         ffbuild_enabled || exit 0
         ffbuild_dockerstage || exit $?
     )
+}
+
+to_df() {
+    _of="${TODF:-Dockerfile}"
+    printf "$@" >> "$_of"
+    echo >> "$_of"
+}
+
+to_df "FROM ${REGISTRY}/${REPO}/base-${TARGET}:latest AS base"
+to_df "ENV TARGET=$TARGET VARIANT=$VARIANT REPO=$REPO ADDINS_STR=$ADDINS_STR"
+
+PREVLAYER="base"
+for ID in $(ls -1d scripts.d/??-* | sed -s 's|^.*/\(..\).*|\1|' | sort -u); do
+    LAYER="layer-$ID"
+
+    for STAGE in scripts.d/$ID-*; do
+        to_df "FROM $PREVLAYER AS $(layername "$STAGE")"
+
+        if [[ -f "$STAGE" ]]; then
+            exec_dockerstage "$STAGE"
+        else
+            for STAGE in "${STAGE}"/??-*; do
+                exec_dockerstage "$STAGE"
             done
+        fi
+    done
+
+    to_df "FROM $PREVLAYER AS $LAYER"
+    for STAGE in scripts.d/$ID-*; do
+        if [[ -f "$STAGE" ]]; then
+            SCRIPT="$STAGE"
+        else
+            SCRIPTS=( "$STAGE"/??-* )
+            SCRIPT="${SCRIPTS[-1]}"
+        fi
+
+        (
+            SELF="$SCRIPT"
+            SELFLAYER="$(layername "$STAGE")"
+            source "$SCRIPT"
+            ffbuild_enabled || exit 0
+            ffbuild_dockerlayer || exit $?
+            TODF="Dockerfile.final" PREVLAYER="__PREVLAYER__" \
+                ffbuild_dockerfinal || exit $?
+        )
+    done
+
+    PREVLAYER="$LAYER"
+done
+
+to_df "FROM base"
+sed "s/__PREVLAYER__/$PREVLAYER/g" Dockerfile.final | sort -u >> Dockerfile
+rm Dockerfile.final

images/base-win32/Dockerfile

@@ -1,5 +1,5 @@
 ARG GH_REPO=btbn/ffmpeg-builds
-FROM docker.pkg.github.com/$GH_REPO/base:latest
+FROM ghcr.io/$GH_REPO/base:latest
 
 ENV DEBIAN_FRONTEND noninteractive
 

images/base-win64/Dockerfile

@@ -1,5 +1,5 @@
 ARG GH_REPO=btbn/ffmpeg-builds
-FROM docker.pkg.github.com/$GH_REPO/base:latest
+FROM ghcr.io/$GH_REPO/base:latest
 
 ENV DEBIAN_FRONTEND noninteractive
 

images/base/run_stage.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -xe
 mkdir -p /stage
+source "$1"
 cd /stage
-source /stage.sh
 ffbuild_dockerbuild
-rm -rf /stage /stage.sh "$FFBUILD_PREFIX"/bin
+rm -rf /stage "$FFBUILD_PREFIX"/bin

makeimage.sh

@@ -3,6 +3,8 @@ set -xe
 cd "$(dirname "$0")"
 source util/vars.sh
 
+export DOCKER_BUILDKIT=1
+
 docker build --tag "$BASE_IMAGE" images/base
 docker build --build-arg GH_REPO="$REPO" --tag "$TARGET_IMAGE" "images/base-${TARGET}"
 

scripts.d/10-mingw.sh

@@ -8,9 +8,13 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
+ffbuild_dockerlayer() {
-    to_df "ADD $SELF /stage.sh"
+    to_df "COPY --from=${SELFLAYER} /opt/mingw/. /"
-    to_df "RUN run_stage"
+    to_df "COPY --from=${SELFLAYER} /opt/mingw/. /opt/mingw"
+}
+
+ffbuild_dockerfinal() {
+    to_df "COPY --from=${PREVLAYER} /opt/mingw/. /"
 }
 
 ffbuild_dockerbuild() {
@@ -33,7 +37,7 @@ ffbuild_dockerbuild() {
 
     ./configure "${myconf[@]}"
     make -j$(nproc)
-    make install
+    make install DESTDIR="/opt/mingw"
 
     cd ../mingw-w64-libraries/winpthreads
 
@@ -49,7 +53,7 @@ ffbuild_dockerbuild() {
 
     ./configure "${myconf[@]}"
     make -j$(nproc)
-    make install
+    make install DESTDIR="/opt/mingw"
 }
 
 ffbuild_configure() {

scripts.d/20-libiconv.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     mkdir iconv
     cd iconv

scripts.d/20-libxml2.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$LIBXML2_REPO" "$LIBXML2_COMMIT" libxml2
     cd libxml2

scripts.d/20-zlib.sh

@@ -6,11 +6,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     mkdir zlib
     cd zlib

scripts.d/25-fftw3.sh

@@ -10,11 +10,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     mkdir fftw3
     cd fftw3

scripts.d/25-freetype.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     mkdir ft
     cd ft

scripts.d/25-fribidi.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$FRIBIDI_REPO" "$FRIBIDI_COMMIT" fribidi
     cd fribidi

scripts.d/25-gmp.sh

@@ -6,11 +6,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     mkdir gmp
     cd gmp

scripts.d/25-libogg.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$OGG_REPO" "$OGG_COMMIT" ogg
     cd ogg

scripts.d/25-openssl.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$OPENSSL_REPO" "$OPENSSL_COMMIT" openssl
     cd openssl

scripts.d/25-xz.sh

@@ -6,11 +6,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     mkdir xz
     cd xz

scripts.d/35-fontconfig.sh

@@ -6,11 +6,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     mkdir fc
     cd fc

scripts.d/45-harfbuzz.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$HARFBUZZ_REPO" "$HARFBUZZ_COMMIT" harfbuzz
     cd harfbuzz

scripts.d/45-libsamplerate.sh

@@ -9,11 +9,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$LIBSR_REPO" "$LIBSR_COMMIT" libsr
     cd libsr

scripts.d/45-libudfread.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$LIBUDFREAD_REPO" "$LIBUDFREAD_COMMIT" libudfread
     cd libudfread

scripts.d/45-libvorbis.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$VORBIS_REPO" "$VORBIS_COMMIT" vorbis
     cd vorbis

scripts.d/45-opencl.sh

@@ -10,11 +10,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     mkdir opencl && cd opencl
 

scripts.d/45-vmaf.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$VMAF_REPO" "$VMAF_COMMIT" vmaf
     cd vmaf

scripts.d/45-vulkan.sh

@@ -8,16 +8,14 @@ ffbuild_enabled() {
 }
 
 ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
+    to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=patches/vulkan,dst=/patches run_stage /stage.sh"
-    to_df "ADD patches/vulkan /stage/patches"
-    to_df "RUN run_stage"
 }
 
 ffbuild_dockerbuild() {
     git clone "$LOADER_REPO" loader
     git -C loader checkout "$LOADER_COMMIT"
 
-    for patch in patches/*.patch; do
+    for patch in /patches/*.patch; do
         echo "Applying $patch"
         git -C loader am -3 < "$patch"
     done

scripts.d/50-amf.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$AMF_REPO" "$AMF_COMMIT" amf
     cd amf

scripts.d/50-aom.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$AOM_REPO" "$AOM_COMMIT" aom
     cd aom

scripts.d/50-avisynth.sh

@@ -8,11 +8,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$AVISYNTH_REPO" "$AVISYNTH_COMMIT" avisynth
     cd avisynth

scripts.d/50-dav1d.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$DAV1D_REPO" "$DAV1D_COMMIT" dav1d
     cd dav1d

scripts.d/50-davs2.sh

@@ -9,11 +9,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git clone "$DAVS2_REPO" davs2
     cd davs2

scripts.d/50-ffnvcodec.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$FFNVCODEC_REPO" "$FFNVCODEC_COMMIT" ffnvcodec
     cd ffnvcodec

scripts.d/50-glslang.sh

@@ -4,14 +4,10 @@ GLSLANG_REPO="https://github.com/KhronosGroup/glslang.git"
 GLSLANG_COMMIT="5878bcb17e43bf22cecaf6095900a33ff7f53445"
 
 ffbuild_enabled() {
+    [[ $ADDINS_STR == *4.3* ]] && return -1
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$GLSLANG_REPO" "$GLSLANG_COMMIT" glslang
     cd glslang

scripts.d/50-gme.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git clone "$GME_REPO" gme
     cd gme

scripts.d/50-libass.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$ASS_REPO" "$ASS_COMMIT" ass
     cd ass

scripts.d/50-libbluray.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$LIBBLURAY_REPO" "$LIBBLURAY_COMMIT" libbluray
     cd libbluray

scripts.d/50-libmp3lame.sh

@@ -6,11 +6,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     mkdir lame
     cd lame

scripts.d/50-libopus.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$OPUS_REPO" "$OPUS_COMMIT" opus
     cd opus

scripts.d/50-libtheora.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$THEORA_REPO" "$THEORA_COMMIT" theora
     cd theora

scripts.d/50-libvpx.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$LIBVPX_REPO" "$LIBVPX_COMMIT" libvpx
     cd libvpx

scripts.d/50-libwebp.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$WEBP_REPO" "$WEBP_COMMIT" webp
     cd webp

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

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$LV2_REPO" "$LV2_COMMIT" lv2
     cd lv2

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

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$SERD_REPO" "$SERD_COMMIT" serd
     cd serd

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

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$SORD_REPO" "$SORD_COMMIT" sord
     cd sord

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

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$SRATOM_REPO" "$SRATOM_COMMIT" sratom
     cd sratom

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

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$LILV_REPO" "$LILV_COMMIT" lilv
     cd lilv

scripts.d/50-mfx.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$MFX_REPO" "$MFX_COMMIT" mfx
     cd mfx

scripts.d/50-opencore-amr.sh

@@ -6,11 +6,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     mkdir opencore
     cd opencore

scripts.d/50-openjpeg.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$OPENJPEG_REPO" "$OPENJPEG_COMMIT" openjpeg
     cd openjpeg

scripts.d/50-rav1e.sh

@@ -8,11 +8,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$RAV1E_REPO" "$RAV1E_COMMIT" rav1e
     cd rav1e

scripts.d/50-rubberband.sh

@@ -8,11 +8,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     mkdir rubberband
     cd rubberband

scripts.d/50-sdl.sh

@@ -6,11 +6,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     mkdir sdl
     cd sdl

scripts.d/50-soxr.sh

@@ -8,11 +8,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$SOXR_REPO" "$SOXR_COMMIT" soxr
     cd soxr

scripts.d/50-srt.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$SRT_REPO" "$SRT_COMMIT" srt
     cd srt

scripts.d/50-svtav1.sh

@@ -9,11 +9,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git clone "$SVTAV1_REPO" svtav1
     cd svtav1

scripts.d/50-twolame.sh

@@ -6,11 +6,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     mkdir twolame
     cd twolame

scripts.d/50-uavs3d.sh

@@ -9,11 +9,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git clone "$UAVS3D_REPO" uavs3d
     cd uavs3d

scripts.d/50-vidstab.sh

@@ -9,11 +9,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$VIDSTAB_REPO" "$VIDSTAB_COMMIT" vidstab
     cd vidstab

scripts.d/50-x264.sh

@@ -8,11 +8,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$X264_REPO" "$X264_COMMIT" x264
     cd x264

scripts.d/50-x265.sh

@@ -8,11 +8,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git clone "$X265_REPO" x265
     cd x265

scripts.d/50-xavs2.sh

@@ -9,11 +9,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git clone "$XAVS2_REPO" xavs2
     cd xavs2

scripts.d/50-xvid.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     mkdir xvid
     cd xvid

scripts.d/50-zimg.sh

@@ -7,11 +7,6 @@ ffbuild_enabled() {
     return 0
 }
 
-ffbuild_dockerstage() {
-    to_df "ADD $SELF /stage.sh"
-    to_df "RUN run_stage"
-}
-
 ffbuild_dockerbuild() {
     git-mini-clone "$ZIMG_REPO" "$ZIMG_COMMIT" zimg
     cd zimg

util/vars.sh

@@ -30,11 +30,23 @@ done
 
 REPO="${GITHUB_REPOSITORY:-btbn/ffmpeg-builds}"
 REPO="${REPO,,}"
-REGISTRY="docker.pkg.github.com"
+REGISTRY="ghcr.io"
 BASE_IMAGE="${REGISTRY}/${REPO}/base:latest"
 TARGET_IMAGE="${REGISTRY}/${REPO}/base-${TARGET}:latest"
 IMAGE="${REGISTRY}/${REPO}/${TARGET}-${VARIANT}${ADDINS_STR:+-}${ADDINS_STR}:latest"
 
+ffbuild_dockerstage() {
+    to_df "RUN --mount=src=${SELF},dst=/stage.sh run_stage /stage.sh"
+}
+
+ffbuild_dockerlayer() {
+    to_df "COPY --from=${SELFLAYER} \$FFBUILD_PREFIX/. \$FFBUILD_PREFIX"
+}
+
+ffbuild_dockerfinal() {
+    to_df "COPY --from=${PREVLAYER} \$FFBUILD_PREFIX/. \$FFBUILD_PREFIX"
+}
+
 ffbuild_configure() {
     return 0
 }