diff --git a/builder/scripts.d/10-mingw.sh b/builder/scripts.d/10-mingw.sh index 2d0d93e50..bdeca336e 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="92eac6fea3c2c5142f6974a35530e23cbe9f9bbe" +SCRIPT_COMMIT="a57cacad31f5766d45959b6c0f9b122918d545fa" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 diff --git a/builder/scripts.d/20-libxml2.sh b/builder/scripts.d/20-libxml2.sh index 7fd50d1ba..e8f0db54b 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="85c6cacd67371045b1d4c9f167606f64ed0d18c7" +SCRIPT_COMMIT="608c65bb8ebfc12763aee1cc1f3778e17d71596e" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/25-freetype.sh b/builder/scripts.d/25-freetype.sh index b0fbed826..8219401d5 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="b405fc5c1dbbe8163bf199b921ccfc5f902eaa4f" +SCRIPT_COMMIT="82ce172669f132839debe6e50a3a53fe88db9e31" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/25-fribidi.sh b/builder/scripts.d/25-fribidi.sh index 00b6273e0..18b8a7509 100755 --- a/builder/scripts.d/25-fribidi.sh +++ b/builder/scripts.d/25-fribidi.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/fribidi/fribidi.git" -SCRIPT_COMMIT="a6a4defff24aabf9195f462f9a7736f3d9e9c120" +SCRIPT_COMMIT="2c2a014bf7161d43ed9f0f23f383be176a4f9df3" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/25-xz.sh b/builder/scripts.d/25-xz.sh index ce6e96bbe..617562ed3 100755 --- a/builder/scripts.d/25-xz.sh +++ b/builder/scripts.d/25-xz.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/xz-mirror/xz.git" -SCRIPT_COMMIT="cf118c014683069b5dbe91898acdc40f2f0a1f5d" +SCRIPT_COMMIT="a8bb8358d10b059274f3cf993d9b8f490bafb268" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/35-fontconfig.sh b/builder/scripts.d/35-fontconfig.sh index 4387fffcc..f1e32db3a 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="ddea974d3cc5d013bdc1c69a090529745cd987b1" +SCRIPT_COMMIT="b7586f0170c5ab1d92d98aab2a5f623c70eee6e5" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/45-chromaprint.sh b/builder/scripts.d/45-chromaprint.sh index f1d21a99a..1bb16fa9b 100755 --- a/builder/scripts.d/45-chromaprint.sh +++ b/builder/scripts.d/45-chromaprint.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/acoustid/chromaprint.git" -SCRIPT_COMMIT="b6d5f131e0c693ea877cbf49e0174be9fb0f9856" +SCRIPT_COMMIT="aa67c95b9e486884a6d3ee8b0c91207d8c2b0551" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/45-harfbuzz.sh b/builder/scripts.d/45-harfbuzz.sh index 855b7be21..3dcabf975 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="35233d2514cc202e9e2f8f94b3102cb620a0d403" +SCRIPT_COMMIT="0c7d386748e7cf0bfb09598f82b84b8927d78190" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/45-opencl.sh b/builder/scripts.d/45-opencl.sh index 3d7140f46..8cfee2015 100755 --- a/builder/scripts.d/45-opencl.sh +++ b/builder/scripts.d/45-opencl.sh @@ -1,10 +1,10 @@ #!/bin/bash SCRIPT_REPO="https://github.com/KhronosGroup/OpenCL-Headers.git" -SCRIPT_COMMIT="8f33fba7c14b926c6551bf86b5b255e3e0f47f86" +SCRIPT_COMMIT="a86f4e7d8ec90c2a78d97729282ce7efff6982f4" SCRIPT_REPO2="https://github.com/KhronosGroup/OpenCL-ICD-Loader.git" -SCRIPT_COMMIT2="9a3e962f16f5097d2054233ad8b6dad51b6f41b7" +SCRIPT_COMMIT2="6ceb5d28d67340fb147d57873c3dc90e79a12782" ffbuild_enabled() { return 0 @@ -22,7 +22,10 @@ ffbuild_dockerbuild() { mkdir build && cd build - cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" -DOPENCL_ICD_LOADER_HEADERS_DIR="$FFBUILD_PREFIX"/include -DOPENCL_ICD_LOADER_BUILD_SHARED_LIBS=OFF -DOPENCL_ICD_LOADER_DISABLE_OPENCLON12=ON -DOPENCL_ICD_LOADER_PIC=ON -DOPENCL_ICD_LOADER_BUILD_TESTING=OFF -DBUILD_TESTING=OFF .. + cmake -DCMAKE_TOOLCHAIN_FILE="$FFBUILD_CMAKE_TOOLCHAIN" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$FFBUILD_PREFIX" \ + -DOPENCL_ICD_LOADER_HEADERS_DIR="$FFBUILD_PREFIX"/include -DOPENCL_ICD_LOADER_BUILD_SHARED_LIBS=OFF \ + -DOPENCL_ICD_LOADER_DISABLE_OPENCLON12=ON -DOPENCL_ICD_LOADER_PIC=ON \ + -DOPENCL_ICD_LOADER_BUILD_TESTING=OFF -DBUILD_TESTING=OFF .. make -j$(nproc) make install @@ -34,12 +37,13 @@ ffbuild_dockerbuild() { echo "Name: OpenCL" >> OpenCL.pc echo "Description: OpenCL ICD Loader" >> OpenCL.pc echo "Version: 3.0" >> OpenCL.pc - echo "Libs: -L\${libdir} -lOpenCL" >> OpenCL.pc echo "Cflags: -I\${includedir}" >> OpenCL.pc if [[ $TARGET == linux* ]]; then + echo "Libs: -L\${libdir} -lOpenCL" >> OpenCL.pc echo "Libs.private: -ldl" >> OpenCL.pc elif [[ $TARGET == win* ]]; then + echo "Libs: -L\${libdir} -l:OpenCL.a" >> OpenCL.pc echo "Libs.private: -lole32 -lshlwapi -lcfgmgr32" >> OpenCL.pc fi diff --git a/builder/scripts.d/45-x11/10-xproto.sh b/builder/scripts.d/45-x11/10-xproto.sh index b23858dde..a4f3bc79a 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="9740bd9bfa75a858853f07b8c06dd813ef692778" +SCRIPT_COMMIT="1b6e63b2c38a0cf6cd1c70bfc5483cac0d1710e1" 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 c6f35ac49..4677e62c9 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="cb8c70f5a65b4bd68b449dcaa637c3c4753e2f81" +SCRIPT_COMMIT="3333d5bde8baaca8981e806ef86b74f4adb77ba7" 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 85f8bac11..cf1314663 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="7f7bcd7b6f569e9f70e3ddd134924f178e2596b1" +SCRIPT_COMMIT="ba548ed1688d4d5a83913218155d0ddf616ff176" 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 2695b96db..d9c10cec2 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="67e82cc395f44faddd83ec3d0d21624fe91c6fc0" +SCRIPT_COMMIT="e8556ab06e03b59e9a512eb02955247efd4c4054" 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 dd4799336..cd51237bb 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="b05bbcdaeb9b700cf7877e6d66f8fc3ac952295b" +SCRIPT_COMMIT="dba80d0158b587de91640fae5c0b420c23599d1e" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/50-amf.sh b/builder/scripts.d/50-amf.sh index 1bcf02c18..7be38a84d 100755 --- a/builder/scripts.d/50-amf.sh +++ b/builder/scripts.d/50-amf.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git" -SCRIPT_COMMIT="734a9ae3ab446cbedb70028469bd323be45700f2" +SCRIPT_COMMIT="9e2ebb91b5447c766b02b43826ca287f06789e5c" ffbuild_enabled() { [[ $TARGET == *arm64 ]] && return -1 diff --git a/builder/scripts.d/50-dav1d.sh b/builder/scripts.d/50-dav1d.sh index 50c566a5a..0fa48955c 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="c56e352b95960d8dd243f6a14c7f1d7a431ceced" +SCRIPT_COMMIT="0d6a31f275dc73dabf9fd8742a4adaa9ecc13da6" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libass.sh b/builder/scripts.d/50-libass.sh index 02b39dfd1..04a97d00f 100755 --- a/builder/scripts.d/50-libass.sh +++ b/builder/scripts.d/50-libass.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/libass/libass.git" -SCRIPT_COMMIT="062d4ec598b4fd06f75c0cd6a0f43f5d0939a764" +SCRIPT_COMMIT="a943ef542e72e849dc0c1047465e0506781374b5" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libopus.sh b/builder/scripts.d/50-libopus.sh index 41bb879b6..f81dee0f3 100755 --- a/builder/scripts.d/50-libopus.sh +++ b/builder/scripts.d/50-libopus.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/xiph/opus.git" -SCRIPT_COMMIT="757c53f775a0b651b0512a1992d67f4b2159a378" +SCRIPT_COMMIT="8cf872a186b96085b1bb3a547afd598354ebeb87" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libvpx.sh b/builder/scripts.d/50-libvpx.sh index 802823284..3182e4746 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="1450ec46e273b32234b036d7803aaae09423dd08" +SCRIPT_COMMIT="7a8052ccda29b3f16f93927cbea46e32c86f422c" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libwebp.sh b/builder/scripts.d/50-libwebp.sh index 1b27a047f..3504e4c86 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="e5fe2cfc1bea149106d94ef5233c488ed1287b68" +SCRIPT_COMMIT="b54d21a01d975c9a5681e8d3db6e0f55265ea5bb" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-onevpl.sh b/builder/scripts.d/50-onevpl.sh index 266d66558..892175d60 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="17f1ef9abb52c10ca88c57508a30de63c4e1bb16" +SCRIPT_COMMIT="5d7b6af5b483e6ddc0d9746efc97edfebf508e1d" ffbuild_enabled() { [[ $TARGET == *arm64 ]] && return -1 diff --git a/builder/scripts.d/50-srt.sh b/builder/scripts.d/50-srt.sh index cc86cb00b..bf5a8edf5 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="38b4211dfc6da072e21ee9472e03acc1f6e1d09a" +SCRIPT_COMMIT="a08a42c431c5beec223562774351d05aa6361a68" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-svtav1.sh b/builder/scripts.d/50-svtav1.sh index 853f73ba2..8814e3f7a 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="b4c89396fa22791570c3992f9c56a6a65bdaca48" +SCRIPT_COMMIT="9b9cc9edc3bf39aee5a9bf6b6df9981bc165d4df" ffbuild_enabled() { [[ $TARGET == win32 ]] && return -1 diff --git a/builder/scripts.d/50-vaapi/30-libpciaccess.sh b/builder/scripts.d/50-vaapi/30-libpciaccess.sh index 34201c9f4..d284296b2 100755 --- a/builder/scripts.d/50-vaapi/30-libpciaccess.sh +++ b/builder/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="935f0b4d6983f77c4f35e6d492f9f2c2d1ed57f9" +SCRIPT_COMMIT="833c86ce15cee2a84a37ae71015f236fd32615d9" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/50-vaapi/40-libdrm.sh b/builder/scripts.d/50-vaapi/40-libdrm.sh index 992ea7ba8..2638cc62c 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="874af994636a534236a747a88aec086b9b35b001" +SCRIPT_COMMIT="0e2c7d05712d65903a9b77fb9f960ddff43bac64" 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 04f345abd..cc2da9623 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="aeb704af762e3b5010908a544f5b2b1adeb27896" +SCRIPT_COMMIT="b75818c092367723c76e716c56d3ef9765ce9e51" 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 b9a2701a4..b6e1a7bb3 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="9806490ff5908aec0012f89df342c1a8985b1263" +SCRIPT_COMMIT="c0308e68c305ba8d61c12d5cef61eeb8b96084c3" 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 aa22ef40e..7585296be 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="c77b09b57c27837dc2d41aa371ed3d236ce9ce47" +SCRIPT_COMMIT="4be568c0047163d61859c0be2411b48d29672ba7" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-vulkan/60-libplacebo.sh b/builder/scripts.d/50-vulkan/60-libplacebo.sh index 8666298bd..0009e8034 100755 --- a/builder/scripts.d/50-vulkan/60-libplacebo.sh +++ b/builder/scripts.d/50-vulkan/60-libplacebo.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git" -SCRIPT_COMMIT="7ead30db8aa75db28236eee40899f0ff6e3c9688" +SCRIPT_COMMIT="9074fd72dd80e365e082008b7588a854d4372408" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-x264.sh b/builder/scripts.d/50-x264.sh index 5de7449b2..a33b0fd29 100755 --- a/builder/scripts.d/50-x264.sh +++ b/builder/scripts.d/50-x264.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/mirror/x264.git" -SCRIPT_COMMIT="416e3eb2b52abb0a67e57599aba4f8be3003b36d" +SCRIPT_COMMIT="941cae6d1d6d6344c9a1d27440eaf2872b18ca9a" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/builder/scripts.d/50-x265.sh b/builder/scripts.d/50-x265.sh index 7f573bf58..36b442cd0 100755 --- a/builder/scripts.d/50-x265.sh +++ b/builder/scripts.d/50-x265.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://bitbucket.org/multicoreware/x265_git.git" -SCRIPT_COMMIT="4da1198a94028026ce96ba1781d3c7842e74e173" +SCRIPT_COMMIT="5d8f20917709642a907dae8a5441d17247b6131f" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/builder/scripts.d/50-zimg.sh b/builder/scripts.d/50-zimg.sh index 2d1b22681..22de0f483 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="48eec5c68b086bbae0f75498e25b5a229e5ea684" +SCRIPT_COMMIT="479206c28b0f59fa94f78fcf253145534ee49560" ffbuild_enabled() { return 0 diff --git a/docker-build-win64.sh b/docker-build-win64.sh index 701b6489d..8892a0399 100755 --- a/docker-build-win64.sh +++ b/docker-build-win64.sh @@ -166,7 +166,7 @@ popd # LZMA mkdir xz pushd xz -xz_ver="5.2.9" +xz_ver="5.4.1" xz_link="https://sourceforge.net/projects/lzmautils/files/xz-${xz_ver}.tar.xz/download" wget ${xz_link} -O xz.tar.xz tar xaf xz.tar.xz diff --git a/docker-build.sh b/docker-build.sh index 9f832487a..cf25560e8 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -201,7 +201,7 @@ prepare_extra_amd64() { # LIBVA pushd ${SOURCE_DIR} - git clone -b 2.16.0 --depth=1 https://github.com/intel/libva + git clone -b 2.17.0 --depth=1 https://github.com/intel/libva pushd libva sed -i 's|getenv("LIBVA_DRIVERS_PATH")|"/usr/lib/jellyfin-ffmpeg/lib/dri:/usr/lib/x86_64-linux-gnu/dri:/usr/lib/dri:/usr/local/lib/dri"|g' va/va.c sed -i 's|getenv("LIBVA_DRIVER_NAME")|getenv("LIBVA_DRIVER_NAME_JELLYFIN")|g' va/va.c @@ -218,7 +218,7 @@ prepare_extra_amd64() { # LIBVA-UTILS pushd ${SOURCE_DIR} - git clone -b 2.16.0 --depth=1 https://github.com/intel/libva-utils + git clone -b 2.17.1 --depth=1 https://github.com/intel/libva-utils pushd libva-utils ./autogen.sh ./configure --prefix=${TARGET_DIR} @@ -242,7 +242,7 @@ prepare_extra_amd64() { # GMMLIB pushd ${SOURCE_DIR} - git clone -b intel-gmmlib-22.3.2 --depth=1 https://github.com/intel/gmmlib + git clone -b intel-gmmlib-22.3.3 --depth=1 https://github.com/intel/gmmlib pushd gmmlib mkdir build && pushd build cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} .. @@ -256,7 +256,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-22.6.4 --depth=1 https://github.com/Intel-Media-SDK/MediaSDK + git clone -b intel-mediasdk-23.1.0 --depth=1 https://github.com/Intel-Media-SDK/MediaSDK 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 @@ -276,8 +276,11 @@ 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-22.6.4 --depth=1 https://github.com/oneapi-src/oneVPL-intel-gpu + git clone -b intel-onevpl-23.1.0 --depth=1 https://github.com/oneapi-src/oneVPL-intel-gpu pushd oneVPL-intel-gpu + # Wa for an av1 dec regression + wget -q -O - https://github.com/oneapi-src/oneVPL-intel-gpu/commit/f31fd02.patch | git apply + wget -q -O - https://github.com/oneapi-src/oneVPL-intel-gpu/commit/dca2c3d.patch | git apply mkdir build && pushd build cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} .. make -j$(nproc) && make install && make install DESTDIR=${SOURCE_DIR}/intel @@ -290,9 +293,8 @@ 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-22.6.4 --depth=1 https://github.com/intel/media-driver + git clone -b intel-media-23.1.0 --depth=1 https://github.com/intel/media-driver pushd media-driver - sed -i 's|#include ||g' media_softlet/linux/common/vp/ddi/ddi_vp_functions.cpp mkdir build && pushd build cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} \ -DENABLE_KERNELS=ON \ @@ -344,7 +346,7 @@ prepare_extra_amd64() { # SHADERC pushd ${SOURCE_DIR} - git clone -b v2022.4 --depth=1 https://github.com/google/shaderc + git clone -b v2023.1 --depth=1 https://github.com/google/shaderc pushd shaderc ./utils/git-sync-deps mkdir build && pushd build @@ -373,13 +375,14 @@ prepare_extra_amd64() { pushd ${SOURCE_DIR} mkdir mesa pushd mesa - mesa_ver="22.2.5" + mesa_ver="22.3.3" mesa_link="https://mesa.freedesktop.org/archive/mesa-${mesa_ver}.tar.xz" wget ${mesa_link} -O mesa.tar.xz tar xaf mesa.tar.xz - # fix the invalid modifier issue on amd apu - MESA_SI_TEX="mesa-${mesa_ver}/src/gallium/drivers/radeonsi/si_texture.c" - sed -i 's|(struct si_texture \*)screen->resource_create(screen, \&templ)|(struct si_texture\*)((tex->surface.modifier==DRM_FORMAT_MOD_INVALID\|\|!screen->resource_create_with_modifiers)?screen->resource_create(screen,\&templ):screen->resource_create_with_modifiers(screen,\&templ,\&tex->surface.modifier,1))|g' ${MESA_SI_TEX} + # Wa for the hevc vce encoder regression + pushd mesa-${mesa_ver} + wget -q -O - https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20714.patch | git apply + popd # disable the broken hevc packed header MESA_VA_PIC="mesa-${mesa_ver}/src/gallium/frontends/va/picture.c" MESA_VA_CONF="mesa-${mesa_ver}/src/gallium/frontends/va/config.c" @@ -396,7 +399,7 @@ prepare_extra_amd64() { --wrap-mode=nofallback \ -Db_ndebug=true \ -Db_lto=false \ - -Dplatforms=x11\ + -Dplatforms=x11 \ -Ddri-drivers=[] \ -Dgallium-drivers=radeonsi \ -Dvulkan-drivers=amd,intel \ @@ -404,7 +407,7 @@ prepare_extra_amd64() { -Ddri3=enabled \ -Degl=disabled \ -Dgallium-{extra-hud,nine}=false \ - -Dgallium-{omx,vdpau,xa,xvmc,opencl}=disabled \ + -Dgallium-{omx,vdpau,xa,opencl}=disabled \ -Dgallium-va=enabled \ -Dvideo-codecs=vc1dec,h264dec,h264enc,h265dec,h265enc \ -Dgbm=disabled \ @@ -489,7 +492,7 @@ EOF # Add armhf architecture dpkg --add-architecture armhf # Update and install cross-gcc-dev - apt-get update + apt-get update && apt-get upgrade -y yes | apt-get install -y cross-gcc-dev # Generate gcc cross source TARGET_LIST="armhf" cross-gcc-gensource ${GCC_VER} @@ -527,7 +530,7 @@ EOF # Add armhf architecture dpkg --add-architecture arm64 # Update and install cross-gcc-dev - apt-get update + apt-get update && apt-get upgrade -y yes | apt-get install -y cross-gcc-dev # Generate gcc cross source TARGET_LIST="arm64" cross-gcc-gensource ${GCC_VER} @@ -541,6 +544,7 @@ EOF # Set the architecture-specific options case ${ARCH} in 'amd64') + apt-get update && apt-get upgrade -y prepare_extra_common prepare_extra_amd64 CONFIG_SITE=""