Merge remote-tracking branch 'upstream/master'

.github/workflows/build.yml

@@ -45,14 +45,16 @@ jobs:
     needs: pre_check
     runs-on: ubuntu-latest
     steps:
+      - name: Free Disk-Space
+        run: df -h && sudo apt-get clean && docker system prune -a -f && sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc && df -h
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         with:
           config: .github/buildkit.toml
       - name: Login to Docker
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -69,11 +71,12 @@ jobs:
       - 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
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: images/base
           pull: true
           push: true
+          provenance: false
           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
@@ -84,12 +87,13 @@ jobs:
           echo "dltagname=$(./util/get_dl_cache_tag.sh)" >> $GITHUB_OUTPUT
           cat Dockerfile.dl
       - name: Build download cache image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: Dockerfile.dl
           pull: true
           push: true
+          provenance: false
           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
@@ -126,14 +130,16 @@ jobs:
       matrix:
         target: [win64,win32]
     steps:
+      - name: Free Disk-Space
+        run: df -h && sudo apt-get clean && docker system prune -a -f && sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc && df -h
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         with:
           config: .github/buildkit.toml
       - name: Login to Docker
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -148,11 +154,12 @@ jobs:
       - 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
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: images/base-${{ matrix.target }}
           pull: true
           push: true
+          provenance: false
           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
@@ -180,14 +187,16 @@ jobs:
         target: [win64,win32]
         variant: [gpl,gpl 6.0]
     steps:
+      - name: Free Disk-Space
+        run: df -h && sudo apt-get clean && docker system prune -a -f && sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc && df -h
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
         with:
           config: .github/buildkit.toml
       - name: Login to Docker
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -203,11 +212,12 @@ jobs:
       - 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
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           pull: true
           push: true
+          provenance: false
           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
@@ -233,10 +243,12 @@ jobs:
         target: [win64,win32]
         variant: [gpl,gpl 6.0]
     steps:
+      - name: Free Disk-Space
+        run: df -h && sudo apt-get clean && docker system prune -a -f && sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc && df -h
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Login to Docker
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -256,8 +268,10 @@ jobs:
     needs: build_ffmpeg
     runs-on: ubuntu-latest
     steps:
+      - name: Free Disk-Space
+        run: df -h && sudo apt-get clean && docker system prune -a -f && sudo rm -rf /usr/local/lib/android /usr/share/dotnet /opt/ghc && df -h
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Download artifacts
         uses: actions/download-artifact@v3
         with:
@@ -271,7 +285,7 @@ jobs:
           RELDATE="$(date +'%Y-%m-%d %H:%M')"
           NAME="Auto-Build $RELDATE"
           TAGNAME="autobuild-$(date +'%Y-%m-%d-%H-%M')"
