diff --git a/builder/scripts.d/10-mingw.sh b/builder/scripts.d/10-mingw.sh index 37f7dc8df71..c35e37850b8 100755 --- a/builder/scripts.d/10-mingw.sh +++ b/builder/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="f1075a71a0027febccc19a1db0244e98f9ae0102" +SCRIPT_COMMIT="1b554dec06f8d3c26b856a7d1575f396d8ffa403" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 diff --git a/builder/scripts.d/20-zlib.sh b/builder/scripts.d/20-zlib.sh index b703898ec99..a50459b4a52 100755 --- a/builder/scripts.d/20-zlib.sh +++ b/builder/scripts.d/20-zlib.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/madler/zlib.git" -SCRIPT_COMMIT="ceadaf28dfa48dbf238a0ddb884d4c543b4170e8" +SCRIPT_COMMIT="d476828316d05d54c6fd6a068b121b30c147b5cd" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/25-freetype.sh b/builder/scripts.d/25-freetype.sh index b2a683f8b07..e8d9b49dd5d 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="1452355de99d22b0cba6ccc17bf5cdf3682ef61e" +SCRIPT_COMMIT="d2612e1c3ff839595fbf67c8263a07d6bac3aaf5" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/25-libxml2.sh b/builder/scripts.d/25-libxml2.sh index 6cac01fe4e4..338e8d6a423 100755 --- a/builder/scripts.d/25-libxml2.sh +++ b/builder/scripts.d/25-libxml2.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/GNOME/libxml2.git" -SCRIPT_COMMIT="7c10393fc0748a4651484408410b9b939d806364" +SCRIPT_COMMIT="40abebbc739fb4cddfc205eeb129cefe9b9f6e5b" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/25-openssl.sh b/builder/scripts.d/25-openssl.sh index deef79bdca8..918e1041a23 100755 --- a/builder/scripts.d/25-openssl.sh +++ b/builder/scripts.d/25-openssl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/openssl/openssl.git" -SCRIPT_COMMIT="openssl-3.1.6" +SCRIPT_COMMIT="openssl-3.1.7" SCRIPT_TAGFILTER="openssl-3.1.*" ffbuild_enabled() { diff --git a/builder/scripts.d/35-fontconfig.sh b/builder/scripts.d/35-fontconfig.sh index 62d4ba1f0f3..bc75817bf49 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="70b60ca46107fc4774d163773febe974c76b2ee7" +SCRIPT_COMMIT="bd83c04aa6f3cb864ba60dc5eaf2b41c4c269c63" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/45-harfbuzz.sh b/builder/scripts.d/45-harfbuzz.sh index da371e168bf..fa1c2d799d0 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="fe7dc0c3cfbdda5d064a8f5de9f0256a2df8dfed" +SCRIPT_COMMIT="a070f9ebbe88dc71b248af9731dd49ec93f4e6e6" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/45-x11/10-xtrans.sh b/builder/scripts.d/45-x11/10-xtrans.sh index a3cd11ff85b..cd4efb701d5 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="edd3f51328df9c621277168c9dd77b1e80ccfd7c" +SCRIPT_COMMIT="0f153064bfa4bb69e86f3f2383f2f421f2360319" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/45-x11/20-libxau.sh b/builder/scripts.d/45-x11/20-libxau.sh index 674dafc8858..bd0fff45f7a 100755 --- a/builder/scripts.d/45-x11/20-libxau.sh +++ b/builder/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="89429bb36de409b204ef105e8b73126a639ccb03" +SCRIPT_COMMIT="6b2e9a63d8306282a2b384762bea004c19f301a1" 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 5fd4d40a709..0e9e3a5f273 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="92014b39634e0b0aa52d4bff955a7aac3ed0a915" +SCRIPT_COMMIT="19b2f5c2d0935cbf9c17ecf30604f80592807b59" 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 cf25700721f..31726bd0424 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="56b11459f833df8f324587847534a548b070da94" +SCRIPT_COMMIT="a5af26c654b4da5fd5eaaeaa2173c734ab9e63ec" 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 1c3e343a333..f027a7ed93e 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="b022c9cf7004fe6f794c4c00dd519a2e4c74eca0" +SCRIPT_COMMIT="fba7bf352678db2938f5a7b173d2a8823595ef3b" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/50-amf.sh b/builder/scripts.d/50-amf.sh index ffa15caa737..c0c05f38897 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="6d7bec0469961e2891c6e1aaa5122b76ed82e1db" +SCRIPT_COMMIT="a6fca4a3bb5585bd0bca4d1a531c40e39f5f572b" ffbuild_enabled() { [[ $TARGET == mac* ]] && return -1 diff --git a/builder/scripts.d/50-dav1d.sh b/builder/scripts.d/50-dav1d.sh index d54f568f12e..dd366f19adc 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="2355eeb8f254a1c34dbb0241be5c70cdf6ed46d1" +SCRIPT_COMMIT="bdef29970a5848dc1bfc706146253931cde0b3f6" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libass.sh b/builder/scripts.d/50-libass.sh index d5eac783e34..aac593e71dd 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="c131a95c443f894bd95a05dfa3d0a8dc67a22d5e" +SCRIPT_COMMIT="3a7a9b99e75fb094f243d4b086b414556a0d9947" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libopus.sh b/builder/scripts.d/50-libopus.sh index 4c6544c67a1..d72eaec06f5 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="2554a89e02c7fc30a980b4f7e635ceae1ecba5d6" +SCRIPT_COMMIT="5854a9f7de06ab3505b8fe6e8943db581c2cbe70" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libvpl.sh b/builder/scripts.d/50-libvpl.sh index 37ebed14581..bc7bc3f367f 100755 --- a/builder/scripts.d/50-libvpl.sh +++ b/builder/scripts.d/50-libvpl.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/intel/libvpl.git" -SCRIPT_COMMIT="0c13c410095764799afea0cf645bd896378579b8" +SCRIPT_COMMIT="5f6bd8a1e753c8f63a3fd8b36894d6968b808a6d" ffbuild_enabled() { [[ $TARGET == mac* ]] && return -1 diff --git a/builder/scripts.d/50-libvpx.sh b/builder/scripts.d/50-libvpx.sh index 7b7ac3e10fe..d1a38b6d6d2 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="3fb0e5d75dc07890113ddbdecb88e34853e058de" +SCRIPT_COMMIT="fbf63dff1f528d44f24bd662abb89fd01a4a1c25" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libwebp.sh b/builder/scripts.d/50-libwebp.sh index 1b4cb7e1f3c..a9b597aded9 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="0c01db7c3ceb3f2c941fc8bba8b3d38878021a79" +SCRIPT_COMMIT="2e81017c7a345f687223086cbc177a8459a18b52" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-openmpt.sh b/builder/scripts.d/50-openmpt.sh index d5619eedbf5..de31dd928d7 100755 --- a/builder/scripts.d/50-openmpt.sh +++ b/builder/scripts.d/50-openmpt.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://source.openmpt.org/svn/openmpt/trunk/OpenMPT" -SCRIPT_REV="21268" +SCRIPT_REV="21571" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-rkmpp.sh b/builder/scripts.d/50-rkmpp.sh index 8198aa7f26b..afceca8374b 100755 --- a/builder/scripts.d/50-rkmpp.sh +++ b/builder/scripts.d/50-rkmpp.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/nyanmisaka/mpp.git" -SCRIPT_COMMIT="19611f16d515cd3725bac67e5dd87df096869b40" +SCRIPT_COMMIT="4ded78b9510145fa79bcd51beb1591450c872277" ffbuild_enabled() { [[ $TARGET == linux* ]] && [[ $TARGET == *arm64 ]] && return 0 diff --git a/builder/scripts.d/50-srt.sh b/builder/scripts.d/50-srt.sh index 963c15d5a5a..f582651fd0e 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="84d18ec9d1ef9e1bb37133d07151d59e92b4295e" +SCRIPT_COMMIT="9c7206f0190c0c800a5ee1e71ee61ec0d4c7e216" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-svtav1.sh b/builder/scripts.d/50-svtav1.sh index cc60caba62d..3566ab9c03c 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="21a1154add74504aa86d782a3cf662d3d7deb815" +SCRIPT_COMMIT="55a01def732bb9e7016d23cc512384f7a88d6e86" 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 65cd50a706a..f7e8c12a979 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="11cafdd8d64e2fcb0b170a2a1df11a896231de67" +SCRIPT_COMMIT="25dec5b91fe4d2638787d033a0b22b6c1dc145e0" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/50-vulkan/45-vulkan.sh b/builder/scripts.d/50-vulkan/45-vulkan.sh index a51745897d0..869a7a3b95d 100755 --- a/builder/scripts.d/50-vulkan/45-vulkan.sh +++ b/builder/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.290" +SCRIPT_COMMIT="v1.3.295" SCRIPT_TAGFILTER="v?.*.*" ffbuild_enabled() { diff --git a/builder/scripts.d/50-vulkan/55-spirv-cross.sh b/builder/scripts.d/50-vulkan/55-spirv-cross.sh index 0a3270f884e..8ecb95d22ae 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="68d401117c85219ee6b2aba9a0cded314c55798f" +SCRIPT_COMMIT="6a1fb66eef1bdca14acf7d0a51a3f883499d79f0" ffbuild_enabled() { [[ $TARGET == mac* ]] && return -1 diff --git a/builder/scripts.d/50-vulkan/60-libplacebo.sh b/builder/scripts.d/50-vulkan/60-libplacebo.sh index 24edc5d59e3..f64cecc5300 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="64c1954570f1cd57f8570a57e51fb0249b57bb90" +SCRIPT_COMMIT="1fd3c7bde7b943fe8985c893310b5269a09b46c5" ffbuild_enabled() { [[ $TARGET == mac* ]] && return -1 diff --git a/builder/scripts.d/50-x265.sh b/builder/scripts.d/50-x265.sh index 383b72b09ca..f4fd012be5d 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="dd594f59d95198c6d8e4133b6002c18e47e7d6fe" +SCRIPT_COMMIT="f6735953b90e4ff74849e20156a520f5bfd410fc" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/debian/changelog b/debian/changelog index 415e1a55e83..2d4795f84a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ jellyfin-ffmpeg (7.0.2-1) unstable; urgency=medium * New upstream version 7.0.2 * Rename package to jellyin-ffmpeg7 * Update build scripts and dependencies + * Add ICtCp based tonemap method to vt/cuda/ocl tonemap + * Add ACES Reference Gamut Compression to vt/cuda/ocl tonemap + * Add DoVi reshaping support to software tonemapx -- nyanmisaka Thu, 1 Aug 2024 22:10:36 +0800 diff --git a/debian/rules b/debian/rules index 41f4ca3c4a7..f59cd655a4e 100755 --- a/debian/rules +++ b/debian/rules @@ -52,6 +52,8 @@ CONFIG := --prefix=${TARGET_DIR} \ --enable-libfdk-aac \ CONFIG_x86 := --arch=amd64 \ + --enable-libshaderc \ + --enable-libplacebo \ --enable-vulkan \ --enable-vaapi \ --enable-amf \ diff --git a/docker-build-win64.sh b/docker-build-win64.sh index ea260451c18..9bf15ca5064 100755 --- a/docker-build-win64.sh +++ b/docker-build-win64.sh @@ -6,7 +6,7 @@ set -o errexit set -o xtrace # Update mingw-w64 headers -mingw_commit="f1075a71a0027febccc19a1db0244e98f9ae0102" +mingw_commit="1b554dec06f8d3c26b856a7d1575f396d8ffa403" git clone https://git.code.sf.net/p/mingw-w64/mingw-w64.git pushd mingw-w64/mingw-w64-headers git checkout ${mingw_commit} @@ -454,7 +454,7 @@ popd popd # SVT-AV1 -git clone -b v2.1.2 --depth=1 https://gitlab.com/AOMediaCodec/SVT-AV1.git +git clone -b v2.2.1 --depth=1 https://gitlab.com/AOMediaCodec/SVT-AV1.git pushd SVT-AV1 mkdir build pushd build @@ -555,7 +555,7 @@ popd popd # VPL -git clone -b v2.12.0 --depth=1 https://github.com/intel/libvpl.git +git clone -b v2.13.0 --depth=1 https://github.com/intel/libvpl.git pushd libvpl mkdir build && pushd build cmake \ diff --git a/docker-build.sh b/docker-build.sh index 58a3bbf87ee..4b3f5988f8a 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -67,7 +67,7 @@ prepare_extra_common() { # LIBXML2 pushd ${SOURCE_DIR} - libxml2_ver="v2.13.2" + libxml2_ver="v2.13.3" if [[ $( lsb_release -c -s ) == "focal" ]]; then # newer versions require automake 1.16.3+ libxml2_ver="v2.9.14" @@ -87,7 +87,7 @@ prepare_extra_common() { # FREETYPE pushd ${SOURCE_DIR} - git clone -b VER-2-13-2 --depth=1 https://gitlab.freedesktop.org/freetype/freetype.git + git clone -b VER-2-13-3 --depth=1 https://gitlab.freedesktop.org/freetype/freetype.git pushd freetype ./autogen.sh ./configure \ @@ -253,7 +253,7 @@ prepare_extra_common() { # SVT-AV1 pushd ${SOURCE_DIR} - git clone -b v2.1.2 --depth=1 https://gitlab.com/AOMediaCodec/SVT-AV1.git + git clone -b v2.2.1 --depth=1 https://gitlab.com/AOMediaCodec/SVT-AV1.git pushd SVT-AV1 mkdir build pushd build @@ -319,7 +319,7 @@ prepare_extra_amd64() { pushd ${SOURCE_DIR} mkdir libdrm pushd libdrm - libdrm_ver="2.4.122" + libdrm_ver="2.4.123" libdrm_link="https://dri.freedesktop.org/libdrm/libdrm-${libdrm_ver}.tar.xz" wget ${libdrm_link} -O libdrm.tar.xz tar xaf libdrm.tar.xz @@ -382,7 +382,7 @@ prepare_extra_amd64() { # GMMLIB pushd ${SOURCE_DIR} - git clone -b intel-gmmlib-22.5.0 --depth=1 https://github.com/intel/gmmlib.git + git clone -b intel-gmmlib-22.5.1 --depth=1 https://github.com/intel/gmmlib.git pushd gmmlib mkdir build && pushd build cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} .. @@ -418,7 +418,7 @@ prepare_extra_amd64() { # Provides VPL header and dispatcher (libvpl.so.2) for FFmpeg # Both MSDK and VPL runtime can be loaded by VPL dispatcher pushd ${SOURCE_DIR} - git clone -b v2.12.0 --depth=1 https://github.com/intel/libvpl.git + git clone -b v2.13.0 --depth=1 https://github.com/intel/libvpl.git pushd libvpl sed -i 's|ParseEnvSearchPaths(ONEVPL_PRIORITY_PATH_VAR, searchDirList)|searchDirList.push_back("/usr/lib/jellyfin-ffmpeg/lib")|g' libvpl/src/mfx_dispatcher_vpl_loader.cpp mkdir build && pushd build @@ -439,7 +439,7 @@ prepare_extra_amd64() { # VPL-GPU-RT (RT only) # Provides VPL runtime (libmfx-gen.so.1.2) for 11th Gen Tiger Lake and newer pushd ${SOURCE_DIR} - git clone -b intel-onevpl-24.3.1 --depth=1 https://github.com/intel/vpl-gpu-rt.git + git clone -b intel-onevpl-24.3.3 --depth=1 https://github.com/intel/vpl-gpu-rt.git pushd vpl-gpu-rt mkdir build && pushd build cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} \ @@ -459,7 +459,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-24.3.1 --depth=1 https://github.com/intel/media-driver.git + git clone -b intel-media-24.3.3 --depth=1 https://github.com/intel/media-driver.git pushd media-driver mkdir build && pushd build cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} \ @@ -478,7 +478,7 @@ prepare_extra_amd64() { # Vulkan Headers pushd ${SOURCE_DIR} - git clone -b v1.3.290 --depth=1 https://github.com/KhronosGroup/Vulkan-Headers.git + git clone -b v1.3.295 --depth=1 https://github.com/KhronosGroup/Vulkan-Headers.git pushd Vulkan-Headers mkdir build && pushd build cmake \ @@ -491,7 +491,7 @@ prepare_extra_amd64() { # Vulkan ICD Loader pushd ${SOURCE_DIR} - git clone -b v1.3.290 --depth=1 https://github.com/KhronosGroup/Vulkan-Loader.git + git clone -b v1.3.295 --depth=1 https://github.com/KhronosGroup/Vulkan-Loader.git pushd Vulkan-Loader mkdir build && pushd build cmake \ @@ -599,25 +599,25 @@ prepare_extra_amd64() { fi # LIBPLACEBO -# pushd ${SOURCE_DIR} -# git clone -b v6.338.2 --recursive --depth=1 https://github.com/haasn/libplacebo.git -# sed -i 's|env: python_env,||g' libplacebo/src/vulkan/meson.build -# meson setup libplacebo placebo_build \ -# --prefix=${TARGET_DIR} \ -# --libdir=lib \ -# --buildtype=release \ -# --default-library=shared \ -# -Dvulkan=enabled \ -# -Dvk-proc-addr=enabled \ -# -Dvulkan-registry=${TARGET_DIR}/share/vulkan/registry/vk.xml \ -# -Dshaderc=enabled \ -# -Dglslang=disabled \ -# -D{demos,tests,bench,fuzz}=false -# meson configure placebo_build -# ninja -j$(nproc) -C placebo_build install -# cp -a ${TARGET_DIR}/lib/libplacebo.so* ${SOURCE_DIR}/libplacebo -# echo "libplacebo/libplacebo* usr/lib/jellyfin-ffmpeg/lib" >> ${DPKG_INSTALL_LIST} -# popd + pushd ${SOURCE_DIR} + git clone -b v7.349.0 --recursive --depth=1 https://github.com/haasn/libplacebo.git + sed -i 's|env: python_env,||g' libplacebo/src/vulkan/meson.build + meson setup libplacebo placebo_build \ + --prefix=${TARGET_DIR} \ + --libdir=lib \ + --buildtype=release \ + --default-library=shared \ + -Dvulkan=enabled \ + -Dvk-proc-addr=enabled \ + -Dvulkan-registry=${TARGET_DIR}/share/vulkan/registry/vk.xml \ + -Dshaderc=enabled \ + -Dglslang=disabled \ + -D{demos,tests,bench,fuzz}=false + meson configure placebo_build + ninja -j$(nproc) -C placebo_build install + cp -a ${TARGET_DIR}/lib/libplacebo.so* ${SOURCE_DIR}/libplacebo + echo "libplacebo/libplacebo* usr/lib/jellyfin-ffmpeg/lib" >> ${DPKG_INSTALL_LIST} + popd } # Prepare extra headers, libs and drivers for {arm,aarch64}-linux-gnu* diff --git a/msys2/PKGBUILD/20-mingw-w64-freetype/PKGBUILD b/msys2/PKGBUILD/20-mingw-w64-freetype/PKGBUILD index 8bca0da7289..d5ef470e31d 100644 --- a/msys2/PKGBUILD/20-mingw-w64-freetype/PKGBUILD +++ b/msys2/PKGBUILD/20-mingw-w64-freetype/PKGBUILD @@ -6,7 +6,7 @@ _with_harfbuzz="no" _realname=freetype pkgbase=mingw-w64-jellyfin-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}" -pkgver=2.13.2 +pkgver=2.13.3 pkgrel=1 pkgdesc="TrueType font rendering library (mingw-w64)" arch=('any') @@ -32,7 +32,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-meson" source=(https://sourceforge.net/projects/freetype/files/freetype2/${pkgver}/freetype-${pkgver}.tar.xz{,.sig} freetype-2.10.0-enable-valid.patch freetype-2.10.0-enable-spr.patch) -sha256sums=('12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d' +sha256sums=('0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289' 'SKIP' '30e84993f899b66c31451992667f7ac6cc9e0b19dfe2f47ccb546d77bbc77ef5' '0571f18d97834df020e4cbdb1338b14f9160669f868237080951e01f5b86727c') diff --git a/msys2/PKGBUILD/20-mingw-w64-libxml2/PKGBUILD b/msys2/PKGBUILD/20-mingw-w64-libxml2/PKGBUILD index 62e2044109d..af5c9c360f1 100644 --- a/msys2/PKGBUILD/20-mingw-w64-libxml2/PKGBUILD +++ b/msys2/PKGBUILD/20-mingw-w64-libxml2/PKGBUILD @@ -5,7 +5,7 @@ _realname=libxml2 pkgbase=mingw-w64-jellyfin-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}" "${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}-docs") -pkgver=2.12.8 +pkgver=2.12.9 pkgrel=1 arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64') @@ -30,7 +30,7 @@ source=("https://download.gnome.org/sources/libxml2/${pkgver%.*}/${_realname}-${ 0029-xml2-config-win-paths.patch 0030-pkgconfig-add-Cflags-private.patch 0031-apply-msvc-relocation.patch) -sha256sums=('43ad877b018bc63deb2468d71f95219c2fac196876ef36d1bee51d226173ec93' +sha256sums=('59912db536ab56a3996489ea0299768c7bcffe57169f0235e7f962a91f483590' '9b61db9f5dbffa545f4b8d78422167083a8568c59bd1129f94138f936cf6fc1f' '0391a4b267ba7251ca74ff2e98bf4c0332a14b618e8147a9341ec5617e45d9d9' '278b4531da3d2aabda080c412c5122b471202dd6df67768b38bb0c31c7a0e508' diff --git a/msys2/PKGBUILD/30-mingw-w64-libvpx/PKGBUILD b/msys2/PKGBUILD/30-mingw-w64-libvpx/PKGBUILD index 4db741eae6f..607da9b9570 100644 --- a/msys2/PKGBUILD/30-mingw-w64-libvpx/PKGBUILD +++ b/msys2/PKGBUILD/30-mingw-w64-libvpx/PKGBUILD @@ -3,7 +3,7 @@ _realname=libvpx pkgbase=mingw-w64-jellyfin-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}" -pkgver=1.14.0 +pkgver=1.14.1 pkgrel=1 pkgdesc="The VP8/VP9 Codec SDK (mingw-w64)" arch=('any') @@ -26,7 +26,7 @@ source=(${_realname}-${pkgver}.tar.gz::https://github.com/webmproject/libvpx/arc 0003-cross-with-native-binutils.mingw.patch 0005-fix-exports.mingw.patch) options=('strip' 'staticlibs') -sha256sums=('5f21d2db27071c8a46f1725928a10227ae45c5cd1cad3727e4aafbe476e321fa' +sha256sums=('901747254d80a7937c933d03bd7c5d41e8e6c883e0665fadcb172542167c7977' 'f37a24525725cad215d73c538c0b06343b043f2b07553e7dc25835bd68af0695' 'fabe7d4a756b33016947f741b1b5d8cbbf9aefd8862240645d0ed7bf7b4a3739' '7c511b5df935278da2cba32b03b90582f360ab6786a5e32028bc82025193fabd') diff --git a/msys2/PKGBUILD/40-mingw-w64-libopenmpt/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-libopenmpt/PKGBUILD index e8d11b7994f..59d575d18fb 100644 --- a/msys2/PKGBUILD/40-mingw-w64-libopenmpt/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-libopenmpt/PKGBUILD @@ -3,7 +3,7 @@ _realname=libopenmpt pkgbase=mingw-w64-jellyfin-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}") -pkgver=0.7.8 +pkgver=0.7.9 pkgrel=1 pkgdesc="A cross-platform C++ and C library to decode tracked music files (modules) into a raw PCM audio stream (mingw-w64)" arch=('any') @@ -20,7 +20,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-jellyfin-zlib" makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools") source=("https://lib.openmpt.org/files/${_realname}/src/${_realname}-${pkgver}+release.autotools.tar.gz") -sha256sums=('87778c8046a226c6cbfb114f4c8e3e27c121b7b3dccce5cb7de45899250274cc') +sha256sums=('0386e918d75d797e79d5b14edd0847165d8b359e9811ef57652c0a356a2dfcf4') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" diff --git a/msys2/PKGBUILD/40-mingw-w64-svt-av1/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-svt-av1/PKGBUILD index 56bdb314b96..2485aa4d0e4 100644 --- a/msys2/PKGBUILD/40-mingw-w64-svt-av1/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-svt-av1/PKGBUILD @@ -3,7 +3,7 @@ _realname=SVT-AV1 pkgbase=mingw-w64-jellyfin-svt-av1 pkgname=("${MINGW_PACKAGE_PREFIX}-jellyfin-svt-av1") -pkgver=2.1.2 +pkgver=2.2.1 pkgrel=1 pkgdesc="Scalable Video Technology AV1 encoder and decoder (mingw-w64)" arch=('any') diff --git a/msys2/PKGBUILD/40-mingw-w64-x265/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-x265/PKGBUILD index 50cb6b9909e..4aeed8d9dda 100644 --- a/msys2/PKGBUILD/40-mingw-w64-x265/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-x265/PKGBUILD @@ -23,7 +23,7 @@ msys2_references=( "cpe: cpe:/a:multicorewareinc:x265" "cpe: cpe:/a:multicorewareinc:x265_high_efficiency_video_coding" ) -_commit="ad1a30a8a69d5bbc0096da7aafc9da21c599cb01" +_commit="f6735953b90e4ff74849e20156a520f5bfd410fc" source=("${_realname}"::"git+https://bitbucket.org/multicoreware/x265_git.git#commit=${_commit}") sha256sums=('SKIP') diff --git a/msys2/PKGBUILD/50-mingw-w64-libvpl/PKGBUILD b/msys2/PKGBUILD/50-mingw-w64-libvpl/PKGBUILD index d688e415c05..e437fa3984a 100644 --- a/msys2/PKGBUILD/50-mingw-w64-libvpl/PKGBUILD +++ b/msys2/PKGBUILD/50-mingw-w64-libvpl/PKGBUILD @@ -3,7 +3,7 @@ _realname=libvpl pkgbase=mingw-w64-jellyfin-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}") -pkgver=2.12.0 +pkgver=2.13.0 pkgrel=1 pkgdesc="Intel Video Processing Library (mingw-w64)" arch=('any')