Master btb n

.github/workflows/build.yml

@@ -204,6 +204,8 @@ jobs:
             variant: gpl 5.0
           - target: win64
             variant: gpl 4.4
+          - target: win64
+            variant: gpl 4.3
     steps:
       - name: Free Disk-Space
         run: df -h && sudo apt-get clean && docker system prune -a -f && sudo rm -rf /opt/ghc /usr/local/.ghcup /usr/local/lib/android && df -h

addins/4.3.sh

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

generate.sh

@@ -135,7 +135,7 @@ export TODF="Dockerfile"
 
 BASELAYER="base-layer"
 to_df "FROM ${REGISTRY}/${REPO}/base-${TARGET}:latest AS ${BASELAYER}"
-to_df "ENV TARGET=$TARGET VARIANT=$VARIANT REPO=$REPO ADDINS_STR=$ADDINS_STR"
+to_df "ENV TARGET=$TARGET VARIANT=$VARIANT REPO=$REPO ADDINS_STR=$ADDINS_STR FFVER=$(ffbuild_ffver)"
 to_df "COPY --link util/run_stage.sh /usr/bin/run_stage"
 
 for addin in "${ADDINS[@]}"; do

images/base/Dockerfile

@@ -16,8 +16,8 @@ RUN \
         gperf itstool ragel libc6-dev zlib1g-dev libssl-dev \
         gtk-doc-tools gobject-introspection gawk \
         ocaml ocaml-findlib ocamlbuild libnum-ocaml-dev indent p7zip-full zstd \
