From e382bab39147c7cd28749256fb5bd78cf9e858ef Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Sun, 5 Nov 2023 00:20:52 +0800 Subject: [PATCH 1/2] Update dependencies Signed-off-by: nyanmisaka --- builder/scripts.d/20-libxml2.sh | 2 +- builder/scripts.d/25-freetype.sh | 2 +- builder/scripts.d/25-openssl.sh | 2 +- builder/scripts.d/45-harfbuzz.sh | 2 +- builder/scripts.d/50-dav1d.sh | 2 +- builder/scripts.d/50-libass.sh | 2 +- builder/scripts.d/50-libopus.sh | 2 +- builder/scripts.d/50-libvpx.sh | 2 +- builder/scripts.d/50-libwebp.sh | 2 +- builder/scripts.d/50-openmpt.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/45-vulkan.sh | 2 +- builder/scripts.d/50-vulkan/55-spirv-cross.sh | 2 +- docker-build-win64.sh | 2 +- docker-build.sh | 10 +++++----- 18 files changed, 22 insertions(+), 22 deletions(-) diff --git a/builder/scripts.d/20-libxml2.sh b/builder/scripts.d/20-libxml2.sh index 139b74002de..9fdf0550260 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="4f132bcdb300850e94a723a4117cf0847a66d9a7" +SCRIPT_COMMIT="7a2d412f681fa4847c5351d7944a1de6959685da" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/25-freetype.sh b/builder/scripts.d/25-freetype.sh index ef5df033694..5e0b904ebb5 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="749b8f9d344105357b82766f8c555586a4b84e7c" +SCRIPT_COMMIT="9e86fb806d93240bb7235ce42201616b19ec59f8" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/25-openssl.sh b/builder/scripts.d/25-openssl.sh index af2505cb156..77d0b02e117 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.3" +SCRIPT_COMMIT="openssl-3.1.4" SCRIPT_TAGFILTER="openssl-3.1.*" ffbuild_enabled() { diff --git a/builder/scripts.d/45-harfbuzz.sh b/builder/scripts.d/45-harfbuzz.sh index 6ac9177d634..f7ea4093c03 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="1f395cbaf91be284f443c27b8b35be0edd788c34" +SCRIPT_COMMIT="fd5eb10d3b4cfee1bb10614ff6719378c949492e" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-dav1d.sh b/builder/scripts.d/50-dav1d.sh index af1e63db75d..4151ee33f68 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="47107e384bd1dc25674acf04d000a8cdc6195234" +SCRIPT_COMMIT="2179b30c84571ae5a4ecfe60821b2dd0050f355f" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libass.sh b/builder/scripts.d/50-libass.sh index 354f74a8931..e21e6688a02 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="358770835248e26241e4796f38f02073a3bae252" +SCRIPT_COMMIT="e64390522d9501a2c7e6a51c31a5b2a1f3a35cd1" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libopus.sh b/builder/scripts.d/50-libopus.sh index 7da881c674e..0f64bcb3445 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="101a71e03bbf860aaafb7090a0e440675cb27660" +SCRIPT_COMMIT="c913dc38fd5eff4a9a7b8d6ea3b3add2da087284" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libvpx.sh b/builder/scripts.d/50-libvpx.sh index ff64966ab81..cda62976e96 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="9c377eafbedd3911e83ee80793b4fba80710d4e0" +SCRIPT_COMMIT="f08d238867a24b8eced67ff4cf54871e2bc9e47e" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libwebp.sh b/builder/scripts.d/50-libwebp.sh index 042086004df..9a786d08e2b 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="deadc339d59dfe64a00b51decce2f6d9337ddeec" +SCRIPT_COMMIT="24d7f9cb6ef1ef90a04d7b6c15d3477813f75ee0" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-openmpt.sh b/builder/scripts.d/50-openmpt.sh index 750ab6228ea..f54a425d5d6 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="19865" +SCRIPT_REV="19907" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-srt.sh b/builder/scripts.d/50-srt.sh index faea591c3c6..30a0461c156 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="eb80f92cec5359b61a5849355ec8dcf16c820cef" +SCRIPT_COMMIT="cb362ee654f24545b218d6594e92b993236e1442" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-svtav1.sh b/builder/scripts.d/50-svtav1.sh index 2fd967f098d..626da597355 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="a6f0981c2b82aea05205b96bfebb1e6cd53790de" +SCRIPT_COMMIT="2f00345865de8c345dd2a04ee06f536d12651cb5" 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 67219af5ea0..cb0cdf0fba1 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="8d8357dc6482c771d2f9501257c29abe8b06ba9c" +SCRIPT_COMMIT="ee558cea20d1f9d822fe1a28e97beaf365bf9d38" 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 7c00868b1ec..7d363746d4b 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="45afd79ae4b887ad06cfca7316ada5c2688513f9" +SCRIPT_COMMIT="633746e717ef8daf82856b9909a4ffd0163df4b4" 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 327e9c6720a..b61670baaaf 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.268" +SCRIPT_COMMIT="v1.3.269" 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 6d813e6c085..c8481062dfd 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="2de1265fca722929785d9acdec4ab728c47a0254" +SCRIPT_COMMIT="4818f7e7ef7b7078a3a7a5a52c4a338e0dda22f4" ffbuild_enabled() { return 0 diff --git a/docker-build-win64.sh b/docker-build-win64.sh index f75ccbd3676..fcb8f9a9a25 100755 --- a/docker-build-win64.sh +++ b/docker-build-win64.sh @@ -159,7 +159,7 @@ popd popd # LZMA -git clone -b v5.4.4 --depth=1 https://github.com/tukaani-project/xz.git +git clone -b v5.4.5 --depth=1 https://github.com/tukaani-project/xz.git pushd xz ./autogen.sh --no-po4a --no-doxygen ./configure \ diff --git a/docker-build.sh b/docker-build.sh index 6c72e8c33ec..456701958c4 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -179,7 +179,7 @@ prepare_extra_amd64() { pushd ${SOURCE_DIR} mkdir libdrm pushd libdrm - libdrm_ver="2.4.116" + libdrm_ver="2.4.115" libdrm_link="https://dri.freedesktop.org/libdrm/libdrm-${libdrm_ver}.tar.xz" wget ${libdrm_link} -O libdrm.tar.xz tar xaf libdrm.tar.xz @@ -278,7 +278,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.3.4 --depth=1 https://github.com/oneapi-src/oneVPL-intel-gpu.git + git clone -b intel-onevpl-23.4.0 --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} \ @@ -298,7 +298,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.3.4 --depth=1 https://github.com/intel/media-driver.git + git clone -b intel-media-23.4.0 --depth=1 https://github.com/intel/media-driver.git pushd media-driver mkdir build && pushd build cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} \ @@ -317,7 +317,7 @@ prepare_extra_amd64() { # Vulkan Headers pushd ${SOURCE_DIR} - vk_ver="v1.3.268" + vk_ver="v1.3.269" if [[ $( lsb_release -c -s ) == "bionic" ]]; then vk_ver="v1.3.240" fi @@ -334,7 +334,7 @@ prepare_extra_amd64() { # Vulkan ICD Loader pushd ${SOURCE_DIR} - vk_ver="v1.3.268" + vk_ver="v1.3.269" if [[ $( lsb_release -c -s ) == "bionic" ]]; then vk_ver="v1.3.240" fi From 2831bba28e96e82d376928afdc6fa9da183b0408 Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Sat, 4 Nov 2023 23:09:21 +0800 Subject: [PATCH 2/2] Bump version to 5.1.3-7 Signed-off-by: nyanmisaka --- build.yaml | 2 +- debian/changelog | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/build.yaml b/build.yaml index adee4bb958f..b0e0bac1250 100644 --- a/build.yaml +++ b/build.yaml @@ -1,7 +1,7 @@ --- # We just wrap `build` so this is really it name: "jellyfin-ffmpeg" -version: "5.1.3-6" +version: "5.1.3-7" packages: - buster-amd64 - buster-armhf diff --git a/debian/changelog b/debian/changelog index 3361983a63c..2cb6c1df35a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +jellyfin-ffmpeg (5.1.3-7) unstable; urgency=medium + + * Fix the brightness issue in HLG-2-SDR tonemap + * Revert libdrm version to 2.4.115 for a known issue + * Update dependencies + + -- nyanmisaka Sat, 4 Nov 2023 22:18:25 +0800 + jellyfin-ffmpeg (5.1.3-6) unstable; urgency=medium * Update dependencies