From 8c867634f05dc89a6f6217bb52ab170eefea78b9 Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Mon, 20 Mar 2023 21:40:05 +0800 Subject: [PATCH] Update dependencies Signed-off-by: nyanmisaka --- builder/scripts.d/10-mingw.sh | 2 +- builder/scripts.d/20-libxml2.sh | 2 +- builder/scripts.d/25-fftw3f.sh | 2 +- builder/scripts.d/25-freetype.sh | 2 +- builder/scripts.d/35-fontconfig.sh | 10 ++++++++-- builder/scripts.d/45-harfbuzz.sh | 2 +- builder/scripts.d/45-opencl.sh | 2 +- builder/scripts.d/45-x11/10-xproto.sh | 2 +- builder/scripts.d/45-x11/10-xtrans.sh | 2 +- builder/scripts.d/45-x11/30-libxcb.sh | 2 +- builder/scripts.d/45-x11/40-libx11.sh | 2 +- builder/scripts.d/45-x11/50-libxext.sh | 2 +- builder/scripts.d/45-x11/50-libxi.sh | 2 +- builder/scripts.d/45-x11/50-libxinerama.sh | 2 +- builder/scripts.d/45-x11/50-libxrender.sh | 2 +- builder/scripts.d/45-x11/50-libxscrnsaver.sh | 2 +- builder/scripts.d/45-x11/50-libxxf86vm.sh | 2 +- builder/scripts.d/45-x11/60-libglvnd.sh | 2 +- builder/scripts.d/45-x11/60-libxcursor.sh | 2 +- builder/scripts.d/45-x11/60-libxrandr.sh | 2 +- builder/scripts.d/45-x11/60-libxv.sh | 2 +- builder/scripts.d/50-dav1d.sh | 2 +- builder/scripts.d/50-libvpx.sh | 2 +- builder/scripts.d/50-libwebp.sh | 2 +- builder/scripts.d/50-onevpl.sh | 2 +- builder/scripts.d/50-srt.sh | 2 +- builder/scripts.d/50-svtav1.sh | 2 +- builder/scripts.d/50-vaapi/40-libdrm.sh | 2 +- builder/scripts.d/50-vaapi/50-libva.sh | 2 +- builder/scripts.d/50-vulkan/50-shaderc.sh | 2 +- builder/scripts.d/50-vulkan/55-spirv-cross.sh | 2 +- builder/scripts.d/50-zimg.sh | 2 +- docker-build-win64.sh | 5 ++--- docker-build.sh | 20 +++++++++---------- 34 files changed, 51 insertions(+), 46 deletions(-) diff --git a/builder/scripts.d/10-mingw.sh b/builder/scripts.d/10-mingw.sh index c01230801..083ed7ba3 100755 --- a/builder/scripts.d/10-mingw.sh +++ b/builder/scripts.d/10-mingw.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/mirror/mingw-w64.git" -SCRIPT_COMMIT="166b83cc85eb515a49764480600dca10862b6d55" +SCRIPT_COMMIT="0f2264e7b8fedbe225921367e82aeb97ddfed46b" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 diff --git a/builder/scripts.d/20-libxml2.sh b/builder/scripts.d/20-libxml2.sh index 23a69edec..a3dcf5054 100755 --- a/builder/scripts.d/20-libxml2.sh +++ b/builder/scripts.d/20-libxml2.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/GNOME/libxml2.git" -SCRIPT_COMMIT="f560065f4d6bd970be3bab81477abaa75cdd36fa" +SCRIPT_COMMIT="b1319c902f6e44d08f8cb33f1fc28847f2bc8aeb" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/25-fftw3f.sh b/builder/scripts.d/25-fftw3f.sh index ad6a2285a..77c9cf69a 100755 --- a/builder/scripts.d/25-fftw3f.sh +++ b/builder/scripts.d/25-fftw3f.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/FFTW/fftw3.git" -SCRIPT_COMMIT="9426cd59106ffddde1f55131c07fa9c562fa2f8e" +SCRIPT_COMMIT="c277d55689eef1616fa622b3bf6794af3a58e960" ffbuild_enabled() { # Dependency of GPL-Only librubberband diff --git a/builder/scripts.d/25-freetype.sh b/builder/scripts.d/25-freetype.sh index 5b4e1310e..36ce2cd7e 100755 --- a/builder/scripts.d/25-freetype.sh +++ b/builder/scripts.d/25-freetype.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/freetype/freetype.git" -SCRIPT_COMMIT="e8931f8c56104786479de38adbe2c8bb7f49c822" +SCRIPT_COMMIT="4f0a55d15ed1c9af267ed8223cc2f04307a3d656" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/35-fontconfig.sh b/builder/scripts.d/35-fontconfig.sh index e22a00721..108f97a17 100755 --- a/builder/scripts.d/35-fontconfig.sh +++ b/builder/scripts.d/35-fontconfig.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/fontconfig/fontconfig.git" -SCRIPT_COMMIT="a6a169572204dd86f4ab462ef505d98fdfd82d76" +SCRIPT_COMMIT="04546f18768e1ce57c24743035118b3eabbd4181" ffbuild_enabled() { return 0 @@ -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" ) diff --git a/builder/scripts.d/45-harfbuzz.sh b/builder/scripts.d/45-harfbuzz.sh index ca6a7a941..4f322db00 100755 --- a/builder/scripts.d/45-harfbuzz.sh +++ b/builder/scripts.d/45-harfbuzz.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git" -SCRIPT_COMMIT="e8f94f9e1249fd1374fa282685ae93aba3b8fcdd" +SCRIPT_COMMIT="79233a149209e3da199bb4e2f74271668502c574" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/45-opencl.sh b/builder/scripts.d/45-opencl.sh index 7e9f2ee93..511cf9e62 100755 --- a/builder/scripts.d/45-opencl.sh +++ b/builder/scripts.d/45-opencl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git" -SCRIPT_COMMIT="1080743ea047d6467bc609f979a21f00e06ac928" +SCRIPT_COMMIT="e3e85862d6905eba9f4b5ed02c52effe673721d3" SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git" SCRIPT_COMMIT2="ece91448a958099b9c277f050fca9df96a2ea718" diff --git a/builder/scripts.d/45-x11/10-xproto.sh b/builder/scripts.d/45-x11/10-xproto.sh index b133f5890..7b2f0fb6e 100755 --- a/builder/scripts.d/45-x11/10-xproto.sh +++ b/builder/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="cf35a91fe57d4721a173d2bc428dd07dcc4674f9" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/45-x11/10-xtrans.sh b/builder/scripts.d/45-x11/10-xtrans.sh index 44b02e040..f8ba5e3ea 100755 --- a/builder/scripts.d/45-x11/10-xtrans.sh +++ b/builder/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/builder/scripts.d/45-x11/30-libxcb.sh b/builder/scripts.d/45-x11/30-libxcb.sh index a559b090d..fd2f43dd3 100755 --- a/builder/scripts.d/45-x11/30-libxcb.sh +++ b/builder/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="fd04ab24a5e99d53874789439d3ffb0eb82574f7" +SCRIPT_COMMIT="18e109d755c5ce18157fdabb6de8ee6845b348ff" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/45-x11/40-libx11.sh b/builder/scripts.d/45-x11/40-libx11.sh index 543b73090..dba70794c 100755 --- a/builder/scripts.d/45-x11/40-libx11.sh +++ b/builder/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="53bf8584e8d7d5d4a4a8114bff26a6f631c7fac1" +SCRIPT_COMMIT="ca99e338a9b8aad300933b1336f9e3c091392213" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/45-x11/50-libxext.sh b/builder/scripts.d/45-x11/50-libxext.sh index f667cadfc..c482aa33c 100755 --- a/builder/scripts.d/45-x11/50-libxext.sh +++ b/builder/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="50cac0209f96469d3a332a59a9c8d6d658edaf5f" +SCRIPT_COMMIT="de2ebd62c1eb8fe16c11aceac4a6981bda124cf4" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/45-x11/50-libxi.sh b/builder/scripts.d/45-x11/50-libxi.sh index 6dfa355b6..3f6e8e756 100755 --- a/builder/scripts.d/45-x11/50-libxi.sh +++ b/builder/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/builder/scripts.d/45-x11/50-libxinerama.sh b/builder/scripts.d/45-x11/50-libxinerama.sh index 1af078e26..72d96ace1 100755 --- a/builder/scripts.d/45-x11/50-libxinerama.sh +++ b/builder/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/builder/scripts.d/45-x11/50-libxrender.sh b/builder/scripts.d/45-x11/50-libxrender.sh index 529d747c1..826ba7d99 100755 --- a/builder/scripts.d/45-x11/50-libxrender.sh +++ b/builder/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/builder/scripts.d/45-x11/50-libxscrnsaver.sh b/builder/scripts.d/45-x11/50-libxscrnsaver.sh index 0f152d27c..10a606b1a 100755 --- a/builder/scripts.d/45-x11/50-libxscrnsaver.sh +++ b/builder/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/builder/scripts.d/45-x11/50-libxxf86vm.sh b/builder/scripts.d/45-x11/50-libxxf86vm.sh index 2d706a183..e18c26d32 100755 --- a/builder/scripts.d/45-x11/50-libxxf86vm.sh +++ b/builder/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/builder/scripts.d/45-x11/60-libglvnd.sh b/builder/scripts.d/45-x11/60-libglvnd.sh index cd51237bb..6d19fb283 100755 --- a/builder/scripts.d/45-x11/60-libglvnd.sh +++ b/builder/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/builder/scripts.d/45-x11/60-libxcursor.sh b/builder/scripts.d/45-x11/60-libxcursor.sh index 8ddb57c04..8e9c9673b 100755 --- a/builder/scripts.d/45-x11/60-libxcursor.sh +++ b/builder/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/builder/scripts.d/45-x11/60-libxrandr.sh b/builder/scripts.d/45-x11/60-libxrandr.sh index 5ba854c3e..42273fdf6 100755 --- a/builder/scripts.d/45-x11/60-libxrandr.sh +++ b/builder/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/builder/scripts.d/45-x11/60-libxv.sh b/builder/scripts.d/45-x11/60-libxv.sh index 996da817e..1c3e343a3 100755 --- a/builder/scripts.d/45-x11/60-libxv.sh +++ b/builder/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/builder/scripts.d/50-dav1d.sh b/builder/scripts.d/50-dav1d.sh index b9f3b3ff9..cef3bcf84 100755 --- a/builder/scripts.d/50-dav1d.sh +++ b/builder/scripts.d/50-dav1d.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/dav1d.git" -SCRIPT_COMMIT="d426d1c91075b9c552b12dd052af1cd0368f05a2" +SCRIPT_COMMIT="16c943484e63da7ed8a8a8d85af88995369f23cd" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libvpx.sh b/builder/scripts.d/50-libvpx.sh index 9080bdf74..009d42764 100755 --- a/builder/scripts.d/50-libvpx.sh +++ b/builder/scripts.d/50-libvpx.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx" -SCRIPT_COMMIT="0e7804ca30c367eefb17594a0c5096f2f26de732" +SCRIPT_COMMIT="6788c75055899796c13787ed44cc6f1cc45e09d7" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libwebp.sh b/builder/scripts.d/50-libwebp.sh index bb815cff7..8097ead14 100755 --- a/builder/scripts.d/50-libwebp.sh +++ b/builder/scripts.d/50-libwebp.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp" -SCRIPT_COMMIT="d64e6d7d9d1e91d99e07de5e17afa0134d87f4ab" +SCRIPT_COMMIT="0825faa4c10d622f2747c5b2752e7b6a6848bf3f" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-onevpl.sh b/builder/scripts.d/50-onevpl.sh index 90beaab91..99a0a34a1 100755 --- a/builder/scripts.d/50-onevpl.sh +++ b/builder/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/builder/scripts.d/50-srt.sh b/builder/scripts.d/50-srt.sh index 09e58a68a..cd7363987 100755 --- a/builder/scripts.d/50-srt.sh +++ b/builder/scripts.d/50-srt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/Haivision/srt.git" -SCRIPT_COMMIT="1cffd2f2abad1782d1218f2c2b893f26bf4bbfce" +SCRIPT_COMMIT="39822840c506d72cef5a742d28f32ea28e144345" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-svtav1.sh b/builder/scripts.d/50-svtav1.sh index 0c47c405d..8d7ec4186 100755 --- a/builder/scripts.d/50-svtav1.sh +++ b/builder/scripts.d/50-svtav1.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.com/AOMediaCodec/SVT-AV1.git" -SCRIPT_COMMIT="f2b4b2d8729d0f9afabaf85ff0dd9741e24b57fd" +SCRIPT_COMMIT="72fd3d479b315fbf6bd1d7e80dec7afe42037819" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/builder/scripts.d/50-vaapi/40-libdrm.sh b/builder/scripts.d/50-vaapi/40-libdrm.sh index 87d6f2cc9..524466a71 100755 --- a/builder/scripts.d/50-vaapi/40-libdrm.sh +++ b/builder/scripts.d/50-vaapi/40-libdrm.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/mesa/drm.git" -SCRIPT_COMMIT="332809f3ee19f07abc03b62d5892fae51b9d9902" +SCRIPT_COMMIT="d1681af05471176215ad3d437249c38768dc959f" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/50-vaapi/50-libva.sh b/builder/scripts.d/50-vaapi/50-libva.sh index 779971d46..c38106e8d 100755 --- a/builder/scripts.d/50-vaapi/50-libva.sh +++ b/builder/scripts.d/50-vaapi/50-libva.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/intel/libva.git" -SCRIPT_COMMIT="97cbc87c94351c62a47d87e776488a9317ad398b" +SCRIPT_COMMIT="0fa448dd00c509f08cf53b9a95a55922ff09d5cf" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/50-vulkan/50-shaderc.sh b/builder/scripts.d/50-vulkan/50-shaderc.sh index 63891e00c..c9720278f 100755 --- a/builder/scripts.d/50-vulkan/50-shaderc.sh +++ b/builder/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() { return 0 diff --git a/builder/scripts.d/50-vulkan/55-spirv-cross.sh b/builder/scripts.d/50-vulkan/55-spirv-cross.sh index 238cf2082..6efd2ca6a 100755 --- a/builder/scripts.d/50-vulkan/55-spirv-cross.sh +++ b/builder/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="7512345f61e5f9b543ebb87df678f3fe7735587b" +SCRIPT_COMMIT="d26c233e1c2629fec1ae1b6fdf538958e5d52bff" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-zimg.sh b/builder/scripts.d/50-zimg.sh index 80c334700..50b4aac1d 100755 --- a/builder/scripts.d/50-zimg.sh +++ b/builder/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 diff --git a/docker-build-win64.sh b/docker-build-win64.sh index 525e9e024..6168c46f1 100755 --- a/docker-build-win64.sh +++ b/docker-build-win64.sh @@ -521,9 +521,8 @@ EOF popd # FFNVCODEC -git clone --depth=1 https://github.com/FFmpeg/nv-codec-headers.git +git clone -b n12.0.16.0 --depth=1 https://github.com/FFmpeg/nv-codec-headers.git pushd nv-codec-headers -git reset --hard "c5e4af7" make PREFIX=${FF_DEPS_PREFIX} install popd @@ -535,7 +534,7 @@ mv * ${FF_DEPS_PREFIX}/include/AMF popd # VPL -git clone -b v2023.1.2 --depth=1 https://github.com/oneapi-src/oneVPL.git +git clone -b v2023.1.3 --depth=1 https://github.com/oneapi-src/oneVPL.git pushd oneVPL mkdir build && pushd build cmake \ diff --git a/docker-build.sh b/docker-build.sh index 0452efbb6..6c11a52af 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -156,9 +156,8 @@ prepare_extra_amd64() { # FFNVCODEC pushd ${SOURCE_DIR} - git clone --depth=1 https://github.com/FFmpeg/nv-codec-headers.git + git clone -b n12.0.16.0 --depth=1 https://github.com/FFmpeg/nv-codec-headers.git pushd nv-codec-headers - git reset --hard "c5e4af7" make && make install popd popd @@ -252,7 +251,7 @@ prepare_extra_amd64() { # Provides MSDK runtime (libmfxhw64.so.1) for 11th Gen Rocket Lake and older # Provides MFX dispatcher (libmfx.so.1) for FFmpeg pushd ${SOURCE_DIR} - git clone -b intel-mediasdk-23.1.2 --depth=1 https://github.com/Intel-Media-SDK/MediaSDK.git + git clone -b intel-mediasdk-23.1.3 --depth=1 https://github.com/Intel-Media-SDK/MediaSDK.git pushd MediaSDK sed -i 's|MFX_PLUGINS_CONF_DIR "/plugins.cfg"|"/usr/lib/jellyfin-ffmpeg/lib/mfx/plugins.cfg"|g' api/mfx_dispatch/linux/mfxloader.cpp mkdir build && pushd build @@ -269,7 +268,7 @@ prepare_extra_amd64() { # ONEVPL (dispatcher + header) pushd ${SOURCE_DIR} - git clone -b v2023.1.2 --depth=1 https://github.com/oneapi-src/oneVPL.git + git clone -b v2023.1.3 --depth=1 https://github.com/oneapi-src/oneVPL.git pushd oneVPL sed -i 's|ParseEnvSearchPaths(ONEVPL_PRIORITY_PATH_VAR, searchDirList)|searchDirList.push_back("/usr/lib/jellyfin-ffmpeg/lib")|g' dispatcher/vpl/mfx_dispatcher_vpl_loader.cpp mkdir build && pushd build @@ -293,7 +292,7 @@ prepare_extra_amd64() { # Provides VPL runtime (libmfx-gen.so.1.2) for 11th Gen Tiger Lake and newer # Both MSDK and VPL runtime can be loaded by MFX dispatcher (libmfx.so.1) pushd ${SOURCE_DIR} - git clone -b intel-onevpl-23.1.2 --depth=1 https://github.com/oneapi-src/oneVPL-intel-gpu.git + git clone -b intel-onevpl-23.1.3 --depth=1 https://github.com/oneapi-src/oneVPL-intel-gpu.git pushd oneVPL-intel-gpu mkdir build && pushd build cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} .. @@ -307,7 +306,7 @@ prepare_extra_amd64() { # Full Feature Build: ENABLE_KERNELS=ON(Default) ENABLE_NONFREE_KERNELS=ON(Default) # Free Kernel Build: ENABLE_KERNELS=ON ENABLE_NONFREE_KERNELS=OFF pushd ${SOURCE_DIR} - git clone -b intel-media-23.1.2 --depth=1 https://github.com/intel/media-driver.git + git clone -b intel-media-23.1.3 --depth=1 https://github.com/intel/media-driver.git pushd media-driver # Possible fix for TGLx timeout caused by 'HCP Scalability Decode' under heavy load wget -q -O - https://github.com/intel/media-driver/commit/284750bf.patch | git apply @@ -362,7 +361,7 @@ prepare_extra_amd64() { # SHADERC pushd ${SOURCE_DIR} - git clone -b v2023.2 --depth=1 https://github.com/google/shaderc.git + git clone -b v2023.3 --depth=1 https://github.com/google/shaderc.git pushd shaderc ./utils/git-sync-deps mkdir build && pushd build @@ -391,9 +390,10 @@ prepare_extra_amd64() { pushd ${SOURCE_DIR} git clone -b main https://gitlab.freedesktop.org/mesa/mesa.git pushd mesa - git reset --hard "a19a37e8" - # fix av1 main nv12 decoding - wget -q -O - https://gitlab.freedesktop.org/mesa/mesa/-/commit/39c6f1f5.patch | git apply + git reset --hard "10622ccc" + # fix building with python 3.8 + wget -q -O - https://gitlab.freedesktop.org/mesa/mesa/-/commit/044db56a.patch | git apply + wget -q -O - https://gitlab.freedesktop.org/mesa/mesa/-/commit/40f89860.patch | git apply popd # disable the broken hevc packed header MESA_VA_PIC="mesa/src/gallium/frontends/va/picture.c"