-        python3-setuptools python3-pip python3-venv python3-jinja2 python3-jsonschema python3-apt python-is-python3 && \
-    curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
+        python3-setuptools python3-pip python3-venv python3-jinja2 python3-jsonschema python3-apt python3-dev python-is-python3 && \
+    curl -fsSL https://deb.nodesource.com/setup_24.x | bash - && \
     apt-get -y install nodejs && \
     apt-get -y autoremove && \
     apt-get -y clean autoclean && \

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="f6a7b25bc70e9c3f5d0a8535ad112b08de564b33"
+SCRIPT_COMMIT="8d02d610f707b5f6af74653c6ebb0cdfa4df9212"
 
 ffbuild_depends() {
     return 0

scripts.d/20-libiconv.sh

@@ -2,11 +2,11 @@
 
 SCRIPT_REPO="https://https.git.savannah.gnu.org/git/libiconv.git"
 SCRIPT_MIRROR="git://git.git.savannah.gnu.org/libiconv.git"
-SCRIPT_COMMIT="b66b2f548166b667a7c48777ded7506a43971b21"
+SCRIPT_COMMIT="30fc26493e4c6457000172d49b526be0919e34c6"
 
 SCRIPT_REPO2="https://https.git.savannah.gnu.org/git/gnulib.git"
 SCRIPT_MIRROR2="https://github.com/coreutils/gnulib.git"
-SCRIPT_COMMIT2="6a9227219c093b9f8c2a22f69c876ade7269e8dd"
+SCRIPT_COMMIT2="075df63ae24e351535a5f2c7b6b3b3acb2ed9a1a"
 
 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="5a82f71ed1dfc0bec044d9702463dbdf84ea3b71"
+SCRIPT_COMMIT="570720b0c24f9686c33f35a1b3165c1f568b96be"
 
 ffbuild_enabled() {
     return 0

scripts.d/25-libxml2.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/GNOME/libxml2.git"
-SCRIPT_COMMIT="22f9d730898d2dfcc03a484e65e1f8fc3675225f"
+SCRIPT_COMMIT="9827e6e44652555992e168609abf94e4237ca944"
 
 ffbuild_depends() {
     echo base

scripts.d/25-xz.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/tukaani-project/xz.git"
-SCRIPT_COMMIT="f57b1716cd0853474980c90a892204dee9bdea1a"
+SCRIPT_COMMIT="9f4c5a0d4817c9c7011cdfd00cfbe0ddda66a455"
 
 ffbuild_depends() {
     echo base

scripts.d/45-fonts/25-freetype.sh

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

scripts.d/45-fonts/35-fontconfig.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git"
-SCRIPT_COMMIT="a9fd30d226322f7f9b674a74d3782eea03c29453"
+SCRIPT_COMMIT="80e8895293c68d88ca4cabfcc582f76b1e28fc87"
 
 ffbuild_depends() {
     echo base
@@ -20,6 +20,7 @@ ffbuild_dockerbuild() {
     ./autogen.sh --noconf
 
     local myconf=(
+        ac_cv_va_copy="C99"
         --prefix="$FFBUILD_PREFIX"
         --disable-docs
         --enable-libxml2

scripts.d/45-fonts/45-harfbuzz.sh

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

scripts.d/45-fonts/50-freetype.sh

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

scripts.d/45-libvorbis.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/xiph/vorbis.git"
-SCRIPT_COMMIT="851cce991da34adf5e1f3132588683758a6369ec"
+SCRIPT_COMMIT="2d79800b6751dddd4b8b4ad50832faa5ae2a00d9"
 
 ffbuild_depends() {
     echo base

scripts.d/45-pulseaudio.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git"
-SCRIPT_COMMIT="be2efb69b97ee49ba81094d49a1b8d7be0c588c2"
+SCRIPT_COMMIT="b096704c0d42c5e784deb781a07b23cfb5286a82"
 
 ffbuild_depends() {
     echo base

scripts.d/45-vmaf.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/Netflix/vmaf.git"
-SCRIPT_COMMIT="e0d9b82d3b55de55927f1e7e7bd11f40a35de3e0"
+SCRIPT_COMMIT="6b75f37728b2eb70c11508ece93afaacc6572b45"
 
 ffbuild_enabled() {
     return 0
@@ -41,8 +41,7 @@ ffbuild_dockerbuild() {
 }
 
 ffbuild_configure() {
-    [[ $ADDINS_STR == *4.4* ]] && return 0
-    [[ $ADDINS_STR == *5.0* ]] && return 0
+    (( $(ffbuild_ffver) >= 501 )) || 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="2ec66abb885801f9d5944ef7b830c24401592b49"
+SCRIPT_COMMIT="283ead0904eb8c6350cef67dd638bb4a6b014c3a"
 
 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="f973f7db89571f61e96cb0a55f416d3e67a75663"
+SCRIPT_COMMIT="c18d2bc22813793bba7f0e4e603c0104d7724802"
 
 ffbuild_enabled() {
     [[ $TARGET != linux* ]] && return -1

scripts.d/47-vulkan/40-vulkan-headers.sh

@@ -1,11 +1,11 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/KhronosGroup/Vulkan-Headers.git"
-SCRIPT_COMMIT="v1.4.332"
+SCRIPT_COMMIT="v1.4.337"
 SCRIPT_TAGFILTER="v?.*.*"
 
 ffbuild_enabled() {
-    [[ $ADDINS_STR == *4.4* ]] && return -1
+    (( $(ffbuild_ffver) > 404 )) || return -1
     return 0
 }
 

scripts.d/47-vulkan/45-vulkan-loader.sh

@@ -4,11 +4,11 @@ SCRIPT_REPO="https://github.com/BtbN/Vulkan-Shim-Loader.git"
 SCRIPT_COMMIT="9657ca8e395ef16c79b57c8bd3f4c1aebb319137"
 
 SCRIPT_REPO2="https://github.com/KhronosGroup/Vulkan-Headers.git"
-SCRIPT_COMMIT2="v1.4.332"
+SCRIPT_COMMIT2="v1.4.337"
 SCRIPT_TAGFILTER2="v?.*.*"
 
 ffbuild_enabled() {
-    [[ $ADDINS_STR == *4.4* ]] && return -1
+    (( $(ffbuild_ffver) > 404 )) || return -1
     return 0
 }
 
@@ -31,5 +31,6 @@ ffbuild_configure() {
 }
 
 ffbuild_unconfigure() {
+    (( $(ffbuild_ffver) >= 404 )) || return 0
     echo --disable-vulkan
 }

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

@@ -1,10 +1,10 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/google/shaderc.git"
-SCRIPT_COMMIT="73743588fe9c39f2f1c780a087d94afac691a189"
+SCRIPT_COMMIT="e0a5092b4b05dbcc448b0883f3575163634f8e86"
 
 ffbuild_enabled() {
-    [[ $ADDINS_STR == *4.4* ]] && return -1
+    (( $(ffbuild_ffver) > 404 )) || return -1
     return 0
 }
 
@@ -62,6 +62,6 @@ ffbuild_configure() {
 }
 
 ffbuild_unconfigure() {
-    [[ $ADDINS_STR == *4.4* ]] && return 0
+    (( $(ffbuild_ffver) > 404 )) || return 0
     echo --disable-libshaderc
 }

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

@@ -1,10 +1,10 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/KhronosGroup/SPIRV-Cross.git"
-SCRIPT_COMMIT="adec7acbf41a988713cdb85f93f26c8ca5ea863e"
+SCRIPT_COMMIT="28184c1e138f18c330256eeb2f56b9f9fbc53921"
 
 ffbuild_enabled() {
-    [[ $ADDINS_STR == *4.4* ]] && return -1
+    (( $(ffbuild_ffver) > 404 )) || return -1
     return 0
 }
 

scripts.d/47-vulkan/99-enable.sh

@@ -3,7 +3,7 @@
 SCRIPT_SKIP="1"
 
 ffbuild_enabled() {
-    [[ $ADDINS_STR == *4.4* ]] && return -1
+    (( $(ffbuild_ffver) > 404 )) || return -1
     return 0
 }
 
@@ -12,6 +12,11 @@ ffbuild_dockerlayer() {
     to_df "COPY --link --from=${SELFLAYER} /opt/glslc /usr/bin/glslc"
 }
 
+ffbuild_dockerfinal() {
+    to_df "COPY --link --from=${PREVLAYER} \$FFBUILD_PREFIX/. \$FFBUILD_PREFIX"
+    to_df "COPY --link --from=${SELFLAYER} /opt/glslc /usr/bin/glslc"
+}
+
 ffbuild_dockerdl() {
     true
 }

scripts.d/50-aom.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://aomedia.googlesource.com/aom"
-SCRIPT_COMMIT="1e900cac01098ba2b996dab9683193daec971e2e"
+SCRIPT_COMMIT="0dfe179f80da866a291728590fd1bbc3b5e6fe0a"
 
 ffbuild_depends() {
     echo base

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

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/glennrp/libpng.git"
-SCRIPT_COMMIT="1ebf432e85b53bf111a4585b410592727dd40a5a"
+SCRIPT_COMMIT="0f07f70aa55e4771d00b0f8a238dca992fbb60e4"
 
 ffbuild_depends() {
     echo base

scripts.d/50-avisynth.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://github.com/AviSynth/AviSynthPlus.git"
-SCRIPT_COMMIT="b6d79944a59cf066fa00466ee02edb08e3ca214f"
+SCRIPT_COMMIT="ab03a3cedb1167909246d5c7a9c0645a4308dfdf"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1

scripts.d/50-chromaprint.sh

@@ -9,10 +9,7 @@ ffbuild_depends() {
 }
 
 ffbuild_enabled() {
-    # pkg-config check is currently only available in master
-    [[ $ADDINS_STR == *4.4* ]] && return -1
-    [[ $ADDINS_STR == *5.0* ]] && return -1
-    [[ $ADDINS_STR == *5.1* ]] && return -1
+    (( $(ffbuild_ffver) >= 600 )) || return -1
     return 0
 }
 

scripts.d/50-dav1d.sh

@@ -1,9 +1,10 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git"
-SCRIPT_COMMIT="e7c280e4cde445589c875dbd97da61579483f605"
+SCRIPT_COMMIT="5e8c380e4b70f62ab7c7d881394ecb891e200a5c"
 
 ffbuild_enabled() {
+    (( $(ffbuild_ffver) >= 404 )) || return -1
     return 0
 }
 
@@ -35,5 +36,6 @@ ffbuild_configure() {
 }
 
 ffbuild_unconfigure() {
+    (( $(ffbuild_ffver) >= 404 )) || return 0
     echo --disable-libdav1d
 }

scripts.d/50-dvd/30-libdvdcss.sh

@@ -1,15 +1,11 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://code.videolan.org/videolan/libdvdcss.git"
-SCRIPT_COMMIT="c838ca97553aeb8505b7baf02b9a90f8505de212"
+SCRIPT_COMMIT="64ff7c56f0ae4b8a87306a1e6b33ba1327a57e1d"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1
-    [[ $ADDINS_STR == *4.4* ]] && return -1
-    [[ $ADDINS_STR == *5.0* ]] && return -1
-    [[ $ADDINS_STR == *5.1* ]] && return -1
-    [[ $ADDINS_STR == *6.0* ]] && return -1
-    [[ $ADDINS_STR == *6.1* ]] && return -1
+    (( $(ffbuild_ffver) >= 700 )) || return -1
     return 0
 }
 

scripts.d/50-dvd/40-libdvdread.sh

@@ -1,15 +1,11 @@
 #!/bin/bash
 
 SCRIPT_REPO="https://code.videolan.org/videolan/libdvdread.git"
-SCRIPT_COMMIT="c7f373951bae9642e1ce1fbb2cd02f92c09756e0"
+SCRIPT_COMMIT="935042af3e7b28f636895a2917307ac6f5931e6c"
 
 ffbuild_enabled() {
     [[ $VARIANT == lgpl* ]] && return -1
-    [[ $ADDINS_STR == *4.4* ]] && return -1
-    [[ $ADDINS_STR == *5.0* ]] && return -1
-    [[ $ADDINS_STR == *5.1* ]] && return -1
-    [[ $ADDINS_STR == *6.0* ]] && return -1
-    [[ $ADDINS_STR == *6.1* ]] && return -1
+    (( $(ffbuild_ffver) >= 700 )) || return -1
     return 0
 }
 
@@ -45,10 +41,6 @@ ffbuild_configure() {
 }
 
 ffbuild_unconfigure() {
-    [[ $ADDINS_STR == *4.4* ]] && return 0
-    [[ $ADDINS_STR == *5.0* ]] && return 0
-    [[ $ADDINS_STR == *5.1* ]] && return 0
-    [[ $ADDINS_STR == *6.0* ]] && return 0
-    [[ $ADDINS_STR == *6.1* ]] && return 0
+    (( $(ffbuild_ffver) >= 700 )) || return 0
     echo --disable-libdvdread
 }