-          hub release create $(for a in artifacts/*.{zip,tar.xz}; do echo -a $a; done) -m "$NAME" -m "$TAGNAME" -t "master" "$TAGNAME"
+          gh release create "$TAGNAME" --target "master" --title "$NAME" artifacts/*.{zip,tar.xz}
           echo "tag_name=${TAGNAME}" >> $GITHUB_OUTPUT
           echo "rel_date=${RELDATE}" >> $GITHUB_OUTPUT
         env:
@@ -282,10 +296,9 @@ jobs:
           shopt -s nullglob
           NAME="Latest Auto-Build (${{ steps.create_release.outputs.rel_date }})"
           TAGNAME="latest"
-          hub release delete "$TAGNAME" || true
-          git push --delete origin "$TAGNAME" || true
+          gh release delete --cleanup-tag --yes "$TAGNAME" || true
           sleep 15
-          hub release create $(for a in artifacts/*.{zip,tar.xz}; do echo -a $a; done) -m "$NAME" -m "$TAGNAME" -t "master" "$TAGNAME"
+          gh release create "$TAGNAME" --target "master" --title "$NAME" artifacts/*.{zip,tar.xz}
         env:
           GITHUB_TOKEN: ${{ github.token }}
       - name: Update Wiki

addins/6.1.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+GIT_BRANCH="release/6.1"

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="833753684d3a520ebcd3cd73e614c97bbb55ffb8"
+SCRIPT_COMMIT="7ea930ba381ace6f19f7cfa59596f6fe49949aa6"
 
 ffbuild_enabled() {
     [[ $TARGET == win* ]] || return -1

scripts.d/20-libxml2.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/GNOME/libxml2.git"
-SCRIPT_COMMIT="d7cfe356500906fad0f3b3d186e1abbd5489a23c"
+SCRIPT_COMMIT="e2ce828c9bb52b2fe8573d90545a490b737f4176"
 
 ffbuild_enabled() {
     return 0

scripts.d/20-zlib.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/madler/zlib.git"
-SCRIPT_COMMIT="79a0e447a0dfa32979420cb21cfb96d684b2c9d5"
+SCRIPT_COMMIT="643e17b7498d12ab8d15565662880579692f769d"
 
 ffbuild_enabled() {
     return 0

scripts.d/25-freetype.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git"
-SCRIPT_COMMIT="c4073d82517eff48458e166a6edfb0618b221a4d"
+SCRIPT_COMMIT="8f255c89e14219ca2489043f699797ee106ec6e9"
 
 ffbuild_enabled() {
     return 0

scripts.d/25-gmp.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/BtbN/gmplib.git"
-SCRIPT_COMMIT="3fe7fa49330acf6c23010575eaada2cd1197c586"
+SCRIPT_COMMIT="9dff3be5f5bd1f417a81a482bb59f4b25c33cc8a"
 
 ffbuild_enabled() {
     return 0

scripts.d/25-openssl.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/openssl/openssl.git"
-SCRIPT_COMMIT="openssl-3.0.11"
+SCRIPT_COMMIT="openssl-3.0.12"
 SCRIPT_TAGFILTER="openssl-3.0.*"
 
 ffbuild_enabled() {

scripts.d/35-fontconfig.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git"
-SCRIPT_COMMIT="16eff2de2350144a08cdb8bec06fd4b0fe3f586b"
+SCRIPT_COMMIT="c53079fcc122de67a17e7056d03186039e2d4242"
 
 ffbuild_enabled() {
     return 0

scripts.d/45-harfbuzz.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
-SCRIPT_COMMIT="d698133743caffe9611b57137cd5027ce076613f"
+SCRIPT_COMMIT="d7c4fdfaa2ed5e44dc5c01cd30c0ddc19ff78fdf"
 
 ffbuild_enabled() {
     return 0

scripts.d/45-libsamplerate.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/libsndfile/libsamplerate.git"
-SCRIPT_COMMIT="22bd06eb114850ebe31981eb794d150a95439fef"
+SCRIPT_COMMIT="20819b6d31907b402d33c30e4a0295ce439c06e6"
 
 ffbuild_enabled() {
     return 0

scripts.d/45-opencl.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git"
-SCRIPT_COMMIT="10aaadf55d582934661ca9d66956696cf1d836dc"
+SCRIPT_COMMIT="8de09e8f07e3272da06e62358a8116c27d235036"
 
 SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git"
 SCRIPT_COMMIT2="229410f86a8c8c9e0f86f195409e5481a2bae067"

scripts.d/45-pulseaudio.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git"
-SCRIPT_COMMIT="13ef02da1bc55b8a36ff35ca5f9d15cf7495932a"
+SCRIPT_COMMIT="81a6cc4967d1f19cef800932b10ade7f896ee2ea"
 
 ffbuild_enabled() {
     [[ $TARGET == linux* ]] || return 1

scripts.d/45-vmaf.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/Netflix/vmaf.git"
-SCRIPT_COMMIT="265263ffd51b4c7d3c585a2a9dd7d541b2ddfece"
+SCRIPT_COMMIT="97e50eae7e07cfce56b4510fb1e50d4289f5340a"
 
 ffbuild_enabled() {
     return 0
@@ -43,6 +43,7 @@ ffbuild_dockerbuild() {
 }
 
 ffbuild_configure() {
+    [[ $ADDINS_STR == *4.4* ]] && return 0
     echo --enable-libvmaf
 }
 

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="98eeebfc2d7db5377b85437418fb942ea30ffc0d"
+SCRIPT_COMMIT="1388374c7149114888a6a5cd6e9bf6ad4b42adf8"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

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="704a75eecdf177a8b18ad7e35813f2f979b0c277"
+SCRIPT_COMMIT="1c8128d72df22843a2022576850bc5ab5e3a46ea"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

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

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/lib/libxtrans.git"
-SCRIPT_COMMIT="3b3a3bd75d86aec78f6ef893b198c3efc378bc64"
+SCRIPT_COMMIT="806f04c6e4529358f160e53135baf105e4ecf3b8"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

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="02a7bbed391859c79864b9aacf040d84f103d38a"
+SCRIPT_COMMIT="3c946010c8521497b0fba2c8bc9bde184622345a"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

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="3962080b7846d79fd3cf10b16eddacf68eb321b7"
+SCRIPT_COMMIT="c745719e23af44a4b40ab4508447637b35d91a1e"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

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="de2ebd62c1eb8fe16c11aceac4a6981bda124cf4"
+SCRIPT_COMMIT="6cb21433d745abea3a161a6fc8e141f7e08b2c27"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

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="09f3eb570fe79bfc0c430b6059d7b4acaf371c24"
+SCRIPT_COMMIT="a340bc0424a73d9fc4badbb7aee5284877635ca9"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

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

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/glvnd/libglvnd.git"
-SCRIPT_COMMIT="e9937526de57c22ef1184739df1eab2b51d58fa3"
+SCRIPT_COMMIT="908086d22dc307d17d0eb35c522c35fd190718cc"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

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="9c1b50ed98d354488329c99bc8bf77d1c6df657c"
+SCRIPT_COMMIT="5e0f8347cebef2b3a9f5d75ca254aabaa0bca259"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

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="5b96863cf2a34ee9e72ffc4ec6415bc59b6121fc"
+SCRIPT_COMMIT="512bf0b15b5597c721ff8c61083616ca9040fa72"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

scripts.d/50-aom.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://aomedia.googlesource.com/aom"
-SCRIPT_COMMIT="a77362f01379a730854f0b24857e798119e8e698"
+SCRIPT_COMMIT="fbed8eca54b0e56529391ede26a13a921c3a1fb9"
 
 ffbuild_enabled() {
     return 0

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

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/glennrp/libpng.git"
-SCRIPT_COMMIT="f8e5fa92b0e37ab597616f554bee254157998227"
+SCRIPT_COMMIT="e755fb79ba945fea8a318dc343e73d22a39e2f4e"
 
 ffbuild_enabled() {
     return 0