From a6e38b38fd9f6a7329b72c59d382edd2d8a0203d Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Sun, 12 Mar 2023 13:12:43 +0800 Subject: [PATCH 01/66] Fix the path to fontconfig configuration file instead of using the install prefix + /etc or /var Signed-off-by: nyanmisaka --- scripts.d/35-fontconfig.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh index 3c20840..cb12f14 100755 --- a/scripts.d/35-fontconfig.sh +++ b/scripts.d/35-fontconfig.sh @@ -22,7 +22,13 @@ ffbuild_dockerbuild() { --enable-static ) - if [[ $TARGET == win* || $TARGET == linux* ]]; then + if [[ $TARGET == linux* ]]; then + myconf+=( + --sysconfdir=/etc + --localstatedir=/var + --host="$FFBUILD_TOOLCHAIN" + ) + elif [[ $TARGET == win* ]]; then myconf+=( --host="$FFBUILD_TOOLCHAIN" ) From f0568e9a9a65fe6e3df17050c0ae4812623c42ce Mon Sep 17 00:00:00 2001 From: BtbN Date: Sun, 12 Mar 2023 17:16:25 +0100 Subject: [PATCH 02/66] Update readme for 6.0 addin Closes #246 --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 7072348..0185e90 100644 --- a/README.md +++ b/README.md @@ -64,8 +64,6 @@ Available variants: * `nonfree-shared` Same again, but with the nonfree set of dependencies. All of those can be optionally combined with any combination of addins: -* `4.4` to build from the 4.4 release branch instead of master. -* `5.0` to build from the 5.0 release branch instead of master. -* `5.1` to build from the 5.1 release branch instead of master. +* `4.4`/`5.0`/`5.1`/`6.0` to build from the respective release branch instead of master. * `debug` to not strip debug symbols from the binaries. This increases the output size by about 250MB. * `lto` build all dependencies and ffmpeg with -flto=auto (HIGHLY EXPERIMENTAL, broken for Windows, sometimes works for Linux) From 3aaec67422e38504ed0d1ae355d9cc98a3ce6d2c Mon Sep 17 00:00:00 2001 From: BtbN Date: Thu, 16 Mar 2023 17:48:38 +0100 Subject: [PATCH 03/66] Retry flaky iconv clone --- scripts.d/20-libiconv.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh index 016c49a..32b5f46 100755 --- a/scripts.d/20-libiconv.sh +++ b/scripts.d/20-libiconv.sh @@ -8,7 +8,7 @@ ffbuild_enabled() { } ffbuild_dockerbuild() { - git clone "$SCRIPT_REPO" iconv + retry-tool sh -c "rm -rf iconv && git clone '$SCRIPT_REPO' iconv" cd iconv git checkout "$SCRIPT_COMMIT" From b78f798c9f58519fc23a2c73d7f9117694f4c08d Mon Sep 17 00:00:00 2001 From: BtbN Date: Sat, 18 Mar 2023 14:19:24 +0100 Subject: [PATCH 04/66] Add cleanup workflow --- .github/workflows/clean.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 .github/workflows/clean.yml diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml new file mode 100644 index 0000000..1f53b93 --- /dev/null +++ b/.github/workflows/clean.yml @@ -0,0 +1,20 @@ +name: Cleanup + +on: + workflow_dispatch: ~ + schedule: + - cron: '0 20 * * *' + +jobs: + cleanup: + name: Cleanup + runs-on: ubuntu-latest + steps: + - name: Cleanup + uses: Chizkiyahu/delete-untagged-ghcr-action@v2 + with: + token: ${{ github.token }} + repository_owner: ${{ github.repository_owner }} + repository: ${{ github.repository }} + owner_type: user + untagged_only: true From c6c7051948a4132d4171cb00e663916019193b62 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sat, 18 Mar 2023 14:27:17 +0100 Subject: [PATCH 05/66] Use PAT for cleanup --- .github/workflows/clean.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index 1f53b93..83a568a 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -13,7 +13,7 @@ jobs: - name: Cleanup uses: Chizkiyahu/delete-untagged-ghcr-action@v2 with: - token: ${{ github.token }} + token: ${{ secrets.CLEANUP_PAT }} repository_owner: ${{ github.repository_owner }} repository: ${{ github.repository }} owner_type: user From ffa7c41e0f4074f682fb70fec915d6d11116df46 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sat, 18 Mar 2023 14:30:26 +0100 Subject: [PATCH 06/66] Work around PAT existence check --- .github/workflows/clean.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index 83a568a..0280d35 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -9,8 +9,11 @@ jobs: cleanup: name: Cleanup runs-on: ubuntu-latest + env: + HAVE_PAT: ${{ secrets.CLEANUP_PAT != '' }} steps: - name: Cleanup + if: ${{ env.HAVE_PAT == 'true' }} uses: Chizkiyahu/delete-untagged-ghcr-action@v2 with: token: ${{ secrets.CLEANUP_PAT }} From 1b3fd62fbf2cdc35860678d84739c58c29960962 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sat, 18 Mar 2023 14:58:57 +0100 Subject: [PATCH 07/66] Do package cleanup as part of build workflow --- .github/workflows/build.yml | 46 +++++++++++++++++++++++++++++++++---- .github/workflows/clean.yml | 23 ------------------- 2 files changed, 42 insertions(+), 27 deletions(-) delete mode 100644 .github/workflows/clean.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ba3434b..d929bf4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,6 +22,7 @@ on: env: DOCKER_BUILDKIT: 1 + HAVE_CLEANUP_PAT: ${{ secrets.CLEANUP_PAT != '' }} jobs: build_base: @@ -43,7 +44,10 @@ jobs: password: ${{ github.token }} - name: Image Name id: imagename - run: echo "name=ghcr.io/${GITHUB_REPOSITORY,,}/base" >> $GITHUB_OUTPUT + run: | + IMG="${GITHUB_REPOSITORY,,}/base" + echo "name=ghcr.io/${IMG/ /-}" >> $GITHUB_OUTPUT + echo "rawname=${IMG/ /-}" >> $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 @@ -55,6 +59,16 @@ jobs: tags: ${{ steps.imagename.outputs.name }}:latest cache-to: type=registry,mode=max,ref=${{ steps.imagename.outputs.name }}:cache cache-from: type=registry,ref=${{ steps.imagename.outputs.name }}:cache + - name: Cleanup + if: ${{ env.HAVE_CLEANUP_PAT == 'true' }} + uses: BtbN/delete-untagged-ghcr-action@main + with: + token: ${{ secrets.CLEANUP_PAT }} + package_name: ${{ steps.imagename.outputs.rawname }} + repository_owner: ${{ github.repository_owner }} + repository: ${{ github.repository }} + owner_type: user + untagged_only: true build_target_bases: name: Build target base image if: ${{ github.event.inputs.buildOnly != 'true' }} @@ -79,7 +93,10 @@ jobs: password: ${{ github.token }} - name: Image Name id: imagename - run: echo "name=ghcr.io/${GITHUB_REPOSITORY,,}/base-${{ matrix.target }}" >> $GITHUB_OUTPUT + run: | + IMG="${GITHUB_REPOSITORY,,}/base-${{ matrix.target }}" + echo "name=ghcr.io/${IMG/ /-}" >> $GITHUB_OUTPUT + echo "rawname=${IMG/ /-}" >> $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 @@ -91,6 +108,16 @@ jobs: tags: ${{ steps.imagename.outputs.name }}:latest cache-to: type=registry,mode=max,ref=${{ steps.imagename.outputs.name }}:cache cache-from: type=registry,ref=${{ steps.imagename.outputs.name }}:cache + - name: Cleanup + if: ${{ env.HAVE_CLEANUP_PAT == 'true' }} + uses: BtbN/delete-untagged-ghcr-action@main + with: + token: ${{ secrets.CLEANUP_PAT }} + package_name: ${{ steps.imagename.outputs.rawname }} + repository_owner: ${{ github.repository_owner }} + repository: ${{ github.repository }} + owner_type: user + untagged_only: true build_targets: name: Build target-variant image if: ${{ github.event.inputs.buildOnly != 'true' }} @@ -119,8 +146,9 @@ jobs: - name: Image Name id: imagename run: | - IMG="ghcr.io/${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}" - echo "name=${IMG/ /-}" >> $GITHUB_OUTPUT + 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}" @@ -135,6 +163,16 @@ jobs: 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' }} + uses: BtbN/delete-untagged-ghcr-action@main + with: + token: ${{ secrets.CLEANUP_PAT }} + package_name: ${{ steps.imagename.outputs.rawname }} + repository_owner: ${{ github.repository_owner }} + repository: ${{ github.repository }} + owner_type: user + untagged_only: true build_ffmpeg: name: Build ffmpeg if: ${{ ( github.event.inputs.buildOnly == 'true' && !cancelled() ) || success() }} diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml deleted file mode 100644 index 0280d35..0000000 --- a/.github/workflows/clean.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Cleanup - -on: - workflow_dispatch: ~ - schedule: - - cron: '0 20 * * *' - -jobs: - cleanup: - name: Cleanup - runs-on: ubuntu-latest - env: - HAVE_PAT: ${{ secrets.CLEANUP_PAT != '' }} - steps: - - name: Cleanup - if: ${{ env.HAVE_PAT == 'true' }} - uses: Chizkiyahu/delete-untagged-ghcr-action@v2 - with: - token: ${{ secrets.CLEANUP_PAT }} - repository_owner: ${{ github.repository_owner }} - repository: ${{ github.repository }} - owner_type: user - untagged_only: true From 13129c7061a4b8105feda0fb1df760cbfceb887b Mon Sep 17 00:00:00 2001 From: BtbN Date: Sat, 18 Mar 2023 15:12:08 +0100 Subject: [PATCH 08/66] Allow cleanup step to fail --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d929bf4..d750bce 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,6 +61,7 @@ jobs: cache-from: type=registry,ref=${{ steps.imagename.outputs.name }}:cache - name: Cleanup if: ${{ env.HAVE_CLEANUP_PAT == 'true' }} + continue-on-error: true uses: BtbN/delete-untagged-ghcr-action@main with: token: ${{ secrets.CLEANUP_PAT }} @@ -110,6 +111,7 @@ jobs: cache-from: type=registry,ref=${{ steps.imagename.outputs.name }}:cache - name: Cleanup if: ${{ env.HAVE_CLEANUP_PAT == 'true' }} + continue-on-error: true uses: BtbN/delete-untagged-ghcr-action@main with: token: ${{ secrets.CLEANUP_PAT }} @@ -165,6 +167,7 @@ jobs: GH_REPO=ghcr.io/${{ steps.imagename.outputs.gh_repo }} - name: Cleanup if: ${{ env.HAVE_CLEANUP_PAT == 'true' }} + continue-on-error: true uses: BtbN/delete-untagged-ghcr-action@main with: token: ${{ secrets.CLEANUP_PAT }} From 521d708a8ee4f71f951b67ad2358098082a0cb8b Mon Sep 17 00:00:00 2001 From: BtbN Date: Sun, 19 Mar 2023 12:26:11 +0100 Subject: [PATCH 09/66] Update dependencies --- scripts.d/10-mingw.sh | 2 +- scripts.d/10-xorg-macros.sh | 2 +- scripts.d/20-libiconv.sh | 2 +- scripts.d/20-libxml2.sh | 2 +- scripts.d/25-fftw3.sh | 2 +- scripts.d/25-freetype.sh | 2 +- scripts.d/35-fontconfig.sh | 2 +- scripts.d/45-harfbuzz.sh | 2 +- scripts.d/45-libsamplerate.sh | 2 +- scripts.d/45-opencl.sh | 4 ++-- scripts.d/45-pulseaudio.sh | 2 +- scripts.d/45-vmaf.sh | 2 +- scripts.d/45-x11/10-xcbproto.sh | 2 +- scripts.d/45-x11/10-xproto.sh | 2 +- scripts.d/45-x11/20-libxau.sh | 2 +- scripts.d/45-x11/30-libxcb.sh | 2 +- scripts.d/45-x11/40-libx11.sh | 2 +- scripts.d/45-x11/50-libxext.sh | 2 +- scripts.d/45-x11/50-libxfixes.sh | 2 +- scripts.d/45-x11/50-libxi.sh | 2 +- scripts.d/45-x11/50-libxinerama.sh | 2 +- scripts.d/45-x11/50-libxrender.sh | 2 +- scripts.d/45-x11/50-libxscrnsaver.sh | 2 +- scripts.d/45-x11/50-libxxf86vm.sh | 2 +- scripts.d/45-x11/60-libglvnd.sh | 2 +- scripts.d/45-x11/60-libxcursor.sh | 2 +- scripts.d/45-x11/60-libxrandr.sh | 2 +- scripts.d/45-x11/60-libxv.sh | 2 +- scripts.d/50-amf.sh | 2 +- scripts.d/50-aom.sh | 2 +- scripts.d/50-aribb24/25-libpng.sh | 2 +- scripts.d/50-avisynth.sh | 2 +- scripts.d/50-dav1d.sh | 2 +- scripts.d/50-ffnvcodec.sh | 2 +- scripts.d/50-frei0r.sh | 2 +- scripts.d/50-libass.sh | 2 +- scripts.d/50-libjxl/50-libjxl.sh | 2 +- scripts.d/50-librist/50-librist.sh | 2 +- scripts.d/50-libssh.sh | 2 +- scripts.d/50-libvpx.sh | 2 +- scripts.d/50-libwebp.sh | 2 +- scripts.d/50-lilv/96-lv2.sh | 2 +- scripts.d/50-lilv/96-serd.sh | 2 +- scripts.d/50-lilv/96-zix.sh | 2 +- scripts.d/50-lilv/97-sord.sh | 2 +- scripts.d/50-lilv/98-sratom.sh | 2 +- scripts.d/50-lilv/99-lilv.sh | 2 +- scripts.d/50-onevpl.sh | 2 +- scripts.d/50-openal.sh | 2 +- scripts.d/50-openh264.sh | 2 +- scripts.d/50-openjpeg.sh | 2 +- scripts.d/50-openmpt.sh | 2 +- scripts.d/50-rav1e.sh | 2 +- scripts.d/50-rubberband.sh | 2 +- scripts.d/50-sdl.sh | 2 +- scripts.d/50-srt.sh | 2 +- scripts.d/50-svtav1.sh | 2 +- scripts.d/50-vaapi/40-libdrm.sh | 2 +- scripts.d/50-vaapi/50-libva.sh | 2 +- scripts.d/50-vulkan/45-vulkan.sh | 2 +- scripts.d/50-vulkan/50-shaderc.sh | 2 +- scripts.d/50-vulkan/55-spirv-cross.sh | 2 +- scripts.d/50-vulkan/60-libplacebo.sh | 2 +- scripts.d/50-x265.sh | 2 +- scripts.d/50-zimg.sh | 2 +- 65 files changed, 66 insertions(+), 66 deletions(-) diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh index 1ad40ec..083ed7b 100755 --- 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="8708b7d92f0d923c0f7196dd7d2aa12c02aa766d" +SCRIPT_COMMIT="0f2264e7b8fedbe225921367e82aeb97ddfed46b" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 diff --git a/scripts.d/10-xorg-macros.sh b/scripts.d/10-xorg-macros.sh index 0de4dd6..6cb4611 100755 --- a/scripts.d/10-xorg-macros.sh +++ b/scripts.d/10-xorg-macros.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/util/macros.git" -SCRIPT_COMMIT="0326ba3c4caa34116c0e7e4af98661858cf25d1c" +SCRIPT_COMMIT="cb147377e9341af05232f95814022abdecf14024" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh index 32b5f46..2d689d0 100755 --- a/scripts.d/20-libiconv.sh +++ b/scripts.d/20-libiconv.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://git.savannah.gnu.org/git/libiconv.git" -SCRIPT_COMMIT="0a05ca75c08ae899f6fca5f79254491e13ffb500" +SCRIPT_COMMIT="c593e206b2d4bc689950c742a0fb00b8013756a0" ffbuild_enabled() { return 0 diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh index cda35ae..e29e35a 100755 --- a/scripts.d/20-libxml2.sh +++ b/scripts.d/20-libxml2.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.gnome.org/GNOME/libxml2.git" -SCRIPT_COMMIT="15c9f4353311c7b765e9e72e63779a161c21f010" +SCRIPT_COMMIT="b1319c902f6e44d08f8cb33f1fc28847f2bc8aeb" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-fftw3.sh b/scripts.d/25-fftw3.sh index bd97245..9d91ed6 100755 --- a/scripts.d/25-fftw3.sh +++ b/scripts.d/25-fftw3.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/FFTW/fftw3.git" -SCRIPT_COMMIT="9426cd59106ffddde1f55131c07fa9c562fa2f8e" +SCRIPT_COMMIT="c277d55689eef1616fa622b3bf6794af3a58e960" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh index 2b57937..ad03a62 100755 --- a/scripts.d/25-freetype.sh +++ b/scripts.d/25-freetype.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git" -SCRIPT_COMMIT="dacbb55433079fb3539163862958a6b9466a0661" +SCRIPT_COMMIT="8fc6df1028ba7173fbcc467a4402bb7ef8a84f8f" ffbuild_enabled() { return 0 diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh index cb12f14..108f97a 100755 --- a/scripts.d/35-fontconfig.sh +++ b/scripts.d/35-fontconfig.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git" -SCRIPT_COMMIT="2ef790a0dbbab24235d1b8c0325ab4414de5f0a9" +SCRIPT_COMMIT="04546f18768e1ce57c24743035118b3eabbd4181" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh index e908674..4f322db 100755 --- a/scripts.d/45-harfbuzz.sh +++ b/scripts.d/45-harfbuzz.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git" -SCRIPT_COMMIT="8bdaeddfcd86aa66f560ff1ae1ae71b1e1723463" +SCRIPT_COMMIT="79233a149209e3da199bb4e2f74271668502c574" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-libsamplerate.sh b/scripts.d/45-libsamplerate.sh index 4f06107..cf6fe1e 100755 --- a/scripts.d/45-libsamplerate.sh +++ b/scripts.d/45-libsamplerate.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libsndfile/libsamplerate.git" -SCRIPT_COMMIT="c01e2405612ad3561bf93e8e6dddb9ba0dffe4d9" +SCRIPT_COMMIT="215c75ea9d6e1685893716100ddae3ebfc9f5cfe" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh index affb991..d0591ec 100755 --- a/scripts.d/45-opencl.sh +++ b/scripts.d/45-opencl.sh @@ -1,10 +1,10 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git" -SCRIPT_COMMIT="4c82e9cfaaad18c340f48af3cf5d09ff33e8c1b7" +SCRIPT_COMMIT="1080743ea047d6467bc609f979a21f00e06ac928" SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git" -SCRIPT_COMMIT2="2cde5d09953a041786d1cfdcb1c08704a82cb904" +SCRIPT_COMMIT2="ece91448a958099b9c277f050fca9df96a2ea718" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh index 8d96ad0..5cf662f 100755 --- a/scripts.d/45-pulseaudio.sh +++ b/scripts.d/45-pulseaudio.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git" -SCRIPT_COMMIT="300db779224625144d6279d230c2daa857c967d8" +SCRIPT_COMMIT="3aaeb5113d2cec907bd101df22bb28b1a1b8394d" ffbuild_enabled() { [[ $TARGET == linux* ]] || return 1 diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh index bf70802..a6496a9 100755 --- a/scripts.d/45-vmaf.sh +++ b/scripts.d/45-vmaf.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/Netflix/vmaf.git" -SCRIPT_COMMIT="e81d12e75629f6f0730077bfa7e28764c41b2907" +SCRIPT_COMMIT="d48ab28eebac8276369cfebeb7cfcbfeb28408c2" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-x11/10-xcbproto.sh b/scripts.d/45-x11/10-xcbproto.sh index 1726024..4fa10ec 100755 --- 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="842d91316243eb1f2e208231acc1512c2cf43a1f" +SCRIPT_COMMIT="15d140d7867e8e654ce917b8d6d1dbd45b3de3b8" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh index a4f3bc7..b133f58 100755 --- 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="1b6e63b2c38a0cf6cd1c70bfc5483cac0d1710e1" +SCRIPT_COMMIT="423098656f145afeb72cbf21aaa0b3a3f9bc36bb" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/20-libxau.sh b/scripts.d/45-x11/20-libxau.sh index 8dc79c5..4ab0d1e 100755 --- a/scripts.d/45-x11/20-libxau.sh +++ b/scripts.d/45-x11/20-libxau.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxau.git" -SCRIPT_COMMIT="14fdf25db9f21c8f3ad37f0d32a5b8e726efdc0d" +SCRIPT_COMMIT="c52f54e9533046a52edf84bcc02abedc2dbcb1a7" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/30-libxcb.sh b/scripts.d/45-x11/30-libxcb.sh index 267d9f7..6884226 100755 --- a/scripts.d/45-x11/30-libxcb.sh +++ b/scripts.d/45-x11/30-libxcb.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git" -SCRIPT_COMMIT="4d1a578dd5348909ade2a853d806272326d228d7" +SCRIPT_COMMIT="18e109d755c5ce18157fdabb6de8ee6845b348ff" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh index c5b4fcc..dba7079 100755 --- 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="fc5ec8edda1efdf5d66db4e76796e3c407527b3b" +SCRIPT_COMMIT="ca99e338a9b8aad300933b1336f9e3c091392213" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/50-libxext.sh b/scripts.d/45-x11/50-libxext.sh index d9c10ce..c482aa3 100755 --- a/scripts.d/45-x11/50-libxext.sh +++ b/scripts.d/45-x11/50-libxext.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxext.git" -SCRIPT_COMMIT="e8556ab06e03b59e9a512eb02955247efd4c4054" +SCRIPT_COMMIT="de2ebd62c1eb8fe16c11aceac4a6981bda124cf4" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/50-libxfixes.sh b/scripts.d/45-x11/50-libxfixes.sh index fa8efc9..9ade485 100755 --- a/scripts.d/45-x11/50-libxfixes.sh +++ b/scripts.d/45-x11/50-libxfixes.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxfixes.git" -SCRIPT_COMMIT="332394278b7110a774b5277bb3cfc58c42cd888c" +SCRIPT_COMMIT="ad22c5ade8789cdb606b244336106a713473318c" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/50-libxi.sh b/scripts.d/45-x11/50-libxi.sh index 6dfa355..3f6e8e7 100755 --- 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="08431d0684f9a1edf199f6c6060d2bef1ac78399" +SCRIPT_COMMIT="826215af0cc46b19555063b8894de6781d4c5993" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/50-libxinerama.sh b/scripts.d/45-x11/50-libxinerama.sh index 1af078e..72d96ac 100755 --- a/scripts.d/45-x11/50-libxinerama.sh +++ b/scripts.d/45-x11/50-libxinerama.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxinerama.git" -SCRIPT_COMMIT="71dfee64feb84f907016940263b235a61c9e8960" +SCRIPT_COMMIT="51c28095951676a5896437c4c3aa40fb1972bad2" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/50-libxrender.sh b/scripts.d/45-x11/50-libxrender.sh index 529d747..826ba7d 100755 --- a/scripts.d/45-x11/50-libxrender.sh +++ b/scripts.d/45-x11/50-libxrender.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrender.git" -SCRIPT_COMMIT="e5e23272394c90731debd7e18dd167e8c25b5c15" +SCRIPT_COMMIT="07efd80468f6b595e6432edd28b8560ca7695ba0" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/50-libxscrnsaver.sh b/scripts.d/45-x11/50-libxscrnsaver.sh index 0f152d2..10a606b 100755 --- a/scripts.d/45-x11/50-libxscrnsaver.sh +++ b/scripts.d/45-x11/50-libxscrnsaver.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxscrnsaver.git" -SCRIPT_COMMIT="34f3f72b88c0a0a10d618e9dfbc88474ae5ce880" +SCRIPT_COMMIT="9b4e000c6c4ae213a3e52345751d885543f17929" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/50-libxxf86vm.sh b/scripts.d/45-x11/50-libxxf86vm.sh index 2d706a1..e18c26d 100755 --- a/scripts.d/45-x11/50-libxxf86vm.sh +++ b/scripts.d/45-x11/50-libxxf86vm.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxxf86vm.git" -SCRIPT_COMMIT="7fe2d41f164d3015216c1079cc7fbce1eea90c98" +SCRIPT_COMMIT="cfda59347e3a04415340a99f925a9cd85c0531b2" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/60-libglvnd.sh b/scripts.d/45-x11/60-libglvnd.sh index cd51237..6d19fb2 100755 --- a/scripts.d/45-x11/60-libglvnd.sh +++ b/scripts.d/45-x11/60-libglvnd.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git" -SCRIPT_COMMIT="dba80d0158b587de91640fae5c0b420c23599d1e" +SCRIPT_COMMIT="056feac0780220822e71a2fd38a83353102e5b36" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/60-libxcursor.sh b/scripts.d/45-x11/60-libxcursor.sh index 8ddb57c..8e9c967 100755 --- a/scripts.d/45-x11/60-libxcursor.sh +++ b/scripts.d/45-x11/60-libxcursor.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcursor.git" -SCRIPT_COMMIT="87a30b1758b7757dd74d0a70e871d7af1cac3a44" +SCRIPT_COMMIT="81dc4a481b64499ab7c355ee43c91e4fe0767545" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/60-libxrandr.sh b/scripts.d/45-x11/60-libxrandr.sh index 5ba854c..42273fd 100755 --- a/scripts.d/45-x11/60-libxrandr.sh +++ b/scripts.d/45-x11/60-libxrandr.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrandr.git" -SCRIPT_COMMIT="3387129532899eaeee3477a2d92fa662d7292a84" +SCRIPT_COMMIT="5b96863cf2a34ee9e72ffc4ec6415bc59b6121fc" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/60-libxv.sh b/scripts.d/45-x11/60-libxv.sh index ebcf8da..19531b7 100755 --- a/scripts.d/45-x11/60-libxv.sh +++ b/scripts.d/45-x11/60-libxv.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxv.git" -SCRIPT_COMMIT="d419928942dbf1897c9627475aa4a2828a81240f" +SCRIPT_COMMIT="b022c9cf7004fe6f794c4c00dd519a2e4c74eca0" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh index 72311dc..b19b5e8 100755 --- a/scripts.d/50-amf.sh +++ b/scripts.d/50-amf.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git" -SCRIPT_COMMIT="37452e9e60940f04fc235a923ffcc31c407240fa" +SCRIPT_COMMIT="4bfa819fc3d6aa4714ad28f8dab46d0fa95177ad" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh index de0f852..046c976 100755 --- a/scripts.d/50-aom.sh +++ b/scripts.d/50-aom.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://aomedia.googlesource.com/aom" -SCRIPT_COMMIT="93fc4d7a259cde11f1c7612867eb33973a26b72d" +SCRIPT_COMMIT="fa2ff85f8963b37be9d74f6b5fd597c6ec1a6021" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-aribb24/25-libpng.sh b/scripts.d/50-aribb24/25-libpng.sh index 267c86c..e48ada5 100755 --- a/scripts.d/50-aribb24/25-libpng.sh +++ b/scripts.d/50-aribb24/25-libpng.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/glennrp/libpng.git" -SCRIPT_COMMIT="aab24fa1b3ccaab8770902a3c50ea9564925d053" +SCRIPT_COMMIT="e519af8b49f52c4ac400f50f23b48ebe36a5f4df" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh index 8aea76b..03f8fff 100755 --- 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="09f362bd2402335afd0b766b496bcd0855c58aa0" +SCRIPT_COMMIT="21c6240b520db4697fd6d905e5d77f1039604b17" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh index 17051f1..cef3bcf 100755 --- a/scripts.d/50-dav1d.sh +++ b/scripts.d/50-dav1d.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git" -SCRIPT_COMMIT="9b4b2448106f863bfa4789ba6e86555ad57c838f" +SCRIPT_COMMIT="16c943484e63da7ed8a8a8d85af88995369f23cd" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh index 920a82e..9853fae 100755 --- a/scripts.d/50-ffnvcodec.sh +++ b/scripts.d/50-ffnvcodec.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/FFmpeg/nv-codec-headers.git" -SCRIPT_COMMIT="c5e4af74850a616c42d39ed45b9b8568b71bf8bf" +SCRIPT_COMMIT="450f8a634309b8f212b1a642630e164150d6a427" SCRIPT_REPO2="https://github.com/FFmpeg/nv-codec-headers.git" SCRIPT_COMMIT2="2055784e5d5bfb3df78d4d3645f345f19062dce2" diff --git a/scripts.d/50-frei0r.sh b/scripts.d/50-frei0r.sh index ffd05ba..e648287 100755 --- 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="599b47843400a248d2b415f46df6d1777902e865" +SCRIPT_COMMIT="3e1234b9f2ba86b1deebdd1034735e12d706c095" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh index 06fae4f..ce74a4d 100755 --- a/scripts.d/50-libass.sh +++ b/scripts.d/50-libass.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libass/libass.git" -SCRIPT_COMMIT="077328ca6715e2e2826881003946640f56cb763c" +SCRIPT_COMMIT="218dacece7d24b45e4637ced4dc56564de29919d" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh index b10cbdd..2154a87 100755 --- a/scripts.d/50-libjxl/50-libjxl.sh +++ b/scripts.d/50-libjxl/50-libjxl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libjxl/libjxl.git" -SCRIPT_COMMIT="6280645ef5530e186ddba0f814f1ea5f6d754e3e" +SCRIPT_COMMIT="25adcd683c382b312ba3ee70bdda4ee1c315ef2c" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-librist/50-librist.sh b/scripts.d/50-librist/50-librist.sh index a5ec29d..103d454 100755 --- a/scripts.d/50-librist/50-librist.sh +++ b/scripts.d/50-librist/50-librist.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/rist/librist.git" -SCRIPT_COMMIT="809390b3b75a259a704079d0fb4d8f1b5f7fa956" +SCRIPT_COMMIT="9f09a3defd6e59839aae3e3b7b5411213fa04b8a" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh index fd0f99b..a4fdca9 100755 --- a/scripts.d/50-libssh.sh +++ b/scripts.d/50-libssh.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://git.libssh.org/projects/libssh.git" -SCRIPT_COMMIT="7291f2173ccfcaf0a90b2df863a2d7b8b2833b1b" +SCRIPT_COMMIT="7b12876f04ae375acd183de3c6cc82bcdc105e1e" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh index e666570..009d427 100755 --- a/scripts.d/50-libvpx.sh +++ b/scripts.d/50-libvpx.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx" -SCRIPT_COMMIT="5595e18870b24fdfd8fdeb4cfa5ea51824486273" +SCRIPT_COMMIT="6788c75055899796c13787ed44cc6f1cc45e09d7" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh index 9682b9c..8097ead 100755 --- a/scripts.d/50-libwebp.sh +++ b/scripts.d/50-libwebp.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp" -SCRIPT_COMMIT="1347a32d82276ecf4daba12f6e9142cc4e1f2401" +SCRIPT_COMMIT="0825faa4c10d622f2747c5b2752e7b6a6848bf3f" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh index 7f3a984..13035f1 100755 --- a/scripts.d/50-lilv/96-lv2.sh +++ b/scripts.d/50-lilv/96-lv2.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/lv2/lv2.git" -SCRIPT_COMMIT="c287eaa2948b7553ccce877115e7a94a07530d80" +SCRIPT_COMMIT="dbdbe3e518daf7b2f3f0e7587d8b2493b1d5a59e" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh index f6f89e6..673583c 100755 --- a/scripts.d/50-lilv/96-serd.sh +++ b/scripts.d/50-lilv/96-serd.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/drobilla/serd.git" -SCRIPT_COMMIT="c7f85701199b42695ce78b28b120a3c56e114fd6" +SCRIPT_COMMIT="61d53637dc62d15f9b3d1fa9e69891313c465c35" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-zix.sh b/scripts.d/50-lilv/96-zix.sh index 74313e0..fe439b3 100755 --- a/scripts.d/50-lilv/96-zix.sh +++ b/scripts.d/50-lilv/96-zix.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/drobilla/zix.git" -SCRIPT_COMMIT="18e62483cb7173c6604f7dd2097299e47c2a4c0c" +SCRIPT_COMMIT="262d4a1522c38be0588746e874159da5c7bb457d" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/97-sord.sh b/scripts.d/50-lilv/97-sord.sh index 5ff235f..8ce7802 100755 --- a/scripts.d/50-lilv/97-sord.sh +++ b/scripts.d/50-lilv/97-sord.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/drobilla/sord.git" -SCRIPT_COMMIT="4113c78db9969054354b153819bde4ff0c8b6a73" +SCRIPT_COMMIT="f5d33a2cda7b6f498bb7e5e61e298dce5510ed5c" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/98-sratom.sh b/scripts.d/50-lilv/98-sratom.sh index c94d244..a2a3a38 100755 --- a/scripts.d/50-lilv/98-sratom.sh +++ b/scripts.d/50-lilv/98-sratom.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/lv2/sratom.git" -SCRIPT_COMMIT="988162496bbb66a2c52d384ef2ca602698024267" +SCRIPT_COMMIT="f1f063c8e170b2a6350eedf68c4859b974d85d5e" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh index 90deec3..cd9f399 100755 --- a/scripts.d/50-lilv/99-lilv.sh +++ b/scripts.d/50-lilv/99-lilv.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/lv2/lilv.git" -SCRIPT_COMMIT="803be790d97a0bd219e15dbe2c9483f33af5877c" +SCRIPT_COMMIT="efb392e32da0bce28dbeb6fb728dcd9183f4611b" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-onevpl.sh b/scripts.d/50-onevpl.sh index 34f6e69..05ebe6a 100755 --- 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="6ca7a09c4b5b2c1ae6b52d73bc44c334ab66adbc" +SCRIPT_COMMIT="4cdf44ccaa605460499c52f39eff5517da2fc3c8" ffbuild_enabled() { [[ $TARGET == *arm64 ]] && return -1 diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh index 13dc57a..0e2cc48 100755 --- 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="b22f9410dde0da5b3795ba62f1a728590238349e" +SCRIPT_COMMIT="186a29b77d8ec01c14d13797f9d51c7c21b22b60" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh index 4de93b9..708fb27 100755 --- a/scripts.d/50-openh264.sh +++ b/scripts.d/50-openh264.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/cisco/openh264.git" -SCRIPT_COMMIT="045aeac1dd01df12dec7b1ef8191b3193cf4273c" +SCRIPT_COMMIT="f8aeaae8e40ea7bbf665c3c4010c78413421ccb4" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh index 3277557..1b11993 100755 --- a/scripts.d/50-openjpeg.sh +++ b/scripts.d/50-openjpeg.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/uclouvain/openjpeg.git" -SCRIPT_COMMIT="ee58d77047867dd422593163e660e66a109ba1c0" +SCRIPT_COMMIT="15c0dca5206d0101de2ce73b97138a2b26949011" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh index eefa723..2f30ed5 100755 --- a/scripts.d/50-openmpt.sh +++ b/scripts.d/50-openmpt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT" -SCRIPT_REV="18737" +SCRIPT_REV="18892" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh index cc8ed36..4d9a64d 100755 --- 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="c548b8498c039614fa3c8583cdf093ffa8fdd742" +SCRIPT_COMMIT="92ed4e82f4aa72d5d14cf8678c85e78dd6f39033" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh index 4c7e9fa..de05236 100755 --- 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="b317d0e81a8e0ea84269cc2c1dab2906ca8df271" +SCRIPT_COMMIT="9e5ebdbafbe1347f2d275fc7d06699e6adad64da" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh index a36f6ea..ac49688 100755 --- 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="2b66ef0df4eee18c5d9fdc77157cc109b6976efc" +SCRIPT_COMMIT="b57a6a1adf15f9a6e4a48e1980aa723d47fa2fe3" SCRIPT_BRANCH="SDL2" ffbuild_enabled() { diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh index 3ca615e..cd73639 100755 --- a/scripts.d/50-srt.sh +++ b/scripts.d/50-srt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/Haivision/srt.git" -SCRIPT_COMMIT="3ffc93f2f6d04dcea765a10e9e5caa7fb071291c" +SCRIPT_COMMIT="39822840c506d72cef5a742d28f32ea28e144345" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh index c674694..8d7ec41 100755 --- a/scripts.d/50-svtav1.sh +++ b/scripts.d/50-svtav1.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git" -SCRIPT_COMMIT="93fc87b0ff0823d5703d31516cb4093aff86c848" +SCRIPT_COMMIT="72fd3d479b315fbf6bd1d7e80dec7afe42037819" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh index fa0a05b..2b0f7cf 100755 --- a/scripts.d/50-vaapi/40-libdrm.sh +++ b/scripts.d/50-vaapi/40-libdrm.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git" -SCRIPT_COMMIT="c6d6dce99fb3e7e681fbba9e198345fdbd10e49e" +SCRIPT_COMMIT="d1681af05471176215ad3d437249c38768dc959f" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh index 65baac9..07af537 100755 --- a/scripts.d/50-vaapi/50-libva.sh +++ b/scripts.d/50-vaapi/50-libva.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/intel/libva.git" -SCRIPT_COMMIT="9ac72efe2e123321d8fd5500fb1aca51cd31bc97" +SCRIPT_COMMIT="ad032fb0bb310e11e945f054289a9c91c8231851" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh index 36499f2..a2b8571 100755 --- a/scripts.d/50-vulkan/45-vulkan.sh +++ b/scripts.d/50-vulkan/45-vulkan.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git" -SCRIPT_COMMIT="v1.3.240" +SCRIPT_COMMIT="v1.3.244" SCRIPT_TAGFILTER="v?.*.*" ffbuild_enabled() { diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh index 2e5c868..31aa364 100755 --- a/scripts.d/50-vulkan/50-shaderc.sh +++ b/scripts.d/50-vulkan/50-shaderc.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/google/shaderc.git" -SCRIPT_COMMIT="dde14deee743b1ae4ec8ad541f3cd268941051bb" +SCRIPT_COMMIT="f1268e6d36cfdcd647d5c7032a6c61a0aad8487b" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh index 7ef0f3a..a48b38e 100755 --- a/scripts.d/50-vulkan/55-spirv-cross.sh +++ b/scripts.d/50-vulkan/55-spirv-cross.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git" -SCRIPT_COMMIT="4e2fdb25671c742a9fbe93a6034eb1542244c7e1" +SCRIPT_COMMIT="d26c233e1c2629fec1ae1b6fdf538958e5d52bff" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh index 4f6a8e2..2b3277a 100755 --- a/scripts.d/50-vulkan/60-libplacebo.sh +++ b/scripts.d/50-vulkan/60-libplacebo.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git" -SCRIPT_COMMIT="855280962b3f5adb453e53d89ea20387e25a1a81" +SCRIPT_COMMIT="5243e797afa4d6dde63d66df013b4667304cad4e" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh index 962dd70..15ace41 100755 --- a/scripts.d/50-x265.sh +++ b/scripts.d/50-x265.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git" -SCRIPT_COMMIT="6da609e41ca5ae1d661a1b5c4805ed7a3f4117cc" +SCRIPT_COMMIT="38cf1c379b5af08856bb2fdd65f65a1f99384886" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh index 80c3347..50b4aac 100755 --- a/scripts.d/50-zimg.sh +++ b/scripts.d/50-zimg.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/sekrit-twc/zimg.git" -SCRIPT_COMMIT="5a5397c2b149fc9e5cb898973121de6edea77c70" +SCRIPT_COMMIT="71394bd10d833ac48faa255f085c3e702a42921d" ffbuild_enabled() { return 0 From a1fdcf77aef5937046bb7de81d9e0378d3d76ad7 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sun, 19 Mar 2023 18:16:36 +0100 Subject: [PATCH 10/66] Downgrade libplacebo again --- scripts.d/50-vulkan/60-libplacebo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh index 2b3277a..2d4f8b3 100755 --- a/scripts.d/50-vulkan/60-libplacebo.sh +++ b/scripts.d/50-vulkan/60-libplacebo.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git" -SCRIPT_COMMIT="5243e797afa4d6dde63d66df013b4667304cad4e" +SCRIPT_COMMIT="bc0fcb9689c282cd631fc37d1b6a67715cfd5fa0" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 From 01980b12aa8aa7ae3342641a8367904687accd12 Mon Sep 17 00:00:00 2001 From: BtbN Date: Wed, 22 Mar 2023 18:26:58 +0100 Subject: [PATCH 11/66] Update ct-ng config --- images/base-linux64/ct-ng-config | 59 ++++++++++++++++++++------- images/base-linuxarm64/ct-ng-config | 59 ++++++++++++++++++++------- images/base-win32/ct-ng-config | 62 +++++++++++++++++++++-------- images/base-win64/ct-ng-config | 62 +++++++++++++++++++++-------- 4 files changed, 182 insertions(+), 60 deletions(-) diff --git a/images/base-linux64/ct-ng-config b/images/base-linux64/ct-ng-config index 7cfd776..df45b9a 100644 --- 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.90_cf9beb1 Configuration +# crosstool-NG 1.25.0.152_89671bf Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y @@ -13,9 +13,9 @@ CT_CONFIGURE_has_make_3_81_or_newer=y CT_CONFIGURE_has_make_4_0_or_newer=y CT_CONFIGURE_has_libtool_2_4_or_newer=y CT_CONFIGURE_has_libtoolize_2_4_or_newer=y -CT_CONFIGURE_has_autoconf_2_65_or_newer=y -CT_CONFIGURE_has_autoreconf_2_65_or_newer=y -CT_CONFIGURE_has_automake_1_15_or_newer=y +CT_CONFIGURE_has_autoconf_2_71_or_newer=y +CT_CONFIGURE_has_autoreconf_2_71_or_newer=y +CT_CONFIGURE_has_automake_1_16_or_newer=y CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y CT_CONFIGURE_has_python_3_4_or_newer=y CT_CONFIGURE_has_bison_2_7_or_newer=y @@ -28,7 +28,7 @@ CT_CONFIGURE_has_sha1sum=y CT_CONFIGURE_has_sha256sum=y CT_CONFIGURE_has_sha512sum=y CT_CONFIGURE_has_install_with_strip_program=y -CT_VERSION="1.25.0.90_cf9beb1" +CT_VERSION="1.25.0.152_89671bf" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -46,6 +46,7 @@ CT_OBSOLETE=y CT_EXPERIMENTAL=y CT_ALLOW_BUILD_AS_ROOT=y CT_ALLOW_BUILD_AS_ROOT_SURE=y +# CT_ENABLE_EXPERIMENTAL_BUNDLED_PATCHES is not set # CT_DEBUG_CT is not set # @@ -64,6 +65,7 @@ CT_REMOVE_DOCS=y # CT_PREFIX_DIR_RO is not set CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y +# CT_TARBALL_RESULT is not set # # Downloading @@ -126,7 +128,6 @@ CT_CONFIG_SHELL="${bash}" CT_LOG_DEBUG=y CT_LOG_LEVEL_MAX="DEBUG" # CT_LOG_SEE_TOOLS_WARN is not set -# CT_LOG_PROGRESS_BAR is not set # CT_LOG_TO_FILE is not set # end of Paths and misc options @@ -137,6 +138,7 @@ CT_LOG_LEVEL_MAX="DEBUG" # CT_ARCH_ARC is not set # CT_ARCH_ARM is not set # CT_ARCH_AVR is not set +# CT_ARCH_BPF is not set # CT_ARCH_C6X is not set # CT_ARCH_LOONGARCH is not set # CT_ARCH_M68K is not set @@ -163,7 +165,7 @@ CT_ARCH_X86_SHOW=y # Options for x86 # CT_ARCH_X86_PKG_KSYM="" -CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" +CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" CT_ARCH_SUFFIX="" # CT_OMIT_TARGET_VENDOR is not set @@ -267,6 +269,7 @@ 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_1 is not set # CT_LINUX_V_6_0 is not set # CT_LINUX_V_5_19 is not set # CT_LINUX_V_5_18 is not set @@ -372,7 +375,8 @@ CT_BINUTILS_PATCH_GLOBAL=y # CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set # CT_BINUTILS_PATCH_NONE is not set CT_BINUTILS_PATCH_ORDER="global" -CT_BINUTILS_V_2_39=y +CT_BINUTILS_V_2_40=y +# CT_BINUTILS_V_2_39 is not set # CT_BINUTILS_V_2_38 is not set # CT_BINUTILS_V_2_37 is not set # CT_BINUTILS_V_2_36 is not set @@ -386,14 +390,14 @@ CT_BINUTILS_V_2_39=y # CT_BINUTILS_V_2_28 is not set # CT_BINUTILS_V_2_27 is not set # CT_BINUTILS_V_2_26 is not set -CT_BINUTILS_VERSION="2.39" +CT_BINUTILS_VERSION="2.40" CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)" CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig" +CT_BINUTILS_later_than_2_39=y CT_BINUTILS_2_39_or_later=y -CT_BINUTILS_2_39_or_older=y CT_BINUTILS_later_than_2_30=y CT_BINUTILS_2_30_or_later=y CT_BINUTILS_later_than_2_27=y @@ -448,6 +452,7 @@ CT_GLIBC_PATCH_GLOBAL=y # CT_GLIBC_PATCH_LOCAL_BUNDLED is not set # CT_GLIBC_PATCH_NONE is not set CT_GLIBC_PATCH_ORDER="global" +# CT_GLIBC_V_2_37 is not set # CT_GLIBC_V_2_36 is not set # CT_GLIBC_V_2_35 is not set # CT_GLIBC_V_2_34 is not set @@ -525,7 +530,7 @@ CT_GLIBC_KERNEL_VERSION_AS_HEADERS=y # CT_GLIBC_KERNEL_VERSION_CHOSEN is not set CT_GLIBC_MIN_KERNEL="4.4.302" CT_GLIBC_ENABLE_COMMON_FLAG=y -CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG" +CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE PICOLIBC UCLIBC_NG" CT_LIBC_SUPPORT_THREADS_ANY=y CT_LIBC_SUPPORT_THREADS_NATIVE=y @@ -545,6 +550,7 @@ CT_CC_SUPPORT_CXX=y CT_CC_SUPPORT_FORTRAN=y CT_CC_SUPPORT_ADA=y CT_CC_SUPPORT_D=y +CT_CC_SUPPORT_JIT=y CT_CC_SUPPORT_OBJC=y CT_CC_SUPPORT_OBJCXX=y CT_CC_SUPPORT_GOLANG=y @@ -661,6 +667,7 @@ CT_ALL_CC_CHOICES="GCC" # CT_CC_LANG_CXX=y # CT_CC_LANG_FORTRAN is not set +# CT_CC_LANG_JIT is not set # CT_CC_LANG_ADA is not set # CT_CC_LANG_D is not set # CT_CC_LANG_OBJC is not set @@ -759,7 +766,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_24=y +CT_ISL_V_0_25=y +# CT_ISL_V_0_24 is not set # CT_ISL_V_0_23 is not set # CT_ISL_V_0_22 is not set # CT_ISL_V_0_21 is not set @@ -770,7 +778,7 @@ CT_ISL_V_0_24=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.24" +CT_ISL_VERSION="0.25" CT_ISL_MIRRORS="https://libisl.sourceforge.io" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -905,7 +913,28 @@ CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz" CT_ZLIB_SIGNATURE_FORMAT="packed/.asc" -CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB" +CT_COMP_LIBS_ZSTD=y +CT_COMP_LIBS_ZSTD_PKG_KSYM="ZSTD" +CT_ZSTD_DIR_NAME="zstd" +CT_ZSTD_PKG_NAME="zstd" +CT_ZSTD_SRC_RELEASE=y +# CT_ZSTD_SRC_DEVEL is not set +# CT_ZSTD_SRC_CUSTOM is not set +CT_ZSTD_PATCH_GLOBAL=y +# CT_ZSTD_PATCH_BUNDLED is not set +# CT_ZSTD_PATCH_LOCAL is not set +# CT_ZSTD_PATCH_BUNDLED_LOCAL is not set +# CT_ZSTD_PATCH_LOCAL_BUNDLED is not set +# CT_ZSTD_PATCH_NONE is not set +CT_ZSTD_PATCH_ORDER="global" +CT_ZSTD_V_1_5_2=y +CT_ZSTD_VERSION="1.5.2" +CT_ZSTD_MIRRORS="https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://www.zstd.net/" +CT_ZSTD_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_ZSTD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_ZSTD_ARCHIVE_FORMATS=".tar.gz" +CT_ZSTD_SIGNATURE_FORMAT="packed/.sig" +CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB ZSTD" CT_LIBICONV_NEEDED=y CT_GETTEXT_NEEDED=y CT_GMP_NEEDED=y @@ -914,6 +943,7 @@ CT_ISL_NEEDED=y CT_MPC_NEEDED=y CT_NCURSES_NEEDED=y CT_ZLIB_NEEDED=y +CT_ZSTD_NEEDED=y CT_LIBICONV=y CT_GETTEXT=y CT_GMP=y @@ -922,6 +952,7 @@ CT_ISL=y CT_MPC=y CT_NCURSES=y CT_ZLIB=y +CT_ZSTD=y # end of Companion libraries # diff --git a/images/base-linuxarm64/ct-ng-config b/images/base-linuxarm64/ct-ng-config index 39137ab..a070e17 100644 --- 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.90_cf9beb1 Configuration +# crosstool-NG 1.25.0.152_89671bf Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y @@ -13,9 +13,9 @@ CT_CONFIGURE_has_make_3_81_or_newer=y CT_CONFIGURE_has_make_4_0_or_newer=y CT_CONFIGURE_has_libtool_2_4_or_newer=y CT_CONFIGURE_has_libtoolize_2_4_or_newer=y -CT_CONFIGURE_has_autoconf_2_65_or_newer=y -CT_CONFIGURE_has_autoreconf_2_65_or_newer=y -CT_CONFIGURE_has_automake_1_15_or_newer=y +CT_CONFIGURE_has_autoconf_2_71_or_newer=y +CT_CONFIGURE_has_autoreconf_2_71_or_newer=y +CT_CONFIGURE_has_automake_1_16_or_newer=y CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y CT_CONFIGURE_has_python_3_4_or_newer=y CT_CONFIGURE_has_bison_2_7_or_newer=y @@ -28,7 +28,7 @@ CT_CONFIGURE_has_sha1sum=y CT_CONFIGURE_has_sha256sum=y CT_CONFIGURE_has_sha512sum=y CT_CONFIGURE_has_install_with_strip_program=y -CT_VERSION="1.25.0.90_cf9beb1" +CT_VERSION="1.25.0.152_89671bf" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -46,6 +46,7 @@ CT_OBSOLETE=y CT_EXPERIMENTAL=y CT_ALLOW_BUILD_AS_ROOT=y CT_ALLOW_BUILD_AS_ROOT_SURE=y +# CT_ENABLE_EXPERIMENTAL_BUNDLED_PATCHES is not set # CT_DEBUG_CT is not set # @@ -64,6 +65,7 @@ CT_REMOVE_DOCS=y # CT_PREFIX_DIR_RO is not set CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y +# CT_TARBALL_RESULT is not set # # Downloading @@ -126,7 +128,6 @@ CT_CONFIG_SHELL="${bash}" CT_LOG_DEBUG=y CT_LOG_LEVEL_MAX="DEBUG" # CT_LOG_SEE_TOOLS_WARN is not set -# CT_LOG_PROGRESS_BAR is not set # CT_LOG_TO_FILE is not set # end of Paths and misc options @@ -137,6 +138,7 @@ CT_LOG_LEVEL_MAX="DEBUG" # CT_ARCH_ARC is not set CT_ARCH_ARM=y # CT_ARCH_AVR is not set +# CT_ARCH_BPF is not set # CT_ARCH_C6X is not set # CT_ARCH_LOONGARCH is not set # CT_ARCH_M68K is not set @@ -163,7 +165,7 @@ CT_ARCH_ARM_SHOW=y # Options for arm # CT_ARCH_ARM_PKG_KSYM="" -CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" +CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" CT_ARCH_SUFFIX="" # CT_OMIT_TARGET_VENDOR is not set @@ -274,6 +276,7 @@ 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_1 is not set # CT_LINUX_V_6_0 is not set # CT_LINUX_V_5_19 is not set # CT_LINUX_V_5_18 is not set @@ -378,7 +381,8 @@ CT_BINUTILS_PATCH_GLOBAL=y # CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set # CT_BINUTILS_PATCH_NONE is not set CT_BINUTILS_PATCH_ORDER="global" -CT_BINUTILS_V_2_39=y +CT_BINUTILS_V_2_40=y +# CT_BINUTILS_V_2_39 is not set # CT_BINUTILS_V_2_38 is not set # CT_BINUTILS_V_2_37 is not set # CT_BINUTILS_V_2_36 is not set @@ -392,14 +396,14 @@ CT_BINUTILS_V_2_39=y # CT_BINUTILS_V_2_28 is not set # CT_BINUTILS_V_2_27 is not set # CT_BINUTILS_V_2_26 is not set -CT_BINUTILS_VERSION="2.39" +CT_BINUTILS_VERSION="2.40" CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)" CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig" +CT_BINUTILS_later_than_2_39=y CT_BINUTILS_2_39_or_later=y -CT_BINUTILS_2_39_or_older=y CT_BINUTILS_later_than_2_30=y CT_BINUTILS_2_30_or_later=y CT_BINUTILS_later_than_2_27=y @@ -454,6 +458,7 @@ CT_GLIBC_PATCH_GLOBAL=y # CT_GLIBC_PATCH_LOCAL_BUNDLED is not set # CT_GLIBC_PATCH_NONE is not set CT_GLIBC_PATCH_ORDER="global" +# CT_GLIBC_V_2_37 is not set # CT_GLIBC_V_2_36 is not set # CT_GLIBC_V_2_35 is not set # CT_GLIBC_V_2_34 is not set @@ -537,7 +542,7 @@ CT_GLIBC_SSP_DEFAULT=y # CT_GLIBC_SSP_ALL is not set # CT_GLIBC_SSP_STRONG is not set CT_GLIBC_ENABLE_COMMON_FLAG=y -CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG" +CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE PICOLIBC UCLIBC_NG" CT_LIBC_SUPPORT_THREADS_ANY=y CT_LIBC_SUPPORT_THREADS_NATIVE=y @@ -557,6 +562,7 @@ CT_CC_SUPPORT_CXX=y CT_CC_SUPPORT_FORTRAN=y CT_CC_SUPPORT_ADA=y CT_CC_SUPPORT_D=y +CT_CC_SUPPORT_JIT=y CT_CC_SUPPORT_OBJC=y CT_CC_SUPPORT_OBJCXX=y CT_CC_SUPPORT_GOLANG=y @@ -673,6 +679,7 @@ CT_ALL_CC_CHOICES="GCC" # CT_CC_LANG_CXX=y # CT_CC_LANG_FORTRAN is not set +# CT_CC_LANG_JIT is not set # CT_CC_LANG_ADA is not set # CT_CC_LANG_D is not set # CT_CC_LANG_OBJC is not set @@ -771,7 +778,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_24=y +CT_ISL_V_0_25=y +# CT_ISL_V_0_24 is not set # CT_ISL_V_0_23 is not set # CT_ISL_V_0_22 is not set # CT_ISL_V_0_21 is not set @@ -782,7 +790,7 @@ CT_ISL_V_0_24=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.24" +CT_ISL_VERSION="0.25" CT_ISL_MIRRORS="https://libisl.sourceforge.io" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -917,7 +925,28 @@ CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz" CT_ZLIB_SIGNATURE_FORMAT="packed/.asc" -CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB" +CT_COMP_LIBS_ZSTD=y +CT_COMP_LIBS_ZSTD_PKG_KSYM="ZSTD" +CT_ZSTD_DIR_NAME="zstd" +CT_ZSTD_PKG_NAME="zstd" +CT_ZSTD_SRC_RELEASE=y +# CT_ZSTD_SRC_DEVEL is not set +# CT_ZSTD_SRC_CUSTOM is not set +CT_ZSTD_PATCH_GLOBAL=y +# CT_ZSTD_PATCH_BUNDLED is not set +# CT_ZSTD_PATCH_LOCAL is not set +# CT_ZSTD_PATCH_BUNDLED_LOCAL is not set +# CT_ZSTD_PATCH_LOCAL_BUNDLED is not set +# CT_ZSTD_PATCH_NONE is not set +CT_ZSTD_PATCH_ORDER="global" +CT_ZSTD_V_1_5_2=y +CT_ZSTD_VERSION="1.5.2" +CT_ZSTD_MIRRORS="https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://www.zstd.net/" +CT_ZSTD_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_ZSTD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_ZSTD_ARCHIVE_FORMATS=".tar.gz" +CT_ZSTD_SIGNATURE_FORMAT="packed/.sig" +CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB ZSTD" CT_LIBICONV_NEEDED=y CT_GETTEXT_NEEDED=y CT_GMP_NEEDED=y @@ -926,6 +955,7 @@ CT_ISL_NEEDED=y CT_MPC_NEEDED=y CT_NCURSES_NEEDED=y CT_ZLIB_NEEDED=y +CT_ZSTD_NEEDED=y CT_LIBICONV=y CT_GETTEXT=y CT_GMP=y @@ -934,6 +964,7 @@ CT_ISL=y CT_MPC=y CT_NCURSES=y CT_ZLIB=y +CT_ZSTD=y # end of Companion libraries # diff --git a/images/base-win32/ct-ng-config b/images/base-win32/ct-ng-config index 07bdd9f..97bdafd 100644 --- 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.90_cf9beb1 Configuration +# crosstool-NG 1.25.0.152_89671bf Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y @@ -13,9 +13,9 @@ CT_CONFIGURE_has_make_3_81_or_newer=y CT_CONFIGURE_has_make_4_0_or_newer=y CT_CONFIGURE_has_libtool_2_4_or_newer=y CT_CONFIGURE_has_libtoolize_2_4_or_newer=y -CT_CONFIGURE_has_autoconf_2_65_or_newer=y -CT_CONFIGURE_has_autoreconf_2_65_or_newer=y -CT_CONFIGURE_has_automake_1_15_or_newer=y +CT_CONFIGURE_has_autoconf_2_71_or_newer=y +CT_CONFIGURE_has_autoreconf_2_71_or_newer=y +CT_CONFIGURE_has_automake_1_16_or_newer=y CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y CT_CONFIGURE_has_python_3_4_or_newer=y CT_CONFIGURE_has_bison_2_7_or_newer=y @@ -28,7 +28,7 @@ CT_CONFIGURE_has_sha1sum=y CT_CONFIGURE_has_sha256sum=y CT_CONFIGURE_has_sha512sum=y CT_CONFIGURE_has_install_with_strip_program=y -CT_VERSION="1.25.0.90_cf9beb1" +CT_VERSION="1.25.0.152_89671bf" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -46,6 +46,7 @@ CT_MODULES=y CT_EXPERIMENTAL=y CT_ALLOW_BUILD_AS_ROOT=y CT_ALLOW_BUILD_AS_ROOT_SURE=y +# CT_ENABLE_EXPERIMENTAL_BUNDLED_PATCHES is not set # CT_DEBUG_CT is not set # @@ -64,6 +65,7 @@ CT_REMOVE_DOCS=y # CT_PREFIX_DIR_RO is not set CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y +# CT_TARBALL_RESULT is not set # # Downloading @@ -126,7 +128,6 @@ CT_CONFIG_SHELL="${bash}" CT_LOG_DEBUG=y CT_LOG_LEVEL_MAX="DEBUG" # CT_LOG_SEE_TOOLS_WARN is not set -# CT_LOG_PROGRESS_BAR is not set # CT_LOG_TO_FILE is not set # end of Paths and misc options @@ -137,6 +138,7 @@ CT_LOG_LEVEL_MAX="DEBUG" # CT_ARCH_ARC is not set # CT_ARCH_ARM is not set # CT_ARCH_AVR is not set +# CT_ARCH_BPF is not set # CT_ARCH_C6X is not set # CT_ARCH_LOONGARCH is not set # CT_ARCH_M68K is not set @@ -163,7 +165,7 @@ CT_ARCH_X86_SHOW=y # Options for x86 # CT_ARCH_X86_PKG_KSYM="" -CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" +CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" CT_ARCH_SUFFIX="" # CT_OMIT_TARGET_VENDOR is not set @@ -292,7 +294,8 @@ CT_BINUTILS_PATCH_GLOBAL=y # CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set # CT_BINUTILS_PATCH_NONE is not set CT_BINUTILS_PATCH_ORDER="global" -CT_BINUTILS_V_2_39=y +CT_BINUTILS_V_2_40=y +# CT_BINUTILS_V_2_39 is not set # CT_BINUTILS_V_2_38 is not set # CT_BINUTILS_V_2_37 is not set # CT_BINUTILS_V_2_36 is not set @@ -306,14 +309,14 @@ CT_BINUTILS_V_2_39=y # CT_BINUTILS_V_2_28 is not set # CT_BINUTILS_V_2_27 is not set # CT_BINUTILS_V_2_26 is not set -CT_BINUTILS_VERSION="2.39" +CT_BINUTILS_VERSION="2.40" CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)" CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig" +CT_BINUTILS_later_than_2_39=y CT_BINUTILS_2_39_or_later=y -CT_BINUTILS_2_39_or_older=y CT_BINUTILS_later_than_2_30=y CT_BINUTILS_2_30_or_later=y CT_BINUTILS_later_than_2_27=y @@ -364,13 +367,14 @@ CT_MINGW_W64_PATCH_GLOBAL=y # CT_MINGW_W64_PATCH_LOCAL_BUNDLED is not set # CT_MINGW_W64_PATCH_NONE is not set CT_MINGW_W64_PATCH_ORDER="global" -CT_MINGW_W64_V_V9_0=y +CT_MINGW_W64_V_V10_0=y +# CT_MINGW_W64_V_V9_0 is not set # CT_MINGW_W64_V_V8_0 is not set # CT_MINGW_W64_V_V7_0 is not set # CT_MINGW_W64_V_V6_0 is not set # CT_MINGW_W64_V_V5_0 is not set # CT_MINGW_W64_V_V4_0 is not set -CT_MINGW_W64_VERSION="v9.0.0" +CT_MINGW_W64_VERSION="v10.0.0" CT_MINGW_W64_MIRRORS="http://downloads.sourceforge.net/sourceforge/mingw-w64 https://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/" CT_MINGW_W64_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MINGW_W64_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -381,7 +385,7 @@ CT_MINGW_DIRECTX=y CT_MINGW_DDK=y CT_MINGW_TOOLS=y CT_MINGW_TOOL_LIST_ARRAY="gendef genidl genlib genpeimg widl" -CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG" +CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE PICOLIBC UCLIBC_NG" CT_LIBC_SUPPORT_THREADS_ANY=y CT_LIBC_SUPPORT_THREADS_NATIVE=y CT_LIBC_SUPPORT_THREADS_POSIX=y @@ -403,6 +407,7 @@ CT_CC_SUPPORT_CXX=y CT_CC_SUPPORT_FORTRAN=y CT_CC_SUPPORT_ADA=y CT_CC_SUPPORT_D=y +CT_CC_SUPPORT_JIT=y CT_CC_SUPPORT_OBJC=y CT_CC_SUPPORT_OBJCXX=y CT_CC_SUPPORT_GOLANG=y @@ -516,6 +521,7 @@ CT_ALL_CC_CHOICES="GCC" # CT_CC_LANG_CXX=y # CT_CC_LANG_FORTRAN is not set +# CT_CC_LANG_JIT is not set # CT_CC_LANG_ADA is not set # CT_CC_LANG_D is not set # CT_CC_LANG_OBJC is not set @@ -614,7 +620,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_24=y +CT_ISL_V_0_25=y +# CT_ISL_V_0_24 is not set # CT_ISL_V_0_23 is not set # CT_ISL_V_0_22 is not set # CT_ISL_V_0_21 is not set @@ -624,7 +631,7 @@ CT_ISL_V_0_24=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.24" +CT_ISL_VERSION="0.25" CT_ISL_MIRRORS="https://libisl.sourceforge.io" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -708,7 +715,28 @@ CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz" CT_ZLIB_SIGNATURE_FORMAT="packed/.asc" -CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB" +CT_COMP_LIBS_ZSTD=y +CT_COMP_LIBS_ZSTD_PKG_KSYM="ZSTD" +CT_ZSTD_DIR_NAME="zstd" +CT_ZSTD_PKG_NAME="zstd" +CT_ZSTD_SRC_RELEASE=y +# CT_ZSTD_SRC_DEVEL is not set +# CT_ZSTD_SRC_CUSTOM is not set +CT_ZSTD_PATCH_GLOBAL=y +# CT_ZSTD_PATCH_BUNDLED is not set +# CT_ZSTD_PATCH_LOCAL is not set +# CT_ZSTD_PATCH_BUNDLED_LOCAL is not set +# CT_ZSTD_PATCH_LOCAL_BUNDLED is not set +# CT_ZSTD_PATCH_NONE is not set +CT_ZSTD_PATCH_ORDER="global" +CT_ZSTD_V_1_5_2=y +CT_ZSTD_VERSION="1.5.2" +CT_ZSTD_MIRRORS="https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://www.zstd.net/" +CT_ZSTD_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_ZSTD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_ZSTD_ARCHIVE_FORMATS=".tar.gz" +CT_ZSTD_SIGNATURE_FORMAT="packed/.sig" +CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB ZSTD" # CT_LIBICONV_NEEDED is not set # CT_GETTEXT_NEEDED is not set CT_GMP_NEEDED=y @@ -716,11 +744,13 @@ CT_MPFR_NEEDED=y CT_ISL_NEEDED=y CT_MPC_NEEDED=y CT_ZLIB_NEEDED=y +CT_ZSTD_NEEDED=y CT_GMP=y CT_MPFR=y CT_ISL=y CT_MPC=y CT_ZLIB=y +CT_ZSTD=y # end of Companion libraries # diff --git a/images/base-win64/ct-ng-config b/images/base-win64/ct-ng-config index 83b65cb..90c00bf 100644 --- 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.90_cf9beb1 Configuration +# crosstool-NG 1.25.0.152_89671bf Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y @@ -13,9 +13,9 @@ CT_CONFIGURE_has_make_3_81_or_newer=y CT_CONFIGURE_has_make_4_0_or_newer=y CT_CONFIGURE_has_libtool_2_4_or_newer=y CT_CONFIGURE_has_libtoolize_2_4_or_newer=y -CT_CONFIGURE_has_autoconf_2_65_or_newer=y -CT_CONFIGURE_has_autoreconf_2_65_or_newer=y -CT_CONFIGURE_has_automake_1_15_or_newer=y +CT_CONFIGURE_has_autoconf_2_71_or_newer=y +CT_CONFIGURE_has_autoreconf_2_71_or_newer=y +CT_CONFIGURE_has_automake_1_16_or_newer=y CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y CT_CONFIGURE_has_python_3_4_or_newer=y CT_CONFIGURE_has_bison_2_7_or_newer=y @@ -28,7 +28,7 @@ CT_CONFIGURE_has_sha1sum=y CT_CONFIGURE_has_sha256sum=y CT_CONFIGURE_has_sha512sum=y CT_CONFIGURE_has_install_with_strip_program=y -CT_VERSION="1.25.0.90_cf9beb1" +CT_VERSION="1.25.0.152_89671bf" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -46,6 +46,7 @@ CT_MODULES=y CT_EXPERIMENTAL=y CT_ALLOW_BUILD_AS_ROOT=y CT_ALLOW_BUILD_AS_ROOT_SURE=y +# CT_ENABLE_EXPERIMENTAL_BUNDLED_PATCHES is not set # CT_DEBUG_CT is not set # @@ -64,6 +65,7 @@ CT_REMOVE_DOCS=y # CT_PREFIX_DIR_RO is not set CT_STRIP_HOST_TOOLCHAIN_EXECUTABLES=y CT_STRIP_TARGET_TOOLCHAIN_EXECUTABLES=y +# CT_TARBALL_RESULT is not set # # Downloading @@ -126,7 +128,6 @@ CT_CONFIG_SHELL="${bash}" CT_LOG_DEBUG=y CT_LOG_LEVEL_MAX="DEBUG" # CT_LOG_SEE_TOOLS_WARN is not set -# CT_LOG_PROGRESS_BAR is not set # CT_LOG_TO_FILE is not set # end of Paths and misc options @@ -137,6 +138,7 @@ CT_LOG_LEVEL_MAX="DEBUG" # CT_ARCH_ARC is not set # CT_ARCH_ARM is not set # CT_ARCH_AVR is not set +# CT_ARCH_BPF is not set # CT_ARCH_C6X is not set # CT_ARCH_LOONGARCH is not set # CT_ARCH_M68K is not set @@ -163,7 +165,7 @@ CT_ARCH_X86_SHOW=y # Options for x86 # CT_ARCH_X86_PKG_KSYM="" -CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" +CT_ALL_ARCH_CHOICES="ALPHA ARC ARM AVR BPF C6X LOONGARCH M68K MICROBLAZE MIPS MOXIE MSP430 NIOS2 POWERPC PRU RISCV S390 SH SPARC X86 XTENSA" CT_ARCH_SUFFIX="" # CT_OMIT_TARGET_VENDOR is not set @@ -293,7 +295,8 @@ CT_BINUTILS_PATCH_GLOBAL=y # CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set # CT_BINUTILS_PATCH_NONE is not set CT_BINUTILS_PATCH_ORDER="global" -CT_BINUTILS_V_2_39=y +CT_BINUTILS_V_2_40=y +# CT_BINUTILS_V_2_39 is not set # CT_BINUTILS_V_2_38 is not set # CT_BINUTILS_V_2_37 is not set # CT_BINUTILS_V_2_36 is not set @@ -307,14 +310,14 @@ CT_BINUTILS_V_2_39=y # CT_BINUTILS_V_2_28 is not set # CT_BINUTILS_V_2_27 is not set # CT_BINUTILS_V_2_26 is not set -CT_BINUTILS_VERSION="2.39" +CT_BINUTILS_VERSION="2.40" CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)" CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_BINUTILS_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz" CT_BINUTILS_SIGNATURE_FORMAT="packed/.sig" +CT_BINUTILS_later_than_2_39=y CT_BINUTILS_2_39_or_later=y -CT_BINUTILS_2_39_or_older=y CT_BINUTILS_later_than_2_30=y CT_BINUTILS_2_30_or_later=y CT_BINUTILS_later_than_2_27=y @@ -365,13 +368,14 @@ CT_MINGW_W64_PATCH_GLOBAL=y # CT_MINGW_W64_PATCH_LOCAL_BUNDLED is not set # CT_MINGW_W64_PATCH_NONE is not set CT_MINGW_W64_PATCH_ORDER="global" -CT_MINGW_W64_V_V9_0=y +CT_MINGW_W64_V_V10_0=y +# CT_MINGW_W64_V_V9_0 is not set # CT_MINGW_W64_V_V8_0 is not set # CT_MINGW_W64_V_V7_0 is not set # CT_MINGW_W64_V_V6_0 is not set # CT_MINGW_W64_V_V5_0 is not set # CT_MINGW_W64_V_V4_0 is not set -CT_MINGW_W64_VERSION="v9.0.0" +CT_MINGW_W64_VERSION="v10.0.0" CT_MINGW_W64_MIRRORS="http://downloads.sourceforge.net/sourceforge/mingw-w64 https://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/" CT_MINGW_W64_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MINGW_W64_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -382,7 +386,7 @@ CT_MINGW_DIRECTX=y CT_MINGW_DDK=y CT_MINGW_TOOLS=y CT_MINGW_TOOL_LIST_ARRAY="gendef genidl genlib genpeimg widl" -CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE UCLIBC_NG" +CT_ALL_LIBC_CHOICES="AVR_LIBC GLIBC MINGW_W64 MOXIEBOX MUSL NEWLIB NONE PICOLIBC UCLIBC_NG" CT_LIBC_SUPPORT_THREADS_ANY=y CT_LIBC_SUPPORT_THREADS_NATIVE=y CT_LIBC_SUPPORT_THREADS_POSIX=y @@ -404,6 +408,7 @@ CT_CC_SUPPORT_CXX=y CT_CC_SUPPORT_FORTRAN=y CT_CC_SUPPORT_ADA=y CT_CC_SUPPORT_D=y +CT_CC_SUPPORT_JIT=y CT_CC_SUPPORT_OBJC=y CT_CC_SUPPORT_OBJCXX=y CT_CC_SUPPORT_GOLANG=y @@ -517,6 +522,7 @@ CT_ALL_CC_CHOICES="GCC" # CT_CC_LANG_CXX=y # CT_CC_LANG_FORTRAN is not set +# CT_CC_LANG_JIT is not set # CT_CC_LANG_ADA is not set # CT_CC_LANG_D is not set # CT_CC_LANG_OBJC is not set @@ -615,7 +621,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_24=y +CT_ISL_V_0_25=y +# CT_ISL_V_0_24 is not set # CT_ISL_V_0_23 is not set # CT_ISL_V_0_22 is not set # CT_ISL_V_0_21 is not set @@ -625,7 +632,7 @@ CT_ISL_V_0_24=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.24" +CT_ISL_VERSION="0.25" CT_ISL_MIRRORS="https://libisl.sourceforge.io" CT_ISL_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ISL_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -709,7 +716,28 @@ CT_ZLIB_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_ZLIB_ARCHIVE_FORMATS=".tar.xz .tar.gz" CT_ZLIB_SIGNATURE_FORMAT="packed/.asc" -CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB" +CT_COMP_LIBS_ZSTD=y +CT_COMP_LIBS_ZSTD_PKG_KSYM="ZSTD" +CT_ZSTD_DIR_NAME="zstd" +CT_ZSTD_PKG_NAME="zstd" +CT_ZSTD_SRC_RELEASE=y +# CT_ZSTD_SRC_DEVEL is not set +# CT_ZSTD_SRC_CUSTOM is not set +CT_ZSTD_PATCH_GLOBAL=y +# CT_ZSTD_PATCH_BUNDLED is not set +# CT_ZSTD_PATCH_LOCAL is not set +# CT_ZSTD_PATCH_BUNDLED_LOCAL is not set +# CT_ZSTD_PATCH_LOCAL_BUNDLED is not set +# CT_ZSTD_PATCH_NONE is not set +CT_ZSTD_PATCH_ORDER="global" +CT_ZSTD_V_1_5_2=y +CT_ZSTD_VERSION="1.5.2" +CT_ZSTD_MIRRORS="https://github.com/facebook/zstd/releases/download/v${CT_ZSTD_VERSION} https://www.zstd.net/" +CT_ZSTD_ARCHIVE_FILENAME="@{pkg_name}-@{version}" +CT_ZSTD_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" +CT_ZSTD_ARCHIVE_FORMATS=".tar.gz" +CT_ZSTD_SIGNATURE_FORMAT="packed/.sig" +CT_ALL_COMP_LIBS_CHOICES="CLOOG EXPAT GETTEXT GMP GNUPRUMCU ISL LIBELF LIBICONV MPC MPFR NCURSES NEWLIB_NANO PICOLIBC ZLIB ZSTD" # CT_LIBICONV_NEEDED is not set # CT_GETTEXT_NEEDED is not set CT_GMP_NEEDED=y @@ -717,11 +745,13 @@ CT_MPFR_NEEDED=y CT_ISL_NEEDED=y CT_MPC_NEEDED=y CT_ZLIB_NEEDED=y +CT_ZSTD_NEEDED=y CT_GMP=y CT_MPFR=y CT_ISL=y CT_MPC=y CT_ZLIB=y +CT_ZSTD=y # end of Companion libraries # From ccbc205c57ef810b82ac8b71e1d2d84a20429156 Mon Sep 17 00:00:00 2001 From: BtbN Date: Tue, 28 Mar 2023 12:46:57 +0200 Subject: [PATCH 12/66] Increate latest re-release delay again --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d750bce..b2bae58 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -240,7 +240,7 @@ jobs: TAGNAME="latest" hub release delete "$TAGNAME" || true git push --delete origin "$TAGNAME" || true - sleep 5 + sleep 15 hub release create $(for a in latest_artifacts/*; do echo -a $a; done) -m "$NAME" -t "master" "$TAGNAME" env: GITHUB_TOKEN: ${{ github.token }} From 5e54b68d5ef0bd5977d1659dd64a3487ca37f2c7 Mon Sep 17 00:00:00 2001 From: BtbN Date: Tue, 28 Mar 2023 14:52:55 +0200 Subject: [PATCH 13/66] Update mbedtls --- scripts.d/50-librist/40-mbedtls.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts.d/50-librist/40-mbedtls.sh b/scripts.d/50-librist/40-mbedtls.sh index ca129ba..93b9abb 100755 --- a/scripts.d/50-librist/40-mbedtls.sh +++ b/scripts.d/50-librist/40-mbedtls.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/ARMmbed/mbedtls.git" -SCRIPT_COMMIT="v3.3.0" +SCRIPT_COMMIT="v3.4.0" SCRIPT_TAGFILTER="v3.*" ffbuild_enabled() { From 341ed9f992033af6dd97a749cfb0d364ade34c69 Mon Sep 17 00:00:00 2001 From: BtbN Date: Tue, 18 Apr 2023 16:23:16 +0200 Subject: [PATCH 14/66] Update dependencies --- scripts.d/10-mingw.sh | 2 +- scripts.d/20-libiconv.sh | 2 +- scripts.d/20-libxml2.sh | 2 +- scripts.d/25-fftw3.sh | 2 +- scripts.d/25-freetype.sh | 2 +- scripts.d/35-fontconfig.sh | 2 +- scripts.d/45-harfbuzz.sh | 2 +- scripts.d/45-libsamplerate.sh | 2 +- scripts.d/45-opencl.sh | 4 ++-- scripts.d/45-pulseaudio.sh | 2 +- scripts.d/45-vmaf.sh | 2 +- scripts.d/45-x11/10-xcbproto.sh | 2 +- scripts.d/45-x11/10-xproto.sh | 2 +- scripts.d/45-x11/10-xtrans.sh | 2 +- scripts.d/45-x11/20-libxau.sh | 2 +- scripts.d/45-x11/30-libxcb.sh | 2 +- scripts.d/45-x11/40-libx11.sh | 2 +- scripts.d/45-x11/50-libxfixes.sh | 2 +- scripts.d/45-x11/60-libglvnd.sh | 2 +- scripts.d/45-x11/60-libxcursor.sh | 2 +- scripts.d/50-amf.sh | 2 +- scripts.d/50-aom.sh | 2 +- scripts.d/50-avisynth.sh | 2 +- scripts.d/50-dav1d.sh | 2 +- scripts.d/50-libass.sh | 2 +- scripts.d/50-libjxl/50-libjxl.sh | 2 +- scripts.d/50-librist/50-librist.sh | 2 +- scripts.d/50-libssh.sh | 2 +- scripts.d/50-libvpx.sh | 2 +- scripts.d/50-libwebp.sh | 2 +- scripts.d/50-lilv/96-lv2.sh | 2 +- scripts.d/50-lilv/96-serd.sh | 2 +- scripts.d/50-onevpl.sh | 2 +- scripts.d/50-openal.sh | 2 +- scripts.d/50-openh264.sh | 2 +- scripts.d/50-openjpeg.sh | 2 +- scripts.d/50-openmpt.sh | 2 +- scripts.d/50-rav1e.sh | 2 +- scripts.d/50-rubberband.sh | 2 +- scripts.d/50-sdl.sh | 2 +- scripts.d/50-srt.sh | 2 +- scripts.d/50-svtav1.sh | 2 +- scripts.d/50-vaapi/30-libpciaccess.sh | 2 +- scripts.d/50-vaapi/40-libdrm.sh | 2 +- scripts.d/50-vaapi/50-libva.sh | 2 +- scripts.d/50-vidstab.sh | 2 +- scripts.d/50-vulkan/45-vulkan.sh | 2 +- scripts.d/50-vulkan/50-shaderc.sh | 2 +- scripts.d/50-vulkan/55-spirv-cross.sh | 2 +- scripts.d/50-vulkan/60-libplacebo.sh | 2 +- scripts.d/50-x265.sh | 2 +- 51 files changed, 52 insertions(+), 52 deletions(-) diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh index 083ed7b..71293ef 100755 --- 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="0f2264e7b8fedbe225921367e82aeb97ddfed46b" +SCRIPT_COMMIT="eff726c461e09f35eeaed125a3570fa5f807f02b" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh index 2d689d0..d1899ed 100755 --- a/scripts.d/20-libiconv.sh +++ b/scripts.d/20-libiconv.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://git.savannah.gnu.org/git/libiconv.git" -SCRIPT_COMMIT="c593e206b2d4bc689950c742a0fb00b8013756a0" +SCRIPT_COMMIT="33f08ec1e0fc1e8203a3d81e9161894dc5793908" ffbuild_enabled() { return 0 diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh index e29e35a..8d56f60 100755 --- a/scripts.d/20-libxml2.sh +++ b/scripts.d/20-libxml2.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.gnome.org/GNOME/libxml2.git" -SCRIPT_COMMIT="b1319c902f6e44d08f8cb33f1fc28847f2bc8aeb" +SCRIPT_COMMIT="33fb297b3685f7ff7b11002155c23f9f1ccd957b" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-fftw3.sh b/scripts.d/25-fftw3.sh index 9d91ed6..ae071fe 100755 --- a/scripts.d/25-fftw3.sh +++ b/scripts.d/25-fftw3.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/FFTW/fftw3.git" -SCRIPT_COMMIT="c277d55689eef1616fa622b3bf6794af3a58e960" +SCRIPT_COMMIT="0842f00ae6b6e1f3aade155bc0edd17a7313fa6a" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh index ad03a62..ba9cdc5 100755 --- a/scripts.d/25-freetype.sh +++ b/scripts.d/25-freetype.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git" -SCRIPT_COMMIT="8fc6df1028ba7173fbcc467a4402bb7ef8a84f8f" +SCRIPT_COMMIT="c4fe77c3f072fab930267f95510562e7aeb03302" ffbuild_enabled() { return 0 diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh index 108f97a..ab81dbd 100755 --- a/scripts.d/35-fontconfig.sh +++ b/scripts.d/35-fontconfig.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git" -SCRIPT_COMMIT="04546f18768e1ce57c24743035118b3eabbd4181" +SCRIPT_COMMIT="222d058525506e587a45368f10e45e4b80ca541f" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh index 4f322db..147a5d7 100755 --- a/scripts.d/45-harfbuzz.sh +++ b/scripts.d/45-harfbuzz.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git" -SCRIPT_COMMIT="79233a149209e3da199bb4e2f74271668502c574" +SCRIPT_COMMIT="3db6baa20e0a4661f99654860000e74a2770c2e0" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-libsamplerate.sh b/scripts.d/45-libsamplerate.sh index cf6fe1e..cff6e1b 100755 --- a/scripts.d/45-libsamplerate.sh +++ b/scripts.d/45-libsamplerate.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libsndfile/libsamplerate.git" -SCRIPT_COMMIT="215c75ea9d6e1685893716100ddae3ebfc9f5cfe" +SCRIPT_COMMIT="22bd06eb114850ebe31981eb794d150a95439fef" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh index d0591ec..9a90658 100755 --- a/scripts.d/45-opencl.sh +++ b/scripts.d/45-opencl.sh @@ -1,10 +1,10 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git" -SCRIPT_COMMIT="1080743ea047d6467bc609f979a21f00e06ac928" +SCRIPT_COMMIT="4fdcfb0ae675f2f63a9add9552e0af62c2b4ed30" SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git" -SCRIPT_COMMIT2="ece91448a958099b9c277f050fca9df96a2ea718" +SCRIPT_COMMIT2="b1bce7c3c580a8345205cf65fc1a5f55ba9cdb01" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh index 5cf662f..0788b5e 100755 --- a/scripts.d/45-pulseaudio.sh +++ b/scripts.d/45-pulseaudio.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git" -SCRIPT_COMMIT="3aaeb5113d2cec907bd101df22bb28b1a1b8394d" +SCRIPT_COMMIT="86e9c901289d2e1a3c2c6cb5885294a829f3eb27" ffbuild_enabled() { [[ $TARGET == linux* ]] || return 1 diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh index a6496a9..4d9319f 100755 --- a/scripts.d/45-vmaf.sh +++ b/scripts.d/45-vmaf.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/Netflix/vmaf.git" -SCRIPT_COMMIT="d48ab28eebac8276369cfebeb7cfcbfeb28408c2" +SCRIPT_COMMIT="bf80018c3f21151b7c90324da95ef2de80f49297" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-x11/10-xcbproto.sh b/scripts.d/45-x11/10-xcbproto.sh index 4fa10ec..894477d 100755 --- 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="15d140d7867e8e654ce917b8d6d1dbd45b3de3b8" +SCRIPT_COMMIT="cfcc51836c1f2c174b67073cc8bed92e7e9c9569" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh index b133f58..b7360dd 100755 --- 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="423098656f145afeb72cbf21aaa0b3a3f9bc36bb" +SCRIPT_COMMIT="fca42f2e5a5da961b231dbbc10f87bb95588d5b1" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/10-xtrans.sh b/scripts.d/45-x11/10-xtrans.sh index 44b02e0..f8ba5e3 100755 --- 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="c761c6505d49e8381a3eae94f2e5e118cbdf6487" +SCRIPT_COMMIT="9d77996f9f972da63c06099fd8c0f0529159b98f" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/20-libxau.sh b/scripts.d/45-x11/20-libxau.sh index 4ab0d1e..4c2e8be 100755 --- a/scripts.d/45-x11/20-libxau.sh +++ b/scripts.d/45-x11/20-libxau.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxau.git" -SCRIPT_COMMIT="c52f54e9533046a52edf84bcc02abedc2dbcb1a7" +SCRIPT_COMMIT="df1bf4fe528a5a9eef420f78efb225e4696ac467" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/30-libxcb.sh b/scripts.d/45-x11/30-libxcb.sh index 6884226..ea21d78 100755 --- a/scripts.d/45-x11/30-libxcb.sh +++ b/scripts.d/45-x11/30-libxcb.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git" -SCRIPT_COMMIT="18e109d755c5ce18157fdabb6de8ee6845b348ff" +SCRIPT_COMMIT="8935793f1f3751a6aa9d78955c7d6236177986de" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh index dba7079..0c822d6 100755 --- 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="ca99e338a9b8aad300933b1336f9e3c091392213" +SCRIPT_COMMIT="96cbac89a02220eb21e13ca5fa7c8c5adf77028a" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/50-libxfixes.sh b/scripts.d/45-x11/50-libxfixes.sh index 9ade485..c60693b 100755 --- a/scripts.d/45-x11/50-libxfixes.sh +++ b/scripts.d/45-x11/50-libxfixes.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxfixes.git" -SCRIPT_COMMIT="ad22c5ade8789cdb606b244336106a713473318c" +SCRIPT_COMMIT="c1cab28e27dd1c5a81394965248b57e490ccf2ca" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/60-libglvnd.sh b/scripts.d/45-x11/60-libglvnd.sh index 6d19fb2..94efdff 100755 --- a/scripts.d/45-x11/60-libglvnd.sh +++ b/scripts.d/45-x11/60-libglvnd.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git" -SCRIPT_COMMIT="056feac0780220822e71a2fd38a83353102e5b36" +SCRIPT_COMMIT="179d7278d7485ceea2d440807be9d677d32aedc4" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/60-libxcursor.sh b/scripts.d/45-x11/60-libxcursor.sh index 8e9c967..18e4057 100755 --- a/scripts.d/45-x11/60-libxcursor.sh +++ b/scripts.d/45-x11/60-libxcursor.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcursor.git" -SCRIPT_COMMIT="81dc4a481b64499ab7c355ee43c91e4fe0767545" +SCRIPT_COMMIT="a353f02a7ac4504ad5edb5407278c7a03c507aef" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh index b19b5e8..b80b397 100755 --- a/scripts.d/50-amf.sh +++ b/scripts.d/50-amf.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git" -SCRIPT_COMMIT="4bfa819fc3d6aa4714ad28f8dab46d0fa95177ad" +SCRIPT_COMMIT="daee84bf3cde928dc1cd0b502c1b6a50cbff2495" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh index 046c976..0941c89 100755 --- a/scripts.d/50-aom.sh +++ b/scripts.d/50-aom.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://aomedia.googlesource.com/aom" -SCRIPT_COMMIT="fa2ff85f8963b37be9d74f6b5fd597c6ec1a6021" +SCRIPT_COMMIT="d6b8177c9e7fe0fa381afb6ed3946c492fc4d6e9" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh index 03f8fff..80666f7 100755 --- 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="21c6240b520db4697fd6d905e5d77f1039604b17" +SCRIPT_COMMIT="35706f838a7f6bdda422891c875e60d503d9bdb4" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh index cef3bcf..7384fe8 100755 --- a/scripts.d/50-dav1d.sh +++ b/scripts.d/50-dav1d.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git" -SCRIPT_COMMIT="16c943484e63da7ed8a8a8d85af88995369f23cd" +SCRIPT_COMMIT="0b809a9281e0a97441728ad763779e7874209d37" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh index ce74a4d..d654acf 100755 --- a/scripts.d/50-libass.sh +++ b/scripts.d/50-libass.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libass/libass.git" -SCRIPT_COMMIT="218dacece7d24b45e4637ced4dc56564de29919d" +SCRIPT_COMMIT="32dea3434dbd85f9fb2700b6863c1bd92f00b86f" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh index 2154a87..bf1b222 100755 --- a/scripts.d/50-libjxl/50-libjxl.sh +++ b/scripts.d/50-libjxl/50-libjxl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libjxl/libjxl.git" -SCRIPT_COMMIT="25adcd683c382b312ba3ee70bdda4ee1c315ef2c" +SCRIPT_COMMIT="6c296fb8ca5ea17a36c123eb82bba2102e26c411" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-librist/50-librist.sh b/scripts.d/50-librist/50-librist.sh index 103d454..94569eb 100755 --- a/scripts.d/50-librist/50-librist.sh +++ b/scripts.d/50-librist/50-librist.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/rist/librist.git" -SCRIPT_COMMIT="9f09a3defd6e59839aae3e3b7b5411213fa04b8a" +SCRIPT_COMMIT="234c2e224c1dc60276a7b427acd3cc0f8bdb3bda" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh index a4fdca9..a0a5eab 100755 --- a/scripts.d/50-libssh.sh +++ b/scripts.d/50-libssh.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://git.libssh.org/projects/libssh.git" -SCRIPT_COMMIT="7b12876f04ae375acd183de3c6cc82bcdc105e1e" +SCRIPT_COMMIT="c3aa0cb18225f2f9fcefd96aad327c6ffbb2d77c" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh index 009d427..636e70b 100755 --- a/scripts.d/50-libvpx.sh +++ b/scripts.d/50-libvpx.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx" -SCRIPT_COMMIT="6788c75055899796c13787ed44cc6f1cc45e09d7" +SCRIPT_COMMIT="8f14f66490f8bfbbf01ce809629c02631baf5b8f" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh index 8097ead..ace60db 100755 --- a/scripts.d/50-libwebp.sh +++ b/scripts.d/50-libwebp.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp" -SCRIPT_COMMIT="0825faa4c10d622f2747c5b2752e7b6a6848bf3f" +SCRIPT_COMMIT="761f49c3ab1c91b8e911840a4f6f246308b7c242" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh index 13035f1..110e1d9 100755 --- a/scripts.d/50-lilv/96-lv2.sh +++ b/scripts.d/50-lilv/96-lv2.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/lv2/lv2.git" -SCRIPT_COMMIT="dbdbe3e518daf7b2f3f0e7587d8b2493b1d5a59e" +SCRIPT_COMMIT="bdaebafd3223551b3d9d890070ac0671b3b645c1" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh index 673583c..e9f6137 100755 --- a/scripts.d/50-lilv/96-serd.sh +++ b/scripts.d/50-lilv/96-serd.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/drobilla/serd.git" -SCRIPT_COMMIT="61d53637dc62d15f9b3d1fa9e69891313c465c35" +SCRIPT_COMMIT="a6cd7dd91d93015ec118286b868c3fd43133f3ac" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-onevpl.sh b/scripts.d/50-onevpl.sh index 05ebe6a..19a6dc4 100755 --- 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="4cdf44ccaa605460499c52f39eff5517da2fc3c8" +SCRIPT_COMMIT="fcabffb463299a8792c6baed69afbb69236ba6cb" ffbuild_enabled() { [[ $TARGET == *arm64 ]] && return -1 diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh index 0e2cc48..b7a6529 100755 --- 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="186a29b77d8ec01c14d13797f9d51c7c21b22b60" +SCRIPT_COMMIT="d9fed51aa6391debc31dbbca550f055c980afe70" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh index 708fb27..7f42e4d 100755 --- a/scripts.d/50-openh264.sh +++ b/scripts.d/50-openh264.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/cisco/openh264.git" -SCRIPT_COMMIT="f8aeaae8e40ea7bbf665c3c4010c78413421ccb4" +SCRIPT_COMMIT="09a4f3ec842a8932341b195c5b01e141c8a16eb7" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh index 1b11993..76bb967 100755 --- a/scripts.d/50-openjpeg.sh +++ b/scripts.d/50-openjpeg.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/uclouvain/openjpeg.git" -SCRIPT_COMMIT="15c0dca5206d0101de2ce73b97138a2b26949011" +SCRIPT_COMMIT="1ee6d115e80036d1d38bad7f95a680bfc612c1bf" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh index 2f30ed5..d4cba17 100755 --- a/scripts.d/50-openmpt.sh +++ b/scripts.d/50-openmpt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT" -SCRIPT_REV="18892" +SCRIPT_REV="19055" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh index 4d9a64d..c6e129f 100755 --- 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="92ed4e82f4aa72d5d14cf8678c85e78dd6f39033" +SCRIPT_COMMIT="80d0ff2df4785e0d3b0050205541914faffd583d" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh index de05236..426a25f 100755 --- 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="9e5ebdbafbe1347f2d275fc7d06699e6adad64da" +SCRIPT_COMMIT="b04b731a954fab2cdbe18e11b372a6d0f4114387" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh index ac49688..3437642 100755 --- 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="b57a6a1adf15f9a6e4a48e1980aa723d47fa2fe3" +SCRIPT_COMMIT="7ec9a4385a0829ef2f7b101ec93f68065ddd2571" SCRIPT_BRANCH="SDL2" ffbuild_enabled() { diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh index cd73639..4b986be 100755 --- a/scripts.d/50-srt.sh +++ b/scripts.d/50-srt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/Haivision/srt.git" -SCRIPT_COMMIT="39822840c506d72cef5a742d28f32ea28e144345" +SCRIPT_COMMIT="4c9a4178d77543aa816cdb09b382e5163bc40a18" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh index 8d7ec41..3ee6e81 100755 --- a/scripts.d/50-svtav1.sh +++ b/scripts.d/50-svtav1.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git" -SCRIPT_COMMIT="72fd3d479b315fbf6bd1d7e80dec7afe42037819" +SCRIPT_COMMIT="fca45816bb70e431b2e664374d93c39afecb2783" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/scripts.d/50-vaapi/30-libpciaccess.sh b/scripts.d/50-vaapi/30-libpciaccess.sh index d284296..ff55e48 100755 --- a/scripts.d/50-vaapi/30-libpciaccess.sh +++ b/scripts.d/50-vaapi/30-libpciaccess.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libpciaccess.git" -SCRIPT_COMMIT="833c86ce15cee2a84a37ae71015f236fd32615d9" +SCRIPT_COMMIT="8980a39004b10298a7db1f1b0b711a19e8b73aee" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh index 2b0f7cf..5ee1a87 100755 --- a/scripts.d/50-vaapi/40-libdrm.sh +++ b/scripts.d/50-vaapi/40-libdrm.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git" -SCRIPT_COMMIT="d1681af05471176215ad3d437249c38768dc959f" +SCRIPT_COMMIT="28d9a3c4fb4c99aafc31b288b3f735e19e728d64" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh index 07af537..915a167 100755 --- a/scripts.d/50-vaapi/50-libva.sh +++ b/scripts.d/50-vaapi/50-libva.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/intel/libva.git" -SCRIPT_COMMIT="ad032fb0bb310e11e945f054289a9c91c8231851" +SCRIPT_COMMIT="4bb5f16c57b059976110db350d771a0ba72b7ef1" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-vidstab.sh b/scripts.d/50-vidstab.sh index 3268a3d..18e8d3f 100755 --- a/scripts.d/50-vidstab.sh +++ b/scripts.d/50-vidstab.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/georgmartius/vid.stab.git" -SCRIPT_COMMIT="90c76aca2cb06c3ff6f7476a7cd6851b39436656" +SCRIPT_COMMIT="77f3ba1b9a8d67be616ce576f24b4b4a73333e82" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh index a2b8571..de8c11c 100755 --- a/scripts.d/50-vulkan/45-vulkan.sh +++ b/scripts.d/50-vulkan/45-vulkan.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git" -SCRIPT_COMMIT="v1.3.244" +SCRIPT_COMMIT="v1.3.247" SCRIPT_TAGFILTER="v?.*.*" ffbuild_enabled() { diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh index 31aa364..f36f2e9 100755 --- a/scripts.d/50-vulkan/50-shaderc.sh +++ b/scripts.d/50-vulkan/50-shaderc.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/google/shaderc.git" -SCRIPT_COMMIT="f1268e6d36cfdcd647d5c7032a6c61a0aad8487b" +SCRIPT_COMMIT="4a8f5e537f20bbcfe4b11f1fe45314f1dcbfddf6" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh index a48b38e..51e725a 100755 --- a/scripts.d/50-vulkan/55-spirv-cross.sh +++ b/scripts.d/50-vulkan/55-spirv-cross.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git" -SCRIPT_COMMIT="d26c233e1c2629fec1ae1b6fdf538958e5d52bff" +SCRIPT_COMMIT="fc9bee27f445644635e83ef111ef54944bb6e3af" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh index 2d4f8b3..a745226 100755 --- a/scripts.d/50-vulkan/60-libplacebo.sh +++ b/scripts.d/50-vulkan/60-libplacebo.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git" -SCRIPT_COMMIT="bc0fcb9689c282cd631fc37d1b6a67715cfd5fa0" +SCRIPT_COMMIT="ae154b4566420507f6821e423450840c8a35bcb9" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh index 15ace41..460db94 100755 --- a/scripts.d/50-x265.sh +++ b/scripts.d/50-x265.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git" -SCRIPT_COMMIT="38cf1c379b5af08856bb2fdd65f65a1f99384886" +SCRIPT_COMMIT="753305affb093ae15d5e4b333125267b16258c21" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 From 8a044562114e7e4cea22d8c5c154a68e320cef54 Mon Sep 17 00:00:00 2001 From: BtbN Date: Wed, 19 Apr 2023 11:42:25 +0200 Subject: [PATCH 15/66] Disable libplacebo for all current versions --- scripts.d/50-vulkan/60-libplacebo.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh index a745226..7c44069 100755 --- a/scripts.d/50-vulkan/60-libplacebo.sh +++ b/scripts.d/50-vulkan/60-libplacebo.sh @@ -5,6 +5,9 @@ SCRIPT_COMMIT="ae154b4566420507f6821e423450840c8a35bcb9" 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 } From e2acf44a523bcfc996ce458bae2ba5d9f0812f94 Mon Sep 17 00:00:00 2001 From: BtbN Date: Wed, 19 Apr 2023 14:08:21 +0200 Subject: [PATCH 16/66] Add explicit enable step to vulkan script dir --- scripts.d/50-vulkan/99-enable.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100755 scripts.d/50-vulkan/99-enable.sh diff --git a/scripts.d/50-vulkan/99-enable.sh b/scripts.d/50-vulkan/99-enable.sh new file mode 100755 index 0000000..f9f8977 --- /dev/null +++ b/scripts.d/50-vulkan/99-enable.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +SCRIPT_SKIP="1" + +ffbuild_enabled() { + [[ $ADDINS_STR == *4.4* ]] && return -1 + return 0 +} + +ffbuild_dockerbuild() { + return 0 +} From 5ab621cb6627c5bf78e35173d69706861f78f220 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sun, 30 Apr 2023 23:19:29 +0200 Subject: [PATCH 17/66] Update OpenSSL to 3.0 --- scripts.d/25-openssl.sh | 21 ++++++++++++++------- scripts.d/50-librist/40-mbedtls.sh | 5 ----- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh index f7ce7e3..100e60f 100755 --- a/scripts.d/25-openssl.sh +++ b/scripts.d/25-openssl.sh @@ -1,8 +1,8 @@ #!/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.8" +SCRIPT_TAGFILTER="openssl-3.0.*" ffbuild_enabled() { return 0 @@ -11,6 +11,7 @@ ffbuild_enabled() { ffbuild_dockerbuild() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openssl cd openssl + git submodule update --init --recursive --depth=1 local myconf=( threads @@ -20,6 +21,7 @@ ffbuild_dockerbuild() { enable-ec enable-srp --prefix="$FFBUILD_PREFIX" + --libdir=lib ) if [[ $TARGET == win64 ]]; then @@ -51,15 +53,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 +} diff --git a/scripts.d/50-librist/40-mbedtls.sh b/scripts.d/50-librist/40-mbedtls.sh index 93b9abb..40bf430 100755 --- a/scripts.d/50-librist/40-mbedtls.sh +++ b/scripts.d/50-librist/40-mbedtls.sh @@ -21,8 +21,3 @@ ffbuild_dockerbuild() { make -j$(nproc) make install } - -ffbuild_configure() { - [[ $TARGET == win* ]] && return -1 - echo --enable-mbedtls -} From c02dbf2722290893ee0d1e21a5be15cf7e7982f3 Mon Sep 17 00:00:00 2001 From: bitraid Date: Mon, 15 May 2023 12:35:21 +0300 Subject: [PATCH 18/66] Fix variable name of fftw3 build script --- scripts.d/25-fftw3.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts.d/25-fftw3.sh b/scripts.d/25-fftw3.sh index ae071fe..0a5eba0 100755 --- a/scripts.d/25-fftw3.sh +++ b/scripts.d/25-fftw3.sh @@ -8,7 +8,7 @@ ffbuild_enabled() { } ffbuild_dockerbuild() { - git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT_PINNED" fftw3 + git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fftw3 cd fftw3 local myconf=( From 94dcf28fad24613012f8d9fa551e449096319f82 Mon Sep 17 00:00:00 2001 From: BtbN Date: Mon, 15 May 2023 18:55:30 +0200 Subject: [PATCH 19/66] Fix vidstab commit variable --- scripts.d/50-vidstab.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts.d/50-vidstab.sh b/scripts.d/50-vidstab.sh index 18e8d3f..89c8820 100755 --- a/scripts.d/50-vidstab.sh +++ b/scripts.d/50-vidstab.sh @@ -9,7 +9,7 @@ ffbuild_enabled() { } ffbuild_dockerbuild() { - git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT_PINNED" vidstab + git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vidstab cd vidstab mkdir build && cd build From 9f930118ab6e607ca30f36acf2b8762d35f0c0bb Mon Sep 17 00:00:00 2001 From: BtbN Date: Mon, 29 May 2023 14:07:27 +0200 Subject: [PATCH 20/66] 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. --- scripts.d/50-mfx.sh | 47 --------------------------------------------- 1 file changed, 47 deletions(-) delete mode 100755 scripts.d/50-mfx.sh diff --git a/scripts.d/50-mfx.sh b/scripts.d/50-mfx.sh deleted file mode 100755 index 28c34d4..0000000 --- a/scripts.d/50-mfx.sh +++ /dev/null @@ -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 -} From 0d1bf557c86cd71a21352318156261639b366a51 Mon Sep 17 00:00:00 2001 From: BtbN Date: Mon, 29 May 2023 14:10:36 +0200 Subject: [PATCH 21/66] Update dependencies --- scripts.d/20-libiconv.sh | 2 +- scripts.d/20-libxml2.sh | 2 +- scripts.d/25-freetype.sh | 2 +- scripts.d/25-fribidi.sh | 2 +- scripts.d/35-fontconfig.sh | 2 +- scripts.d/45-harfbuzz.sh | 2 +- scripts.d/45-opencl.sh | 4 ++-- scripts.d/45-pulseaudio.sh | 2 +- scripts.d/45-vmaf.sh | 2 +- scripts.d/45-x11/10-xproto.sh | 2 +- scripts.d/45-x11/10-xtrans.sh | 2 +- scripts.d/45-x11/40-libx11.sh | 2 +- scripts.d/45-x11/50-libxi.sh | 2 +- scripts.d/50-amf.sh | 2 +- scripts.d/50-aom.sh | 2 +- scripts.d/50-avisynth.sh | 2 +- scripts.d/50-dav1d.sh | 2 +- scripts.d/50-ffnvcodec.sh | 4 ++-- scripts.d/50-frei0r.sh | 2 +- scripts.d/50-libass.sh | 2 +- scripts.d/50-libjxl/50-libjxl.sh | 2 +- scripts.d/50-libopus.sh | 2 +- scripts.d/50-libssh.sh | 2 +- scripts.d/50-libvpx.sh | 2 +- scripts.d/50-libwebp.sh | 2 +- scripts.d/50-lilv/96-lv2.sh | 2 +- scripts.d/50-lilv/96-serd.sh | 2 +- scripts.d/50-lilv/96-zix.sh | 2 +- scripts.d/50-lilv/97-sord.sh | 2 +- scripts.d/50-lilv/98-sratom.sh | 2 +- scripts.d/50-lilv/99-lilv.sh | 2 +- scripts.d/50-openal.sh | 2 +- scripts.d/50-openh264.sh | 2 +- scripts.d/50-openmpt.sh | 2 +- scripts.d/50-rav1e.sh | 2 +- scripts.d/50-rubberband.sh | 2 +- scripts.d/50-sdl.sh | 2 +- scripts.d/50-srt.sh | 2 +- scripts.d/50-svtav1.sh | 2 +- scripts.d/50-vaapi/40-libdrm.sh | 2 +- scripts.d/50-vaapi/50-libva.sh | 2 +- scripts.d/50-vulkan/45-vulkan.sh | 2 +- scripts.d/50-vulkan/50-shaderc.sh | 2 +- scripts.d/50-vulkan/55-spirv-cross.sh | 2 +- scripts.d/50-vulkan/60-libplacebo.sh | 2 +- scripts.d/50-x265.sh | 2 +- scripts.d/50-zimg.sh | 2 +- 47 files changed, 49 insertions(+), 49 deletions(-) diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh index d1899ed..33e6972 100755 --- a/scripts.d/20-libiconv.sh +++ b/scripts.d/20-libiconv.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://git.savannah.gnu.org/git/libiconv.git" -SCRIPT_COMMIT="33f08ec1e0fc1e8203a3d81e9161894dc5793908" +SCRIPT_COMMIT="5448df580c4287b7bfe59d3be0dcbb2227e641d1" ffbuild_enabled() { return 0 diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh index 8d56f60..b811727 100755 --- a/scripts.d/20-libxml2.sh +++ b/scripts.d/20-libxml2.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.gnome.org/GNOME/libxml2.git" -SCRIPT_COMMIT="33fb297b3685f7ff7b11002155c23f9f1ccd957b" +SCRIPT_COMMIT="1e8ab6977d8a990906867514f37528274efebe44" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh index ba9cdc5..1f54520 100755 --- a/scripts.d/25-freetype.sh +++ b/scripts.d/25-freetype.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git" -SCRIPT_COMMIT="c4fe77c3f072fab930267f95510562e7aeb03302" +SCRIPT_COMMIT="80a507a6b8e3d2906ad2c8ba69329bd2fb2a85ef" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-fribidi.sh b/scripts.d/25-fribidi.sh index 18b8a75..92a1d5d 100755 --- a/scripts.d/25-fribidi.sh +++ b/scripts.d/25-fribidi.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/fribidi/fribidi.git" -SCRIPT_COMMIT="2c2a014bf7161d43ed9f0f23f383be176a4f9df3" +SCRIPT_COMMIT="b54871c339dabb7434718da3fed2fa63320997e5" ffbuild_enabled() { return 0 diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh index ab81dbd..5ab0100 100755 --- a/scripts.d/35-fontconfig.sh +++ b/scripts.d/35-fontconfig.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git" -SCRIPT_COMMIT="222d058525506e587a45368f10e45e4b80ca541f" +SCRIPT_COMMIT="f0612537cb55ef97835914b0c64497034c60b8c9" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh index 147a5d7..e81ff6f 100755 --- a/scripts.d/45-harfbuzz.sh +++ b/scripts.d/45-harfbuzz.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git" -SCRIPT_COMMIT="3db6baa20e0a4661f99654860000e74a2770c2e0" +SCRIPT_COMMIT="4a93576bca0f56e82a1d8ad67733df9c5ddb8dcd" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh index 9a90658..4ae38fb 100755 --- a/scripts.d/45-opencl.sh +++ b/scripts.d/45-opencl.sh @@ -1,10 +1,10 @@ #!/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="0b8be9fd5fae61bfd85378ef346f508e4f5cfe61" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh index 0788b5e..d14cf2f 100755 --- a/scripts.d/45-pulseaudio.sh +++ b/scripts.d/45-pulseaudio.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git" -SCRIPT_COMMIT="86e9c901289d2e1a3c2c6cb5885294a829f3eb27" +SCRIPT_COMMIT="e96d278bfc514f290b60c9e924fabc1c772e1689" ffbuild_enabled() { [[ $TARGET == linux* ]] || return 1 diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh index 4d9319f..c16f5f5 100755 --- a/scripts.d/45-vmaf.sh +++ b/scripts.d/45-vmaf.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/Netflix/vmaf.git" -SCRIPT_COMMIT="bf80018c3f21151b7c90324da95ef2de80f49297" +SCRIPT_COMMIT="5ee0051cd7b1337e033558910c30525d73edfd76" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh index b7360dd..bd0ce74 100755 --- 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="5a3d5d624e08cd8fcbe7f4da594dd458f45127d0" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/10-xtrans.sh b/scripts.d/45-x11/10-xtrans.sh index f8ba5e3..775472b 100755 --- 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="232a11a947564762689e63c3a6603d3f956f696d" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh index 0c822d6..3fb1bf8 100755 --- 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="03ba0140940cc76524d83096a47309f5c398541f" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/50-libxi.sh b/scripts.d/45-x11/50-libxi.sh index 3f6e8e7..aa7a8da 100755 --- 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 diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh index b80b397..2bb533b 100755 --- a/scripts.d/50-amf.sh +++ b/scripts.d/50-amf.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git" -SCRIPT_COMMIT="daee84bf3cde928dc1cd0b502c1b6a50cbff2495" +SCRIPT_COMMIT="bd5db31d3d8ea1fae7002dd903898599bdb7d97a" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh index 0941c89..8f7afc2 100755 --- a/scripts.d/50-aom.sh +++ b/scripts.d/50-aom.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://aomedia.googlesource.com/aom" -SCRIPT_COMMIT="d6b8177c9e7fe0fa381afb6ed3946c492fc4d6e9" +SCRIPT_COMMIT="d954a78fdae80b49229cb7c4b7032f5c0e67b0e8" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh index 80666f7..058eabf 100755 --- 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="237c4505c944937b411bfc56ab044323e327a2fd" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh index 7384fe8..e35e769 100755 --- a/scripts.d/50-dav1d.sh +++ b/scripts.d/50-dav1d.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git" -SCRIPT_COMMIT="0b809a9281e0a97441728ad763779e7874209d37" +SCRIPT_COMMIT="fa8ae5776d5603f52725c1a6bc673acb649577fb" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh index 9853fae..02986f8 100755 --- a/scripts.d/50-ffnvcodec.sh +++ b/scripts.d/50-ffnvcodec.sh @@ -1,10 +1,10 @@ #!/bin/bash SCRIPT_REPO="https://github.com/FFmpeg/nv-codec-headers.git" -SCRIPT_COMMIT="450f8a634309b8f212b1a642630e164150d6a427" +SCRIPT_COMMIT="4fd7be29a431441ca31b8db0155875ae2ff4ed47" SCRIPT_REPO2="https://github.com/FFmpeg/nv-codec-headers.git" -SCRIPT_COMMIT2="2055784e5d5bfb3df78d4d3645f345f19062dce2" +SCRIPT_COMMIT2="2cd175b30366b6e295991ee0540e3e875cce6f2e" SCRIPT_BRANCH2="sdk/11.1" ffbuild_enabled() { diff --git a/scripts.d/50-frei0r.sh b/scripts.d/50-frei0r.sh index e648287..5b32d91 100755 --- 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="69819601c671915075bbd1c5c87be01a5feba08d" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh index d654acf..07b278b 100755 --- a/scripts.d/50-libass.sh +++ b/scripts.d/50-libass.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libass/libass.git" -SCRIPT_COMMIT="32dea3434dbd85f9fb2700b6863c1bd92f00b86f" +SCRIPT_COMMIT="1a599b1db748dfc07df98cd37d8603edb87da2fd" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh index bf1b222..81d7949 100755 --- a/scripts.d/50-libjxl/50-libjxl.sh +++ b/scripts.d/50-libjxl/50-libjxl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libjxl/libjxl.git" -SCRIPT_COMMIT="6c296fb8ca5ea17a36c123eb82bba2102e26c411" +SCRIPT_COMMIT="c8a4a7aa88f926c00ca4178f6677f83c2fa4e290" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh index f81dee0..5b6ab88 100755 --- a/scripts.d/50-libopus.sh +++ b/scripts.d/50-libopus.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/xiph/opus.git" -SCRIPT_COMMIT="8cf872a186b96085b1bb3a547afd598354ebeb87" +SCRIPT_COMMIT="5023249b5c935545fb02dbfe845cae996ecfc8bb" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh index a0a5eab..1bf0948 100755 --- a/scripts.d/50-libssh.sh +++ b/scripts.d/50-libssh.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://git.libssh.org/projects/libssh.git" -SCRIPT_COMMIT="c3aa0cb18225f2f9fcefd96aad327c6ffbb2d77c" +SCRIPT_COMMIT="2bf49e3e65912fd26c06fc4aa37a72eeedfec9d8" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh index 636e70b..d93ae4f 100755 --- a/scripts.d/50-libvpx.sh +++ b/scripts.d/50-libvpx.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx" -SCRIPT_COMMIT="8f14f66490f8bfbbf01ce809629c02631baf5b8f" +SCRIPT_COMMIT="ad5677eafceac4eccf7a7fd506a4e1f081cea22d" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh index ace60db..ac44dd6 100755 --- a/scripts.d/50-libwebp.sh +++ b/scripts.d/50-libwebp.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp" -SCRIPT_COMMIT="761f49c3ab1c91b8e911840a4f6f246308b7c242" +SCRIPT_COMMIT="e3366659a019515de765a281567242ceaa6eaf75" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh index 110e1d9..157f3d3 100755 --- a/scripts.d/50-lilv/96-lv2.sh +++ b/scripts.d/50-lilv/96-lv2.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/lv2/lv2.git" -SCRIPT_COMMIT="bdaebafd3223551b3d9d890070ac0671b3b645c1" +SCRIPT_COMMIT="52a96cec13bf2d541c42f8f398e7ea1387c6f56d" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh index e9f6137..8df2e77 100755 --- a/scripts.d/50-lilv/96-serd.sh +++ b/scripts.d/50-lilv/96-serd.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/drobilla/serd.git" -SCRIPT_COMMIT="a6cd7dd91d93015ec118286b868c3fd43133f3ac" +SCRIPT_COMMIT="dbf48d099a78d2075e224549a28e690d56a6d503" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-zix.sh b/scripts.d/50-lilv/96-zix.sh index fe439b3..0a300aa 100755 --- a/scripts.d/50-lilv/96-zix.sh +++ b/scripts.d/50-lilv/96-zix.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/drobilla/zix.git" -SCRIPT_COMMIT="262d4a1522c38be0588746e874159da5c7bb457d" +SCRIPT_COMMIT="a13ae5ad9dc70075740f11139f1db96cc79faa59" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/97-sord.sh b/scripts.d/50-lilv/97-sord.sh index 8ce7802..819e3f2 100755 --- a/scripts.d/50-lilv/97-sord.sh +++ b/scripts.d/50-lilv/97-sord.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/drobilla/sord.git" -SCRIPT_COMMIT="f5d33a2cda7b6f498bb7e5e61e298dce5510ed5c" +SCRIPT_COMMIT="46f4bcbe04330645a11d00e56a7754cc1386bc45" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/98-sratom.sh b/scripts.d/50-lilv/98-sratom.sh index a2a3a38..150d70f 100755 --- a/scripts.d/50-lilv/98-sratom.sh +++ b/scripts.d/50-lilv/98-sratom.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/lv2/sratom.git" -SCRIPT_COMMIT="f1f063c8e170b2a6350eedf68c4859b974d85d5e" +SCRIPT_COMMIT="6805327a511242ce9697ccfb98be4569d8883e33" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh index cd9f399..a352455 100755 --- a/scripts.d/50-lilv/99-lilv.sh +++ b/scripts.d/50-lilv/99-lilv.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/lv2/lilv.git" -SCRIPT_COMMIT="efb392e32da0bce28dbeb6fb728dcd9183f4611b" +SCRIPT_COMMIT="d564baafed0863813a87d872f8663134e74228c8" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh index b7a6529..f7ed3f3 100755 --- 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="cd781b1511d437816aac65f89646bd80dbf7c040" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh index 7f42e4d..7a90d22 100755 --- a/scripts.d/50-openh264.sh +++ b/scripts.d/50-openh264.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/cisco/openh264.git" -SCRIPT_COMMIT="09a4f3ec842a8932341b195c5b01e141c8a16eb7" +SCRIPT_COMMIT="986606644aca8f795fc04f76dcc758d88378e4a0" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh index d4cba17..9b72c7b 100755 --- a/scripts.d/50-openmpt.sh +++ b/scripts.d/50-openmpt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT" -SCRIPT_REV="19055" +SCRIPT_REV="19363" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh index c6e129f..2044052 100755 --- 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="005a86d38a2eef5004bdc415b504e66accd246e0" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh index 426a25f..3dc4081 100755 --- 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="7d5b101d278ac4f7eb557d481013b3cc5d8da478" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh index 3437642..90df797 100755 --- 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="5007b963639bff2fa3359abbfe20d53ea9111fd9" SCRIPT_BRANCH="SDL2" ffbuild_enabled() { diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh index 4b986be..7807899 100755 --- a/scripts.d/50-srt.sh +++ b/scripts.d/50-srt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/Haivision/srt.git" -SCRIPT_COMMIT="4c9a4178d77543aa816cdb09b382e5163bc40a18" +SCRIPT_COMMIT="3cefedefe91fca543083d260d1ed32efd2e7cba5" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh index 3ee6e81..043b85c 100755 --- a/scripts.d/50-svtav1.sh +++ b/scripts.d/50-svtav1.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git" -SCRIPT_COMMIT="fca45816bb70e431b2e664374d93c39afecb2783" +SCRIPT_COMMIT="0f8b3a81363b7148f90a07f026f69c97d11e0363" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh index 5ee1a87..3a556a0 100755 --- a/scripts.d/50-vaapi/40-libdrm.sh +++ b/scripts.d/50-vaapi/40-libdrm.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git" -SCRIPT_COMMIT="28d9a3c4fb4c99aafc31b288b3f735e19e728d64" +SCRIPT_COMMIT="98e1db501173303e58ef6a1def94ab7a2d84afc1" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh index 915a167..0c2e38e 100755 --- a/scripts.d/50-vaapi/50-libva.sh +++ b/scripts.d/50-vaapi/50-libva.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/intel/libva.git" -SCRIPT_COMMIT="4bb5f16c57b059976110db350d771a0ba72b7ef1" +SCRIPT_COMMIT="1114bd2b3ef7b6467f94c15cab3e061d3c197571" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh index de8c11c..2dda908 100755 --- a/scripts.d/50-vulkan/45-vulkan.sh +++ b/scripts.d/50-vulkan/45-vulkan.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git" -SCRIPT_COMMIT="v1.3.247" +SCRIPT_COMMIT="v1.3.251" SCRIPT_TAGFILTER="v?.*.*" ffbuild_enabled() { diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh index f36f2e9..bf890b5 100755 --- a/scripts.d/50-vulkan/50-shaderc.sh +++ b/scripts.d/50-vulkan/50-shaderc.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/google/shaderc.git" -SCRIPT_COMMIT="4a8f5e537f20bbcfe4b11f1fe45314f1dcbfddf6" +SCRIPT_COMMIT="95ea3c915aa48ecdeda2f14db73983d1be3f9209" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh index 51e725a..61317a4 100755 --- a/scripts.d/50-vulkan/55-spirv-cross.sh +++ b/scripts.d/50-vulkan/55-spirv-cross.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git" -SCRIPT_COMMIT="fc9bee27f445644635e83ef111ef54944bb6e3af" +SCRIPT_COMMIT="12542fc6fc05000e04742daf93892a0b10edbe80" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh index 7c44069..723647a 100755 --- a/scripts.d/50-vulkan/60-libplacebo.sh +++ b/scripts.d/50-vulkan/60-libplacebo.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git" -SCRIPT_COMMIT="ae154b4566420507f6821e423450840c8a35bcb9" +SCRIPT_COMMIT="3e25675dc10d98ac67d1ca2af9f07b79c543dc77" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh index 460db94..a5e4b2e 100755 --- a/scripts.d/50-x265.sh +++ b/scripts.d/50-x265.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git" -SCRIPT_COMMIT="753305affb093ae15d5e4b333125267b16258c21" +SCRIPT_COMMIT="34532bda12a3a3141880582aa186a59cd4538ae6" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh index 50b4aac..70087bd 100755 --- a/scripts.d/50-zimg.sh +++ b/scripts.d/50-zimg.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/sekrit-twc/zimg.git" -SCRIPT_COMMIT="71394bd10d833ac48faa255f085c3e702a42921d" +SCRIPT_COMMIT="332aaac5e99de46ddd5663092779742ec1958b11" ffbuild_enabled() { return 0 From 67723fc5c2c4b08a45353dad7117a4a33bbca758 Mon Sep 17 00:00:00 2001 From: BtbN Date: Mon, 29 May 2023 15:16:55 +0200 Subject: [PATCH 22/66] iconv: Force autogen to use hostcc to build its stuff --- scripts.d/20-libiconv.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh index 33e6972..789be57 100755 --- a/scripts.d/20-libiconv.sh +++ b/scripts.d/20-libiconv.sh @@ -12,8 +12,8 @@ ffbuild_dockerbuild() { cd iconv git checkout "$SCRIPT_COMMIT" - ./gitsub.sh pull - ./autogen.sh + retry-tool ./autopull.sh --one-time + (unset CC CFLAGS GMAKE && ./autogen.sh) local myconf=( --prefix="$FFBUILD_PREFIX" From ccda3224ff5e1a436459cc5da39f4d4632d3c2ca Mon Sep 17 00:00:00 2001 From: BtbN Date: Mon, 29 May 2023 15:29:46 +0200 Subject: [PATCH 23/66] Update Ubuntu base version --- images/base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/base/Dockerfile b/images/base/Dockerfile index 8162026..17dead2 100644 --- a/images/base/Dockerfile +++ b/images/base/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.10 +FROM ubuntu:23.04 ENV DEBIAN_FRONTEND noninteractive RUN \ From 915d6e0afa023bafe32a334febfbd8bc6d76ff52 Mon Sep 17 00:00:00 2001 From: BtbN Date: Mon, 29 May 2023 23:09:09 +0200 Subject: [PATCH 24/66] Switch mingw-w64 to official git repo The Github mirror seems to be broken, maybe switch back once it's revived. Closes #276 --- scripts.d/10-mingw.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh index 71293ef..dfa9a1c 100755 --- 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="9df2e604ddf16765410724716a8d1887ffc61fa9" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 From a197b3f9ca8e3f03d36e6843fd125e4b0e303aeb Mon Sep 17 00:00:00 2001 From: BtbN Date: Fri, 2 Jun 2023 17:42:44 +0200 Subject: [PATCH 25/66] Do full clone for mingw SF's git server seems to be incapable of bandwidth saving single-commit clones. --- scripts.d/10-mingw.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh index dfa9a1c..294ea9a 100755 --- a/scripts.d/10-mingw.sh +++ b/scripts.d/10-mingw.sh @@ -18,8 +18,9 @@ ffbuild_dockerfinal() { } ffbuild_dockerbuild() { - git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" mingw + retry-tool sh -c "rm -rf mingw && git clone '$SCRIPT_REPO' mingw" cd mingw + git checkout "$SCRIPT_COMMIT" cd mingw-w64-headers From 1ae971430e86df8ebdf925bc74a552c21d676178 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sun, 4 Jun 2023 00:44:53 +0200 Subject: [PATCH 26/66] Update ct-ng configs --- images/base-linux64/ct-ng-config | 30 +++++++++++++++++++---------- images/base-linuxarm64/ct-ng-config | 30 +++++++++++++++++++---------- images/base-win32/ct-ng-config | 26 +++++++++++++++++-------- images/base-win64/ct-ng-config | 25 ++++++++++++++++-------- scripts.d/10-mingw.sh | 1 + 5 files changed, 76 insertions(+), 36 deletions(-) diff --git a/images/base-linux64/ct-ng-config b/images/base-linux64/ct-ng-config index df45b9a..dc1039b 100644 --- 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}" diff --git a/images/base-linuxarm64/ct-ng-config b/images/base-linuxarm64/ct-ng-config index a070e17..1ab09e8 100644 --- 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}" diff --git a/images/base-win32/ct-ng-config b/images/base-win32/ct-ng-config index 97bdafd..96759e1 100644 --- 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}" diff --git a/images/base-win64/ct-ng-config b/images/base-win64/ct-ng-config index 90c00bf..340cccd 100644 --- 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}" diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh index 294ea9a..3ce017f 100755 --- a/scripts.d/10-mingw.sh +++ b/scripts.d/10-mingw.sh @@ -35,6 +35,7 @@ ffbuild_dockerbuild() { --prefix="$GCC_SYSROOT/usr/$FFBUILD_TOOLCHAIN" --host="$FFBUILD_TOOLCHAIN" --with-default-win32-winnt="0x601" + --with-default-msvcrt=ucrt --enable-idl ) From d75466340a9a5985e546fff9756b976727c4ab98 Mon Sep 17 00:00:00 2001 From: BtbN Date: Fri, 16 Jun 2023 20:36:29 +0200 Subject: [PATCH 27/66] 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. --- scripts.d/25-gmp.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts.d/25-gmp.sh b/scripts.d/25-gmp.sh index 926f715..23bbeb4 100755 --- a/scripts.d/25-gmp.sh +++ b/scripts.d/25-gmp.sh @@ -1,17 +1,18 @@ #!/bin/bash -SCRIPT_REPO="https://gmplib.org/repo/gmp/" -SCRIPT_HGREV="614a1cd8bb1d" +SCRIPT_VERSION="6.2.1" +SCRIPT_SHA512="c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84" +SCRIPT_URL="https://ftp.gnu.org/gnu/gmp/gmp-${SCRIPT_VERSION}.tar.xz" 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 + retry-tool check-wget "gmp.tar.xz" "$SCRIPT_URL" "$SCRIPT_SHA512" - ./.bootstrap + tar xaf "gmp.tar.xz" + cd "gmp-$SCRIPT_VERSION" local myconf=( --prefix="$FFBUILD_PREFIX" From 78191a73a6a1959d13a62a4d6adb9ddeffa18522 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sun, 18 Jun 2023 12:18:47 +0200 Subject: [PATCH 28/66] Add fork-guard into workflow --- .github/workflows/build.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b2bae58..4c18efe 100644 --- 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 From c3fec1bd501bbfbbe046ee52e2e6dabc19a6b807 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sun, 18 Jun 2023 16:44:57 +0200 Subject: [PATCH 29/66] Add infrastructure for caching downloads in separate image --- .gitignore | 2 +- generate.sh | 66 ++++++++++++++++++++++++--- images/base/Dockerfile | 3 ++ images/base/run_stage.sh | 9 +++- makeimage.sh | 21 ++++++--- scripts.d/10-mingw-std-threads.sh | 7 ++- scripts.d/10-mingw.sh | 6 ++- scripts.d/10-xorg-macros.sh | 7 ++- scripts.d/20-libiconv.sh | 7 ++- scripts.d/20-libxml2.sh | 7 ++- scripts.d/20-zlib.sh | 7 ++- scripts.d/25-fftw3.sh | 7 ++- scripts.d/25-freetype.sh | 7 ++- scripts.d/25-fribidi.sh | 7 ++- scripts.d/25-gmp.sh | 6 ++- scripts.d/25-libogg.sh | 7 ++- scripts.d/25-openssl.sh | 6 ++- scripts.d/25-xz.sh | 7 ++- scripts.d/35-fontconfig.sh | 7 ++- scripts.d/45-harfbuzz.sh | 7 ++- scripts.d/45-libsamplerate.sh | 7 ++- scripts.d/45-libudfread.sh | 7 ++- scripts.d/45-libvorbis.sh | 7 ++- scripts.d/45-opencl.sh | 11 +++-- scripts.d/45-pulseaudio.sh | 6 ++- scripts.d/45-vmaf.sh | 7 ++- scripts.d/45-x11/10-xcbproto.sh | 7 ++- scripts.d/45-x11/10-xproto.sh | 7 ++- scripts.d/45-x11/10-xtrans.sh | 7 ++- scripts.d/45-x11/20-libxau.sh | 7 ++- scripts.d/45-x11/30-libxcb.sh | 7 ++- scripts.d/45-x11/40-libx11.sh | 7 ++- scripts.d/45-x11/50-libxext.sh | 7 ++- scripts.d/45-x11/50-libxfixes.sh | 7 ++- scripts.d/45-x11/50-libxi.sh | 7 ++- scripts.d/45-x11/50-libxinerama.sh | 7 ++- scripts.d/45-x11/50-libxrender.sh | 7 ++- scripts.d/45-x11/50-libxscrnsaver.sh | 7 ++- scripts.d/45-x11/50-libxxf86vm.sh | 7 ++- scripts.d/45-x11/60-libglvnd.sh | 7 ++- scripts.d/45-x11/60-libxcursor.sh | 7 ++- scripts.d/45-x11/60-libxrandr.sh | 7 ++- scripts.d/45-x11/60-libxv.sh | 7 ++- scripts.d/45-x11/99-finalize.sh | 4 ++ scripts.d/50-amf.sh | 7 ++- scripts.d/50-aom.sh | 9 ++-- scripts.d/50-aribb24/25-libpng.sh | 7 ++- scripts.d/50-aribb24/50-libaribb24.sh | 9 ++-- scripts.d/50-avisynth.sh | 7 ++- scripts.d/50-chromaprint.sh | 7 ++- scripts.d/50-dav1d.sh | 7 ++- scripts.d/50-davs2.sh | 6 ++- scripts.d/50-fdk-aac.sh | 7 ++- scripts.d/50-ffnvcodec.sh | 12 +++-- scripts.d/50-frei0r.sh | 7 ++- scripts.d/50-gme.sh | 6 ++- scripts.d/50-kvazaar.sh | 7 ++- scripts.d/50-libass.sh | 7 ++- scripts.d/50-libbluray.sh | 7 ++- scripts.d/50-libjxl/45-brotli.sh | 7 ++- scripts.d/50-libjxl/50-libjxl.sh | 6 ++- scripts.d/50-libmp3lame.sh | 7 ++- scripts.d/50-libopus.sh | 7 ++- scripts.d/50-librist/40-mbedtls.sh | 7 ++- scripts.d/50-librist/50-librist.sh | 7 ++- scripts.d/50-libssh.sh | 7 ++- scripts.d/50-libtheora.sh | 7 ++- scripts.d/50-libvpx.sh | 7 ++- scripts.d/50-libwebp.sh | 7 ++- scripts.d/50-lilv/96-lv2.sh | 7 ++- scripts.d/50-lilv/96-serd.sh | 7 ++- scripts.d/50-lilv/96-zix.sh | 7 ++- scripts.d/50-lilv/97-sord.sh | 7 ++- scripts.d/50-lilv/98-sratom.sh | 7 ++- scripts.d/50-lilv/99-lilv.sh | 7 ++- scripts.d/50-onevpl.sh | 7 ++- scripts.d/50-openal.sh | 7 ++- scripts.d/50-opencore-amr.sh | 7 ++- scripts.d/50-openh264.sh | 7 ++- scripts.d/50-openjpeg.sh | 7 ++- scripts.d/50-openmpt.sh | 7 ++- scripts.d/50-rav1e.sh | 7 ++- scripts.d/50-rubberband.sh | 7 ++- scripts.d/50-schannel.sh | 12 +++++ scripts.d/50-sdl.sh | 7 ++- scripts.d/50-soxr.sh | 7 ++- scripts.d/50-srt.sh | 7 ++- scripts.d/50-svtav1.sh | 6 ++- scripts.d/50-twolame.sh | 7 ++- scripts.d/50-uavs3d.sh | 6 ++- scripts.d/50-vaapi/30-libpciaccess.sh | 7 ++- scripts.d/50-vaapi/40-libdrm.sh | 7 ++- scripts.d/50-vaapi/50-libva.sh | 7 ++- scripts.d/50-vaapi/99-finalize.sh | 4 ++ scripts.d/50-vidstab.sh | 7 ++- scripts.d/50-vulkan/45-vulkan.sh | 7 ++- scripts.d/50-vulkan/50-shaderc.sh | 7 ++- scripts.d/50-vulkan/55-spirv-cross.sh | 7 ++- scripts.d/50-vulkan/60-libplacebo.sh | 6 ++- scripts.d/50-vulkan/99-enable.sh | 4 ++ scripts.d/50-x264.sh | 7 ++- scripts.d/50-x265.sh | 6 ++- scripts.d/50-xavs2.sh | 6 ++- scripts.d/50-xvid.sh | 7 ++- scripts.d/50-zimg.sh | 6 ++- scripts.d/50-zvbi.sh | 9 ++-- scripts.d/99-rpath.sh | 12 +++++ util/vars.sh | 16 ++++++- variants/dl-only.sh | 1 + 109 files changed, 631 insertions(+), 204 deletions(-) create mode 100644 variants/dl-only.sh diff --git a/.gitignore b/.gitignore index 1c27a7e..107f214 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -/Dockerfile +/Dockerfile* /ffbuild/ /artifacts/ /.cache/ diff --git a/generate.sh b/generate.sh index 29d505d..c56a4c1 100755 --- a/generate.sh +++ b/generate.sh @@ -3,13 +3,71 @@ set -e cd "$(dirname "$0")" source util/vars.sh -rm -f Dockerfile +rm -f Dockerfile Dockerfile.{dl,final,dl.final} layername() { printf "layer-" basename "$1" | sed 's/.sh$//' } +to_df() { + _of="${TODF:-Dockerfile}" + printf "$@" >> "$_of" + echo >> "$_of" +} + +### +### Generate download Dockerfile +### + +exec_dockerstage_dl() { + SCRIPT="$1" + ( + SELF="$SCRIPT" + SELFLAYER="$(layername "$STAGE")" + source "$SCRIPT" + ffbuild_dockerstage_dl || 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" + +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 + if [[ -f "$STAGE" ]]; then + to_df "FROM $PREVLAYER AS $(layername "$STAGE")" + exec_dockerstage_dl "$STAGE" + else + for STAGE in "${STAGE}"/??-*; do + to_df "FROM $PREVLAYER AS $(layername "$STAGE")" + exec_dockerstage_dl "$STAGE" + done + fi + done +done + +to_df "FROM base AS intermediate" +cat Dockerfile.dl.final >> "$TODF" +rm Dockerfile.dl.final + +to_df "FROM base" +to_df "COPY --from=intermediate \$FFBUILD_DLDIR/. \$FFBUILD_DLDIR" + +if [[ "$TARGET" == "dl" && "$VARIANT" == "only" ]]; then + exit 0 +fi + +### +### Generate main Dockerfile +### + exec_dockerstage() { SCRIPT="$1" ( @@ -20,11 +78,7 @@ exec_dockerstage() { ) } -to_df() { - _of="${TODF:-Dockerfile}" - printf "$@" >> "$_of" - echo >> "$_of" -} +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" diff --git a/images/base/Dockerfile b/images/base/Dockerfile index 17dead2..4d191e8 100644 --- a/images/base/Dockerfile +++ b/images/base/Dockerfile @@ -1,7 +1,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 \ diff --git a/images/base/run_stage.sh b/images/base/run_stage.sh index 6db0e8d..baf52b1 100755 --- 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 diff --git a/makeimage.sh b/makeimage.sh index bbbd4cd..39a1fa2 100755 --- 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,20 @@ 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[@]}" +docker buildx --builder ffbuilder build -f Dockerfile.dl \ + --cache-from=type=local,src=.cache/"${DL_IMAGE/:/_}" \ + --cache-to=type=local,mode=max,dest=.cache/"${DL_IMAGE/:/_}" \ + --push --tag "${LOCAL_ROOT}/dl_cache:latest" . + 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 diff --git a/scripts.d/10-mingw-std-threads.sh b/scripts.d/10-mingw-std-threads.sh index ad55011..f9be4ad 100755 --- a/scripts.d/10-mingw-std-threads.sh +++ b/scripts.d/10-mingw-std-threads.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" mingw-std-threads - cd mingw-std-threads +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/mingw-std-threads mkdir -p "$FFBUILD_PREFIX"/include cp *.h "$FFBUILD_PREFIX"/include diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh index 3ce017f..078e4c7 100755 --- a/scripts.d/10-mingw.sh +++ b/scripts.d/10-mingw.sh @@ -17,10 +17,14 @@ ffbuild_dockerfinal() { to_df "COPY --from=${PREVLAYER} /opt/mingw/. /" } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { retry-tool sh -c "rm -rf mingw && git clone '$SCRIPT_REPO' mingw" cd mingw git checkout "$SCRIPT_COMMIT" +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR/mingw" cd mingw-w64-headers diff --git a/scripts.d/10-xorg-macros.sh b/scripts.d/10-xorg-macros.sh index 6cb4611..e9cf447 100755 --- a/scripts.d/10-xorg-macros.sh +++ b/scripts.d/10-xorg-macros.sh @@ -13,9 +13,12 @@ ffbuild_dockerlayer() { to_df "COPY --from=${SELFLAYER} \$FFBUILD_PREFIX/share/aclocal/. /usr/share/aclocal" } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xorg-macros - cd xorg-macros +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/xorg-macros autoreconf -i ./configure --prefix="$FFBUILD_PREFIX" diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh index 789be57..8cf0bfb 100755 --- a/scripts.d/20-libiconv.sh +++ b/scripts.d/20-libiconv.sh @@ -7,10 +7,15 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { retry-tool sh -c "rm -rf iconv && git clone '$SCRIPT_REPO' iconv" cd iconv git checkout "$SCRIPT_COMMIT" + retry-tool ./autopull.sh --one-time +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/iconv retry-tool ./autopull.sh --one-time (unset CC CFLAGS GMAKE && ./autogen.sh) diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh index b811727..2689fa1 100755 --- a/scripts.d/20-libxml2.sh +++ b/scripts.d/20-libxml2.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxml2 - cd libxml2 +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libxml2 local myconf=( --prefix="$FFBUILD_PREFIX" diff --git a/scripts.d/20-zlib.sh b/scripts.d/20-zlib.sh index c400b17..98b6182 100755 --- a/scripts.d/20-zlib.sh +++ b/scripts.d/20-zlib.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" zlib - cd zlib +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/zlib local myconf=( --prefix="$FFBUILD_PREFIX" diff --git a/scripts.d/25-fftw3.sh b/scripts.d/25-fftw3.sh index 0a5eba0..0fd6e51 100755 --- a/scripts.d/25-fftw3.sh +++ b/scripts.d/25-fftw3.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fftw3 - cd fftw3 +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/fftw3 local myconf=( --prefix="$FFBUILD_PREFIX" diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh index 1f54520..7bf5340 100755 --- a/scripts.d/25-freetype.sh +++ b/scripts.d/25-freetype.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" freetype - cd freetype +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/freetype ./autogen.sh diff --git a/scripts.d/25-fribidi.sh b/scripts.d/25-fribidi.sh index 92a1d5d..9febfa6 100755 --- a/scripts.d/25-fribidi.sh +++ b/scripts.d/25-fribidi.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fribidi - cd fribidi +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/fribidi mkdir build && cd build diff --git a/scripts.d/25-gmp.sh b/scripts.d/25-gmp.sh index 23bbeb4..cd3a76b 100755 --- a/scripts.d/25-gmp.sh +++ b/scripts.d/25-gmp.sh @@ -8,10 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { retry-tool check-wget "gmp.tar.xz" "$SCRIPT_URL" "$SCRIPT_SHA512" +} - tar xaf "gmp.tar.xz" +ffbuild_dockerbuild() { + tar xaf "$FFBUILD_DLDIR"/gmp.tar.xz cd "gmp-$SCRIPT_VERSION" local myconf=( diff --git a/scripts.d/25-libogg.sh b/scripts.d/25-libogg.sh index 5b48232..9ba3b7b 100755 --- a/scripts.d/25-libogg.sh +++ b/scripts.d/25-libogg.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" ogg - cd ogg +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/ogg ./autogen.sh diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh index 100e60f..761cd0a 100755 --- a/scripts.d/25-openssl.sh +++ b/scripts.d/25-openssl.sh @@ -8,10 +8,14 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openssl cd openssl git submodule update --init --recursive --depth=1 +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/openssl local myconf=( threads diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh index 4f02f98..3602596 100755 --- a/scripts.d/25-xz.sh +++ b/scripts.d/25-xz.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xz - cd xz +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/xz ./autogen.sh --no-po4a diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh index 5ab0100..464a8e7 100755 --- a/scripts.d/35-fontconfig.sh +++ b/scripts.d/35-fontconfig.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fc - cd fc +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/fc ./autogen.sh --noconf diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh index e81ff6f..ef56d57 100755 --- a/scripts.d/45-harfbuzz.sh +++ b/scripts.d/45-harfbuzz.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" harfbuzz - cd harfbuzz +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/harfbuzz local myconf=( --prefix="$FFBUILD_PREFIX" diff --git a/scripts.d/45-libsamplerate.sh b/scripts.d/45-libsamplerate.sh index cff6e1b..693bfe8 100755 --- a/scripts.d/45-libsamplerate.sh +++ b/scripts.d/45-libsamplerate.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libsr - cd libsr +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libsr mkdir build cd build diff --git a/scripts.d/45-libudfread.sh b/scripts.d/45-libudfread.sh index e46ea84..2e3e491 100755 --- a/scripts.d/45-libudfread.sh +++ b/scripts.d/45-libudfread.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libudfread - cd libudfread +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libudfread ./bootstrap diff --git a/scripts.d/45-libvorbis.sh b/scripts.d/45-libvorbis.sh index 1499431..79425ed 100755 --- a/scripts.d/45-libvorbis.sh +++ b/scripts.d/45-libvorbis.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vorbis - cd vorbis +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/vorbis ./autogen.sh diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh index 4ae38fb..c8db699 100755 --- a/scripts.d/45-opencl.sh +++ b/scripts.d/45-opencl.sh @@ -10,16 +10,19 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { mkdir opencl && cd opencl - git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" headers + git-mini-clone "$SCRIPT_REPO2" "$SCRIPT_COMMIT2" loader +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/opencl + 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" \ diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh index d14cf2f..5d7adef 100755 --- a/scripts.d/45-pulseaudio.sh +++ b/scripts.d/45-pulseaudio.sh @@ -8,10 +8,14 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git clone --filter=blob:none "$SCRIPT_REPO" pa cd pa git checkout "$SCRIPT_COMMIT" +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/pa # Kill build of utils and their sndfile dep echo > src/utils/meson.build diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh index c16f5f5..242e63d 100755 --- a/scripts.d/45-vmaf.sh +++ b/scripts.d/45-vmaf.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vmaf - cd vmaf +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/vmaf # Kill build of unused and broken tools echo > libvmaf/tools/meson.build diff --git a/scripts.d/45-x11/10-xcbproto.sh b/scripts.d/45-x11/10-xcbproto.sh index 894477d..d785ee9 100755 --- a/scripts.d/45-x11/10-xcbproto.sh +++ b/scripts.d/45-x11/10-xcbproto.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xcbproto - cd xcbproto +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/xcbproto autoreconf -i diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh index bd0ce74..33da41e 100755 --- a/scripts.d/45-x11/10-xproto.sh +++ b/scripts.d/45-x11/10-xproto.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" xproto - cd xproto +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/xproto autoreconf -i diff --git a/scripts.d/45-x11/10-xtrans.sh b/scripts.d/45-x11/10-xtrans.sh index 775472b..22e701d 100755 --- a/scripts.d/45-x11/10-xtrans.sh +++ b/scripts.d/45-x11/10-xtrans.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxtrans - cd libxtrans +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libxtrans autoreconf -i diff --git a/scripts.d/45-x11/20-libxau.sh b/scripts.d/45-x11/20-libxau.sh index 4c2e8be..79d6f34 100755 --- a/scripts.d/45-x11/20-libxau.sh +++ b/scripts.d/45-x11/20-libxau.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxau - cd libxau +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libxau autoreconf -i diff --git a/scripts.d/45-x11/30-libxcb.sh b/scripts.d/45-x11/30-libxcb.sh index ea21d78..678f4d2 100755 --- a/scripts.d/45-x11/30-libxcb.sh +++ b/scripts.d/45-x11/30-libxcb.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxcb - cd libxcb +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libxcb autoreconf -i diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh index 3fb1bf8..ae22436 100755 --- a/scripts.d/45-x11/40-libx11.sh +++ b/scripts.d/45-x11/40-libx11.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libx11 - cd libx11 +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libx11 autoreconf -i diff --git a/scripts.d/45-x11/50-libxext.sh b/scripts.d/45-x11/50-libxext.sh index c482aa3..a61384b 100755 --- a/scripts.d/45-x11/50-libxext.sh +++ b/scripts.d/45-x11/50-libxext.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxext - cd libxext +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libxext autoreconf -i diff --git a/scripts.d/45-x11/50-libxfixes.sh b/scripts.d/45-x11/50-libxfixes.sh index c60693b..c1830ff 100755 --- a/scripts.d/45-x11/50-libxfixes.sh +++ b/scripts.d/45-x11/50-libxfixes.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxfixes - cd libxfixes +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libxfixes autoreconf -i diff --git a/scripts.d/45-x11/50-libxi.sh b/scripts.d/45-x11/50-libxi.sh index aa7a8da..4a26ac4 100755 --- a/scripts.d/45-x11/50-libxi.sh +++ b/scripts.d/45-x11/50-libxi.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxi - cd libxi +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libxi autoreconf -i diff --git a/scripts.d/45-x11/50-libxinerama.sh b/scripts.d/45-x11/50-libxinerama.sh index 72d96ac..285483d 100755 --- a/scripts.d/45-x11/50-libxinerama.sh +++ b/scripts.d/45-x11/50-libxinerama.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxinerama - cd libxinerama +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libxinerama autoreconf -i diff --git a/scripts.d/45-x11/50-libxrender.sh b/scripts.d/45-x11/50-libxrender.sh index 826ba7d..df174f1 100755 --- a/scripts.d/45-x11/50-libxrender.sh +++ b/scripts.d/45-x11/50-libxrender.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxrender - cd libxrender +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libxrender autoreconf -i diff --git a/scripts.d/45-x11/50-libxscrnsaver.sh b/scripts.d/45-x11/50-libxscrnsaver.sh index 10a606b..7cd8e94 100755 --- a/scripts.d/45-x11/50-libxscrnsaver.sh +++ b/scripts.d/45-x11/50-libxscrnsaver.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxscrnsaver - cd libxscrnsaver +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libxscrnsaver autoreconf -i diff --git a/scripts.d/45-x11/50-libxxf86vm.sh b/scripts.d/45-x11/50-libxxf86vm.sh index e18c26d..208ad23 100755 --- a/scripts.d/45-x11/50-libxxf86vm.sh +++ b/scripts.d/45-x11/50-libxxf86vm.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxxf86vm - cd libxxf86vm +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libxxf86vm autoreconf -i diff --git a/scripts.d/45-x11/60-libglvnd.sh b/scripts.d/45-x11/60-libglvnd.sh index 94efdff..b0de160 100755 --- a/scripts.d/45-x11/60-libglvnd.sh +++ b/scripts.d/45-x11/60-libglvnd.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" glvnd - cd glvnd +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/glvnd mkdir build && cd build diff --git a/scripts.d/45-x11/60-libxcursor.sh b/scripts.d/45-x11/60-libxcursor.sh index 18e4057..2b4a2c8 100755 --- a/scripts.d/45-x11/60-libxcursor.sh +++ b/scripts.d/45-x11/60-libxcursor.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxcursor - cd libxcursor +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libxcursor autoreconf -i diff --git a/scripts.d/45-x11/60-libxrandr.sh b/scripts.d/45-x11/60-libxrandr.sh index 42273fd..a2bb8aa 100755 --- a/scripts.d/45-x11/60-libxrandr.sh +++ b/scripts.d/45-x11/60-libxrandr.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxrandr - cd libxrandr +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libxrandr autoreconf -i diff --git a/scripts.d/45-x11/60-libxv.sh b/scripts.d/45-x11/60-libxv.sh index 19531b7..b603b1c 100755 --- a/scripts.d/45-x11/60-libxv.sh +++ b/scripts.d/45-x11/60-libxv.sh @@ -9,9 +9,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libxv - cd libxv +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libxv autoreconf -i diff --git a/scripts.d/45-x11/99-finalize.sh b/scripts.d/45-x11/99-finalize.sh index 1714e39..c63652b 100755 --- 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 diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh index 2bb533b..822ac9c 100755 --- a/scripts.d/50-amf.sh +++ b/scripts.d/50-amf.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" amf - cd amf +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/amf mkdir -p "$FFBUILD_PREFIX"/include mv amf/public/include "$FFBUILD_PREFIX"/include/AMF diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh index 8f7afc2..10524e8 100755 --- a/scripts.d/50-aom.sh +++ b/scripts.d/50-aom.sh @@ -8,12 +8,15 @@ ffbuild_enabled() { } 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=\$FFBUILD_DLDIR,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw --mount=src=patches/aom,dst=/patches run_stage /stage.sh" } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" aom - cd aom +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/aom for patch in /patches/*.patch; do echo "Applying $patch" diff --git a/scripts.d/50-aribb24/25-libpng.sh b/scripts.d/50-aribb24/25-libpng.sh index e48ada5..f71f404 100755 --- a/scripts.d/50-aribb24/25-libpng.sh +++ b/scripts.d/50-aribb24/25-libpng.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libpng - cd libpng +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libpng autoreconf -i diff --git a/scripts.d/50-aribb24/50-libaribb24.sh b/scripts.d/50-aribb24/50-libaribb24.sh index 30a7c05..618da9a 100755 --- a/scripts.d/50-aribb24/50-libaribb24.sh +++ b/scripts.d/50-aribb24/50-libaribb24.sh @@ -8,12 +8,15 @@ 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=\$FFBUILD_DLDIR,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw --mount=src=patches/aribb24,dst=/patches run_stage /stage.sh" } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" aribb24 - cd aribb24 +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/aribb24 for patch in /patches/*.patch; do echo "Applying $patch" diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh index 058eabf..50b85db 100755 --- a/scripts.d/50-avisynth.sh +++ b/scripts.d/50-avisynth.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" avisynth - cd avisynth +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/avisynth mkdir build && cd build diff --git a/scripts.d/50-chromaprint.sh b/scripts.d/50-chromaprint.sh index 85c7149..2e32319 100755 --- a/scripts.d/50-chromaprint.sh +++ b/scripts.d/50-chromaprint.sh @@ -11,9 +11,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" chromaprint - cd chromaprint +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/chromaprint mkdir build && cd build diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh index e35e769..01bc4c7 100755 --- a/scripts.d/50-dav1d.sh +++ b/scripts.d/50-dav1d.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" dav1d - cd dav1d +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/dav1d mkdir build && cd build diff --git a/scripts.d/50-davs2.sh b/scripts.d/50-davs2.sh index fb5dcbb..5b80d71 100755 --- a/scripts.d/50-davs2.sh +++ b/scripts.d/50-davs2.sh @@ -11,10 +11,14 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git clone "$SCRIPT_REPO" davs2 cd davs2 git checkout "$SCRIPT_COMMIT" +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/davs2 cd build/linux local myconf=( diff --git a/scripts.d/50-fdk-aac.sh b/scripts.d/50-fdk-aac.sh index 9e6c9c3..c34dae1 100755 --- a/scripts.d/50-fdk-aac.sh +++ b/scripts.d/50-fdk-aac.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" fdk - cd fdk +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/fdk ./autogen.sh diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh index 02986f8..d20b416 100755 --- a/scripts.d/50-ffnvcodec.sh +++ b/scripts.d/50-ffnvcodec.sh @@ -11,14 +11,18 @@ ffbuild_enabled() { return 0 } +ffbuild_dockerdl() { + git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" ffnvcodec + 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 } diff --git a/scripts.d/50-frei0r.sh b/scripts.d/50-frei0r.sh index 5b32d91..4e3ee13 100755 --- a/scripts.d/50-frei0r.sh +++ b/scripts.d/50-frei0r.sh @@ -9,9 +9,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" frei0r - cd frei0r +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/frei0r mkdir build && cd build diff --git a/scripts.d/50-gme.sh b/scripts.d/50-gme.sh index 8411df2..dda45ba 100755 --- a/scripts.d/50-gme.sh +++ b/scripts.d/50-gme.sh @@ -7,10 +7,14 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git clone "$SCRIPT_REPO" gme cd gme git checkout "$SCRIPT_COMMIT" +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/gme mkdir build && cd build diff --git a/scripts.d/50-kvazaar.sh b/scripts.d/50-kvazaar.sh index d864353..dea6fea 100755 --- a/scripts.d/50-kvazaar.sh +++ b/scripts.d/50-kvazaar.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" kvazaar - cd kvazaar +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/kvazaar ./autogen.sh diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh index 07b278b..5c92d18 100755 --- a/scripts.d/50-libass.sh +++ b/scripts.d/50-libass.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" ass - cd ass +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/ass ./autogen.sh diff --git a/scripts.d/50-libbluray.sh b/scripts.d/50-libbluray.sh index 1e71eac..16ff944 100755 --- a/scripts.d/50-libbluray.sh +++ b/scripts.d/50-libbluray.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libbluray - cd libbluray +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libbluray ./bootstrap diff --git a/scripts.d/50-libjxl/45-brotli.sh b/scripts.d/50-libjxl/45-brotli.sh index 33cd082..8bc85cb 100755 --- a/scripts.d/50-libjxl/45-brotli.sh +++ b/scripts.d/50-libjxl/45-brotli.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" brotli - cd brotli +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/brotli mkdir build && cd build diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh index 81d7949..8128486 100755 --- a/scripts.d/50-libjxl/50-libjxl.sh +++ b/scripts.d/50-libjxl/50-libjxl.sh @@ -9,10 +9,14 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" jxl cd jxl git submodule update --init --recursive --depth 1 --recommend-shallow third_party/{highway,skcms} +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/jxl mkdir build && cd build diff --git a/scripts.d/50-libmp3lame.sh b/scripts.d/50-libmp3lame.sh index e5418f2..740eadf 100755 --- a/scripts.d/50-libmp3lame.sh +++ b/scripts.d/50-libmp3lame.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { retry-tool sh -c "rm -rf lame && svn checkout '${SCRIPT_REPO}@${SCRIPT_REV}' lame" - cd lame +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/lame autoreconf -i diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh index 5b6ab88..448ae10 100755 --- a/scripts.d/50-libopus.sh +++ b/scripts.d/50-libopus.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" opus - cd opus +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/opus ./autogen.sh diff --git a/scripts.d/50-librist/40-mbedtls.sh b/scripts.d/50-librist/40-mbedtls.sh index 40bf430..0211f8b 100755 --- a/scripts.d/50-librist/40-mbedtls.sh +++ b/scripts.d/50-librist/40-mbedtls.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" mbedtls - cd mbedtls +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/mbedtls mkdir build && cd build diff --git a/scripts.d/50-librist/50-librist.sh b/scripts.d/50-librist/50-librist.sh index 94569eb..4aff562 100755 --- a/scripts.d/50-librist/50-librist.sh +++ b/scripts.d/50-librist/50-librist.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" librist - cd librist +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/librist mkdir build && cd build diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh index 1bf0948..6f9784e 100755 --- a/scripts.d/50-libssh.sh +++ b/scripts.d/50-libssh.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libssh - cd libssh +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libssh mkdir build && cd build diff --git a/scripts.d/50-libtheora.sh b/scripts.d/50-libtheora.sh index 11f5ac1..efc3645 100755 --- a/scripts.d/50-libtheora.sh +++ b/scripts.d/50-libtheora.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" theora - cd theora +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/theora ./autogen.sh diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh index d93ae4f..203e8f9 100755 --- a/scripts.d/50-libvpx.sh +++ b/scripts.d/50-libvpx.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libvpx - cd libvpx +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libvpx local myconf=( --disable-shared diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh index ac44dd6..99b4bf6 100755 --- a/scripts.d/50-libwebp.sh +++ b/scripts.d/50-libwebp.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" webp - cd webp +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/webp ./autogen.sh diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh index 157f3d3..498b51a 100755 --- a/scripts.d/50-lilv/96-lv2.sh +++ b/scripts.d/50-lilv/96-lv2.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" lv2 - cd lv2 +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/lv2 mkdir build && cd build diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh index 8df2e77..17acce1 100755 --- a/scripts.d/50-lilv/96-serd.sh +++ b/scripts.d/50-lilv/96-serd.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" serd - cd serd +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/serd mkdir build && cd build diff --git a/scripts.d/50-lilv/96-zix.sh b/scripts.d/50-lilv/96-zix.sh index 0a300aa..51ae119 100755 --- a/scripts.d/50-lilv/96-zix.sh +++ b/scripts.d/50-lilv/96-zix.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" zix - cd zix +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/zix mkdir build && cd build diff --git a/scripts.d/50-lilv/97-sord.sh b/scripts.d/50-lilv/97-sord.sh index 819e3f2..72fe959 100755 --- a/scripts.d/50-lilv/97-sord.sh +++ b/scripts.d/50-lilv/97-sord.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" sord - cd sord +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/sord mkdir build && cd build diff --git a/scripts.d/50-lilv/98-sratom.sh b/scripts.d/50-lilv/98-sratom.sh index 150d70f..2e5ce9e 100755 --- a/scripts.d/50-lilv/98-sratom.sh +++ b/scripts.d/50-lilv/98-sratom.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" sratom - cd sratom +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/sratom mkdir build && cd build diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh index a352455..ec20306 100755 --- a/scripts.d/50-lilv/99-lilv.sh +++ b/scripts.d/50-lilv/99-lilv.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" lilv - cd lilv +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/lilv mkdir build && cd build diff --git a/scripts.d/50-onevpl.sh b/scripts.d/50-onevpl.sh index 19a6dc4..ae2822f 100755 --- a/scripts.d/50-onevpl.sh +++ b/scripts.d/50-onevpl.sh @@ -11,9 +11,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" onevpl - cd onevpl +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/onevpl mkdir build && cd build diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh index f7ed3f3..fe93ae6 100755 --- a/scripts.d/50-openal.sh +++ b/scripts.d/50-openal.sh @@ -10,9 +10,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openal - cd openal +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/openal mkdir cm_build && cd cm_build diff --git a/scripts.d/50-opencore-amr.sh b/scripts.d/50-opencore-amr.sh index b72d70d..090cd90 100755 --- a/scripts.d/50-opencore-amr.sh +++ b/scripts.d/50-opencore-amr.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" opencore - cd opencore +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/opencore autoreconf -i diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh index 7a90d22..0fb425c 100755 --- a/scripts.d/50-openh264.sh +++ b/scripts.d/50-openh264.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openh264 - cd openh264 +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/openh264 local myconf=( PREFIX="$FFBUILD_PREFIX" diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh index 76bb967..dd8461d 100755 --- a/scripts.d/50-openjpeg.sh +++ b/scripts.d/50-openjpeg.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openjpeg - cd openjpeg +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/openjpeg mkdir build && cd build diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh index 9b72c7b..0769e2c 100755 --- a/scripts.d/50-openmpt.sh +++ b/scripts.d/50-openmpt.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { retry-tool sh -c "rm -rf openmpt && svn checkout '${SCRIPT_REPO}@${SCRIPT}' openmpt" - cd openmpt +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/openmpt local myconf=( PREFIX="$FFBUILD_PREFIX" diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh index 2044052..dba5f5a 100755 --- a/scripts.d/50-rav1e.sh +++ b/scripts.d/50-rav1e.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" rav1e - cd rav1e +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/rav1e local myconf=( --prefix="$FFBUILD_PREFIX" diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh index 3dc4081..135c95d 100755 --- a/scripts.d/50-rubberband.sh +++ b/scripts.d/50-rubberband.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" rubberband - cd rubberband +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/rubberband mkdir build && cd build diff --git a/scripts.d/50-schannel.sh b/scripts.d/50-schannel.sh index 4546e2b..27ac5c8 100755 --- 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,14 @@ ffbuild_dockerbuild() { return 0 } +ffbuild_dockerstage_dl() { + return 0 +} + +ffbuild_dockerlayer_dl() { + return 0 +} + ffbuild_configure() { echo --enable-schannel } diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh index 90df797..850c824 100755 --- a/scripts.d/50-sdl.sh +++ b/scripts.d/50-sdl.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" sdl - cd sdl +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/sdl mkdir build && cd build diff --git a/scripts.d/50-soxr.sh b/scripts.d/50-soxr.sh index f351fa6..76ab55e 100755 --- a/scripts.d/50-soxr.sh +++ b/scripts.d/50-soxr.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" soxr - cd soxr +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/soxr mkdir build && cd build diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh index 7807899..b1f8c2e 100755 --- a/scripts.d/50-srt.sh +++ b/scripts.d/50-srt.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" srt - cd srt +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/srt mkdir build && cd build diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh index 043b85c..7a7a9b2 100755 --- a/scripts.d/50-svtav1.sh +++ b/scripts.d/50-svtav1.sh @@ -8,10 +8,14 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git clone "$SCRIPT_REPO" svtav1 cd svtav1 git checkout "$SCRIPT_COMMIT" +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/svtav1 mkdir build && cd build diff --git a/scripts.d/50-twolame.sh b/scripts.d/50-twolame.sh index 2dac91d..b56ab85 100755 --- a/scripts.d/50-twolame.sh +++ b/scripts.d/50-twolame.sh @@ -7,9 +7,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" twolame - cd twolame +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/twolame NOCONFIGURE=1 ./autogen.sh touch doc/twolame.1 diff --git a/scripts.d/50-uavs3d.sh b/scripts.d/50-uavs3d.sh index 02ca0e5..22b979a 100755 --- a/scripts.d/50-uavs3d.sh +++ b/scripts.d/50-uavs3d.sh @@ -8,10 +8,14 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git clone "$SCRIPT_REPO" uavs3d cd uavs3d git checkout "$SCRIPT_COMMIT" +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/uavs3d mkdir build/linux cd build/linux diff --git a/scripts.d/50-vaapi/30-libpciaccess.sh b/scripts.d/50-vaapi/30-libpciaccess.sh index ff55e48..cbf3516 100755 --- a/scripts.d/50-vaapi/30-libpciaccess.sh +++ b/scripts.d/50-vaapi/30-libpciaccess.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libpciaccess - cd libpciaccess +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libpciaccess autoreconf -fi diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh index 3a556a0..e65cecd 100755 --- a/scripts.d/50-vaapi/40-libdrm.sh +++ b/scripts.d/50-vaapi/40-libdrm.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libdrm - cd libdrm +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libdrm mkdir build && cd build diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh index 0c2e38e..217781f 100755 --- a/scripts.d/50-vaapi/50-libva.sh +++ b/scripts.d/50-vaapi/50-libva.sh @@ -9,9 +9,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" libva - cd libva +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/libva autoreconf -i diff --git a/scripts.d/50-vaapi/99-finalize.sh b/scripts.d/50-vaapi/99-finalize.sh index 5435582..ee8a518 100755 --- a/scripts.d/50-vaapi/99-finalize.sh +++ b/scripts.d/50-vaapi/99-finalize.sh @@ -7,6 +7,10 @@ ffbuild_enabled() { return 0 } +ffbuild_dockerdl() { + return 0 +} + ffbuild_dockerbuild() { rm "$FFBUILD_PREFIX"/lib/lib*.so* || true rm "$FFBUILD_PREFIX"/lib/*.la || true diff --git a/scripts.d/50-vidstab.sh b/scripts.d/50-vidstab.sh index 89c8820..0151898 100755 --- a/scripts.d/50-vidstab.sh +++ b/scripts.d/50-vidstab.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vidstab - cd vidstab +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/vidstab mkdir build && cd build diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh index 2dda908..cf787a8 100755 --- a/scripts.d/50-vulkan/45-vulkan.sh +++ b/scripts.d/50-vulkan/45-vulkan.sh @@ -9,9 +9,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" vkheaders - cd vkheaders +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/vkheaders mkdir build && cd build diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh index bf890b5..3c589d7 100755 --- a/scripts.d/50-vulkan/50-shaderc.sh +++ b/scripts.d/50-vulkan/50-shaderc.sh @@ -8,11 +8,14 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" shaderc cd shaderc - ./utils/git-sync-deps +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/shaderc mkdir build && cd build diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh index 61317a4..80ce449 100755 --- a/scripts.d/50-vulkan/55-spirv-cross.sh +++ b/scripts.d/50-vulkan/55-spirv-cross.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" spirv-cross - cd spirv-cross +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/spirv-cross 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/')" diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh index 723647a..8a4b7ed 100755 --- a/scripts.d/50-vulkan/60-libplacebo.sh +++ b/scripts.d/50-vulkan/60-libplacebo.sh @@ -11,10 +11,14 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" placebo cd placebo git submodule update --init --recursive +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/placebo mkdir build && cd build diff --git a/scripts.d/50-vulkan/99-enable.sh b/scripts.d/50-vulkan/99-enable.sh index f9f8977..d83e3cb 100755 --- a/scripts.d/50-vulkan/99-enable.sh +++ b/scripts.d/50-vulkan/99-enable.sh @@ -7,6 +7,10 @@ ffbuild_enabled() { return 0 } +ffbuild_dockerdl() { + return 0 +} + ffbuild_dockerbuild() { return 0 } diff --git a/scripts.d/50-x264.sh b/scripts.d/50-x264.sh index 38997cb..cafaa96 100755 --- a/scripts.d/50-x264.sh +++ b/scripts.d/50-x264.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" x264 - cd x264 +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/x264 local myconf=( --disable-cli diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh index a5e4b2e..ad252e0 100755 --- a/scripts.d/50-x265.sh +++ b/scripts.d/50-x265.sh @@ -8,10 +8,14 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git clone "$SCRIPT_REPO" x265 cd x265 git checkout "$SCRIPT_COMMIT" +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/x265 local common_config=( -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" diff --git a/scripts.d/50-xavs2.sh b/scripts.d/50-xavs2.sh index bd128b3..d11230d 100755 --- a/scripts.d/50-xavs2.sh +++ b/scripts.d/50-xavs2.sh @@ -11,10 +11,14 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git clone "$SCRIPT_REPO" xavs2 cd xavs2 git checkout "$SCRIPT_COMMIT" +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/xavs2 cd build/linux local myconf=( diff --git a/scripts.d/50-xvid.sh b/scripts.d/50-xvid.sh index 0db384d..1325a9e 100755 --- a/scripts.d/50-xvid.sh +++ b/scripts.d/50-xvid.sh @@ -8,9 +8,12 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { retry-tool sh -c "rm -rf xvid && svn checkout --username 'anonymous' --password '' '${SCRIPT_REPO}@${SCRIPT_REV}' xvid" - cd xvid +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/xvid cd build/generic diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh index 70087bd..e9c54d4 100755 --- a/scripts.d/50-zimg.sh +++ b/scripts.d/50-zimg.sh @@ -7,10 +7,14 @@ ffbuild_enabled() { return 0 } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" zimg cd zimg git submodule update --init --recursive --depth=1 +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/zimg ./autogen.sh diff --git a/scripts.d/50-zvbi.sh b/scripts.d/50-zvbi.sh index d0c8031..e5fbe35 100755 --- a/scripts.d/50-zvbi.sh +++ b/scripts.d/50-zvbi.sh @@ -8,12 +8,15 @@ ffbuild_enabled() { } ffbuild_dockerstage() { - to_df "RUN --mount=src=${SELF},dst=/stage.sh --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 run_stage /stage.sh" } -ffbuild_dockerbuild() { +ffbuild_dockerdl() { retry-tool sh -c "rm -rf zvbi && svn checkout '${SCRIPT_REPO}@${SCRIPT_REV}' zvbi" - cd zvbi +} + +ffbuild_dockerbuild() { + cd "$FFBUILD_DLDIR"/zvbi for patch in /patches/*.patch; do echo "Applying $patch" diff --git a/scripts.d/99-rpath.sh b/scripts.d/99-rpath.sh index c5d3256..7a7daf4 100755 --- a/scripts.d/99-rpath.sh +++ b/scripts.d/99-rpath.sh @@ -10,6 +10,10 @@ ffbuild_dockerfinal() { return 0 } +ffbuild_dockerdl() { + return 0 +} + ffbuild_dockerlayer() { return 0 } @@ -18,6 +22,14 @@ ffbuild_dockerstage() { return 0 } +ffbuild_dockerstage_dl() { + return 0 +} + +ffbuild_dockerlayer_dl() { + return 0 +} + ffbuild_dockerbuild() { return 0 } diff --git a/util/vars.sh b/util/vars.sh index 656ac06..a0a8697 100644 --- a/util/vars.sh +++ b/util/vars.sh @@ -36,9 +36,23 @@ REGISTRY="${REGISTRY_OVERRIDE:-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" +DL_IMAGE="${REGISTRY}/${REPO}/dl_cache:latest" + +if [[ -n "$REGISTRY_OVERRIDE_DL" && -n "$GITHUB_REPOSITORY_DL" ]]; then + DL_IMAGE="${REGISTRY_OVERRIDE_DL}/${GITHUB_REPOSITORY_DL}/dl_cache:latest" + DL_IMAGE="${DL_IMAGE,,}" +fi + +ffbuild_dockerstage_dl() { + to_df "RUN --mount=src=${SELF},dst=/stage.sh run_stage /stage.sh ffbuild_dockerdl \$FFBUILD_DLDIR" +} + +ffbuild_dockerlayer_dl() { + to_df "COPY --from=${SELFLAYER} \$FFBUILD_DLDIR/. \$FFBUILD_DLDIR" +} ffbuild_dockerstage() { - to_df "RUN --mount=src=${SELF},dst=/stage.sh run_stage /stage.sh" + to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=\$FFBUILD_DLDIR,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw run_stage /stage.sh" } ffbuild_dockerlayer() { diff --git a/variants/dl-only.sh b/variants/dl-only.sh new file mode 100644 index 0000000..a9bf588 --- /dev/null +++ b/variants/dl-only.sh @@ -0,0 +1 @@ +#!/bin/bash From 61debb00e507b3a5056f20572c9139eadafaaa24 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sun, 18 Jun 2023 21:25:50 +0200 Subject: [PATCH 30/66] Switch to a more direct Dockerfile.dl generation Otherwise the entire build cache effectively invalidates the moment one script changes.. --- generate.sh | 7 ++++++- scripts.d/10-mingw-std-threads.sh | 6 +----- scripts.d/10-mingw.sh | 4 +--- scripts.d/10-xorg-macros.sh | 6 +----- scripts.d/20-libiconv.sh | 8 +++----- scripts.d/20-libxml2.sh | 6 +----- scripts.d/20-zlib.sh | 6 +----- scripts.d/25-fftw3.sh | 6 +----- scripts.d/25-freetype.sh | 6 +----- scripts.d/25-fribidi.sh | 6 +----- scripts.d/25-gmp.sh | 2 +- scripts.d/25-libogg.sh | 6 +----- scripts.d/25-openssl.sh | 7 +++---- scripts.d/25-xz.sh | 6 +----- scripts.d/35-fontconfig.sh | 6 +----- scripts.d/45-harfbuzz.sh | 6 +----- scripts.d/45-libsamplerate.sh | 6 +----- scripts.d/45-libudfread.sh | 6 +----- scripts.d/45-libvorbis.sh | 6 +----- scripts.d/45-opencl.sh | 5 ++--- scripts.d/45-pulseaudio.sh | 7 +++---- scripts.d/45-vmaf.sh | 6 +----- scripts.d/45-x11/10-xcbproto.sh | 6 +----- scripts.d/45-x11/10-xproto.sh | 6 +----- scripts.d/45-x11/10-xtrans.sh | 6 +----- scripts.d/45-x11/20-libxau.sh | 6 +----- scripts.d/45-x11/30-libxcb.sh | 6 +----- scripts.d/45-x11/40-libx11.sh | 6 +----- scripts.d/45-x11/50-libxext.sh | 6 +----- scripts.d/45-x11/50-libxfixes.sh | 6 +----- scripts.d/45-x11/50-libxi.sh | 6 +----- scripts.d/45-x11/50-libxinerama.sh | 6 +----- scripts.d/45-x11/50-libxrender.sh | 6 +----- scripts.d/45-x11/50-libxscrnsaver.sh | 6 +----- scripts.d/45-x11/50-libxxf86vm.sh | 6 +----- scripts.d/45-x11/60-libglvnd.sh | 6 +----- scripts.d/45-x11/60-libxcursor.sh | 6 +----- scripts.d/45-x11/60-libxrandr.sh | 6 +----- scripts.d/45-x11/60-libxv.sh | 6 +----- scripts.d/50-amf.sh | 6 +----- scripts.d/50-aom.sh | 8 ++------ scripts.d/50-aribb24/25-libpng.sh | 6 +----- scripts.d/50-aribb24/50-libaribb24.sh | 8 ++------ scripts.d/50-avisynth.sh | 6 +----- scripts.d/50-chromaprint.sh | 6 +----- scripts.d/50-dav1d.sh | 6 +----- scripts.d/50-davs2.sh | 7 +++---- scripts.d/50-fdk-aac.sh | 6 +----- scripts.d/50-ffnvcodec.sh | 4 ++-- scripts.d/50-frei0r.sh | 6 +----- scripts.d/50-gme.sh | 7 +++---- scripts.d/50-kvazaar.sh | 6 +----- scripts.d/50-libass.sh | 6 +----- scripts.d/50-libbluray.sh | 6 +----- scripts.d/50-libjxl/45-brotli.sh | 6 +----- scripts.d/50-libjxl/50-libjxl.sh | 7 +++---- scripts.d/50-libmp3lame.sh | 2 +- scripts.d/50-libopus.sh | 6 +----- scripts.d/50-librist/40-mbedtls.sh | 6 +----- scripts.d/50-librist/50-librist.sh | 6 +----- scripts.d/50-libssh.sh | 6 +----- scripts.d/50-libtheora.sh | 6 +----- scripts.d/50-libvpx.sh | 6 +----- scripts.d/50-libwebp.sh | 6 +----- scripts.d/50-lilv/96-lv2.sh | 6 +----- scripts.d/50-lilv/96-serd.sh | 6 +----- scripts.d/50-lilv/96-zix.sh | 6 +----- scripts.d/50-lilv/97-sord.sh | 6 +----- scripts.d/50-lilv/98-sratom.sh | 6 +----- scripts.d/50-lilv/99-lilv.sh | 6 +----- scripts.d/50-onevpl.sh | 6 +----- scripts.d/50-openal.sh | 6 +----- scripts.d/50-opencore-amr.sh | 6 +----- scripts.d/50-openh264.sh | 6 +----- scripts.d/50-openjpeg.sh | 6 +----- scripts.d/50-openmpt.sh | 2 +- scripts.d/50-rav1e.sh | 6 +----- scripts.d/50-rubberband.sh | 6 +----- scripts.d/50-schannel.sh | 4 ---- scripts.d/50-sdl.sh | 6 +----- scripts.d/50-soxr.sh | 6 +----- scripts.d/50-srt.sh | 6 +----- scripts.d/50-svtav1.sh | 7 +++---- scripts.d/50-twolame.sh | 6 +----- scripts.d/50-uavs3d.sh | 7 +++---- scripts.d/50-vaapi/30-libpciaccess.sh | 6 +----- scripts.d/50-vaapi/40-libdrm.sh | 6 +----- scripts.d/50-vaapi/50-libva.sh | 6 +----- scripts.d/50-vidstab.sh | 6 +----- scripts.d/50-vulkan/45-vulkan.sh | 6 +----- scripts.d/50-vulkan/50-shaderc.sh | 7 +++---- scripts.d/50-vulkan/55-spirv-cross.sh | 6 +----- scripts.d/50-vulkan/60-libplacebo.sh | 7 +++---- scripts.d/50-x264.sh | 6 +----- scripts.d/50-x265.sh | 7 +++---- scripts.d/50-xavs2.sh | 7 +++---- scripts.d/50-xvid.sh | 2 +- scripts.d/50-zimg.sh | 7 +++---- scripts.d/50-zvbi.sh | 6 +++--- scripts.d/99-rpath.sh | 4 ---- util/vars.sh | 6 +++--- 101 files changed, 138 insertions(+), 462 deletions(-) diff --git a/generate.sh b/generate.sh index c56a4c1..87c0dbb 100755 --- a/generate.sh +++ b/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 diff --git a/scripts.d/10-mingw-std-threads.sh b/scripts.d/10-mingw-std-threads.sh index f9be4ad..d1ced26 100755 --- a/scripts.d/10-mingw-std-threads.sh +++ b/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 diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh index 078e4c7..0b47612 100755 --- a/scripts.d/10-mingw.sh +++ b/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" - cd mingw - git checkout "$SCRIPT_COMMIT" + to_df "RUN retry-tool sh -c \"rm -rf mingw && git clone '$SCRIPT_REPO' mingw\" && cd mingw && git checkout \"$SCRIPT_COMMIT\"" } ffbuild_dockerbuild() { diff --git a/scripts.d/10-xorg-macros.sh b/scripts.d/10-xorg-macros.sh index e9cf447..d336ff1 100755 --- a/scripts.d/10-xorg-macros.sh +++ b/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" diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh index 8cf0bfb..993ad79 100755 --- a/scripts.d/20-libiconv.sh +++ b/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" - cd iconv - git checkout "$SCRIPT_COMMIT" - retry-tool ./autopull.sh --one-time + to_df "RUN retry-tool sh -c \"rm -rf $SELF && git clone '$SCRIPT_REPO' $SELF\"" + to_df "RUN git -C $SELF checkout \"$SCRIPT_COMMIT\"" } ffbuild_dockerbuild() { - cd "$FFBUILD_DLDIR"/iconv + cd "$FFBUILD_DLDIR/$SELF" retry-tool ./autopull.sh --one-time (unset CC CFLAGS GMAKE && ./autogen.sh) diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh index 2689fa1..14ff564 100755 --- a/scripts.d/20-libxml2.sh +++ b/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" diff --git a/scripts.d/20-zlib.sh b/scripts.d/20-zlib.sh index 98b6182..b9f4d5c 100755 --- a/scripts.d/20-zlib.sh +++ b/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" diff --git a/scripts.d/25-fftw3.sh b/scripts.d/25-fftw3.sh index 0fd6e51..ebe8357 100755 --- a/scripts.d/25-fftw3.sh +++ b/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" diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh index 7bf5340..4ffbf52 100755 --- a/scripts.d/25-freetype.sh +++ b/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 diff --git a/scripts.d/25-fribidi.sh b/scripts.d/25-fribidi.sh index 9febfa6..b9d824a 100755 --- a/scripts.d/25-fribidi.sh +++ b/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 diff --git a/scripts.d/25-gmp.sh b/scripts.d/25-gmp.sh index cd3a76b..8f7b1c9 100755 --- a/scripts.d/25-gmp.sh +++ b/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() { diff --git a/scripts.d/25-libogg.sh b/scripts.d/25-libogg.sh index 9ba3b7b..066f8fa 100755 --- a/scripts.d/25-libogg.sh +++ b/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 diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh index 761cd0a..49ef1cc 100755 --- a/scripts.d/25-openssl.sh +++ b/scripts.d/25-openssl.sh @@ -9,13 +9,12 @@ ffbuild_enabled() { } ffbuild_dockerdl() { - git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" openssl - cd openssl - git submodule update --init --recursive --depth=1 + default_dl "$SELF" + to_df "RUN git -C \"$SELF\" submodule update --init --recursive --depth=1" } ffbuild_dockerbuild() { - cd "$FFBUILD_DLDIR"/openssl + cd "$FFBUILD_DLDIR/$SELF" local myconf=( threads diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh index 3602596..8b04f91 100755 --- a/scripts.d/25-xz.sh +++ b/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 diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh index 464a8e7..cad9f83 100755 --- a/scripts.d/35-fontconfig.sh +++ b/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 diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh index ef56d57..a34cdb3 100755 --- a/scripts.d/45-harfbuzz.sh +++ b/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" diff --git a/scripts.d/45-libsamplerate.sh b/scripts.d/45-libsamplerate.sh index 693bfe8..701f294 100755 --- a/scripts.d/45-libsamplerate.sh +++ b/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 diff --git a/scripts.d/45-libudfread.sh b/scripts.d/45-libudfread.sh index 2e3e491..58b5780 100755 --- a/scripts.d/45-libudfread.sh +++ b/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 diff --git a/scripts.d/45-libvorbis.sh b/scripts.d/45-libvorbis.sh index 79425ed..4b5cde8 100755 --- a/scripts.d/45-libvorbis.sh +++ b/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 diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh index c8db699..afe9e83 100755 --- a/scripts.d/45-opencl.sh +++ b/scripts.d/45-opencl.sh @@ -11,9 +11,8 @@ ffbuild_enabled() { } ffbuild_dockerdl() { - mkdir opencl && cd opencl - git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" headers - git-mini-clone "$SCRIPT_REPO2" "$SCRIPT_COMMIT2" loader + default_dl opencl/headers + to_df "RUN git-mini-clone \"$SCRIPT_REPO2\" \"$SCRIPT_COMMIT2\" opencl/loader" } ffbuild_dockerbuild() { diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh index 5d7adef..e4d5761 100755 --- a/scripts.d/45-pulseaudio.sh +++ b/scripts.d/45-pulseaudio.sh @@ -9,13 +9,12 @@ ffbuild_enabled() { } ffbuild_dockerdl() { - git clone --filter=blob:none "$SCRIPT_REPO" pa - cd pa - git checkout "$SCRIPT_COMMIT" + to_df "RUN git clone --filter=blob:none \"$SCRIPT_REPO\" \"$SELF\"" + to_df "RUN git -C \"$SELF\" 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 diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh index 242e63d..10ea30a 100755 --- a/scripts.d/45-vmaf.sh +++ b/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 diff --git a/scripts.d/45-x11/10-xcbproto.sh b/scripts.d/45-x11/10-xcbproto.sh index d785ee9..ef95b9b 100755 --- a/scripts.d/45-x11/10-xcbproto.sh +++ b/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 diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh index 33da41e..f0e6192 100755 --- a/scripts.d/45-x11/10-xproto.sh +++ b/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 diff --git a/scripts.d/45-x11/10-xtrans.sh b/scripts.d/45-x11/10-xtrans.sh index 22e701d..e997e2a 100755 --- a/scripts.d/45-x11/10-xtrans.sh +++ b/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 diff --git a/scripts.d/45-x11/20-libxau.sh b/scripts.d/45-x11/20-libxau.sh index 79d6f34..19d9fde 100755 --- a/scripts.d/45-x11/20-libxau.sh +++ b/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 diff --git a/scripts.d/45-x11/30-libxcb.sh b/scripts.d/45-x11/30-libxcb.sh index 678f4d2..588568d 100755 --- a/scripts.d/45-x11/30-libxcb.sh +++ b/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 diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh index ae22436..836fe2d 100755 --- a/scripts.d/45-x11/40-libx11.sh +++ b/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 diff --git a/scripts.d/45-x11/50-libxext.sh b/scripts.d/45-x11/50-libxext.sh index a61384b..2e73d25 100755 --- a/scripts.d/45-x11/50-libxext.sh +++ b/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 diff --git a/scripts.d/45-x11/50-libxfixes.sh b/scripts.d/45-x11/50-libxfixes.sh index c1830ff..80fa4dd 100755 --- a/scripts.d/45-x11/50-libxfixes.sh +++ b/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 diff --git a/scripts.d/45-x11/50-libxi.sh b/scripts.d/45-x11/50-libxi.sh index 4a26ac4..f979476 100755 --- a/scripts.d/45-x11/50-libxi.sh +++ b/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 diff --git a/scripts.d/45-x11/50-libxinerama.sh b/scripts.d/45-x11/50-libxinerama.sh index 285483d..6f24a94 100755 --- a/scripts.d/45-x11/50-libxinerama.sh +++ b/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 diff --git a/scripts.d/45-x11/50-libxrender.sh b/scripts.d/45-x11/50-libxrender.sh index df174f1..4f5566f 100755 --- a/scripts.d/45-x11/50-libxrender.sh +++ b/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 diff --git a/scripts.d/45-x11/50-libxscrnsaver.sh b/scripts.d/45-x11/50-libxscrnsaver.sh index 7cd8e94..fec2cab 100755 --- a/scripts.d/45-x11/50-libxscrnsaver.sh +++ b/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 diff --git a/scripts.d/45-x11/50-libxxf86vm.sh b/scripts.d/45-x11/50-libxxf86vm.sh index 208ad23..72dd8fa 100755 --- a/scripts.d/45-x11/50-libxxf86vm.sh +++ b/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 diff --git a/scripts.d/45-x11/60-libglvnd.sh b/scripts.d/45-x11/60-libglvnd.sh index b0de160..15c439f 100755 --- a/scripts.d/45-x11/60-libglvnd.sh +++ b/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 diff --git a/scripts.d/45-x11/60-libxcursor.sh b/scripts.d/45-x11/60-libxcursor.sh index 2b4a2c8..eaa36f8 100755 --- a/scripts.d/45-x11/60-libxcursor.sh +++ b/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 diff --git a/scripts.d/45-x11/60-libxrandr.sh b/scripts.d/45-x11/60-libxrandr.sh index a2bb8aa..ab1cdbc 100755 --- a/scripts.d/45-x11/60-libxrandr.sh +++ b/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 diff --git a/scripts.d/45-x11/60-libxv.sh b/scripts.d/45-x11/60-libxv.sh index b603b1c..980490e 100755 --- a/scripts.d/45-x11/60-libxv.sh +++ b/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 diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh index 822ac9c..6f43a86 100755 --- a/scripts.d/50-amf.sh +++ b/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 diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh index 10524e8..bc26159 100755 --- a/scripts.d/50-aom.sh +++ b/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" -} - -ffbuild_dockerdl() { - git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" aom + 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_dockerbuild() { - cd "$FFBUILD_DLDIR"/aom + cd "$FFBUILD_DLDIR/$SELF" for patch in /patches/*.patch; do echo "Applying $patch" diff --git a/scripts.d/50-aribb24/25-libpng.sh b/scripts.d/50-aribb24/25-libpng.sh index f71f404..8ae9f16 100755 --- a/scripts.d/50-aribb24/25-libpng.sh +++ b/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 diff --git a/scripts.d/50-aribb24/50-libaribb24.sh b/scripts.d/50-aribb24/50-libaribb24.sh index 618da9a..3ebb968 100755 --- a/scripts.d/50-aribb24/50-libaribb24.sh +++ b/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" -} - -ffbuild_dockerdl() { - git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" aribb24 + 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_dockerbuild() { - cd "$FFBUILD_DLDIR"/aribb24 + cd "$FFBUILD_DLDIR/$SELF" for patch in /patches/*.patch; do echo "Applying $patch" diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh index 50b85db..9011dfc 100755 --- a/scripts.d/50-avisynth.sh +++ b/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 diff --git a/scripts.d/50-chromaprint.sh b/scripts.d/50-chromaprint.sh index 2e32319..cdec6d4 100755 --- a/scripts.d/50-chromaprint.sh +++ b/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 diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh index 01bc4c7..7ea56b1 100755 --- a/scripts.d/50-dav1d.sh +++ b/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 diff --git a/scripts.d/50-davs2.sh b/scripts.d/50-davs2.sh index 5b80d71..8a3e778 100755 --- a/scripts.d/50-davs2.sh +++ b/scripts.d/50-davs2.sh @@ -12,13 +12,12 @@ ffbuild_enabled() { } ffbuild_dockerdl() { - git clone "$SCRIPT_REPO" davs2 - cd davs2 - git checkout "$SCRIPT_COMMIT" + to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\"" + to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\"" } ffbuild_dockerbuild() { - cd "$FFBUILD_DLDIR"/davs2 + cd "$FFBUILD_DLDIR/$SELF" cd build/linux local myconf=( diff --git a/scripts.d/50-fdk-aac.sh b/scripts.d/50-fdk-aac.sh index c34dae1..e5f69b6 100755 --- a/scripts.d/50-fdk-aac.sh +++ b/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 diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh index d20b416..3bb3f00 100755 --- a/scripts.d/50-ffnvcodec.sh +++ b/scripts.d/50-ffnvcodec.sh @@ -12,8 +12,8 @@ ffbuild_enabled() { } ffbuild_dockerdl() { - git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" ffnvcodec - git-mini-clone "$SCRIPT_REPO2" "$SCRIPT_COMMIT2" ffnvcodec2 + default_dl ffnvcodec + to_df "RUN git-mini-clone \"$SCRIPT_REPO2\" \"$SCRIPT_COMMIT2\" ffnvcodec2" } ffbuild_dockerbuild() { diff --git a/scripts.d/50-frei0r.sh b/scripts.d/50-frei0r.sh index 4e3ee13..f685a4a 100755 --- a/scripts.d/50-frei0r.sh +++ b/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 diff --git a/scripts.d/50-gme.sh b/scripts.d/50-gme.sh index dda45ba..015cfae 100755 --- a/scripts.d/50-gme.sh +++ b/scripts.d/50-gme.sh @@ -8,13 +8,12 @@ ffbuild_enabled() { } ffbuild_dockerdl() { - git clone "$SCRIPT_REPO" gme - cd gme - git checkout "$SCRIPT_COMMIT" + to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\"" + to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\"" } ffbuild_dockerbuild() { - cd "$FFBUILD_DLDIR"/gme + cd "$FFBUILD_DLDIR/$SELF" mkdir build && cd build diff --git a/scripts.d/50-kvazaar.sh b/scripts.d/50-kvazaar.sh index dea6fea..7a34e28 100755 --- a/scripts.d/50-kvazaar.sh +++ b/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 diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh index 5c92d18..e418f67 100755 --- a/scripts.d/50-libass.sh +++ b/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 diff --git a/scripts.d/50-libbluray.sh b/scripts.d/50-libbluray.sh index 16ff944..8d23987 100755 --- a/scripts.d/50-libbluray.sh +++ b/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 diff --git a/scripts.d/50-libjxl/45-brotli.sh b/scripts.d/50-libjxl/45-brotli.sh index 8bc85cb..2dc01c1 100755 --- a/scripts.d/50-libjxl/45-brotli.sh +++ b/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 diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh index 8128486..dc489c0 100755 --- a/scripts.d/50-libjxl/50-libjxl.sh +++ b/scripts.d/50-libjxl/50-libjxl.sh @@ -10,13 +10,12 @@ ffbuild_enabled() { } ffbuild_dockerdl() { - git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" jxl - cd jxl - git submodule update --init --recursive --depth 1 --recommend-shallow third_party/{highway,skcms} + default_dl "$SELF" + to_df "RUN git -C \"$SELF\" submodule update --init --recursive --depth 1 --recommend-shallow third_party/highway third_party/skcms" } ffbuild_dockerbuild() { - cd "$FFBUILD_DLDIR"/jxl + cd "$FFBUILD_DLDIR/$SELF" mkdir build && cd build diff --git a/scripts.d/50-libmp3lame.sh b/scripts.d/50-libmp3lame.sh index 740eadf..352e3f2 100755 --- a/scripts.d/50-libmp3lame.sh +++ b/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() { diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh index 448ae10..7a69d3f 100755 --- a/scripts.d/50-libopus.sh +++ b/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 diff --git a/scripts.d/50-librist/40-mbedtls.sh b/scripts.d/50-librist/40-mbedtls.sh index 0211f8b..404abda 100755 --- a/scripts.d/50-librist/40-mbedtls.sh +++ b/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 diff --git a/scripts.d/50-librist/50-librist.sh b/scripts.d/50-librist/50-librist.sh index 4aff562..ac6b99e 100755 --- a/scripts.d/50-librist/50-librist.sh +++ b/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 diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh index 6f9784e..4e17f30 100755 --- a/scripts.d/50-libssh.sh +++ b/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 diff --git a/scripts.d/50-libtheora.sh b/scripts.d/50-libtheora.sh index efc3645..79b7603 100755 --- a/scripts.d/50-libtheora.sh +++ b/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 diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh index 203e8f9..05d9a63 100755 --- a/scripts.d/50-libvpx.sh +++ b/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 diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh index 99b4bf6..9cdfcb5 100755 --- a/scripts.d/50-libwebp.sh +++ b/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 diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh index 498b51a..498c0e6 100755 --- a/scripts.d/50-lilv/96-lv2.sh +++ b/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 diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh index 17acce1..3a5cbcb 100755 --- a/scripts.d/50-lilv/96-serd.sh +++ b/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 diff --git a/scripts.d/50-lilv/96-zix.sh b/scripts.d/50-lilv/96-zix.sh index 51ae119..c6d56cc 100755 --- a/scripts.d/50-lilv/96-zix.sh +++ b/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 diff --git a/scripts.d/50-lilv/97-sord.sh b/scripts.d/50-lilv/97-sord.sh index 72fe959..cce7dda 100755 --- a/scripts.d/50-lilv/97-sord.sh +++ b/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 diff --git a/scripts.d/50-lilv/98-sratom.sh b/scripts.d/50-lilv/98-sratom.sh index 2e5ce9e..2bc170a 100755 --- a/scripts.d/50-lilv/98-sratom.sh +++ b/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 diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh index ec20306..0e791e6 100755 --- a/scripts.d/50-lilv/99-lilv.sh +++ b/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 diff --git a/scripts.d/50-onevpl.sh b/scripts.d/50-onevpl.sh index ae2822f..e5a9487 100755 --- a/scripts.d/50-onevpl.sh +++ b/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 diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh index fe93ae6..126815f 100755 --- a/scripts.d/50-openal.sh +++ b/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 diff --git a/scripts.d/50-opencore-amr.sh b/scripts.d/50-opencore-amr.sh index 090cd90..02309a4 100755 --- a/scripts.d/50-opencore-amr.sh +++ b/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 diff --git a/scripts.d/50-openh264.sh b/scripts.d/50-openh264.sh index 0fb425c..476489c 100755 --- a/scripts.d/50-openh264.sh +++ b/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" diff --git a/scripts.d/50-openjpeg.sh b/scripts.d/50-openjpeg.sh index dd8461d..1a8fd49 100755 --- a/scripts.d/50-openjpeg.sh +++ b/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 diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh index 0769e2c..f5e5477 100755 --- a/scripts.d/50-openmpt.sh +++ b/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() { diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh index dba5f5a..75004a0 100755 --- a/scripts.d/50-rav1e.sh +++ b/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" diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh index 135c95d..83585aa 100755 --- a/scripts.d/50-rubberband.sh +++ b/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 diff --git a/scripts.d/50-schannel.sh b/scripts.d/50-schannel.sh index 27ac5c8..2ea5efa 100755 --- a/scripts.d/50-schannel.sh +++ b/scripts.d/50-schannel.sh @@ -18,10 +18,6 @@ ffbuild_dockerbuild() { return 0 } -ffbuild_dockerstage_dl() { - return 0 -} - ffbuild_dockerlayer_dl() { return 0 } diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh index 850c824..34225a3 100755 --- a/scripts.d/50-sdl.sh +++ b/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 diff --git a/scripts.d/50-soxr.sh b/scripts.d/50-soxr.sh index 76ab55e..f3651aa 100755 --- a/scripts.d/50-soxr.sh +++ b/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 diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh index b1f8c2e..e0eb8a8 100755 --- a/scripts.d/50-srt.sh +++ b/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 diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh index 7a7a9b2..d5256d9 100755 --- a/scripts.d/50-svtav1.sh +++ b/scripts.d/50-svtav1.sh @@ -9,13 +9,12 @@ ffbuild_enabled() { } ffbuild_dockerdl() { - git clone "$SCRIPT_REPO" svtav1 - cd svtav1 - git checkout "$SCRIPT_COMMIT" + to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\"" + to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\"" } ffbuild_dockerbuild() { - cd "$FFBUILD_DLDIR"/svtav1 + cd "$FFBUILD_DLDIR/$SELF" mkdir build && cd build diff --git a/scripts.d/50-twolame.sh b/scripts.d/50-twolame.sh index b56ab85..8e8a60b 100755 --- a/scripts.d/50-twolame.sh +++ b/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 diff --git a/scripts.d/50-uavs3d.sh b/scripts.d/50-uavs3d.sh index 22b979a..c6d4573 100755 --- a/scripts.d/50-uavs3d.sh +++ b/scripts.d/50-uavs3d.sh @@ -9,13 +9,12 @@ ffbuild_enabled() { } ffbuild_dockerdl() { - git clone "$SCRIPT_REPO" uavs3d - cd uavs3d - git checkout "$SCRIPT_COMMIT" + to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\"" + to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\"" } ffbuild_dockerbuild() { - cd "$FFBUILD_DLDIR"/uavs3d + cd "$FFBUILD_DLDIR/$SELF" mkdir build/linux cd build/linux diff --git a/scripts.d/50-vaapi/30-libpciaccess.sh b/scripts.d/50-vaapi/30-libpciaccess.sh index cbf3516..83dfbc2 100755 --- a/scripts.d/50-vaapi/30-libpciaccess.sh +++ b/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 diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh index e65cecd..bbc9873 100755 --- a/scripts.d/50-vaapi/40-libdrm.sh +++ b/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 diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh index 217781f..e88aa0e 100755 --- a/scripts.d/50-vaapi/50-libva.sh +++ b/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 diff --git a/scripts.d/50-vidstab.sh b/scripts.d/50-vidstab.sh index 0151898..a0404df 100755 --- a/scripts.d/50-vidstab.sh +++ b/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 diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh index cf787a8..c6bd864 100755 --- a/scripts.d/50-vulkan/45-vulkan.sh +++ b/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 diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh index 3c589d7..26164f1 100755 --- a/scripts.d/50-vulkan/50-shaderc.sh +++ b/scripts.d/50-vulkan/50-shaderc.sh @@ -9,13 +9,12 @@ ffbuild_enabled() { } ffbuild_dockerdl() { - git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" shaderc - cd shaderc - ./utils/git-sync-deps + default_dl "$SELF" + to_df "RUN cd \"$SELF\" && ./utils/git-sync-deps" } ffbuild_dockerbuild() { - cd "$FFBUILD_DLDIR"/shaderc + cd "$FFBUILD_DLDIR/$SELF" mkdir build && cd build diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh index 80ce449..5013387 100755 --- a/scripts.d/50-vulkan/55-spirv-cross.sh +++ b/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/')" diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh index 8a4b7ed..d863d8e 100755 --- a/scripts.d/50-vulkan/60-libplacebo.sh +++ b/scripts.d/50-vulkan/60-libplacebo.sh @@ -12,13 +12,12 @@ ffbuild_enabled() { } ffbuild_dockerdl() { - git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" placebo - cd placebo - git submodule update --init --recursive + default_dl "$SELF" + to_df "RUN git -C \"$SELF\" submodule update --init --recursive" } ffbuild_dockerbuild() { - cd "$FFBUILD_DLDIR"/placebo + cd "$FFBUILD_DLDIR/$SELF" mkdir build && cd build diff --git a/scripts.d/50-x264.sh b/scripts.d/50-x264.sh index cafaa96..0060cf3 100755 --- a/scripts.d/50-x264.sh +++ b/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 diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh index ad252e0..c7ad259 100755 --- a/scripts.d/50-x265.sh +++ b/scripts.d/50-x265.sh @@ -9,13 +9,12 @@ ffbuild_enabled() { } ffbuild_dockerdl() { - git clone "$SCRIPT_REPO" x265 - cd x265 - git checkout "$SCRIPT_COMMIT" + to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\"" + to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\"" } ffbuild_dockerbuild() { - cd "$FFBUILD_DLDIR"/x265 + cd "$FFBUILD_DLDIR/$SELF" local common_config=( -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" diff --git a/scripts.d/50-xavs2.sh b/scripts.d/50-xavs2.sh index d11230d..ffcde84 100755 --- a/scripts.d/50-xavs2.sh +++ b/scripts.d/50-xavs2.sh @@ -12,13 +12,12 @@ ffbuild_enabled() { } ffbuild_dockerdl() { - git clone "$SCRIPT_REPO" xavs2 - cd xavs2 - git checkout "$SCRIPT_COMMIT" + to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\"" + to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\"" } ffbuild_dockerbuild() { - cd "$FFBUILD_DLDIR"/xavs2 + cd "$FFBUILD_DLDIR/$SELF" cd build/linux local myconf=( diff --git a/scripts.d/50-xvid.sh b/scripts.d/50-xvid.sh index 1325a9e..484d2fa 100755 --- a/scripts.d/50-xvid.sh +++ b/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() { diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh index e9c54d4..13a7551 100755 --- a/scripts.d/50-zimg.sh +++ b/scripts.d/50-zimg.sh @@ -8,13 +8,12 @@ ffbuild_enabled() { } ffbuild_dockerdl() { - git-mini-clone "$SCRIPT_REPO" "$SCRIPT_COMMIT" zimg - cd zimg - git submodule update --init --recursive --depth=1 + default_dl "$SELF" + to_df "RUN git -C \"$SELF\" submodule update --init --recursive --depth=1" } ffbuild_dockerbuild() { - cd "$FFBUILD_DLDIR"/zimg + cd "$FFBUILD_DLDIR/$SELF" ./autogen.sh diff --git a/scripts.d/50-zvbi.sh b/scripts.d/50-zvbi.sh index e5fbe35..8025c8a 100755 --- a/scripts.d/50-zvbi.sh +++ b/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" diff --git a/scripts.d/99-rpath.sh b/scripts.d/99-rpath.sh index 7a7daf4..be7bc33 100755 --- a/scripts.d/99-rpath.sh +++ b/scripts.d/99-rpath.sh @@ -22,10 +22,6 @@ ffbuild_dockerstage() { return 0 } -ffbuild_dockerstage_dl() { - return 0 -} - ffbuild_dockerlayer_dl() { return 0 } diff --git a/util/vars.sh b/util/vars.sh index a0a8697..312f5f0 100644 --- a/util/vars.sh +++ b/util/vars.sh @@ -43,8 +43,8 @@ if [[ -n "$REGISTRY_OVERRIDE_DL" && -n "$GITHUB_REPOSITORY_DL" ]]; then DL_IMAGE="${DL_IMAGE,,}" fi -ffbuild_dockerstage_dl() { - to_df "RUN --mount=src=${SELF},dst=/stage.sh run_stage /stage.sh ffbuild_dockerdl \$FFBUILD_DLDIR" +ffbuild_dockerdl() { + default_dl "$SELF" } ffbuild_dockerlayer_dl() { @@ -52,7 +52,7 @@ ffbuild_dockerlayer_dl() { } ffbuild_dockerstage() { - to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=\$FFBUILD_DLDIR,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw run_stage /stage.sh" + to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=\$FFBUILD_DLDIR,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw SELF=\"$SELF\" run_stage /stage.sh" } ffbuild_dockerlayer() { From 3e75fcc0e4547358b2da21b08e718c5769226809 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sun, 18 Jun 2023 21:26:29 +0200 Subject: [PATCH 31/66] Enable new DL-Cache in Workflow --- .github/workflows/build.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4c18efe..282904e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,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 @@ -74,6 +77,18 @@ 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 + run: ./generate.sh dl only + - 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 }}:latest + 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 @@ -85,6 +100,17 @@ 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: true build_target_bases: name: Build target base image if: ${{ github.event.inputs.buildOnly != 'true' }} From 8c336b4dec1d77e66904046eb64b89eed9bb54e5 Mon Sep 17 00:00:00 2001 From: BtbN Date: Tue, 20 Jun 2023 23:26:40 +0200 Subject: [PATCH 32/66] Add more explicit cache image name --- .github/workflows/build.yml | 11 ++++++++--- generate.sh | 5 +++++ makeimage.sh | 17 +++++++++++++---- scripts.d/50-aom.sh | 2 +- scripts.d/50-aribb24/50-libaribb24.sh | 2 +- scripts.d/50-zvbi.sh | 2 +- util/get_dl_cache_tag.sh | 4 ++++ util/vars.sh | 9 +++++---- 8 files changed, 38 insertions(+), 14 deletions(-) create mode 100755 util/get_dl_cache_tag.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 282904e..54631ed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -78,7 +78,11 @@ jobs: 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 - run: ./generate.sh dl only + 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: @@ -86,7 +90,7 @@ jobs: file: Dockerfile.dl pull: true push: true - tags: ${{ steps.imagename.outputs.dlname }}:latest + 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 @@ -110,7 +114,8 @@ jobs: repository_owner: ${{ github.repository_owner }} repository: ${{ github.repository }} owner_type: user - untagged_only: true + untagged_only: false + keep_latest: 3 build_target_bases: name: Build target base image if: ${{ github.event.inputs.buildOnly != 'true' }} diff --git a/generate.sh b/generate.sh index 87c0dbb..091ade1 100755 --- a/generate.sh +++ b/generate.sh @@ -69,6 +69,8 @@ if [[ "$TARGET" == "dl" && "$VARIANT" == "only" ]]; then exit 0 fi +DL_IMAGE="${DL_IMAGE_RAW}:$(./util/get_dl_cache_tag.sh)" + ### ### Generate main Dockerfile ### @@ -78,7 +80,10 @@ exec_dockerstage() { ( SELF="$SCRIPT" source "$SCRIPT" + ffbuild_enabled || exit 0 + + to_df "ENV SELF=\"$SELF\"" ffbuild_dockerstage || exit $? ) } diff --git a/makeimage.sh b/makeimage.sh index 39a1fa2..2e63a43 100755 --- a/makeimage.sh +++ b/makeimage.sh @@ -43,11 +43,20 @@ if [[ -z "$QUICKBUILD" ]]; then fi ./generate.sh "$TARGET" "$VARIANT" "${ADDINS[@]}" +DL_CACHE_TAG="$(./util/get_dl_cache_tag.sh)" +DL_IMAGE="${DL_IMAGE_RAW}:${DL_CACHE_TAG}" -docker buildx --builder ffbuilder build -f Dockerfile.dl \ - --cache-from=type=local,src=.cache/"${DL_IMAGE/:/_}" \ - --cache-to=type=local,mode=max,dest=.cache/"${DL_IMAGE/:/_}" \ - --push --tag "${LOCAL_ROOT}/dl_cache:latest" . +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/:/_}" \ diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh index bc26159..95458f2 100755 --- a/scripts.d/50-aom.sh +++ b/scripts.d/50-aom.sh @@ -8,7 +8,7 @@ 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 SELF=\"$SELF\" 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 run_stage /stage.sh" } ffbuild_dockerbuild() { diff --git a/scripts.d/50-aribb24/50-libaribb24.sh b/scripts.d/50-aribb24/50-libaribb24.sh index 3ebb968..4232541 100755 --- a/scripts.d/50-aribb24/50-libaribb24.sh +++ b/scripts.d/50-aribb24/50-libaribb24.sh @@ -8,7 +8,7 @@ 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 SELF=\"$SELF\" 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 run_stage /stage.sh" } ffbuild_dockerbuild() { diff --git a/scripts.d/50-zvbi.sh b/scripts.d/50-zvbi.sh index 8025c8a..6eaa22e 100755 --- a/scripts.d/50-zvbi.sh +++ b/scripts.d/50-zvbi.sh @@ -8,7 +8,7 @@ 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 SELF=\"$SELF\" 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 run_stage /stage.sh" } ffbuild_dockerdl() { diff --git a/util/get_dl_cache_tag.sh b/util/get_dl_cache_tag.sh new file mode 100755 index 0000000..4ca3a36 --- /dev/null +++ b/util/get_dl_cache_tag.sh @@ -0,0 +1,4 @@ +#!/bin/bash +set -eo pipefail +printf dlcache_ +tail -n+3 Dockerfile.dl | sha256sum | cut -d' ' -f1 diff --git a/util/vars.sh b/util/vars.sh index 312f5f0..030ac15 100644 --- a/util/vars.sh +++ b/util/vars.sh @@ -36,12 +36,13 @@ REGISTRY="${REGISTRY_OVERRIDE:-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" -DL_IMAGE="${REGISTRY}/${REPO}/dl_cache:latest" +DL_IMAGE_RAW="${REGISTRY}/${REPO}/dl_cache" if [[ -n "$REGISTRY_OVERRIDE_DL" && -n "$GITHUB_REPOSITORY_DL" ]]; then - DL_IMAGE="${REGISTRY_OVERRIDE_DL}/${GITHUB_REPOSITORY_DL}/dl_cache:latest" - DL_IMAGE="${DL_IMAGE,,}" + DL_IMAGE_RAW="${REGISTRY_OVERRIDE_DL}/${GITHUB_REPOSITORY_DL}/dl_cache" + DL_IMAGE_RAW="${DL_IMAGE_RAW,,}" fi +DL_IMAGE="${DL_IMAGE_RAW}:unset" ffbuild_dockerdl() { default_dl "$SELF" @@ -52,7 +53,7 @@ ffbuild_dockerlayer_dl() { } ffbuild_dockerstage() { - to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=\$FFBUILD_DLDIR,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw SELF=\"$SELF\" run_stage /stage.sh" + to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=\$FFBUILD_DLDIR,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw run_stage /stage.sh" } ffbuild_dockerlayer() { From 91b977f84d106822cdbfb861769318811b5bdf7c Mon Sep 17 00:00:00 2001 From: BtbN Date: Tue, 20 Jun 2023 23:58:06 +0200 Subject: [PATCH 33/66] Simplify download Dockerfile generation --- generate.sh | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/generate.sh b/generate.sh index 091ade1..a0687da 100755 --- a/generate.sh +++ b/generate.sh @@ -41,21 +41,9 @@ 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 - LAYER="layer-$ID" - - for STAGE in scripts.d/$ID-*; do - if [[ -f "$STAGE" ]]; then - to_df "FROM $PREVLAYER AS $(layername "$STAGE")" - exec_dockerstage_dl "$STAGE" - else - for STAGE in "${STAGE}"/??-*; do - to_df "FROM $PREVLAYER AS $(layername "$STAGE")" - exec_dockerstage_dl "$STAGE" - done - fi - done +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" From 73f17b72130507f50d5557cf7def42fba1624dcb Mon Sep 17 00:00:00 2001 From: BtbN Date: Wed, 21 Jun 2023 00:06:33 +0200 Subject: [PATCH 34/66] Force C locale in Dockerfile generation Turns out bash sorting behaviour differs between locales, causing cache mismatches... --- generate.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generate.sh b/generate.sh index a0687da..530aed4 100755 --- a/generate.sh +++ b/generate.sh @@ -3,6 +3,8 @@ set -e cd "$(dirname "$0")" source util/vars.sh +export LC_ALL=C.UTF-8 + rm -f Dockerfile Dockerfile.{dl,final,dl.final} layername() { From 0598fb3dba147d62922881e67c4992fb671f560f Mon Sep 17 00:00:00 2001 From: BtbN Date: Wed, 21 Jun 2023 00:38:32 +0200 Subject: [PATCH 35/66] Make final dl cache image FROM scratch --- generate.sh | 4 ++-- scripts.d/50-aom.sh | 2 +- scripts.d/50-aribb24/50-libaribb24.sh | 2 +- scripts.d/50-zvbi.sh | 2 +- util/vars.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/generate.sh b/generate.sh index 530aed4..c9fda9b 100755 --- a/generate.sh +++ b/generate.sh @@ -52,8 +52,8 @@ to_df "FROM base AS intermediate" cat Dockerfile.dl.final >> "$TODF" rm Dockerfile.dl.final -to_df "FROM base" -to_df "COPY --from=intermediate \$FFBUILD_DLDIR/. \$FFBUILD_DLDIR" +to_df "FROM scratch" +to_df "COPY --from=intermediate /opt/ffdl/. /" if [[ "$TARGET" == "dl" && "$VARIANT" == "only" ]]; then exit 0 diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh index 95458f2..7c8cdb0 100755 --- a/scripts.d/50-aom.sh +++ b/scripts.d/50-aom.sh @@ -8,7 +8,7 @@ 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=/,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw --mount=src=patches/aom,dst=/patches run_stage /stage.sh" } ffbuild_dockerbuild() { diff --git a/scripts.d/50-aribb24/50-libaribb24.sh b/scripts.d/50-aribb24/50-libaribb24.sh index 4232541..c032178 100755 --- a/scripts.d/50-aribb24/50-libaribb24.sh +++ b/scripts.d/50-aribb24/50-libaribb24.sh @@ -8,7 +8,7 @@ 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=/,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw --mount=src=patches/aribb24,dst=/patches run_stage /stage.sh" } ffbuild_dockerbuild() { diff --git a/scripts.d/50-zvbi.sh b/scripts.d/50-zvbi.sh index 6eaa22e..5f7cb97 100755 --- a/scripts.d/50-zvbi.sh +++ b/scripts.d/50-zvbi.sh @@ -8,7 +8,7 @@ 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=/,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw --mount=src=patches/zvbi,dst=/patches run_stage /stage.sh" } ffbuild_dockerdl() { diff --git a/util/vars.sh b/util/vars.sh index 030ac15..0fd91ef 100644 --- a/util/vars.sh +++ b/util/vars.sh @@ -53,7 +53,7 @@ ffbuild_dockerlayer_dl() { } ffbuild_dockerstage() { - to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=\$FFBUILD_DLDIR,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw run_stage /stage.sh" + to_df "RUN --mount=src=${SELF},dst=/stage.sh --mount=src=/,dst=\$FFBUILD_DLDIR,from=${DL_IMAGE},rw run_stage /stage.sh" } ffbuild_dockerlayer() { From be992fa253f2fc6a4c763ac5f1227f98de16f843 Mon Sep 17 00:00:00 2001 From: BtbN Date: Wed, 21 Jun 2023 00:55:45 +0200 Subject: [PATCH 36/66] Be more generous with cache image retention Avoid pointless rebuilds on revert or other situations. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 54631ed..dec190d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -115,7 +115,7 @@ jobs: repository: ${{ github.repository }} owner_type: user untagged_only: false - keep_latest: 3 + keep_latest: 20 build_target_bases: name: Build target base image if: ${{ github.event.inputs.buildOnly != 'true' }} From 547eee9db45612096732f04f0ccbd172fb4ef51f Mon Sep 17 00:00:00 2001 From: BtbN Date: Wed, 21 Jun 2023 13:43:28 +0200 Subject: [PATCH 37/66] Update dependencies --- scripts.d/10-mingw.sh | 2 +- scripts.d/20-libxml2.sh | 2 +- scripts.d/25-freetype.sh | 2 +- scripts.d/25-openssl.sh | 2 +- scripts.d/25-xz.sh | 2 +- scripts.d/35-fontconfig.sh | 2 +- scripts.d/45-harfbuzz.sh | 2 +- scripts.d/45-opencl.sh | 2 +- scripts.d/45-x11/10-xproto.sh | 2 +- scripts.d/45-x11/10-xtrans.sh | 2 +- scripts.d/45-x11/40-libx11.sh | 2 +- scripts.d/50-aom.sh | 2 +- scripts.d/50-aribb24/25-libpng.sh | 2 +- scripts.d/50-avisynth.sh | 2 +- scripts.d/50-dav1d.sh | 2 +- scripts.d/50-ffnvcodec.sh | 4 ++-- scripts.d/50-frei0r.sh | 2 +- scripts.d/50-kvazaar.sh | 2 +- scripts.d/50-libjxl/45-brotli.sh | 2 +- scripts.d/50-libjxl/50-libjxl.sh | 2 +- scripts.d/50-libopus.sh | 2 +- scripts.d/50-librist/50-librist.sh | 2 +- scripts.d/50-libssh.sh | 2 +- scripts.d/50-libvpx.sh | 2 +- scripts.d/50-libwebp.sh | 2 +- scripts.d/50-lilv/96-lv2.sh | 2 +- scripts.d/50-lilv/99-lilv.sh | 2 +- scripts.d/50-onevpl.sh | 2 +- scripts.d/50-openal.sh | 2 +- scripts.d/50-openmpt.sh | 2 +- scripts.d/50-rav1e.sh | 2 +- scripts.d/50-rubberband.sh | 2 +- scripts.d/50-sdl.sh | 2 +- scripts.d/50-srt.sh | 2 +- scripts.d/50-svtav1.sh | 2 +- scripts.d/50-vaapi/50-libva.sh | 2 +- scripts.d/50-vidstab.sh | 2 +- scripts.d/50-vulkan/45-vulkan.sh | 2 +- scripts.d/50-vulkan/50-shaderc.sh | 2 +- scripts.d/50-vulkan/55-spirv-cross.sh | 2 +- scripts.d/50-vulkan/60-libplacebo.sh | 2 +- scripts.d/50-zimg.sh | 2 +- 42 files changed, 43 insertions(+), 43 deletions(-) diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh index 0b47612..e518753 100755 --- a/scripts.d/10-mingw.sh +++ b/scripts.d/10-mingw.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://git.code.sf.net/p/mingw-w64/mingw-w64.git" -SCRIPT_COMMIT="9df2e604ddf16765410724716a8d1887ffc61fa9" +SCRIPT_COMMIT="b38a7d3e8016d920f02aad09187e4a5f6ae46246" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh index 14ff564..8f9c0a8 100755 --- a/scripts.d/20-libxml2.sh +++ b/scripts.d/20-libxml2.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.gnome.org/GNOME/libxml2.git" -SCRIPT_COMMIT="1e8ab6977d8a990906867514f37528274efebe44" +SCRIPT_COMMIT="5f54bac9ebfc1486c9180b581e32588ee74c59e4" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh index 4ffbf52..9cf3ae2 100755 --- a/scripts.d/25-freetype.sh +++ b/scripts.d/25-freetype.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git" -SCRIPT_COMMIT="80a507a6b8e3d2906ad2c8ba69329bd2fb2a85ef" +SCRIPT_COMMIT="5c00a46805d6423fc45b4ba2c0f2e22dd0450d73" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh index 49ef1cc..63131eb 100755 --- a/scripts.d/25-openssl.sh +++ b/scripts.d/25-openssl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/openssl/openssl.git" -SCRIPT_COMMIT="openssl-3.0.8" +SCRIPT_COMMIT="openssl-3.0.9" SCRIPT_TAGFILTER="openssl-3.0.*" ffbuild_enabled() { diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh index 8b04f91..f9b5ee4 100755 --- a/scripts.d/25-xz.sh +++ b/scripts.d/25-xz.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/xz-mirror/xz.git" -SCRIPT_COMMIT="1dbe12b90cff79bb51923733ac0840747b4b4131" +SCRIPT_COMMIT="dbb3a536ed9873ffa0870321f6873e564c6a9da8" ffbuild_enabled() { return 0 diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh index cad9f83..aba3f20 100755 --- a/scripts.d/35-fontconfig.sh +++ b/scripts.d/35-fontconfig.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git" -SCRIPT_COMMIT="f0612537cb55ef97835914b0c64497034c60b8c9" +SCRIPT_COMMIT="7e2a1b2577e8d90ea5be3f14091e809ac7742438" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh index a34cdb3..2314d34 100755 --- a/scripts.d/45-harfbuzz.sh +++ b/scripts.d/45-harfbuzz.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git" -SCRIPT_COMMIT="4a93576bca0f56e82a1d8ad67733df9c5ddb8dcd" +SCRIPT_COMMIT="a77f28286569b1d187aa7470a4721222a3fc44e7" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh index afe9e83..dfbda16 100755 --- a/scripts.d/45-opencl.sh +++ b/scripts.d/45-opencl.sh @@ -4,7 +4,7 @@ SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git" SCRIPT_COMMIT="e049b16b5f157e2f28e7b5c301e71e1ccb3fe288" SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git" -SCRIPT_COMMIT2="0b8be9fd5fae61bfd85378ef346f508e4f5cfe61" +SCRIPT_COMMIT2="229410f86a8c8c9e0f86f195409e5481a2bae067" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh index f0e6192..e0e1428 100755 --- 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="5a3d5d624e08cd8fcbe7f4da594dd458f45127d0" +SCRIPT_COMMIT="766967322209f2dcb72e6a8edea0c651f586201d" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/10-xtrans.sh b/scripts.d/45-x11/10-xtrans.sh index e997e2a..3f582b9 100755 --- 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="232a11a947564762689e63c3a6603d3f956f696d" +SCRIPT_COMMIT="3b3a3bd75d86aec78f6ef893b198c3efc378bc64" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh index 836fe2d..fb0c61b 100755 --- 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="03ba0140940cc76524d83096a47309f5c398541f" +SCRIPT_COMMIT="178c4fefd3b0b4be5e69274108b86a51f08ec3a6" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh index 7c8cdb0..cb79cc0 100755 --- a/scripts.d/50-aom.sh +++ b/scripts.d/50-aom.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://aomedia.googlesource.com/aom" -SCRIPT_COMMIT="d954a78fdae80b49229cb7c4b7032f5c0e67b0e8" +SCRIPT_COMMIT="7d637e1ccd859f9018ebff88911411685d3a3a2b" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-aribb24/25-libpng.sh b/scripts.d/50-aribb24/25-libpng.sh index 8ae9f16..4c596a4 100755 --- a/scripts.d/50-aribb24/25-libpng.sh +++ b/scripts.d/50-aribb24/25-libpng.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/glennrp/libpng.git" -SCRIPT_COMMIT="e519af8b49f52c4ac400f50f23b48ebe36a5f4df" +SCRIPT_COMMIT="8be5c147d567bf90553088305208e612abb16768" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh index 9011dfc..6c5af1c 100755 --- 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="237c4505c944937b411bfc56ab044323e327a2fd" +SCRIPT_COMMIT="ad0d546cd2fd5eadf3b4d29df24bf3f6713d9707" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh index 7ea56b1..7aaebe8 100755 --- a/scripts.d/50-dav1d.sh +++ b/scripts.d/50-dav1d.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git" -SCRIPT_COMMIT="fa8ae5776d5603f52725c1a6bc673acb649577fb" +SCRIPT_COMMIT="2373fda303d46489c1ec269dc66369a31663cb25" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh index 3bb3f00..0c52cc4 100755 --- a/scripts.d/50-ffnvcodec.sh +++ b/scripts.d/50-ffnvcodec.sh @@ -1,10 +1,10 @@ #!/bin/bash SCRIPT_REPO="https://github.com/FFmpeg/nv-codec-headers.git" -SCRIPT_COMMIT="4fd7be29a431441ca31b8db0155875ae2ff4ed47" +SCRIPT_COMMIT="9402b5a7693e9841f8a4f4488cd2df21ac55c685" SCRIPT_REPO2="https://github.com/FFmpeg/nv-codec-headers.git" -SCRIPT_COMMIT2="2cd175b30366b6e295991ee0540e3e875cce6f2e" +SCRIPT_COMMIT2="dc3e4484dc83485734e503991fe5ed3bdf256fba" SCRIPT_BRANCH2="sdk/11.1" ffbuild_enabled() { diff --git a/scripts.d/50-frei0r.sh b/scripts.d/50-frei0r.sh index f685a4a..ae465f4 100755 --- 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="69819601c671915075bbd1c5c87be01a5feba08d" +SCRIPT_COMMIT="c3f987c4cc8c1a7f6928e574f4cb272a7770ca6f" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-kvazaar.sh b/scripts.d/50-kvazaar.sh index 7a34e28..a045ea9 100755 --- a/scripts.d/50-kvazaar.sh +++ b/scripts.d/50-kvazaar.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/ultravideo/kvazaar.git" -SCRIPT_COMMIT="37a0404bc8ccdc39515a5aed706205dc53810019" +SCRIPT_COMMIT="e001c6a867068b448354d955363bd2ff7caf33d2" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/45-brotli.sh b/scripts.d/50-libjxl/45-brotli.sh index 2dc01c1..f037940 100755 --- a/scripts.d/50-libjxl/45-brotli.sh +++ b/scripts.d/50-libjxl/45-brotli.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/google/brotli.git" -SCRIPT_COMMIT="ed1995b6bda19244070ab5d331111f16f67c8054" +SCRIPT_COMMIT="1d8452b783dafd7e2acc0914919d38d46b861765" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh index dc489c0..4be5db0 100755 --- a/scripts.d/50-libjxl/50-libjxl.sh +++ b/scripts.d/50-libjxl/50-libjxl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libjxl/libjxl.git" -SCRIPT_COMMIT="c8a4a7aa88f926c00ca4178f6677f83c2fa4e290" +SCRIPT_COMMIT="b4369bdafa2901512aa6b0728a05a90c8fa314fc" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh index 7a69d3f..e69f098 100755 --- a/scripts.d/50-libopus.sh +++ b/scripts.d/50-libopus.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/xiph/opus.git" -SCRIPT_COMMIT="5023249b5c935545fb02dbfe845cae996ecfc8bb" +SCRIPT_COMMIT="9fc8fc4cf432640f284113ba502ee027268b0d9f" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-librist/50-librist.sh b/scripts.d/50-librist/50-librist.sh index ac6b99e..9b7ee52 100755 --- a/scripts.d/50-librist/50-librist.sh +++ b/scripts.d/50-librist/50-librist.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/rist/librist.git" -SCRIPT_COMMIT="234c2e224c1dc60276a7b427acd3cc0f8bdb3bda" +SCRIPT_COMMIT="c917e970be95658411e249f6e4e7fc1eeea6fe99" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh index 4e17f30..a94e25e 100755 --- a/scripts.d/50-libssh.sh +++ b/scripts.d/50-libssh.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://git.libssh.org/projects/libssh.git" -SCRIPT_COMMIT="2bf49e3e65912fd26c06fc4aa37a72eeedfec9d8" +SCRIPT_COMMIT="df0a445c87dc9678f23984141f6b396c72888972" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh index 05d9a63..be696ff 100755 --- a/scripts.d/50-libvpx.sh +++ b/scripts.d/50-libvpx.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx" -SCRIPT_COMMIT="ad5677eafceac4eccf7a7fd506a4e1f081cea22d" +SCRIPT_COMMIT="14e52008edbf2e91386423fdd53310fe49654991" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh index 9cdfcb5..e5306cf 100755 --- a/scripts.d/50-libwebp.sh +++ b/scripts.d/50-libwebp.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp" -SCRIPT_COMMIT="e3366659a019515de765a281567242ceaa6eaf75" +SCRIPT_COMMIT="64819c7cf34350aafa9f2f0e3f5d5a444cb82d2a" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh index 498c0e6..7a14ca7 100755 --- a/scripts.d/50-lilv/96-lv2.sh +++ b/scripts.d/50-lilv/96-lv2.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/lv2/lv2.git" -SCRIPT_COMMIT="52a96cec13bf2d541c42f8f398e7ea1387c6f56d" +SCRIPT_COMMIT="bb6a2103c7adf3c1339728915d7f1497ee98dcbf" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh index 0e791e6..b2f3eda 100755 --- a/scripts.d/50-lilv/99-lilv.sh +++ b/scripts.d/50-lilv/99-lilv.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/lv2/lilv.git" -SCRIPT_COMMIT="d564baafed0863813a87d872f8663134e74228c8" +SCRIPT_COMMIT="caad4f5554fd77b61a0907a67bab90bc656d86ad" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-onevpl.sh b/scripts.d/50-onevpl.sh index e5a9487..1e6aee5 100755 --- 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 diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh index 126815f..0c1b47a 100755 --- 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="cd781b1511d437816aac65f89646bd80dbf7c040" +SCRIPT_COMMIT="a49b612ef470003ffb16ddc5e19c9a1984a71619" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh index f5e5477..e7cf9e2 100755 --- a/scripts.d/50-openmpt.sh +++ b/scripts.d/50-openmpt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT" -SCRIPT_REV="19363" +SCRIPT_REV="19424" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh index 75004a0..3eade10 100755 --- 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="005a86d38a2eef5004bdc415b504e66accd246e0" +SCRIPT_COMMIT="ba7ed562b01e47dcdb428a44edd0c26a61e8950c" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh index 83585aa..6ad0385 100755 --- 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="7d5b101d278ac4f7eb557d481013b3cc5d8da478" +SCRIPT_COMMIT="82dab93ecf44c9b1203289c0118760b7331b2156" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh index 34225a3..d8c1434 100755 --- 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="5007b963639bff2fa3359abbfe20d53ea9111fd9" +SCRIPT_COMMIT="ceece918e4ebe7adfe80ee35a0a4a928c0018252" SCRIPT_BRANCH="SDL2" ffbuild_enabled() { diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh index e0eb8a8..b45b942 100755 --- a/scripts.d/50-srt.sh +++ b/scripts.d/50-srt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/Haivision/srt.git" -SCRIPT_COMMIT="3cefedefe91fca543083d260d1ed32efd2e7cba5" +SCRIPT_COMMIT="9448e26fcd7602098b4bf9cd7fe535136e89e10b" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh index d5256d9..5ec307c 100755 --- a/scripts.d/50-svtav1.sh +++ b/scripts.d/50-svtav1.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git" -SCRIPT_COMMIT="0f8b3a81363b7148f90a07f026f69c97d11e0363" +SCRIPT_COMMIT="08c18ba0768ed3dbbff0903adc326fb3a7549bd9" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh index e88aa0e..78bac1d 100755 --- a/scripts.d/50-vaapi/50-libva.sh +++ b/scripts.d/50-vaapi/50-libva.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/intel/libva.git" -SCRIPT_COMMIT="1114bd2b3ef7b6467f94c15cab3e061d3c197571" +SCRIPT_COMMIT="1c58941b93ba5013c68e8370a408efd630275c9c" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-vidstab.sh b/scripts.d/50-vidstab.sh index a0404df..c9a3b4c 100755 --- a/scripts.d/50-vidstab.sh +++ b/scripts.d/50-vidstab.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/georgmartius/vid.stab.git" -SCRIPT_COMMIT="77f3ba1b9a8d67be616ce576f24b4b4a73333e82" +SCRIPT_COMMIT="05829db776069b7478dd2d90b6e0081668a41abc" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh index c6bd864..13e6622 100755 --- a/scripts.d/50-vulkan/45-vulkan.sh +++ b/scripts.d/50-vulkan/45-vulkan.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git" -SCRIPT_COMMIT="v1.3.251" +SCRIPT_COMMIT="v1.3.254" SCRIPT_TAGFILTER="v?.*.*" ffbuild_enabled() { diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh index 26164f1..9f282ac 100755 --- a/scripts.d/50-vulkan/50-shaderc.sh +++ b/scripts.d/50-vulkan/50-shaderc.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/google/shaderc.git" -SCRIPT_COMMIT="95ea3c915aa48ecdeda2f14db73983d1be3f9209" +SCRIPT_COMMIT="4dc596ddc2702092c670e828745dc3e0338d83c1" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh index 5013387..e5f30ba 100755 --- a/scripts.d/50-vulkan/55-spirv-cross.sh +++ b/scripts.d/50-vulkan/55-spirv-cross.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git" -SCRIPT_COMMIT="12542fc6fc05000e04742daf93892a0b10edbe80" +SCRIPT_COMMIT="2d3a152081ca6e6bea7093940d0f81088fe4d01c" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh index d863d8e..b8d74e7 100755 --- a/scripts.d/50-vulkan/60-libplacebo.sh +++ b/scripts.d/50-vulkan/60-libplacebo.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git" -SCRIPT_COMMIT="3e25675dc10d98ac67d1ca2af9f07b79c543dc77" +SCRIPT_COMMIT="d25b82b7dbf961d25d510bed6198ad3f24a7ec27" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh index 13a7551..9b9b80b 100755 --- a/scripts.d/50-zimg.sh +++ b/scripts.d/50-zimg.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/sekrit-twc/zimg.git" -SCRIPT_COMMIT="332aaac5e99de46ddd5663092779742ec1958b11" +SCRIPT_COMMIT="939a78cae6a8207ef778375dfcaa75511162a186" ffbuild_enabled() { return 0 From 9465728b3b9d2fe1c9c595abcb49f85ebdd46e7f Mon Sep 17 00:00:00 2001 From: BtbN Date: Wed, 21 Jun 2023 13:50:46 +0200 Subject: [PATCH 38/66] Disable doxgen for xz --- scripts.d/25-xz.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh index f9b5ee4..c3fa95d 100755 --- a/scripts.d/25-xz.sh +++ b/scripts.d/25-xz.sh @@ -10,7 +10,7 @@ ffbuild_enabled() { ffbuild_dockerbuild() { cd "$FFBUILD_DLDIR/$SELF" - ./autogen.sh --no-po4a + ./autogen.sh --no-po4a --no-doxygen local myconf=( --prefix="$FFBUILD_PREFIX" From 0071c270bbb6f72ef2158583d1bb7dc86655ba83 Mon Sep 17 00:00:00 2001 From: BtbN Date: Wed, 21 Jun 2023 14:04:39 +0200 Subject: [PATCH 39/66] Specify dlltool in meson cross files --- images/base-win32/cross.meson | 1 + images/base-win64/cross.meson | 1 + 2 files changed, 2 insertions(+) diff --git a/images/base-win32/cross.meson b/images/base-win32/cross.meson index a52a835..c2a0ad1 100644 --- 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] diff --git a/images/base-win64/cross.meson b/images/base-win64/cross.meson index eb16efb..0b5513c 100644 --- 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] From 0e9c6f8e4d2cb1c9c8c250e3615650d244d2cc2f Mon Sep 17 00:00:00 2001 From: nihil-admirari <50202386+nihil-admirari@users.noreply.github.com> Date: Thu, 22 Jun 2023 23:26:29 +0300 Subject: [PATCH 40/66] Package man --- variants/linux-install-shared.sh | 3 +++ variants/linux-install-static.sh | 15 +++++++++++++++ variants/linux64-gpl.sh | 2 +- variants/linux64-lgpl.sh | 2 +- variants/linuxarm64-gpl.sh | 2 +- variants/linuxarm64-lgpl.sh | 2 +- variants/win32-gpl.sh | 2 +- variants/win32-lgpl.sh | 2 +- variants/win64-gpl.sh | 2 +- variants/win64-lgpl.sh | 2 +- ...fault-install.sh => windows-install-static.sh} | 0 11 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 variants/linux-install-static.sh rename variants/{default-install.sh => windows-install-static.sh} (100%) diff --git a/variants/linux-install-shared.sh b/variants/linux-install-shared.sh index ef8e791..5507cb6 100644 --- a/variants/linux-install-shared.sh +++ b/variants/linux-install-shared.sh @@ -23,4 +23,7 @@ package_variant() { mkdir -p "$OUT"/doc cp -r "$IN"/share/doc/ffmpeg/* "$OUT"/doc + + mkdir -p "$OUT/man" + cp -r "$IN"/share/man/* "$OUT"/man } diff --git a/variants/linux-install-static.sh b/variants/linux-install-static.sh new file mode 100644 index 0000000..6c6a4e6 --- /dev/null +++ b/variants/linux-install-static.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +package_variant() { + IN="$1" + OUT="$2" + + mkdir -p "$OUT"/bin + cp "$IN"/bin/* "$OUT"/bin + + mkdir -p "$OUT/doc" + cp -r "$IN"/share/doc/ffmpeg/* "$OUT"/doc + + mkdir -p "$OUT/man" + cp -r "$IN"/share/man/* "$OUT"/man +} diff --git a/variants/linux64-gpl.sh b/variants/linux64-gpl.sh index b3003a4..bd5fc12 100644 --- a/variants/linux64-gpl.sh +++ b/variants/linux64-gpl.sh @@ -1,3 +1,3 @@ #!/bin/bash -source "$(dirname "$BASH_SOURCE")"/default-install.sh +source "$(dirname "$BASH_SOURCE")"/linux-install-static.sh source "$(dirname "$BASH_SOURCE")"/defaults-gpl.sh diff --git a/variants/linux64-lgpl.sh b/variants/linux64-lgpl.sh index f000a33..da1f9b7 100644 --- a/variants/linux64-lgpl.sh +++ b/variants/linux64-lgpl.sh @@ -1,3 +1,3 @@ #!/bin/bash -source "$(dirname "$BASH_SOURCE")"/default-install.sh +source "$(dirname "$BASH_SOURCE")"/linux-install-static.sh source "$(dirname "$BASH_SOURCE")"/defaults-lgpl.sh diff --git a/variants/linuxarm64-gpl.sh b/variants/linuxarm64-gpl.sh index b3003a4..bd5fc12 100644 --- a/variants/linuxarm64-gpl.sh +++ b/variants/linuxarm64-gpl.sh @@ -1,3 +1,3 @@ #!/bin/bash -source "$(dirname "$BASH_SOURCE")"/default-install.sh +source "$(dirname "$BASH_SOURCE")"/linux-install-static.sh source "$(dirname "$BASH_SOURCE")"/defaults-gpl.sh diff --git a/variants/linuxarm64-lgpl.sh b/variants/linuxarm64-lgpl.sh index f000a33..da1f9b7 100644 --- a/variants/linuxarm64-lgpl.sh +++ b/variants/linuxarm64-lgpl.sh @@ -1,3 +1,3 @@ #!/bin/bash -source "$(dirname "$BASH_SOURCE")"/default-install.sh +source "$(dirname "$BASH_SOURCE")"/linux-install-static.sh source "$(dirname "$BASH_SOURCE")"/defaults-lgpl.sh diff --git a/variants/win32-gpl.sh b/variants/win32-gpl.sh index b3003a4..d629915 100644 --- a/variants/win32-gpl.sh +++ b/variants/win32-gpl.sh @@ -1,3 +1,3 @@ #!/bin/bash -source "$(dirname "$BASH_SOURCE")"/default-install.sh +source "$(dirname "$BASH_SOURCE")"/windows-install-static.sh source "$(dirname "$BASH_SOURCE")"/defaults-gpl.sh diff --git a/variants/win32-lgpl.sh b/variants/win32-lgpl.sh index f000a33..f360d75 100644 --- a/variants/win32-lgpl.sh +++ b/variants/win32-lgpl.sh @@ -1,3 +1,3 @@ #!/bin/bash -source "$(dirname "$BASH_SOURCE")"/default-install.sh +source "$(dirname "$BASH_SOURCE")"/windows-install-static.sh source "$(dirname "$BASH_SOURCE")"/defaults-lgpl.sh diff --git a/variants/win64-gpl.sh b/variants/win64-gpl.sh index b3003a4..d629915 100644 --- a/variants/win64-gpl.sh +++ b/variants/win64-gpl.sh @@ -1,3 +1,3 @@ #!/bin/bash -source "$(dirname "$BASH_SOURCE")"/default-install.sh +source "$(dirname "$BASH_SOURCE")"/windows-install-static.sh source "$(dirname "$BASH_SOURCE")"/defaults-gpl.sh diff --git a/variants/win64-lgpl.sh b/variants/win64-lgpl.sh index f000a33..f360d75 100644 --- a/variants/win64-lgpl.sh +++ b/variants/win64-lgpl.sh @@ -1,3 +1,3 @@ #!/bin/bash -source "$(dirname "$BASH_SOURCE")"/default-install.sh +source "$(dirname "$BASH_SOURCE")"/windows-install-static.sh source "$(dirname "$BASH_SOURCE")"/defaults-lgpl.sh diff --git a/variants/default-install.sh b/variants/windows-install-static.sh similarity index 100% rename from variants/default-install.sh rename to variants/windows-install-static.sh From 20172ca00af0bc0e554c203c559a1339da6651d0 Mon Sep 17 00:00:00 2001 From: Chad Kimes <1936066+chkimes@users.noreply.github.com> Date: Fri, 30 Jun 2023 11:01:53 -0400 Subject: [PATCH 41/66] Use GH_REPO build-arg in target-base builds --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dec190d..971260b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -144,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 @@ -155,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 @@ -197,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 @@ -209,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 From 71c3a919b8e51b2ed462d3963748bc3b2f5c2142 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sat, 8 Jul 2023 17:37:10 +0200 Subject: [PATCH 42/66] Update dependencies --- scripts.d/10-mingw.sh | 2 +- scripts.d/20-libiconv.sh | 2 +- scripts.d/20-libxml2.sh | 2 +- scripts.d/25-fftw3.sh | 2 +- scripts.d/25-freetype.sh | 2 +- scripts.d/25-xz.sh | 2 +- scripts.d/45-harfbuzz.sh | 2 +- scripts.d/45-vmaf.sh | 2 +- scripts.d/45-x11/10-xcbproto.sh | 2 +- scripts.d/45-x11/40-libx11.sh | 2 +- scripts.d/50-amf.sh | 2 +- scripts.d/50-aom.sh | 2 +- scripts.d/50-aribb24/25-libpng.sh | 2 +- scripts.d/50-dav1d.sh | 2 +- scripts.d/50-ffnvcodec.sh | 2 +- scripts.d/50-kvazaar.sh | 2 +- scripts.d/50-libjxl/45-brotli.sh | 2 +- scripts.d/50-libjxl/50-libjxl.sh | 2 +- scripts.d/50-librist/50-librist.sh | 2 +- scripts.d/50-libssh.sh | 2 +- scripts.d/50-libvpx.sh | 2 +- scripts.d/50-libwebp.sh | 2 +- scripts.d/50-lilv/96-zix.sh | 2 +- scripts.d/50-lilv/98-sratom.sh | 2 +- scripts.d/50-lilv/99-lilv.sh | 2 +- scripts.d/50-openal.sh | 2 +- scripts.d/50-openmpt.sh | 2 +- scripts.d/50-rav1e.sh | 2 +- scripts.d/50-rubberband.sh | 2 +- scripts.d/50-sdl.sh | 2 +- scripts.d/50-srt.sh | 2 +- scripts.d/50-vaapi/40-libdrm.sh | 2 +- scripts.d/50-vaapi/50-libva.sh | 2 +- scripts.d/50-vulkan/45-vulkan.sh | 2 +- scripts.d/50-vulkan/50-shaderc.sh | 2 +- scripts.d/50-vulkan/55-spirv-cross.sh | 2 +- scripts.d/50-vulkan/60-libplacebo.sh | 2 +- scripts.d/50-x265.sh | 2 +- scripts.d/50-zimg.sh | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh index e518753..d0a6546 100755 --- a/scripts.d/10-mingw.sh +++ b/scripts.d/10-mingw.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://git.code.sf.net/p/mingw-w64/mingw-w64.git" -SCRIPT_COMMIT="b38a7d3e8016d920f02aad09187e4a5f6ae46246" +SCRIPT_COMMIT="3638d5e9a6f28354bc3e18f04ba0d97e2cc3b44c" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh index 993ad79..ebadb7d 100755 --- a/scripts.d/20-libiconv.sh +++ b/scripts.d/20-libiconv.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://git.savannah.gnu.org/git/libiconv.git" -SCRIPT_COMMIT="5448df580c4287b7bfe59d3be0dcbb2227e641d1" +SCRIPT_COMMIT="6e2b31f6d66739c5abd850338ea68c6bd2012812" ffbuild_enabled() { return 0 diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh index 8f9c0a8..40dfe1b 100755 --- a/scripts.d/20-libxml2.sh +++ b/scripts.d/20-libxml2.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.gnome.org/GNOME/libxml2.git" -SCRIPT_COMMIT="5f54bac9ebfc1486c9180b581e32588ee74c59e4" +SCRIPT_COMMIT="884474477284474e0151280aaa275a18e3d7a036" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-fftw3.sh b/scripts.d/25-fftw3.sh index ebe8357..ede5622 100755 --- a/scripts.d/25-fftw3.sh +++ b/scripts.d/25-fftw3.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/FFTW/fftw3.git" -SCRIPT_COMMIT="0842f00ae6b6e1f3aade155bc0edd17a7313fa6a" +SCRIPT_COMMIT="69f6c1a6ebd7ac5af33e7074134fb79fbc729c3d" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh index 9cf3ae2..bcb52ed 100755 --- a/scripts.d/25-freetype.sh +++ b/scripts.d/25-freetype.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git" -SCRIPT_COMMIT="5c00a46805d6423fc45b4ba2c0f2e22dd0450d73" +SCRIPT_COMMIT="dec2743e6a2a40cddfc8a9892895cb4f861e1eeb" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh index c3fa95d..4d9581b 100755 --- a/scripts.d/25-xz.sh +++ b/scripts.d/25-xz.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/xz-mirror/xz.git" -SCRIPT_COMMIT="dbb3a536ed9873ffa0870321f6873e564c6a9da8" +SCRIPT_COMMIT="66bdcfa85fef2911cc80f5f30fed3f9610faccb4" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh index 2314d34..65c2f38 100755 --- a/scripts.d/45-harfbuzz.sh +++ b/scripts.d/45-harfbuzz.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git" -SCRIPT_COMMIT="a77f28286569b1d187aa7470a4721222a3fc44e7" +SCRIPT_COMMIT="73ee9c346f3acccbe14a4caf258b636de7c459be" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh index 10ea30a..1ad7bac 100755 --- a/scripts.d/45-vmaf.sh +++ b/scripts.d/45-vmaf.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/Netflix/vmaf.git" -SCRIPT_COMMIT="5ee0051cd7b1337e033558910c30525d73edfd76" +SCRIPT_COMMIT="98bdd77b296da207ab42c3113ec8f30de58db197" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-x11/10-xcbproto.sh b/scripts.d/45-x11/10-xcbproto.sh index ef95b9b..75dfd3d 100755 --- 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 diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh index fb0c61b..8d90f37 100755 --- 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="178c4fefd3b0b4be5e69274108b86a51f08ec3a6" +SCRIPT_COMMIT="af2b6dfab1616dc85be9c9b196e4c56d00447851" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh index 6f43a86..73ed13c 100755 --- a/scripts.d/50-amf.sh +++ b/scripts.d/50-amf.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git" -SCRIPT_COMMIT="bd5db31d3d8ea1fae7002dd903898599bdb7d97a" +SCRIPT_COMMIT="68f2396f1a55a5b12767f5433411bb4093ea65ed" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh index cb79cc0..89b526e 100755 --- a/scripts.d/50-aom.sh +++ b/scripts.d/50-aom.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://aomedia.googlesource.com/aom" -SCRIPT_COMMIT="7d637e1ccd859f9018ebff88911411685d3a3a2b" +SCRIPT_COMMIT="83ccc009eade321c8723ae0da8655fc68ce6a128" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-aribb24/25-libpng.sh b/scripts.d/50-aribb24/25-libpng.sh index 4c596a4..e7aa9ff 100755 --- a/scripts.d/50-aribb24/25-libpng.sh +++ b/scripts.d/50-aribb24/25-libpng.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/glennrp/libpng.git" -SCRIPT_COMMIT="8be5c147d567bf90553088305208e612abb16768" +SCRIPT_COMMIT="82414985c1085737bccd3eedb0aaa997451f5d32" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh index 7aaebe8..ca12597 100755 --- a/scripts.d/50-dav1d.sh +++ b/scripts.d/50-dav1d.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git" -SCRIPT_COMMIT="2373fda303d46489c1ec269dc66369a31663cb25" +SCRIPT_COMMIT="a7e12b628472516718d37108fde7d438b14a0372" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh index 0c52cc4..63862b5 100755 --- a/scripts.d/50-ffnvcodec.sh +++ b/scripts.d/50-ffnvcodec.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/FFmpeg/nv-codec-headers.git" -SCRIPT_COMMIT="9402b5a7693e9841f8a4f4488cd2df21ac55c685" +SCRIPT_COMMIT="855f8263d97bbdcaeabaaaa2997e1ccad7c52dc3" SCRIPT_REPO2="https://github.com/FFmpeg/nv-codec-headers.git" SCRIPT_COMMIT2="dc3e4484dc83485734e503991fe5ed3bdf256fba" diff --git a/scripts.d/50-kvazaar.sh b/scripts.d/50-kvazaar.sh index a045ea9..2ee1b5d 100755 --- a/scripts.d/50-kvazaar.sh +++ b/scripts.d/50-kvazaar.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/ultravideo/kvazaar.git" -SCRIPT_COMMIT="e001c6a867068b448354d955363bd2ff7caf33d2" +SCRIPT_COMMIT="aaae5b0f4926065136f287876c6bc41631bae692" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/45-brotli.sh b/scripts.d/50-libjxl/45-brotli.sh index f037940..717e814 100755 --- a/scripts.d/50-libjxl/45-brotli.sh +++ b/scripts.d/50-libjxl/45-brotli.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/google/brotli.git" -SCRIPT_COMMIT="1d8452b783dafd7e2acc0914919d38d46b861765" +SCRIPT_COMMIT="413b098564a90a2e6cae192d30642d33a9197a39" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh index 4be5db0..7af5a5c 100755 --- a/scripts.d/50-libjxl/50-libjxl.sh +++ b/scripts.d/50-libjxl/50-libjxl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libjxl/libjxl.git" -SCRIPT_COMMIT="b4369bdafa2901512aa6b0728a05a90c8fa314fc" +SCRIPT_COMMIT="c3a4f9ca89ae59c6265a2f1bf2a6d2a87a71fc16" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-librist/50-librist.sh b/scripts.d/50-librist/50-librist.sh index 9b7ee52..0b648ba 100755 --- a/scripts.d/50-librist/50-librist.sh +++ b/scripts.d/50-librist/50-librist.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/rist/librist.git" -SCRIPT_COMMIT="c917e970be95658411e249f6e4e7fc1eeea6fe99" +SCRIPT_COMMIT="04ba78abb6f8f673da0cc75056df876178e504fb" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh index a94e25e..9f4b611 100755 --- a/scripts.d/50-libssh.sh +++ b/scripts.d/50-libssh.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://git.libssh.org/projects/libssh.git" -SCRIPT_COMMIT="df0a445c87dc9678f23984141f6b396c72888972" +SCRIPT_COMMIT="a7f85944c8c04cd1aba1a122b766f5d04db51050" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh index be696ff..f16cc1e 100755 --- a/scripts.d/50-libvpx.sh +++ b/scripts.d/50-libvpx.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx" -SCRIPT_COMMIT="14e52008edbf2e91386423fdd53310fe49654991" +SCRIPT_COMMIT="b2c2955c8200ff434f178009df41a1e1e1623156" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh index e5306cf..2579d7e 100755 --- a/scripts.d/50-libwebp.sh +++ b/scripts.d/50-libwebp.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp" -SCRIPT_COMMIT="64819c7cf34350aafa9f2f0e3f5d5a444cb82d2a" +SCRIPT_COMMIT="eac3bd5c53da8bec55a635c6f4234c9cd5753820" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-zix.sh b/scripts.d/50-lilv/96-zix.sh index c6d56cc..534e224 100755 --- a/scripts.d/50-lilv/96-zix.sh +++ b/scripts.d/50-lilv/96-zix.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/drobilla/zix.git" -SCRIPT_COMMIT="a13ae5ad9dc70075740f11139f1db96cc79faa59" +SCRIPT_COMMIT="a5c18d52a5351430d370084f25aaf7d166f7afd5" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/98-sratom.sh b/scripts.d/50-lilv/98-sratom.sh index 2bc170a..d32e200 100755 --- a/scripts.d/50-lilv/98-sratom.sh +++ b/scripts.d/50-lilv/98-sratom.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/lv2/sratom.git" -SCRIPT_COMMIT="6805327a511242ce9697ccfb98be4569d8883e33" +SCRIPT_COMMIT="b97b447d77fbf172260b4b40f184959f59c3623e" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh index b2f3eda..d026da6 100755 --- a/scripts.d/50-lilv/99-lilv.sh +++ b/scripts.d/50-lilv/99-lilv.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/lv2/lilv.git" -SCRIPT_COMMIT="caad4f5554fd77b61a0907a67bab90bc656d86ad" +SCRIPT_COMMIT="54b32c1949d60225602a7161d5d6c4853230307a" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh index 0c1b47a..7da1fa1 100755 --- 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="a49b612ef470003ffb16ddc5e19c9a1984a71619" +SCRIPT_COMMIT="05f9ce8b978239cebecef1a60f0d451a118fa3df" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh index e7cf9e2..b3803f6 100755 --- a/scripts.d/50-openmpt.sh +++ b/scripts.d/50-openmpt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT" -SCRIPT_REV="19424" +SCRIPT_REV="19445" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh index 3eade10..eb8c37c 100755 --- 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="ba7ed562b01e47dcdb428a44edd0c26a61e8950c" +SCRIPT_COMMIT="5ec4f95d9fe1a9295fe8239e2860c8f84e5e2336" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh index 6ad0385..e3577c4 100755 --- 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="82dab93ecf44c9b1203289c0118760b7331b2156" +SCRIPT_COMMIT="1eddafd7a7c8b64e377d64ee5e87ead881a32a48" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh index d8c1434..bf6b0c2 100755 --- 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="ceece918e4ebe7adfe80ee35a0a4a928c0018252" +SCRIPT_COMMIT="e16a83d393ae1784040519f42c482e2641b971a2" SCRIPT_BRANCH="SDL2" ffbuild_enabled() { diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh index b45b942..d40e9da 100755 --- a/scripts.d/50-srt.sh +++ b/scripts.d/50-srt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/Haivision/srt.git" -SCRIPT_COMMIT="9448e26fcd7602098b4bf9cd7fe535136e89e10b" +SCRIPT_COMMIT="61c7bedf27a2edbcf6e6fdc179612980bae53c6a" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh index bbc9873..f2b3d4c 100755 --- a/scripts.d/50-vaapi/40-libdrm.sh +++ b/scripts.d/50-vaapi/40-libdrm.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git" -SCRIPT_COMMIT="98e1db501173303e58ef6a1def94ab7a2d84afc1" +SCRIPT_COMMIT="7d7a9901bd67cf5b1ce07e5d237a82e13e9fb500" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh index 78bac1d..ed3d88f 100755 --- a/scripts.d/50-vaapi/50-libva.sh +++ b/scripts.d/50-vaapi/50-libva.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/intel/libva.git" -SCRIPT_COMMIT="1c58941b93ba5013c68e8370a408efd630275c9c" +SCRIPT_COMMIT="984dfee4177021c400367f5dffc0776a6dd745dc" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh index 13e6622..c1a718b 100755 --- a/scripts.d/50-vulkan/45-vulkan.sh +++ b/scripts.d/50-vulkan/45-vulkan.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git" -SCRIPT_COMMIT="v1.3.254" +SCRIPT_COMMIT="v1.3.257" SCRIPT_TAGFILTER="v?.*.*" ffbuild_enabled() { diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh index 9f282ac..576dc37 100755 --- a/scripts.d/50-vulkan/50-shaderc.sh +++ b/scripts.d/50-vulkan/50-shaderc.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/google/shaderc.git" -SCRIPT_COMMIT="4dc596ddc2702092c670e828745dc3e0338d83c1" +SCRIPT_COMMIT="e31c4c2e41544d63d90be28c46e4a4793a624240" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh index e5f30ba..f5d189c 100755 --- a/scripts.d/50-vulkan/55-spirv-cross.sh +++ b/scripts.d/50-vulkan/55-spirv-cross.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git" -SCRIPT_COMMIT="2d3a152081ca6e6bea7093940d0f81088fe4d01c" +SCRIPT_COMMIT="b8e742c91ba47eb3238c939ee11ec9ba2ba247bf" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh index b8d74e7..0987426 100755 --- a/scripts.d/50-vulkan/60-libplacebo.sh +++ b/scripts.d/50-vulkan/60-libplacebo.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git" -SCRIPT_COMMIT="d25b82b7dbf961d25d510bed6198ad3f24a7ec27" +SCRIPT_COMMIT="b959cab8b859dc53a6dbd26c050be0b3883114c8" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh index c7ad259..0e026de 100755 --- a/scripts.d/50-x265.sh +++ b/scripts.d/50-x265.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git" -SCRIPT_COMMIT="34532bda12a3a3141880582aa186a59cd4538ae6" +SCRIPT_COMMIT="8f18e3ad32684eee95e885e718655f93951128c3" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh index 9b9b80b..49bc5bb 100755 --- a/scripts.d/50-zimg.sh +++ b/scripts.d/50-zimg.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/sekrit-twc/zimg.git" -SCRIPT_COMMIT="939a78cae6a8207ef778375dfcaa75511162a186" +SCRIPT_COMMIT="ec0c604a9e29dd144b0bb1fb0974ac3b398fc18b" ffbuild_enabled() { return 0 From 49684930d271d0f7765d7a197d261a90d093d508 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sat, 8 Jul 2023 18:30:19 +0200 Subject: [PATCH 43/66] Jxl has a new submodule --- scripts.d/50-libjxl/50-libjxl.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh index 7af5a5c..0a4e691 100755 --- a/scripts.d/50-libjxl/50-libjxl.sh +++ b/scripts.d/50-libjxl/50-libjxl.sh @@ -11,7 +11,7 @@ ffbuild_enabled() { 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" + to_df "RUN git -C \"$SELF\" submodule update --init --recursive --depth 1 --recommend-shallow third_party/highway third_party/skcms third_party/libjpeg-turbo" } ffbuild_dockerbuild() { From 6c86fdaad04c6908de8175a5015affe457517a95 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sat, 8 Jul 2023 19:09:14 +0200 Subject: [PATCH 44/66] Downgrade libjxl, they removed deprecated stuff --- scripts.d/50-libjxl/50-libjxl.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh index 0a4e691..6d7645a 100755 --- a/scripts.d/50-libjxl/50-libjxl.sh +++ b/scripts.d/50-libjxl/50-libjxl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libjxl/libjxl.git" -SCRIPT_COMMIT="c3a4f9ca89ae59c6265a2f1bf2a6d2a87a71fc16" +SCRIPT_COMMIT="5f3cc36bca9e43cf78aa5b819b74b387c638cac5" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 @@ -11,7 +11,7 @@ ffbuild_enabled() { 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 third_party/libjpeg-turbo" + to_df "RUN git -C \"$SELF\" submodule update --init --recursive --depth 1 --recommend-shallow third_party/highway third_party/skcms" } ffbuild_dockerbuild() { @@ -30,7 +30,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 From a7ae13efb77f33f645f4faa2143cf1431393aef0 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sat, 8 Jul 2023 20:11:09 +0200 Subject: [PATCH 45/66] Fix cache invalidation on commit update --- scripts.d/20-libiconv.sh | 3 +-- scripts.d/45-pulseaudio.sh | 3 +-- scripts.d/50-davs2.sh | 3 +-- scripts.d/50-gme.sh | 3 +-- scripts.d/50-svtav1.sh | 3 +-- scripts.d/50-uavs3d.sh | 3 +-- scripts.d/50-x265.sh | 3 +-- scripts.d/50-xavs2.sh | 3 +-- 8 files changed, 8 insertions(+), 16 deletions(-) diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh index ebadb7d..f6d09f7 100755 --- a/scripts.d/20-libiconv.sh +++ b/scripts.d/20-libiconv.sh @@ -8,8 +8,7 @@ ffbuild_enabled() { } ffbuild_dockerdl() { - to_df "RUN retry-tool sh -c \"rm -rf $SELF && git clone '$SCRIPT_REPO' $SELF\"" - to_df "RUN git -C $SELF checkout \"$SCRIPT_COMMIT\"" + to_df "RUN retry-tool sh -c \"rm -rf $SELF && git clone '$SCRIPT_REPO' $SELF\" && git -C $SELF checkout \"$SCRIPT_COMMIT\"" } ffbuild_dockerbuild() { diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh index e4d5761..356b6be 100755 --- a/scripts.d/45-pulseaudio.sh +++ b/scripts.d/45-pulseaudio.sh @@ -9,8 +9,7 @@ ffbuild_enabled() { } ffbuild_dockerdl() { - to_df "RUN git clone --filter=blob:none \"$SCRIPT_REPO\" \"$SELF\"" - to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\"" + to_df "RUN git clone --filter=blob:none \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\"" } ffbuild_dockerbuild() { diff --git a/scripts.d/50-davs2.sh b/scripts.d/50-davs2.sh index 8a3e778..1e4cd15 100755 --- a/scripts.d/50-davs2.sh +++ b/scripts.d/50-davs2.sh @@ -12,8 +12,7 @@ ffbuild_enabled() { } ffbuild_dockerdl() { - to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\"" - to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\"" + to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\"" } ffbuild_dockerbuild() { diff --git a/scripts.d/50-gme.sh b/scripts.d/50-gme.sh index 015cfae..e580cd4 100755 --- a/scripts.d/50-gme.sh +++ b/scripts.d/50-gme.sh @@ -8,8 +8,7 @@ ffbuild_enabled() { } ffbuild_dockerdl() { - to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\"" - to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\"" + to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\"" } ffbuild_dockerbuild() { diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh index 5ec307c..66b6600 100755 --- a/scripts.d/50-svtav1.sh +++ b/scripts.d/50-svtav1.sh @@ -9,8 +9,7 @@ ffbuild_enabled() { } ffbuild_dockerdl() { - to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\"" - to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\"" + to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\"" } ffbuild_dockerbuild() { diff --git a/scripts.d/50-uavs3d.sh b/scripts.d/50-uavs3d.sh index c6d4573..38e56bd 100755 --- a/scripts.d/50-uavs3d.sh +++ b/scripts.d/50-uavs3d.sh @@ -9,8 +9,7 @@ ffbuild_enabled() { } ffbuild_dockerdl() { - to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\"" - to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\"" + to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\"" } ffbuild_dockerbuild() { diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh index 0e026de..14bc515 100755 --- a/scripts.d/50-x265.sh +++ b/scripts.d/50-x265.sh @@ -9,8 +9,7 @@ ffbuild_enabled() { } ffbuild_dockerdl() { - to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\"" - to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\"" + to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\"" } ffbuild_dockerbuild() { diff --git a/scripts.d/50-xavs2.sh b/scripts.d/50-xavs2.sh index ffcde84..36b1e65 100755 --- a/scripts.d/50-xavs2.sh +++ b/scripts.d/50-xavs2.sh @@ -12,8 +12,7 @@ ffbuild_enabled() { } ffbuild_dockerdl() { - to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\"" - to_df "RUN git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\"" + to_df "RUN git clone \"$SCRIPT_REPO\" \"$SELF\" && git -C \"$SELF\" checkout \"$SCRIPT_COMMIT\"" } ffbuild_dockerbuild() { From 7a5bf0c0bb23d2b367f00fde3e7dd8665d3c4f2f Mon Sep 17 00:00:00 2001 From: BtbN Date: Sun, 9 Jul 2023 19:44:10 +0200 Subject: [PATCH 46/66] Switch to gmplib github mirror --- scripts.d/25-gmp.sh | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/scripts.d/25-gmp.sh b/scripts.d/25-gmp.sh index 8f7b1c9..3884ce6 100755 --- a/scripts.d/25-gmp.sh +++ b/scripts.d/25-gmp.sh @@ -1,20 +1,16 @@ #!/bin/bash -SCRIPT_VERSION="6.2.1" -SCRIPT_SHA512="c99be0950a1d05a0297d65641dd35b75b74466f7bf03c9e8a99895a3b2f9a0856cd17887738fa51cf7499781b65c049769271cbcb77d057d2e9f1ec52e07dd84" -SCRIPT_URL="https://ftp.gnu.org/gnu/gmp/gmp-${SCRIPT_VERSION}.tar.xz" +SCRIPT_REPO="https://github.com/BtbN/gmplib.git" +SCRIPT_COMMIT="1d7f62515fc8f5109fabace9592d863417f17c37" ffbuild_enabled() { return 0 } -ffbuild_dockerdl() { - to_df "RUN retry-tool check-wget gmp.tar.xz \"$SCRIPT_URL\" \"$SCRIPT_SHA512\"" -} - ffbuild_dockerbuild() { - tar xaf "$FFBUILD_DLDIR"/gmp.tar.xz - cd "gmp-$SCRIPT_VERSION" + cd "$FFBUILD_DLDIR/$SELF" + + ./.bootstrap local myconf=( --prefix="$FFBUILD_PREFIX" From 683e3a4dc9084673f7ea53f94b98a9895f89c811 Mon Sep 17 00:00:00 2001 From: BtbN Date: Mon, 10 Jul 2023 22:40:41 +0200 Subject: [PATCH 47/66] Bump libjxl --- scripts.d/50-libjxl/50-libjxl.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh index 6d7645a..adbcf6a 100755 --- a/scripts.d/50-libjxl/50-libjxl.sh +++ b/scripts.d/50-libjxl/50-libjxl.sh @@ -1,11 +1,13 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libjxl/libjxl.git" -SCRIPT_COMMIT="5f3cc36bca9e43cf78aa5b819b74b387c638cac5" +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 } From 2fe73c5aaba608f77060effde14732f7c2aef78b Mon Sep 17 00:00:00 2001 From: BtbN Date: Thu, 20 Jul 2023 15:29:46 +0200 Subject: [PATCH 48/66] Bump avisynth --- scripts.d/50-avisynth.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh index 6c5af1c..699250d 100755 --- 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="ad0d546cd2fd5eadf3b4d29df24bf3f6713d9707" +SCRIPT_COMMIT="fc5b9bc41fd47001b7da39ea777d29c0ede2a2a7" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 From c07b573acd10e813c500ed50f4ceeee9cd819b04 Mon Sep 17 00:00:00 2001 From: BtbN Date: Thu, 20 Jul 2023 15:54:19 +0200 Subject: [PATCH 49/66] Avisynth insist on a tag to exist --- scripts.d/50-avisynth.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts.d/50-avisynth.sh b/scripts.d/50-avisynth.sh index 699250d..4978378 100755 --- a/scripts.d/50-avisynth.sh +++ b/scripts.d/50-avisynth.sh @@ -11,6 +11,9 @@ ffbuild_enabled() { ffbuild_dockerbuild() { cd "$FFBUILD_DLDIR/$SELF" + # their version check is insistant on a tag to exist, so make one + git tag -a ffbuild -m "FFbuild Version" + mkdir build && cd build cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DHEADERS_ONLY=ON .. From 336c8909c8640e90a3f994dfdde209e040189938 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sat, 22 Jul 2023 15:46:55 +0200 Subject: [PATCH 50/66] Don't depend on zip Closes #284 --- build.sh | 4 ++-- images/base/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index 80ec56a..532535a 100755 --- 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 - diff --git a/images/base/Dockerfile b/images/base/Dockerfile index 4d191e8..9725cf4 100644 --- a/images/base/Dockerfile +++ b/images/base/Dockerfile @@ -8,7 +8,7 @@ RUN \ 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 \ From 0a5e19d524d224bfc3ee1d9678ae562bae4265b7 Mon Sep 17 00:00:00 2001 From: BtbN Date: Tue, 25 Jul 2023 14:39:11 +0200 Subject: [PATCH 51/66] Move iconv submodule fetch to cache --- scripts.d/20-libiconv.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh index f6d09f7..6303f14 100755 --- a/scripts.d/20-libiconv.sh +++ b/scripts.d/20-libiconv.sh @@ -9,12 +9,12 @@ ffbuild_enabled() { ffbuild_dockerdl() { to_df "RUN retry-tool sh -c \"rm -rf $SELF && git clone '$SCRIPT_REPO' $SELF\" && git -C $SELF checkout \"$SCRIPT_COMMIT\"" + to_df "RUN cd $SELF && retry-tool ./autopull.sh --one-time" } ffbuild_dockerbuild() { cd "$FFBUILD_DLDIR/$SELF" - retry-tool ./autopull.sh --one-time (unset CC CFLAGS GMAKE && ./autogen.sh) local myconf=( From d6558a3efad5138cf883fde16e2bcdc31a1e1bb7 Mon Sep 17 00:00:00 2001 From: BtbN Date: Thu, 17 Aug 2023 18:33:19 +0200 Subject: [PATCH 52/66] Update dependencies --- scripts.d/10-mingw-std-threads.sh | 2 +- scripts.d/10-mingw.sh | 2 +- scripts.d/20-libxml2.sh | 2 +- scripts.d/20-zlib.sh | 2 +- scripts.d/25-fftw3.sh | 2 +- scripts.d/25-freetype.sh | 2 +- scripts.d/25-gmp.sh | 2 +- scripts.d/25-openssl.sh | 2 +- scripts.d/25-xz.sh | 2 +- scripts.d/35-fontconfig.sh | 2 +- scripts.d/45-harfbuzz.sh | 2 +- scripts.d/45-pulseaudio.sh | 2 +- scripts.d/45-vmaf.sh | 2 +- scripts.d/45-x11/10-xcbproto.sh | 2 +- scripts.d/45-x11/10-xproto.sh | 2 +- scripts.d/45-x11/20-libxau.sh | 2 +- scripts.d/45-x11/30-libxcb.sh | 2 +- scripts.d/45-x11/40-libx11.sh | 2 +- scripts.d/45-x11/50-libxi.sh | 2 +- scripts.d/45-x11/60-libxcursor.sh | 2 +- scripts.d/50-amf.sh | 2 +- scripts.d/50-aom.sh | 2 +- scripts.d/50-aribb24/25-libpng.sh | 2 +- scripts.d/50-dav1d.sh | 2 +- scripts.d/50-frei0r.sh | 2 +- scripts.d/50-kvazaar.sh | 2 +- scripts.d/50-libass.sh | 2 +- scripts.d/50-libjxl/45-brotli.sh | 2 +- scripts.d/50-libjxl/50-libjxl.sh | 2 +- scripts.d/50-librist/40-mbedtls.sh | 2 +- scripts.d/50-librist/50-librist.sh | 2 +- scripts.d/50-libssh.sh | 2 +- scripts.d/50-libvpx.sh | 2 +- scripts.d/50-libwebp.sh | 2 +- scripts.d/50-onevpl.sh | 2 +- scripts.d/50-openal.sh | 2 +- scripts.d/50-openmpt.sh | 2 +- scripts.d/50-rav1e.sh | 2 +- scripts.d/50-rubberband.sh | 2 +- scripts.d/50-sdl.sh | 2 +- scripts.d/50-srt.sh | 2 +- scripts.d/50-svtav1.sh | 2 +- scripts.d/50-vaapi/30-libpciaccess.sh | 2 +- scripts.d/50-vaapi/40-libdrm.sh | 2 +- scripts.d/50-vaapi/50-libva.sh | 2 +- scripts.d/50-vulkan/45-vulkan.sh | 2 +- scripts.d/50-vulkan/50-shaderc.sh | 2 +- scripts.d/50-vulkan/55-spirv-cross.sh | 2 +- scripts.d/50-vulkan/60-libplacebo.sh | 2 +- scripts.d/50-zimg.sh | 2 +- 50 files changed, 50 insertions(+), 50 deletions(-) diff --git a/scripts.d/10-mingw-std-threads.sh b/scripts.d/10-mingw-std-threads.sh index d1ced26..135a614 100755 --- a/scripts.d/10-mingw-std-threads.sh +++ b/scripts.d/10-mingw-std-threads.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/meganz/mingw-std-threads.git" -SCRIPT_COMMIT="6c2061b7da41d6aa1b2162ff4383ec3ece864bc6" +SCRIPT_COMMIT="c931bac289dd431f1dd30fc4a5d1a7be36668073" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh index d0a6546..f720c0c 100755 --- a/scripts.d/10-mingw.sh +++ b/scripts.d/10-mingw.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://git.code.sf.net/p/mingw-w64/mingw-w64.git" -SCRIPT_COMMIT="3638d5e9a6f28354bc3e18f04ba0d97e2cc3b44c" +SCRIPT_COMMIT="e89de847dd3e05bb8e46344378ce3e124f4e7d1c" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh index 40dfe1b..b5799f4 100755 --- a/scripts.d/20-libxml2.sh +++ b/scripts.d/20-libxml2.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.gnome.org/GNOME/libxml2.git" -SCRIPT_COMMIT="884474477284474e0151280aaa275a18e3d7a036" +SCRIPT_COMMIT="9d80a2b134e7d681940e8e29f20922a0acf22e46" ffbuild_enabled() { return 0 diff --git a/scripts.d/20-zlib.sh b/scripts.d/20-zlib.sh index b9f4d5c..e52f0f4 100755 --- a/scripts.d/20-zlib.sh +++ b/scripts.d/20-zlib.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/madler/zlib.git" -SCRIPT_COMMIT="04f42ceca40f73e2978b50e93806c2a18c1281fc" +SCRIPT_COMMIT="d98251478246c8ef2f405d76e4ef1678c14d7eda" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-fftw3.sh b/scripts.d/25-fftw3.sh index ede5622..f8a7625 100755 --- a/scripts.d/25-fftw3.sh +++ b/scripts.d/25-fftw3.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/FFTW/fftw3.git" -SCRIPT_COMMIT="69f6c1a6ebd7ac5af33e7074134fb79fbc729c3d" +SCRIPT_COMMIT="38ea230e25e69e7a3f35b957b815bac4f9aa22b0" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh index bcb52ed..45b6019 100755 --- a/scripts.d/25-freetype.sh +++ b/scripts.d/25-freetype.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git" -SCRIPT_COMMIT="dec2743e6a2a40cddfc8a9892895cb4f861e1eeb" +SCRIPT_COMMIT="a20de84e1608f9eb1d0391d7322b2e0e0f235aba" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-gmp.sh b/scripts.d/25-gmp.sh index 3884ce6..0c39466 100755 --- a/scripts.d/25-gmp.sh +++ b/scripts.d/25-gmp.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/BtbN/gmplib.git" -SCRIPT_COMMIT="1d7f62515fc8f5109fabace9592d863417f17c37" +SCRIPT_COMMIT="d8c52e7b0ee334ab52406972d26b06cca1a78d46" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh index 63131eb..1ac7682 100755 --- a/scripts.d/25-openssl.sh +++ b/scripts.d/25-openssl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/openssl/openssl.git" -SCRIPT_COMMIT="openssl-3.0.9" +SCRIPT_COMMIT="openssl-3.0.10" SCRIPT_TAGFILTER="openssl-3.0.*" ffbuild_enabled() { diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh index 4d9581b..e6d01bc 100755 --- a/scripts.d/25-xz.sh +++ b/scripts.d/25-xz.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/xz-mirror/xz.git" -SCRIPT_COMMIT="66bdcfa85fef2911cc80f5f30fed3f9610faccb4" +SCRIPT_COMMIT="16068f6c30b888cdb873f6285af941d00f95741d" ffbuild_enabled() { return 0 diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh index aba3f20..80343ce 100755 --- a/scripts.d/35-fontconfig.sh +++ b/scripts.d/35-fontconfig.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git" -SCRIPT_COMMIT="7e2a1b2577e8d90ea5be3f14091e809ac7742438" +SCRIPT_COMMIT="5d954398d1ebe04778a945d5c1546d9dbfb8e031" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh index 65c2f38..d62d8f6 100755 --- a/scripts.d/45-harfbuzz.sh +++ b/scripts.d/45-harfbuzz.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git" -SCRIPT_COMMIT="73ee9c346f3acccbe14a4caf258b636de7c459be" +SCRIPT_COMMIT="c7f2d440f463be31ae24cbae7ceb6ea72a15e990" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh index 356b6be..0278b2d 100755 --- a/scripts.d/45-pulseaudio.sh +++ b/scripts.d/45-pulseaudio.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git" -SCRIPT_COMMIT="e96d278bfc514f290b60c9e924fabc1c772e1689" +SCRIPT_COMMIT="421cf15486eea1b52f10e2b0be305018fee8c285" ffbuild_enabled() { [[ $TARGET == linux* ]] || return 1 diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh index 1ad7bac..b092ff2 100755 --- a/scripts.d/45-vmaf.sh +++ b/scripts.d/45-vmaf.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/Netflix/vmaf.git" -SCRIPT_COMMIT="98bdd77b296da207ab42c3113ec8f30de58db197" +SCRIPT_COMMIT="4c08f00bde5b2fa70e4b4f88c23c3aac2043e4f0" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-x11/10-xcbproto.sh b/scripts.d/45-x11/10-xcbproto.sh index 75dfd3d..832737e 100755 --- a/scripts.d/45-x11/10-xcbproto.sh +++ b/scripts.d/45-x11/10-xcbproto.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xcbproto.git" -SCRIPT_COMMIT="91178913c25b19e0457cdf6d21e00e6a613823e2" +SCRIPT_COMMIT="98eeebfc2d7db5377b85437418fb942ea30ffc0d" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/10-xproto.sh b/scripts.d/45-x11/10-xproto.sh index e0e1428..f918ea7 100755 --- a/scripts.d/45-x11/10-xproto.sh +++ b/scripts.d/45-x11/10-xproto.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/proto/xorgproto.git" -SCRIPT_COMMIT="766967322209f2dcb72e6a8edea0c651f586201d" +SCRIPT_COMMIT="704a75eecdf177a8b18ad7e35813f2f979b0c277" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/20-libxau.sh b/scripts.d/45-x11/20-libxau.sh index 19d9fde..3832bfe 100755 --- a/scripts.d/45-x11/20-libxau.sh +++ b/scripts.d/45-x11/20-libxau.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxau.git" -SCRIPT_COMMIT="df1bf4fe528a5a9eef420f78efb225e4696ac467" +SCRIPT_COMMIT="aec9d7266777e0b9243ef0f112fe0e07256bd446" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/30-libxcb.sh b/scripts.d/45-x11/30-libxcb.sh index 588568d..975807b 100755 --- a/scripts.d/45-x11/30-libxcb.sh +++ b/scripts.d/45-x11/30-libxcb.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git" -SCRIPT_COMMIT="8935793f1f3751a6aa9d78955c7d6236177986de" +SCRIPT_COMMIT="cc4b93c9cd93bad15b7106747b0213e4b9c53a1c" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh index 8d90f37..914f4bf 100755 --- a/scripts.d/45-x11/40-libx11.sh +++ b/scripts.d/45-x11/40-libx11.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libx11.git" -SCRIPT_COMMIT="af2b6dfab1616dc85be9c9b196e4c56d00447851" +SCRIPT_COMMIT="70f44d76fd8fad96f33ba5c80a394d68b77dda03" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/50-libxi.sh b/scripts.d/45-x11/50-libxi.sh index f979476..3226fa9 100755 --- a/scripts.d/45-x11/50-libxi.sh +++ b/scripts.d/45-x11/50-libxi.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxi.git" -SCRIPT_COMMIT="3a7503ec7703f10de17c622ea22b7bff736cea74" +SCRIPT_COMMIT="09f3eb570fe79bfc0c430b6059d7b4acaf371c24" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/60-libxcursor.sh b/scripts.d/45-x11/60-libxcursor.sh index eaa36f8..3de4576 100755 --- a/scripts.d/45-x11/60-libxcursor.sh +++ b/scripts.d/45-x11/60-libxcursor.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcursor.git" -SCRIPT_COMMIT="a353f02a7ac4504ad5edb5407278c7a03c507aef" +SCRIPT_COMMIT="9c1b50ed98d354488329c99bc8bf77d1c6df657c" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-amf.sh b/scripts.d/50-amf.sh index 73ed13c..440dd9a 100755 --- a/scripts.d/50-amf.sh +++ b/scripts.d/50-amf.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git" -SCRIPT_COMMIT="68f2396f1a55a5b12767f5433411bb4093ea65ed" +SCRIPT_COMMIT="2f326350e849894a929296854f5290e66197c97c" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh index 89b526e..31ee786 100755 --- a/scripts.d/50-aom.sh +++ b/scripts.d/50-aom.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://aomedia.googlesource.com/aom" -SCRIPT_COMMIT="83ccc009eade321c8723ae0da8655fc68ce6a128" +SCRIPT_COMMIT="5a4ea09dc1f1767d9b5923f7a8f582d8820bbfa5" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-aribb24/25-libpng.sh b/scripts.d/50-aribb24/25-libpng.sh index e7aa9ff..6bdc99d 100755 --- a/scripts.d/50-aribb24/25-libpng.sh +++ b/scripts.d/50-aribb24/25-libpng.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/glennrp/libpng.git" -SCRIPT_COMMIT="82414985c1085737bccd3eedb0aaa997451f5d32" +SCRIPT_COMMIT="f8e5fa92b0e37ab597616f554bee254157998227" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh index ca12597..82deec4 100755 --- a/scripts.d/50-dav1d.sh +++ b/scripts.d/50-dav1d.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git" -SCRIPT_COMMIT="a7e12b628472516718d37108fde7d438b14a0372" +SCRIPT_COMMIT="e58afe4dd9057591882a01c31382c203e8a61c92" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-frei0r.sh b/scripts.d/50-frei0r.sh index ae465f4..54de218 100755 --- a/scripts.d/50-frei0r.sh +++ b/scripts.d/50-frei0r.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/dyne/frei0r.git" -SCRIPT_COMMIT="c3f987c4cc8c1a7f6928e574f4cb272a7770ca6f" +SCRIPT_COMMIT="49f759d9e153a4e2850127e368f7aa6f40d59aaf" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-kvazaar.sh b/scripts.d/50-kvazaar.sh index 2ee1b5d..c93254c 100755 --- a/scripts.d/50-kvazaar.sh +++ b/scripts.d/50-kvazaar.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/ultravideo/kvazaar.git" -SCRIPT_COMMIT="aaae5b0f4926065136f287876c6bc41631bae692" +SCRIPT_COMMIT="aab6aa9b349d2768f9371ef58680298c200e47e6" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh index e418f67..6acad8d 100755 --- a/scripts.d/50-libass.sh +++ b/scripts.d/50-libass.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libass/libass.git" -SCRIPT_COMMIT="1a599b1db748dfc07df98cd37d8603edb87da2fd" +SCRIPT_COMMIT="91422bdb9497e8484b3248f5ae7eb50d41e2555d" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/45-brotli.sh b/scripts.d/50-libjxl/45-brotli.sh index 717e814..f89ece0 100755 --- a/scripts.d/50-libjxl/45-brotli.sh +++ b/scripts.d/50-libjxl/45-brotli.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/google/brotli.git" -SCRIPT_COMMIT="413b098564a90a2e6cae192d30642d33a9197a39" +SCRIPT_COMMIT="0f2157cc5e7f6a28bf648738c208ca825917589a" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh index adbcf6a..ec60456 100755 --- a/scripts.d/50-libjxl/50-libjxl.sh +++ b/scripts.d/50-libjxl/50-libjxl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libjxl/libjxl.git" -SCRIPT_COMMIT="c3a4f9ca89ae59c6265a2f1bf2a6d2a87a71fc16" +SCRIPT_COMMIT="06ce6cb513c442bfe9a0a9ad7df0d6d5f17dc07d" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-librist/40-mbedtls.sh b/scripts.d/50-librist/40-mbedtls.sh index 404abda..cb03ec0 100755 --- a/scripts.d/50-librist/40-mbedtls.sh +++ b/scripts.d/50-librist/40-mbedtls.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/ARMmbed/mbedtls.git" -SCRIPT_COMMIT="v3.4.0" +SCRIPT_COMMIT="v3.4.1" SCRIPT_TAGFILTER="v3.*" ffbuild_enabled() { diff --git a/scripts.d/50-librist/50-librist.sh b/scripts.d/50-librist/50-librist.sh index 0b648ba..ccdf413 100755 --- a/scripts.d/50-librist/50-librist.sh +++ b/scripts.d/50-librist/50-librist.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/rist/librist.git" -SCRIPT_COMMIT="04ba78abb6f8f673da0cc75056df876178e504fb" +SCRIPT_COMMIT="cda5bf5800be9f14ab3f2185fc47efb81ae09241" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh index 9f4b611..0ede185 100755 --- a/scripts.d/50-libssh.sh +++ b/scripts.d/50-libssh.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://git.libssh.org/projects/libssh.git" -SCRIPT_COMMIT="a7f85944c8c04cd1aba1a122b766f5d04db51050" +SCRIPT_COMMIT="a71e2f8f3747a1224e30d94a902dfcdb668b3f60" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh index f16cc1e..1116f39 100755 --- a/scripts.d/50-libvpx.sh +++ b/scripts.d/50-libvpx.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx" -SCRIPT_COMMIT="b2c2955c8200ff434f178009df41a1e1e1623156" +SCRIPT_COMMIT="e7bfd8b6c230a6824e7fd1efa2378a7322986128" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh index 2579d7e..e0fc1df 100755 --- a/scripts.d/50-libwebp.sh +++ b/scripts.d/50-libwebp.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp" -SCRIPT_COMMIT="eac3bd5c53da8bec55a635c6f4234c9cd5753820" +SCRIPT_COMMIT="aac5c5d0df942ad12e4f026eed4603a2ffdebe3c" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-onevpl.sh b/scripts.d/50-onevpl.sh index 1e6aee5..7493154 100755 --- a/scripts.d/50-onevpl.sh +++ b/scripts.d/50-onevpl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/oneapi-src/oneVPL.git" -SCRIPT_COMMIT="e12ace9761bb52786409e830f619916b86e87fc5" +SCRIPT_COMMIT="ca5bbbb057a6e84b103aca807612afb693ad046c" ffbuild_enabled() { [[ $TARGET == *arm64 ]] && return -1 diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh index 7da1fa1..762cfb2 100755 --- a/scripts.d/50-openal.sh +++ b/scripts.d/50-openal.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/kcat/openal-soft.git" -SCRIPT_COMMIT="05f9ce8b978239cebecef1a60f0d451a118fa3df" +SCRIPT_COMMIT="188a637c70019108d980f72b8521673b5648d19e" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh index b3803f6..39186fd 100755 --- a/scripts.d/50-openmpt.sh +++ b/scripts.d/50-openmpt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT" -SCRIPT_REV="19445" +SCRIPT_REV="19586" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-rav1e.sh b/scripts.d/50-rav1e.sh index eb8c37c..ef545c5 100755 --- a/scripts.d/50-rav1e.sh +++ b/scripts.d/50-rav1e.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/xiph/rav1e.git" -SCRIPT_COMMIT="5ec4f95d9fe1a9295fe8239e2860c8f84e5e2336" +SCRIPT_COMMIT="f8b95d97517a6e223f1c6a90a467188586dd090f" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/scripts.d/50-rubberband.sh b/scripts.d/50-rubberband.sh index e3577c4..dcf7bdf 100755 --- a/scripts.d/50-rubberband.sh +++ b/scripts.d/50-rubberband.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/breakfastquay/rubberband.git" -SCRIPT_COMMIT="1eddafd7a7c8b64e377d64ee5e87ead881a32a48" +SCRIPT_COMMIT="6cd48ab2c711eb32da25fd1953d6f7f1d5e2cba3" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh index bf6b0c2..b0289c0 100755 --- 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="e16a83d393ae1784040519f42c482e2641b971a2" +SCRIPT_COMMIT="0b9d8e679a26ee98bb055efd244c703b7dda8727" SCRIPT_BRANCH="SDL2" ffbuild_enabled() { diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh index d40e9da..8d90543 100755 --- a/scripts.d/50-srt.sh +++ b/scripts.d/50-srt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/Haivision/srt.git" -SCRIPT_COMMIT="61c7bedf27a2edbcf6e6fdc179612980bae53c6a" +SCRIPT_COMMIT="33a620bb3eb56ebcb14755b62ffb92466563aae5" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh index 66b6600..1cf1949 100755 --- a/scripts.d/50-svtav1.sh +++ b/scripts.d/50-svtav1.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git" -SCRIPT_COMMIT="08c18ba0768ed3dbbff0903adc326fb3a7549bd9" +SCRIPT_COMMIT="903ff3add82744d586295c37ec1241dc51dab16e" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/scripts.d/50-vaapi/30-libpciaccess.sh b/scripts.d/50-vaapi/30-libpciaccess.sh index 83dfbc2..9efdcf1 100755 --- a/scripts.d/50-vaapi/30-libpciaccess.sh +++ b/scripts.d/50-vaapi/30-libpciaccess.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libpciaccess.git" -SCRIPT_COMMIT="8980a39004b10298a7db1f1b0b711a19e8b73aee" +SCRIPT_COMMIT="03d0b467804bf033c2be259be3f091231f74cff9" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh index f2b3d4c..ce1f321 100755 --- a/scripts.d/50-vaapi/40-libdrm.sh +++ b/scripts.d/50-vaapi/40-libdrm.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git" -SCRIPT_COMMIT="7d7a9901bd67cf5b1ce07e5d237a82e13e9fb500" +SCRIPT_COMMIT="3bc3cca230c5a064b2f554f26fdec27db0f5ead8" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh index ed3d88f..ff30ab0 100755 --- a/scripts.d/50-vaapi/50-libva.sh +++ b/scripts.d/50-vaapi/50-libva.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/intel/libva.git" -SCRIPT_COMMIT="984dfee4177021c400367f5dffc0776a6dd745dc" +SCRIPT_COMMIT="7d6c7d482b9d2330b1f3a8bac13a6a3205f33382" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh index c1a718b..ebf53d7 100755 --- a/scripts.d/50-vulkan/45-vulkan.sh +++ b/scripts.d/50-vulkan/45-vulkan.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git" -SCRIPT_COMMIT="v1.3.257" +SCRIPT_COMMIT="v1.3.261" SCRIPT_TAGFILTER="v?.*.*" ffbuild_enabled() { diff --git a/scripts.d/50-vulkan/50-shaderc.sh b/scripts.d/50-vulkan/50-shaderc.sh index 576dc37..f07bc24 100755 --- a/scripts.d/50-vulkan/50-shaderc.sh +++ b/scripts.d/50-vulkan/50-shaderc.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/google/shaderc.git" -SCRIPT_COMMIT="e31c4c2e41544d63d90be28c46e4a4793a624240" +SCRIPT_COMMIT="e166325b24d79d64bfa47065328890ce116ea642" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh index f5d189c..5b80c14 100755 --- a/scripts.d/50-vulkan/55-spirv-cross.sh +++ b/scripts.d/50-vulkan/55-spirv-cross.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git" -SCRIPT_COMMIT="b8e742c91ba47eb3238c939ee11ec9ba2ba247bf" +SCRIPT_COMMIT="633dc301350952a9a895c8db42eed371ea969a64" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh index 0987426..4110575 100755 --- a/scripts.d/50-vulkan/60-libplacebo.sh +++ b/scripts.d/50-vulkan/60-libplacebo.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git" -SCRIPT_COMMIT="b959cab8b859dc53a6dbd26c050be0b3883114c8" +SCRIPT_COMMIT="b2a5365d917e5974a4ac17275bce9bcefc41e21a" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-zimg.sh b/scripts.d/50-zimg.sh index 49bc5bb..3e99a01 100755 --- a/scripts.d/50-zimg.sh +++ b/scripts.d/50-zimg.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/sekrit-twc/zimg.git" -SCRIPT_COMMIT="ec0c604a9e29dd144b0bb1fb0974ac3b398fc18b" +SCRIPT_COMMIT="71431815950664f1e11b9ee4e5d4ba23d6d997f1" ffbuild_enabled() { return 0 From 9a6aafa8ea544ddaab89bd2bd0d257a89d1d0bb3 Mon Sep 17 00:00:00 2001 From: BtbN Date: Thu, 17 Aug 2023 18:50:27 +0200 Subject: [PATCH 53/66] Stick to video codec sdk 12.0 --- scripts.d/50-ffnvcodec.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh index 63862b5..7cf67b3 100755 --- a/scripts.d/50-ffnvcodec.sh +++ b/scripts.d/50-ffnvcodec.sh @@ -1,7 +1,8 @@ #!/bin/bash SCRIPT_REPO="https://github.com/FFmpeg/nv-codec-headers.git" -SCRIPT_COMMIT="855f8263d97bbdcaeabaaaa2997e1ccad7c52dc3" +SCRIPT_COMMIT="9402b5a7693e9841f8a4f4488cd2df21ac55c685" +SCRIPT_BRANCH="sdk/12.0" SCRIPT_REPO2="https://github.com/FFmpeg/nv-codec-headers.git" SCRIPT_COMMIT2="dc3e4484dc83485734e503991fe5ed3bdf256fba" From 256a55e1481f137fdf77a7e7cb8d10517bcb771b Mon Sep 17 00:00:00 2001 From: BtbN Date: Sat, 19 Aug 2023 12:45:50 +0200 Subject: [PATCH 54/66] Disable libjxl on win32 --- scripts.d/50-libjxl/50-libjxl.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh index ec60456..d41a6f0 100755 --- a/scripts.d/50-libjxl/50-libjxl.sh +++ b/scripts.d/50-libjxl/50-libjxl.sh @@ -8,6 +8,7 @@ ffbuild_enabled() { [[ $ADDINS_STR == *5.0* ]] && return -1 [[ $ADDINS_STR == *5.1* ]] && return -1 [[ $ADDINS_STR == *6.0* ]] && return -1 + [[ $TARGET == win32 ]] && return -1 return 0 } From 15d0b26bda212fce0314e57673595a625d3c337b Mon Sep 17 00:00:00 2001 From: BtbN Date: Thu, 31 Aug 2023 15:26:22 +0200 Subject: [PATCH 55/66] Re-enable libjxl on win32 --- scripts.d/50-libjxl/50-libjxl.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh index d41a6f0..6bd2019 100755 --- a/scripts.d/50-libjxl/50-libjxl.sh +++ b/scripts.d/50-libjxl/50-libjxl.sh @@ -1,14 +1,13 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libjxl/libjxl.git" -SCRIPT_COMMIT="06ce6cb513c442bfe9a0a9ad7df0d6d5f17dc07d" +SCRIPT_COMMIT="5d20fbe1cfcdb54bcc7880fc8a59bb9047d8c60f" 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 - [[ $TARGET == win32 ]] && return -1 return 0 } From f10c39ec379becfb19229c997c5b9c129072ff1f Mon Sep 17 00:00:00 2001 From: BtbN Date: Mon, 18 Sep 2023 12:13:32 +0200 Subject: [PATCH 56/66] Explicitly enable libharfbuzz on latest master Closes #297 --- scripts.d/45-harfbuzz.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh index d62d8f6..d2a2a33 100755 --- a/scripts.d/45-harfbuzz.sh +++ b/scripts.d/45-harfbuzz.sh @@ -32,3 +32,11 @@ ffbuild_dockerbuild() { make -j$(nproc) make install } + +ffbuild_configure() { + [[ $ADDINS_STR == *4.4* ]] && return 0 + [[ $ADDINS_STR == *5.0* ]] && return 0 + [[ $ADDINS_STR == *5.1* ]] && return 0 + [[ $ADDINS_STR == *6.0* ]] && return 0 + echo --enable-libharfbuzz +} From d4e9130c4842f41cd1949c65f1e64ff55b40c634 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sat, 26 Aug 2023 16:47:41 +0200 Subject: [PATCH 57/66] Add NOCLEAN option for makeimage.sh --- makeimage.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/makeimage.sh b/makeimage.sh index 2e63a43..2b73e37 100755 --- a/makeimage.sh +++ b/makeimage.sh @@ -63,5 +63,7 @@ docker buildx --builder ffbuilder build \ --cache-to=type=local,mode=max,dest=.cache/"${IMAGE/:/_}" \ --load --tag "$IMAGE" . -docker container stop ffbuildreg -docker buildx rm -f ffbuilder +if [[ -z "$NOCLEAN" ]]; then + docker container stop ffbuildreg + docker buildx rm -f ffbuilder +fi From f478b313481b7d7513e5525f5c0d8435bd7cd29b Mon Sep 17 00:00:00 2001 From: BtbN Date: Sat, 26 Aug 2023 22:58:49 +0200 Subject: [PATCH 58/66] Slim down openssl build --- scripts.d/25-openssl.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh index 1ac7682..b901514 100755 --- a/scripts.d/25-openssl.sh +++ b/scripts.d/25-openssl.sh @@ -20,6 +20,11 @@ ffbuild_dockerbuild() { threads zlib no-shared + no-tests + no-apps + no-legacy + no-ssl2 + no-ssl3 enable-camellia enable-ec enable-srp @@ -61,6 +66,9 @@ ffbuild_dockerbuild() { export AR="${AR/${FFBUILD_CROSS_PREFIX}/}" export RANLIB="${RANLIB/${FFBUILD_CROSS_PREFIX}/}" + # Actually allow Configure to disable apps + sed -i '/^my @disablables =/ s/$/"apps",/' Configure + ./Configure "${myconf[@]}" sed -i -e "/^CFLAGS=/s|=.*|=${CFLAGS}|" -e "/^LDFLAGS=/s|=[[:space:]]*$|=${LDFLAGS}|" Makefile From b758f790f1dbb17454c0340e52783d2a7898fbb1 Mon Sep 17 00:00:00 2001 From: Araki <45124115+ArakiSatoshi@users.noreply.github.com> Date: Tue, 19 Sep 2023 06:27:29 +0300 Subject: [PATCH 59/66] Update 50-svtav1.sh from 1.6 to 1.7.0.1 Update SVT-AV1 from 1.6 to 1.7.0.1, using the latest commit from the SVT-AV1 repository. --- scripts.d/50-svtav1.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts.d/50-svtav1.sh b/scripts.d/50-svtav1.sh index 1cf1949..ba80c22 100755 --- a/scripts.d/50-svtav1.sh +++ b/scripts.d/50-svtav1.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git" -SCRIPT_COMMIT="903ff3add82744d586295c37ec1241dc51dab16e" +SCRIPT_COMMIT="a6f0981c2b82aea05205b96bfebb1e6cd53790de" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 From b734a4d288b82e96b0aa277a89648dd28f905dec Mon Sep 17 00:00:00 2001 From: BtbN Date: Tue, 19 Sep 2023 21:04:27 +0200 Subject: [PATCH 60/66] Harden implib trampolines --- images/base-linux64/gen-implib.sh | 2 +- images/base-linuxarm64/gen-implib.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/base-linux64/gen-implib.sh b/images/base-linux64/gen-implib.sh index fd1930f..389996f 100755 --- a/images/base-linux64/gen-implib.sh +++ b/images/base-linux64/gen-implib.sh @@ -13,5 +13,5 @@ cd "$TMPDIR" set -x python3 /opt/implib/implib-gen.py --target x86_64-linux-gnu --dlopen --lazy-load --verbose "$IN" -${FFBUILD_CROSS_PREFIX}gcc $CFLAGS $STAGE_CFLAGS -DIMPLIB_HIDDEN_SHIMS -c *.tramp.S *.init.c +${FFBUILD_CROSS_PREFIX}gcc $CFLAGS $STAGE_CFLAGS -Wa,--noexecstack -DIMPLIB_HIDDEN_SHIMS -c *.tramp.S *.init.c ${FFBUILD_CROSS_PREFIX}ar -rcs "$OUT" *.tramp.o *.init.o diff --git a/images/base-linuxarm64/gen-implib.sh b/images/base-linuxarm64/gen-implib.sh index 71d6d46..1e6bc8e 100755 --- a/images/base-linuxarm64/gen-implib.sh +++ b/images/base-linuxarm64/gen-implib.sh @@ -13,5 +13,5 @@ cd "$TMPDIR" set -x python3 /opt/implib/implib-gen.py --target aarch64-linux-gnu --dlopen --lazy-load --verbose "$IN" -${FFBUILD_CROSS_PREFIX}gcc $CFLAGS $STAGE_CFLAGS -DIMPLIB_HIDDEN_SHIMS -c *.tramp.S *.init.c +${FFBUILD_CROSS_PREFIX}gcc $CFLAGS $STAGE_CFLAGS -Wa,--noexecstack -DIMPLIB_HIDDEN_SHIMS -c *.tramp.S *.init.c ${FFBUILD_CROSS_PREFIX}ar -rcs "$OUT" *.tramp.o *.init.o From 86871adfcaa15fa9cc9107b79133617b21f13042 Mon Sep 17 00:00:00 2001 From: BtbN Date: Tue, 19 Sep 2023 22:52:51 +0200 Subject: [PATCH 61/66] Enable libva on Windows I was not able to get the driver to work at all. It just crashes a lot, but since it has no averse side-effects (hopefully), let's just enable it by default. --- scripts.d/50-vaapi/50-libva.sh | 64 +++++++++++++++++++++---------- scripts.d/50-vaapi/99-finalize.sh | 7 ++-- 2 files changed, 48 insertions(+), 23 deletions(-) diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh index ff30ab0..43f827b 100755 --- a/scripts.d/50-vaapi/50-libva.sh +++ b/scripts.d/50-vaapi/50-libva.sh @@ -4,7 +4,10 @@ SCRIPT_REPO="https://github.com/intel/libva.git" SCRIPT_COMMIT="7d6c7d482b9d2330b1f3a8bac13a6a3205f33382" ffbuild_enabled() { - [[ $TARGET != linux* ]] && return -1 + [[ $ADDINS_STR == *4.4* && $TARGET == win* ]] && return -1 + [[ $ADDINS_STR == *5.0* && $TARGET == win* ]] && return -1 + [[ $ADDINS_STR == *5.1* && $TARGET == win* ]] && return -1 + [[ $ADDINS_STR == *6.0* && $TARGET == win* ]] && return -1 [[ $TARGET == linuxarm64 ]] && return -1 return 0 } @@ -12,25 +15,35 @@ ffbuild_enabled() { ffbuild_dockerbuild() { cd "$FFBUILD_DLDIR/$SELF" - autoreconf -i + # This works around an issue of our libxcb-dri3 implib-wrapper not exporting data symbols. + # Under normal circumstances, this would break horribly. + # But we only want to generate another import lib for libva, so it doesn't matter. + echo "#include " >> va/x11/va_dri3.c + echo "xcb_extension_t xcb_dri3_id;" >> va/x11/va_dri3.c + + mkdir mybuild && cd mybuild local myconf=( --prefix="$FFBUILD_PREFIX" - --enable-shared - --disable-static - --with-pic - --disable-docs - --enable-drm - --enable-x11 - --disable-glx - --disable-wayland + --buildtype=release + --default-library=shared + -Denable_docs=false ) if [[ $TARGET == linux64 ]]; then myconf+=( - --host="$FFBUILD_TOOLCHAIN" - --with-drivers-path="/usr/lib/x86_64-linux-gnu/dri" + --cross-file=/cross.meson --sysconfdir="/etc" + -Ddriverdir="/usr/lib/x86_64-linux-gnu/dri" + -Ddisable_drm=false + -Dwith_x11=yes + -Dwith_glx=no + -Dwith_wayland=no + ) + elif [[ $TARGET == win* ]]; then + myconf+=( + --cross-file=/cross.meson + -Dwith_win32=yes ) else echo "Unknown target" @@ -40,16 +53,27 @@ ffbuild_dockerbuild() { export CFLAGS="$RAW_CFLAGS" export LDFLAFS="$RAW_LDFLAGS" - ./configure "${myconf[@]}" - make -j$(nproc) - make install + meson "${myconf[@]}" .. + ninja -j"$(nproc)" + ninja install - gen-implib "$FFBUILD_PREFIX"/lib/{libva.so.2,libva.a} - gen-implib "$FFBUILD_PREFIX"/lib/{libva-drm.so.2,libva-drm.a} - gen-implib "$FFBUILD_PREFIX"/lib/{libva-x11.so.2,libva-x11.a} - rm "$FFBUILD_PREFIX"/lib/libva{,-drm,-x11}{.so*,.la} + if [[ $TARGET == linux* ]]; then + gen-implib "$FFBUILD_PREFIX"/lib/{libva.so.2,libva.a} + gen-implib "$FFBUILD_PREFIX"/lib/{libva-drm.so.2,libva-drm.a} + gen-implib "$FFBUILD_PREFIX"/lib/{libva-x11.so.2,libva-x11.a} + rm "$FFBUILD_PREFIX"/lib/libva{,-drm,-x11}.so* - echo "Libs: -ldl" >> "$FFBUILD_PREFIX"/lib/pkgconfig/libva.pc + echo "Libs: -ldl" >> "$FFBUILD_PREFIX"/lib/pkgconfig/libva.pc + elif [[ $TARGET == win* ]]; then + "$FFBUILD_CROSS_PREFIX"gendef - "$FFBUILD_PREFIX"/bin/libva.dll > libva.def + "$FFBUILD_CROSS_PREFIX"gendef - "$FFBUILD_PREFIX"/bin/libva_win32.dll > libva_win32.def + "$FFBUILD_CROSS_PREFIX"dlltool --input-def libva.def --output-delaylib "$FFBUILD_PREFIX"/lib/libva.a + "$FFBUILD_CROSS_PREFIX"dlltool --input-def libva_win32.def --output-delaylib "$FFBUILD_PREFIX"/lib/libva_win32.a + rm "$FFBUILD_PREFIX"/bin/libva*.dll "$FFBUILD_PREFIX"/lib/libva*.dll.a + else + echo "Unknown target" + return -1 + fi } ffbuild_configure() { diff --git a/scripts.d/50-vaapi/99-finalize.sh b/scripts.d/50-vaapi/99-finalize.sh index ee8a518..54c7a93 100755 --- a/scripts.d/50-vaapi/99-finalize.sh +++ b/scripts.d/50-vaapi/99-finalize.sh @@ -3,7 +3,6 @@ SCRIPT_SKIP="1" ffbuild_enabled() { - [[ $TARGET != linux* ]] && return -1 return 0 } @@ -12,6 +11,8 @@ ffbuild_dockerdl() { } ffbuild_dockerbuild() { - rm "$FFBUILD_PREFIX"/lib/lib*.so* || true - rm "$FFBUILD_PREFIX"/lib/*.la || true + if [[ $TARGET == linux* ]]; then + rm "$FFBUILD_PREFIX"/lib/lib*.so* || true + rm "$FFBUILD_PREFIX"/lib/*.la || true + fi } From fe9763a14882422f8d070d5b34ac1c6df3e11ada Mon Sep 17 00:00:00 2001 From: BtbN Date: Tue, 19 Sep 2023 23:36:02 +0200 Subject: [PATCH 62/66] Force true static link for libva-win32 --- scripts.d/50-vaapi/50-libva.sh | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh index 43f827b..1bd7e6b 100755 --- a/scripts.d/50-vaapi/50-libva.sh +++ b/scripts.d/50-vaapi/50-libva.sh @@ -21,18 +21,21 @@ ffbuild_dockerbuild() { echo "#include " >> va/x11/va_dri3.c echo "xcb_extension_t xcb_dri3_id;" >> va/x11/va_dri3.c + # Allow to actually toggle static linking + sed -i "s/shared_library/library/g" va/meson.build + mkdir mybuild && cd mybuild local myconf=( --prefix="$FFBUILD_PREFIX" --buildtype=release - --default-library=shared -Denable_docs=false ) if [[ $TARGET == linux64 ]]; then myconf+=( --cross-file=/cross.meson + --default-library=shared --sysconfdir="/etc" -Ddriverdir="/usr/lib/x86_64-linux-gnu/dri" -Ddisable_drm=false @@ -43,6 +46,7 @@ ffbuild_dockerbuild() { elif [[ $TARGET == win* ]]; then myconf+=( --cross-file=/cross.meson + --default-library=static -Dwith_win32=yes ) else @@ -64,15 +68,6 @@ ffbuild_dockerbuild() { rm "$FFBUILD_PREFIX"/lib/libva{,-drm,-x11}.so* echo "Libs: -ldl" >> "$FFBUILD_PREFIX"/lib/pkgconfig/libva.pc - elif [[ $TARGET == win* ]]; then - "$FFBUILD_CROSS_PREFIX"gendef - "$FFBUILD_PREFIX"/bin/libva.dll > libva.def - "$FFBUILD_CROSS_PREFIX"gendef - "$FFBUILD_PREFIX"/bin/libva_win32.dll > libva_win32.def - "$FFBUILD_CROSS_PREFIX"dlltool --input-def libva.def --output-delaylib "$FFBUILD_PREFIX"/lib/libva.a - "$FFBUILD_CROSS_PREFIX"dlltool --input-def libva_win32.def --output-delaylib "$FFBUILD_PREFIX"/lib/libva_win32.a - rm "$FFBUILD_PREFIX"/bin/libva*.dll "$FFBUILD_PREFIX"/lib/libva*.dll.a - else - echo "Unknown target" - return -1 fi } From 90b801a3704f1e42d82a905f3669a6c2ad2fa5df Mon Sep 17 00:00:00 2001 From: BtbN Date: Wed, 20 Sep 2023 15:47:43 +0200 Subject: [PATCH 63/66] Update dependencies --- scripts.d/10-mingw.sh | 2 +- scripts.d/20-libiconv.sh | 2 +- scripts.d/20-libxml2.sh | 4 ++-- scripts.d/20-zlib.sh | 2 +- scripts.d/25-freetype.sh | 2 +- scripts.d/25-gmp.sh | 2 +- scripts.d/25-openssl.sh | 2 +- scripts.d/25-xz.sh | 2 +- scripts.d/35-fontconfig.sh | 2 +- scripts.d/45-harfbuzz.sh | 2 +- scripts.d/45-opencl.sh | 2 +- scripts.d/45-pulseaudio.sh | 2 +- scripts.d/45-vmaf.sh | 2 +- scripts.d/45-x11/20-libxau.sh | 2 +- scripts.d/45-x11/30-libxcb.sh | 2 +- scripts.d/45-x11/40-libx11.sh | 2 +- scripts.d/45-x11/50-libxrender.sh | 2 +- scripts.d/45-x11/60-libglvnd.sh | 2 +- scripts.d/50-aom.sh | 2 +- scripts.d/50-dav1d.sh | 2 +- scripts.d/50-libass.sh | 2 +- scripts.d/50-libjxl/45-brotli.sh | 2 +- scripts.d/50-libjxl/50-libjxl.sh | 2 +- scripts.d/50-libopus.sh | 2 +- scripts.d/50-librist/50-librist.sh | 2 +- scripts.d/50-libssh.sh | 2 +- scripts.d/50-libvpx.sh | 2 +- scripts.d/50-libwebp.sh | 2 +- scripts.d/50-lilv/96-lv2.sh | 2 +- scripts.d/50-lilv/96-serd.sh | 2 +- scripts.d/50-lilv/96-zix.sh | 2 +- scripts.d/50-lilv/97-sord.sh | 2 +- scripts.d/50-lilv/98-sratom.sh | 2 +- scripts.d/50-lilv/99-lilv.sh | 2 +- scripts.d/50-openal.sh | 2 +- scripts.d/50-openmpt.sh | 2 +- scripts.d/50-sdl.sh | 2 +- scripts.d/50-srt.sh | 2 +- scripts.d/50-vaapi/40-libdrm.sh | 2 +- scripts.d/50-vaapi/50-libva.sh | 2 +- scripts.d/50-vulkan/45-vulkan.sh | 2 +- scripts.d/50-vulkan/55-spirv-cross.sh | 2 +- scripts.d/50-vulkan/60-libplacebo.sh | 2 +- scripts.d/50-x265.sh | 2 +- 44 files changed, 45 insertions(+), 45 deletions(-) diff --git a/scripts.d/10-mingw.sh b/scripts.d/10-mingw.sh index f720c0c..24b2be9 100755 --- a/scripts.d/10-mingw.sh +++ b/scripts.d/10-mingw.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://git.code.sf.net/p/mingw-w64/mingw-w64.git" -SCRIPT_COMMIT="e89de847dd3e05bb8e46344378ce3e124f4e7d1c" +SCRIPT_COMMIT="833753684d3a520ebcd3cd73e614c97bbb55ffb8" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 diff --git a/scripts.d/20-libiconv.sh b/scripts.d/20-libiconv.sh index 6303f14..583d75b 100755 --- a/scripts.d/20-libiconv.sh +++ b/scripts.d/20-libiconv.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://git.savannah.gnu.org/git/libiconv.git" -SCRIPT_COMMIT="6e2b31f6d66739c5abd850338ea68c6bd2012812" +SCRIPT_COMMIT="317dfadc6c68b3465205873b140200e5b0d0256f" ffbuild_enabled() { return 0 diff --git a/scripts.d/20-libxml2.sh b/scripts.d/20-libxml2.sh index b5799f4..21403fc 100755 --- a/scripts.d/20-libxml2.sh +++ b/scripts.d/20-libxml2.sh @@ -1,7 +1,7 @@ #!/bin/bash -SCRIPT_REPO="https://gitlab.gnome.org/GNOME/libxml2.git" -SCRIPT_COMMIT="9d80a2b134e7d681940e8e29f20922a0acf22e46" +SCRIPT_REPO="https://github.com/GNOME/libxml2.git" +SCRIPT_COMMIT="d7cfe356500906fad0f3b3d186e1abbd5489a23c" ffbuild_enabled() { return 0 diff --git a/scripts.d/20-zlib.sh b/scripts.d/20-zlib.sh index e52f0f4..e1678a7 100755 --- a/scripts.d/20-zlib.sh +++ b/scripts.d/20-zlib.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/madler/zlib.git" -SCRIPT_COMMIT="d98251478246c8ef2f405d76e4ef1678c14d7eda" +SCRIPT_COMMIT="79a0e447a0dfa32979420cb21cfb96d684b2c9d5" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-freetype.sh b/scripts.d/25-freetype.sh index 45b6019..552bc2c 100755 --- a/scripts.d/25-freetype.sh +++ b/scripts.d/25-freetype.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git" -SCRIPT_COMMIT="a20de84e1608f9eb1d0391d7322b2e0e0f235aba" +SCRIPT_COMMIT="c4073d82517eff48458e166a6edfb0618b221a4d" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-gmp.sh b/scripts.d/25-gmp.sh index 0c39466..1e78b80 100755 --- a/scripts.d/25-gmp.sh +++ b/scripts.d/25-gmp.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/BtbN/gmplib.git" -SCRIPT_COMMIT="d8c52e7b0ee334ab52406972d26b06cca1a78d46" +SCRIPT_COMMIT="3fe7fa49330acf6c23010575eaada2cd1197c586" ffbuild_enabled() { return 0 diff --git a/scripts.d/25-openssl.sh b/scripts.d/25-openssl.sh index b901514..6c7677d 100755 --- a/scripts.d/25-openssl.sh +++ b/scripts.d/25-openssl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/openssl/openssl.git" -SCRIPT_COMMIT="openssl-3.0.10" +SCRIPT_COMMIT="openssl-3.0.11" SCRIPT_TAGFILTER="openssl-3.0.*" ffbuild_enabled() { diff --git a/scripts.d/25-xz.sh b/scripts.d/25-xz.sh index e6d01bc..c667606 100755 --- a/scripts.d/25-xz.sh +++ b/scripts.d/25-xz.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/xz-mirror/xz.git" -SCRIPT_COMMIT="16068f6c30b888cdb873f6285af941d00f95741d" +SCRIPT_COMMIT="74c3449d8b816a724b12ebce7417e00fb597309a" ffbuild_enabled() { return 0 diff --git a/scripts.d/35-fontconfig.sh b/scripts.d/35-fontconfig.sh index 80343ce..9693b52 100755 --- a/scripts.d/35-fontconfig.sh +++ b/scripts.d/35-fontconfig.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git" -SCRIPT_COMMIT="5d954398d1ebe04778a945d5c1546d9dbfb8e031" +SCRIPT_COMMIT="16eff2de2350144a08cdb8bec06fd4b0fe3f586b" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-harfbuzz.sh b/scripts.d/45-harfbuzz.sh index d2a2a33..134a87d 100755 --- a/scripts.d/45-harfbuzz.sh +++ b/scripts.d/45-harfbuzz.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git" -SCRIPT_COMMIT="c7f2d440f463be31ae24cbae7ceb6ea72a15e990" +SCRIPT_COMMIT="d698133743caffe9611b57137cd5027ce076613f" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-opencl.sh b/scripts.d/45-opencl.sh index dfbda16..5994cc2 100755 --- a/scripts.d/45-opencl.sh +++ b/scripts.d/45-opencl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git" -SCRIPT_COMMIT="e049b16b5f157e2f28e7b5c301e71e1ccb3fe288" +SCRIPT_COMMIT="10aaadf55d582934661ca9d66956696cf1d836dc" SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git" SCRIPT_COMMIT2="229410f86a8c8c9e0f86f195409e5481a2bae067" diff --git a/scripts.d/45-pulseaudio.sh b/scripts.d/45-pulseaudio.sh index 0278b2d..a4c1a63 100755 --- a/scripts.d/45-pulseaudio.sh +++ b/scripts.d/45-pulseaudio.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git" -SCRIPT_COMMIT="421cf15486eea1b52f10e2b0be305018fee8c285" +SCRIPT_COMMIT="13ef02da1bc55b8a36ff35ca5f9d15cf7495932a" ffbuild_enabled() { [[ $TARGET == linux* ]] || return 1 diff --git a/scripts.d/45-vmaf.sh b/scripts.d/45-vmaf.sh index b092ff2..8b7f101 100755 --- a/scripts.d/45-vmaf.sh +++ b/scripts.d/45-vmaf.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/Netflix/vmaf.git" -SCRIPT_COMMIT="4c08f00bde5b2fa70e4b4f88c23c3aac2043e4f0" +SCRIPT_COMMIT="265263ffd51b4c7d3c585a2a9dd7d541b2ddfece" ffbuild_enabled() { return 0 diff --git a/scripts.d/45-x11/20-libxau.sh b/scripts.d/45-x11/20-libxau.sh index 3832bfe..3c87207 100755 --- a/scripts.d/45-x11/20-libxau.sh +++ b/scripts.d/45-x11/20-libxau.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxau.git" -SCRIPT_COMMIT="aec9d7266777e0b9243ef0f112fe0e07256bd446" +SCRIPT_COMMIT="f4fc44202b554e68093828b556f8c7fd9644ddb0" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/30-libxcb.sh b/scripts.d/45-x11/30-libxcb.sh index 975807b..b9b903e 100755 --- a/scripts.d/45-x11/30-libxcb.sh +++ b/scripts.d/45-x11/30-libxcb.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxcb.git" -SCRIPT_COMMIT="cc4b93c9cd93bad15b7106747b0213e4b9c53a1c" +SCRIPT_COMMIT="02a7bbed391859c79864b9aacf040d84f103d38a" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/40-libx11.sh b/scripts.d/45-x11/40-libx11.sh index 914f4bf..761a29f 100755 --- 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="70f44d76fd8fad96f33ba5c80a394d68b77dda03" +SCRIPT_COMMIT="3962080b7846d79fd3cf10b16eddacf68eb321b7" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/50-libxrender.sh b/scripts.d/45-x11/50-libxrender.sh index 4f5566f..165ac41 100755 --- a/scripts.d/45-x11/50-libxrender.sh +++ b/scripts.d/45-x11/50-libxrender.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxrender.git" -SCRIPT_COMMIT="07efd80468f6b595e6432edd28b8560ca7695ba0" +SCRIPT_COMMIT="01e754610df2195536c5b31c1e8df756480599d1" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/45-x11/60-libglvnd.sh b/scripts.d/45-x11/60-libglvnd.sh index 15c439f..31781d9 100755 --- a/scripts.d/45-x11/60-libglvnd.sh +++ b/scripts.d/45-x11/60-libglvnd.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git" -SCRIPT_COMMIT="179d7278d7485ceea2d440807be9d677d32aedc4" +SCRIPT_COMMIT="e9937526de57c22ef1184739df1eab2b51d58fa3" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-aom.sh b/scripts.d/50-aom.sh index 31ee786..ec3ef81 100755 --- a/scripts.d/50-aom.sh +++ b/scripts.d/50-aom.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://aomedia.googlesource.com/aom" -SCRIPT_COMMIT="5a4ea09dc1f1767d9b5923f7a8f582d8820bbfa5" +SCRIPT_COMMIT="a77362f01379a730854f0b24857e798119e8e698" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-dav1d.sh b/scripts.d/50-dav1d.sh index 82deec4..3589bd1 100755 --- a/scripts.d/50-dav1d.sh +++ b/scripts.d/50-dav1d.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git" -SCRIPT_COMMIT="e58afe4dd9057591882a01c31382c203e8a61c92" +SCRIPT_COMMIT="769bd1457a9567da5e50b8c670e49234b5bea8c0" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libass.sh b/scripts.d/50-libass.sh index 6acad8d..90a038b 100755 --- a/scripts.d/50-libass.sh +++ b/scripts.d/50-libass.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libass/libass.git" -SCRIPT_COMMIT="91422bdb9497e8484b3248f5ae7eb50d41e2555d" +SCRIPT_COMMIT="5c15c883a4783641f7e71a6a1f440209965eb64f" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/45-brotli.sh b/scripts.d/50-libjxl/45-brotli.sh index f89ece0..852fb59 100755 --- a/scripts.d/50-libjxl/45-brotli.sh +++ b/scripts.d/50-libjxl/45-brotli.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/google/brotli.git" -SCRIPT_COMMIT="0f2157cc5e7f6a28bf648738c208ca825917589a" +SCRIPT_COMMIT="53947c15f57774f34f31c0dc485e5a7f5fd9794c" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libjxl/50-libjxl.sh b/scripts.d/50-libjxl/50-libjxl.sh index 6bd2019..dfec8c3 100755 --- a/scripts.d/50-libjxl/50-libjxl.sh +++ b/scripts.d/50-libjxl/50-libjxl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libjxl/libjxl.git" -SCRIPT_COMMIT="5d20fbe1cfcdb54bcc7880fc8a59bb9047d8c60f" +SCRIPT_COMMIT="f19ccc68fcab2045f6301ffd0d50e7878738963c" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-libopus.sh b/scripts.d/50-libopus.sh index e69f098..9d659e0 100755 --- a/scripts.d/50-libopus.sh +++ b/scripts.d/50-libopus.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/xiph/opus.git" -SCRIPT_COMMIT="9fc8fc4cf432640f284113ba502ee027268b0d9f" +SCRIPT_COMMIT="101a71e03bbf860aaafb7090a0e440675cb27660" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-librist/50-librist.sh b/scripts.d/50-librist/50-librist.sh index ccdf413..6ca63b2 100755 --- a/scripts.d/50-librist/50-librist.sh +++ b/scripts.d/50-librist/50-librist.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/rist/librist.git" -SCRIPT_COMMIT="cda5bf5800be9f14ab3f2185fc47efb81ae09241" +SCRIPT_COMMIT="32dcfa18c2cb6341674c5cd0610a4e173bb2a526" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libssh.sh b/scripts.d/50-libssh.sh index 0ede185..739cc4d 100755 --- a/scripts.d/50-libssh.sh +++ b/scripts.d/50-libssh.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://git.libssh.org/projects/libssh.git" -SCRIPT_COMMIT="a71e2f8f3747a1224e30d94a902dfcdb668b3f60" +SCRIPT_COMMIT="6cf5f0e340370ecdc80e300a2622f47fe04c5682" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh index 1116f39..2d4e25c 100755 --- a/scripts.d/50-libvpx.sh +++ b/scripts.d/50-libvpx.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx" -SCRIPT_COMMIT="e7bfd8b6c230a6824e7fd1efa2378a7322986128" +SCRIPT_COMMIT="ad3301e6a3f70608b17fa8b61527a3bd2c711bbd" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-libwebp.sh b/scripts.d/50-libwebp.sh index e0fc1df..4c5318f 100755 --- a/scripts.d/50-libwebp.sh +++ b/scripts.d/50-libwebp.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp" -SCRIPT_COMMIT="aac5c5d0df942ad12e4f026eed4603a2ffdebe3c" +SCRIPT_COMMIT="05c469843ce3947a63f5ac7ac2c3baa5df2c167d" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-lv2.sh b/scripts.d/50-lilv/96-lv2.sh index 7a14ca7..658ebc6 100755 --- a/scripts.d/50-lilv/96-lv2.sh +++ b/scripts.d/50-lilv/96-lv2.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/lv2/lv2.git" -SCRIPT_COMMIT="bb6a2103c7adf3c1339728915d7f1497ee98dcbf" +SCRIPT_COMMIT="88a4334f8180c488ee7a14b301a9742cc751d908" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-serd.sh b/scripts.d/50-lilv/96-serd.sh index 3a5cbcb..cd3d654 100755 --- a/scripts.d/50-lilv/96-serd.sh +++ b/scripts.d/50-lilv/96-serd.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/drobilla/serd.git" -SCRIPT_COMMIT="dbf48d099a78d2075e224549a28e690d56a6d503" +SCRIPT_COMMIT="3df98b4f22773ec1d6d3230d88f14b430cdcf91e" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/96-zix.sh b/scripts.d/50-lilv/96-zix.sh index 534e224..3e1ca37 100755 --- a/scripts.d/50-lilv/96-zix.sh +++ b/scripts.d/50-lilv/96-zix.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/drobilla/zix.git" -SCRIPT_COMMIT="a5c18d52a5351430d370084f25aaf7d166f7afd5" +SCRIPT_COMMIT="3d880e00f3a0d7129b642002c3fb51ddbb56ac96" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/97-sord.sh b/scripts.d/50-lilv/97-sord.sh index cce7dda..41317f2 100755 --- a/scripts.d/50-lilv/97-sord.sh +++ b/scripts.d/50-lilv/97-sord.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/drobilla/sord.git" -SCRIPT_COMMIT="46f4bcbe04330645a11d00e56a7754cc1386bc45" +SCRIPT_COMMIT="4aae0ffa8b38106202fe96962981562a14a26fc1" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/98-sratom.sh b/scripts.d/50-lilv/98-sratom.sh index d32e200..2a7c386 100755 --- a/scripts.d/50-lilv/98-sratom.sh +++ b/scripts.d/50-lilv/98-sratom.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/lv2/sratom.git" -SCRIPT_COMMIT="b97b447d77fbf172260b4b40f184959f59c3623e" +SCRIPT_COMMIT="1d48d40ac4948b1864ca09e9d0a26fdd71bbee8d" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-lilv/99-lilv.sh b/scripts.d/50-lilv/99-lilv.sh index d026da6..18670fb 100755 --- a/scripts.d/50-lilv/99-lilv.sh +++ b/scripts.d/50-lilv/99-lilv.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/lv2/lilv.git" -SCRIPT_COMMIT="54b32c1949d60225602a7161d5d6c4853230307a" +SCRIPT_COMMIT="fb0a4d0bf17af25f5a90f643695b016651867952" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-openal.sh b/scripts.d/50-openal.sh index 762cfb2..5807ebc 100755 --- 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="188a637c70019108d980f72b8521673b5648d19e" +SCRIPT_COMMIT="01597b42054fef632ac856ae8e2defa41dfc0307" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-openmpt.sh b/scripts.d/50-openmpt.sh index 39186fd..d62b2ad 100755 --- a/scripts.d/50-openmpt.sh +++ b/scripts.d/50-openmpt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT" -SCRIPT_REV="19586" +SCRIPT_REV="19733" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-sdl.sh b/scripts.d/50-sdl.sh index b0289c0..0e17025 100755 --- 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="0b9d8e679a26ee98bb055efd244c703b7dda8727" +SCRIPT_COMMIT="95a6f986a06b9ba2b5b09a04d03eccdd7f55d7db" SCRIPT_BRANCH="SDL2" ffbuild_enabled() { diff --git a/scripts.d/50-srt.sh b/scripts.d/50-srt.sh index 8d90543..c81c673 100755 --- a/scripts.d/50-srt.sh +++ b/scripts.d/50-srt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/Haivision/srt.git" -SCRIPT_COMMIT="33a620bb3eb56ebcb14755b62ffb92466563aae5" +SCRIPT_COMMIT="f477af533562505abf5295f059cf2156b17be740" ffbuild_enabled() { return 0 diff --git a/scripts.d/50-vaapi/40-libdrm.sh b/scripts.d/50-vaapi/40-libdrm.sh index ce1f321..cb7df88 100755 --- a/scripts.d/50-vaapi/40-libdrm.sh +++ b/scripts.d/50-vaapi/40-libdrm.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git" -SCRIPT_COMMIT="3bc3cca230c5a064b2f554f26fdec27db0f5ead8" +SCRIPT_COMMIT="6abc164052e4902f67213baa279d743cf46227d4" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/scripts.d/50-vaapi/50-libva.sh b/scripts.d/50-vaapi/50-libva.sh index 1bd7e6b..2ab7d28 100755 --- a/scripts.d/50-vaapi/50-libva.sh +++ b/scripts.d/50-vaapi/50-libva.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/intel/libva.git" -SCRIPT_COMMIT="7d6c7d482b9d2330b1f3a8bac13a6a3205f33382" +SCRIPT_COMMIT="8575b2bbc6d5cbf31690e682f4fa268d742fcb62" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* && $TARGET == win* ]] && return -1 diff --git a/scripts.d/50-vulkan/45-vulkan.sh b/scripts.d/50-vulkan/45-vulkan.sh index ebf53d7..e135e22 100755 --- a/scripts.d/50-vulkan/45-vulkan.sh +++ b/scripts.d/50-vulkan/45-vulkan.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git" -SCRIPT_COMMIT="v1.3.261" +SCRIPT_COMMIT="v1.3.264" SCRIPT_TAGFILTER="v?.*.*" ffbuild_enabled() { diff --git a/scripts.d/50-vulkan/55-spirv-cross.sh b/scripts.d/50-vulkan/55-spirv-cross.sh index 5b80c14..54beaf6 100755 --- a/scripts.d/50-vulkan/55-spirv-cross.sh +++ b/scripts.d/50-vulkan/55-spirv-cross.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git" -SCRIPT_COMMIT="633dc301350952a9a895c8db42eed371ea969a64" +SCRIPT_COMMIT="5e963d62fa3f2f0ff891c9f9ca150097127c3aad" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh index 4110575..d3618b7 100755 --- a/scripts.d/50-vulkan/60-libplacebo.sh +++ b/scripts.d/50-vulkan/60-libplacebo.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git" -SCRIPT_COMMIT="b2a5365d917e5974a4ac17275bce9bcefc41e21a" +SCRIPT_COMMIT="d1057ef5ed46968800771faa64a6d4a1fb049eab" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 diff --git a/scripts.d/50-x265.sh b/scripts.d/50-x265.sh index 14bc515..8b1fab5 100755 --- a/scripts.d/50-x265.sh +++ b/scripts.d/50-x265.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git" -SCRIPT_COMMIT="8f18e3ad32684eee95e885e718655f93951128c3" +SCRIPT_COMMIT="8ee01d45b05cdbc9da89b884815257807a514bc8" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 From ce3bd941a81b59791f6d1f75f73011acdf0b223e Mon Sep 17 00:00:00 2001 From: BtbN Date: Wed, 20 Sep 2023 16:02:03 +0200 Subject: [PATCH 64/66] Update ct-ng configs --- images/base-linux64/ct-ng-config | 27 +++++++++++++++------------ images/base-linuxarm64/ct-ng-config | 27 +++++++++++++++------------ images/base-win32/ct-ng-config | 26 ++++++++++---------------- images/base-win64/ct-ng-config | 26 ++++++++++---------------- 4 files changed, 50 insertions(+), 56 deletions(-) diff --git a/images/base-linux64/ct-ng-config b/images/base-linux64/ct-ng-config index dc1039b..5ac75e3 100644 --- a/images/base-linux64/ct-ng-config +++ b/images/base-linux64/ct-ng-config @@ -1,21 +1,19 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.25.0.196_227d99d Configuration +# crosstool-NG 1.25.0.232_c175b21 Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y CT_CONFIGURE_has_wget=y CT_CONFIGURE_has_curl=y -CT_CONFIGURE_has_meson=y -CT_CONFIGURE_has_ninja=y CT_CONFIGURE_has_rsync=y CT_CONFIGURE_has_make_3_81_or_newer=y CT_CONFIGURE_has_make_4_0_or_newer=y CT_CONFIGURE_has_libtool_2_4_or_newer=y CT_CONFIGURE_has_libtoolize_2_4_or_newer=y -CT_CONFIGURE_has_autoconf_2_71_or_newer=y -CT_CONFIGURE_has_autoreconf_2_71_or_newer=y -CT_CONFIGURE_has_automake_1_16_or_newer=y +CT_CONFIGURE_has_autoconf_2_65_or_newer=y +CT_CONFIGURE_has_autoreconf_2_65_or_newer=y +CT_CONFIGURE_has_automake_1_15_or_newer=y CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y CT_CONFIGURE_has_python_3_4_or_newer=y CT_CONFIGURE_has_bison_2_7_or_newer=y @@ -28,7 +26,7 @@ CT_CONFIGURE_has_sha1sum=y CT_CONFIGURE_has_sha256sum=y CT_CONFIGURE_has_sha512sum=y CT_CONFIGURE_has_install_with_strip_program=y -CT_VERSION="1.25.0.196_227d99d" +CT_VERSION="1.25.0.232_c175b21" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -269,6 +267,7 @@ 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_4 is not set # CT_LINUX_V_6_3 is not set # CT_LINUX_V_6_2 is not set # CT_LINUX_V_6_1 is not set @@ -454,6 +453,7 @@ CT_GLIBC_PATCH_GLOBAL=y # CT_GLIBC_PATCH_LOCAL_BUNDLED is not set # CT_GLIBC_PATCH_NONE is not set CT_GLIBC_PATCH_ORDER="global" +# CT_GLIBC_V_2_38 is not set # CT_GLIBC_V_2_37 is not set # CT_GLIBC_V_2_36 is not set # CT_GLIBC_V_2_35 is not set @@ -477,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_38_or_older=y +CT_GLIBC_older_than_2_38=y CT_GLIBC_2_37_or_older=y CT_GLIBC_older_than_2_37=y CT_GLIBC_2_36_or_older=y @@ -593,7 +595,7 @@ CT_GCC_V_13=y # CT_GCC_V_6 is not set # CT_GCC_V_5 is not set # CT_GCC_V_4_9 is not set -CT_GCC_VERSION="13.1.0" +CT_GCC_VERSION="13.2.0" CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})" CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -837,7 +839,7 @@ CT_MPC_V_1_2=y # CT_MPC_V_1_1 is not set # CT_MPC_V_1_0 is not set CT_MPC_VERSION="1.2.1" -CT_MPC_MIRRORS="http://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)" +CT_MPC_MIRRORS="https://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)" CT_MPC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MPC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_MPC_ARCHIVE_FORMATS=".tar.gz" @@ -858,11 +860,12 @@ CT_MPFR_PATCH_GLOBAL=y # CT_MPFR_PATCH_LOCAL_BUNDLED is not set # CT_MPFR_PATCH_NONE is not set CT_MPFR_PATCH_ORDER="global" -CT_MPFR_V_4_1=y +CT_MPFR_V_4_2=y +# CT_MPFR_V_4_1 is not set # CT_MPFR_V_4_0 is not set # CT_MPFR_V_3_1 is not set -CT_MPFR_VERSION="4.1.0" -CT_MPFR_MIRRORS="http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)" +CT_MPFR_VERSION="4.2.1" +CT_MPFR_MIRRORS="https://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)" CT_MPFR_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MPFR_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_MPFR_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz .zip" diff --git a/images/base-linuxarm64/ct-ng-config b/images/base-linuxarm64/ct-ng-config index 1ab09e8..939ed8c 100644 --- a/images/base-linuxarm64/ct-ng-config +++ b/images/base-linuxarm64/ct-ng-config @@ -1,21 +1,19 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.25.0.196_227d99d Configuration +# crosstool-NG 1.25.0.232_c175b21 Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y CT_CONFIGURE_has_wget=y CT_CONFIGURE_has_curl=y -CT_CONFIGURE_has_meson=y -CT_CONFIGURE_has_ninja=y CT_CONFIGURE_has_rsync=y CT_CONFIGURE_has_make_3_81_or_newer=y CT_CONFIGURE_has_make_4_0_or_newer=y CT_CONFIGURE_has_libtool_2_4_or_newer=y CT_CONFIGURE_has_libtoolize_2_4_or_newer=y -CT_CONFIGURE_has_autoconf_2_71_or_newer=y -CT_CONFIGURE_has_autoreconf_2_71_or_newer=y -CT_CONFIGURE_has_automake_1_16_or_newer=y +CT_CONFIGURE_has_autoconf_2_65_or_newer=y +CT_CONFIGURE_has_autoreconf_2_65_or_newer=y +CT_CONFIGURE_has_automake_1_15_or_newer=y CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y CT_CONFIGURE_has_python_3_4_or_newer=y CT_CONFIGURE_has_bison_2_7_or_newer=y @@ -28,7 +26,7 @@ CT_CONFIGURE_has_sha1sum=y CT_CONFIGURE_has_sha256sum=y CT_CONFIGURE_has_sha512sum=y CT_CONFIGURE_has_install_with_strip_program=y -CT_VERSION="1.25.0.196_227d99d" +CT_VERSION="1.25.0.232_c175b21" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -276,6 +274,7 @@ 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_4 is not set # CT_LINUX_V_6_3 is not set # CT_LINUX_V_6_2 is not set # CT_LINUX_V_6_1 is not set @@ -460,6 +459,7 @@ CT_GLIBC_PATCH_GLOBAL=y # CT_GLIBC_PATCH_LOCAL_BUNDLED is not set # CT_GLIBC_PATCH_NONE is not set CT_GLIBC_PATCH_ORDER="global" +# CT_GLIBC_V_2_38 is not set # CT_GLIBC_V_2_37 is not set # CT_GLIBC_V_2_36 is not set # CT_GLIBC_V_2_35 is not set @@ -483,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_38_or_older=y +CT_GLIBC_older_than_2_38=y CT_GLIBC_2_37_or_older=y CT_GLIBC_older_than_2_37=y CT_GLIBC_2_36_or_older=y @@ -605,7 +607,7 @@ CT_GCC_V_13=y # CT_GCC_V_6 is not set # CT_GCC_V_5 is not set # CT_GCC_V_4_9 is not set -CT_GCC_VERSION="13.1.0" +CT_GCC_VERSION="13.2.0" CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})" CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -849,7 +851,7 @@ CT_MPC_V_1_2=y # CT_MPC_V_1_1 is not set # CT_MPC_V_1_0 is not set CT_MPC_VERSION="1.2.1" -CT_MPC_MIRRORS="http://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)" +CT_MPC_MIRRORS="https://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)" CT_MPC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MPC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_MPC_ARCHIVE_FORMATS=".tar.gz" @@ -870,11 +872,12 @@ CT_MPFR_PATCH_GLOBAL=y # CT_MPFR_PATCH_LOCAL_BUNDLED is not set # CT_MPFR_PATCH_NONE is not set CT_MPFR_PATCH_ORDER="global" -CT_MPFR_V_4_1=y +CT_MPFR_V_4_2=y +# CT_MPFR_V_4_1 is not set # CT_MPFR_V_4_0 is not set # CT_MPFR_V_3_1 is not set -CT_MPFR_VERSION="4.1.0" -CT_MPFR_MIRRORS="http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)" +CT_MPFR_VERSION="4.2.1" +CT_MPFR_MIRRORS="https://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)" CT_MPFR_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MPFR_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_MPFR_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz .zip" diff --git a/images/base-win32/ct-ng-config b/images/base-win32/ct-ng-config index 96759e1..2b6fd5b 100644 --- a/images/base-win32/ct-ng-config +++ b/images/base-win32/ct-ng-config @@ -1,21 +1,19 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.25.0.196_227d99d Configuration +# crosstool-NG 1.25.0.232_c175b21 Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y CT_CONFIGURE_has_wget=y CT_CONFIGURE_has_curl=y -CT_CONFIGURE_has_meson=y -CT_CONFIGURE_has_ninja=y CT_CONFIGURE_has_rsync=y CT_CONFIGURE_has_make_3_81_or_newer=y CT_CONFIGURE_has_make_4_0_or_newer=y CT_CONFIGURE_has_libtool_2_4_or_newer=y CT_CONFIGURE_has_libtoolize_2_4_or_newer=y -CT_CONFIGURE_has_autoconf_2_71_or_newer=y -CT_CONFIGURE_has_autoreconf_2_71_or_newer=y -CT_CONFIGURE_has_automake_1_16_or_newer=y +CT_CONFIGURE_has_autoconf_2_65_or_newer=y +CT_CONFIGURE_has_autoreconf_2_65_or_newer=y +CT_CONFIGURE_has_automake_1_15_or_newer=y CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y CT_CONFIGURE_has_python_3_4_or_newer=y CT_CONFIGURE_has_bison_2_7_or_newer=y @@ -28,7 +26,7 @@ CT_CONFIGURE_has_sha1sum=y CT_CONFIGURE_has_sha256sum=y CT_CONFIGURE_has_sha512sum=y CT_CONFIGURE_has_install_with_strip_program=y -CT_VERSION="1.25.0.196_227d99d" +CT_VERSION="1.25.0.232_c175b21" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -451,7 +449,7 @@ CT_GCC_V_13=y # CT_GCC_V_6 is not set # CT_GCC_V_5 is not set # CT_GCC_V_4_9 is not set -CT_GCC_VERSION="13.1.0" +CT_GCC_VERSION="13.2.0" CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})" CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -667,10 +665,8 @@ CT_MPC_PATCH_GLOBAL=y # CT_MPC_PATCH_NONE is not set CT_MPC_PATCH_ORDER="global" CT_MPC_V_1_2=y -# CT_MPC_V_1_1 is not set -# CT_MPC_V_1_0 is not set CT_MPC_VERSION="1.2.1" -CT_MPC_MIRRORS="http://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)" +CT_MPC_MIRRORS="https://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)" CT_MPC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MPC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_MPC_ARCHIVE_FORMATS=".tar.gz" @@ -691,11 +687,9 @@ CT_MPFR_PATCH_GLOBAL=y # CT_MPFR_PATCH_LOCAL_BUNDLED is not set # CT_MPFR_PATCH_NONE is not set CT_MPFR_PATCH_ORDER="global" -CT_MPFR_V_4_1=y -# CT_MPFR_V_4_0 is not set -# CT_MPFR_V_3_1 is not set -CT_MPFR_VERSION="4.1.0" -CT_MPFR_MIRRORS="http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)" +CT_MPFR_V_4_2=y +CT_MPFR_VERSION="4.2.1" +CT_MPFR_MIRRORS="https://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)" CT_MPFR_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MPFR_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_MPFR_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz .zip" diff --git a/images/base-win64/ct-ng-config b/images/base-win64/ct-ng-config index 340cccd..d388a1d 100644 --- a/images/base-win64/ct-ng-config +++ b/images/base-win64/ct-ng-config @@ -1,21 +1,19 @@ # # Automatically generated file; DO NOT EDIT. -# crosstool-NG 1.25.0.196_227d99d Configuration +# crosstool-NG 1.25.0.232_c175b21 Configuration # CT_CONFIGURE_has_static_link=y CT_CONFIGURE_has_cxx11=y CT_CONFIGURE_has_wget=y CT_CONFIGURE_has_curl=y -CT_CONFIGURE_has_meson=y -CT_CONFIGURE_has_ninja=y CT_CONFIGURE_has_rsync=y CT_CONFIGURE_has_make_3_81_or_newer=y CT_CONFIGURE_has_make_4_0_or_newer=y CT_CONFIGURE_has_libtool_2_4_or_newer=y CT_CONFIGURE_has_libtoolize_2_4_or_newer=y -CT_CONFIGURE_has_autoconf_2_71_or_newer=y -CT_CONFIGURE_has_autoreconf_2_71_or_newer=y -CT_CONFIGURE_has_automake_1_16_or_newer=y +CT_CONFIGURE_has_autoconf_2_65_or_newer=y +CT_CONFIGURE_has_autoreconf_2_65_or_newer=y +CT_CONFIGURE_has_automake_1_15_or_newer=y CT_CONFIGURE_has_gnu_m4_1_4_12_or_newer=y CT_CONFIGURE_has_python_3_4_or_newer=y CT_CONFIGURE_has_bison_2_7_or_newer=y @@ -28,7 +26,7 @@ CT_CONFIGURE_has_sha1sum=y CT_CONFIGURE_has_sha256sum=y CT_CONFIGURE_has_sha512sum=y CT_CONFIGURE_has_install_with_strip_program=y -CT_VERSION="1.25.0.196_227d99d" +CT_VERSION="1.25.0.232_c175b21" CT_VCHECK="" CT_CONFIG_VERSION_ENV="4" CT_CONFIG_VERSION_CURRENT="4" @@ -451,7 +449,7 @@ CT_GCC_V_13=y # CT_GCC_V_6 is not set # CT_GCC_V_5 is not set # CT_GCC_V_4_9 is not set -CT_GCC_VERSION="13.1.0" +CT_GCC_VERSION="13.2.0" CT_GCC_MIRRORS="$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})" CT_GCC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_GCC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" @@ -667,10 +665,8 @@ CT_MPC_PATCH_GLOBAL=y # CT_MPC_PATCH_NONE is not set CT_MPC_PATCH_ORDER="global" CT_MPC_V_1_2=y -# CT_MPC_V_1_1 is not set -# CT_MPC_V_1_0 is not set CT_MPC_VERSION="1.2.1" -CT_MPC_MIRRORS="http://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)" +CT_MPC_MIRRORS="https://www.multiprecision.org/downloads $(CT_Mirrors GNU mpc)" CT_MPC_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MPC_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_MPC_ARCHIVE_FORMATS=".tar.gz" @@ -691,11 +687,9 @@ CT_MPFR_PATCH_GLOBAL=y # CT_MPFR_PATCH_LOCAL_BUNDLED is not set # CT_MPFR_PATCH_NONE is not set CT_MPFR_PATCH_ORDER="global" -CT_MPFR_V_4_1=y -# CT_MPFR_V_4_0 is not set -# CT_MPFR_V_3_1 is not set -CT_MPFR_VERSION="4.1.0" -CT_MPFR_MIRRORS="http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)" +CT_MPFR_V_4_2=y +CT_MPFR_VERSION="4.2.1" +CT_MPFR_MIRRORS="https://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)" CT_MPFR_ARCHIVE_FILENAME="@{pkg_name}-@{version}" CT_MPFR_ARCHIVE_DIRNAME="@{pkg_name}-@{version}" CT_MPFR_ARCHIVE_FORMATS=".tar.xz .tar.bz2 .tar.gz .zip" From bbcf2b9a5330d5611869e6ddd62cab4c90e49498 Mon Sep 17 00:00:00 2001 From: BtbN Date: Thu, 28 Sep 2023 19:28:41 +0200 Subject: [PATCH 65/66] Update ffnvcodec --- scripts.d/50-ffnvcodec.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts.d/50-ffnvcodec.sh b/scripts.d/50-ffnvcodec.sh index 7cf67b3..98cc681 100755 --- a/scripts.d/50-ffnvcodec.sh +++ b/scripts.d/50-ffnvcodec.sh @@ -1,11 +1,11 @@ #!/bin/bash SCRIPT_REPO="https://github.com/FFmpeg/nv-codec-headers.git" -SCRIPT_COMMIT="9402b5a7693e9841f8a4f4488cd2df21ac55c685" +SCRIPT_COMMIT="451da99614412a7f9526ef301a5ee0c7a6f9ad76" SCRIPT_BRANCH="sdk/12.0" SCRIPT_REPO2="https://github.com/FFmpeg/nv-codec-headers.git" -SCRIPT_COMMIT2="dc3e4484dc83485734e503991fe5ed3bdf256fba" +SCRIPT_COMMIT2="43d91706e097565f57b311e567f0219838bcc2f6" SCRIPT_BRANCH2="sdk/11.1" ffbuild_enabled() { From 418d8af03cbca866c2ea729caece27734d3a94d1 Mon Sep 17 00:00:00 2001 From: BtbN Date: Fri, 29 Sep 2023 13:46:54 +0200 Subject: [PATCH 66/66] Update libvpx --- scripts.d/50-libvpx.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts.d/50-libvpx.sh b/scripts.d/50-libvpx.sh index 2d4e25c..5df5d5f 100755 --- a/scripts.d/50-libvpx.sh +++ b/scripts.d/50-libvpx.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx" -SCRIPT_COMMIT="ad3301e6a3f70608b17fa8b61527a3bd2c711bbd" +SCRIPT_COMMIT="fd2052d4c91ca9451563482817bbeab1da3f76e7" ffbuild_enabled() { return 0