From 0d3800e759ffb971197f8fc4c2633f9bc9eaf0c7 Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Sat, 14 Dec 2024 18:32:10 +0800 Subject: [PATCH 1/2] Update dependencies Signed-off-by: nyanmisaka --- builder/scripts.d/10-mingw.sh | 2 +- builder/scripts.d/10-xorg-macros.sh | 2 +- builder/scripts.d/20-zlib.sh | 2 +- builder/scripts.d/25-freetype.sh | 2 +- builder/scripts.d/25-fribidi.sh | 2 +- builder/scripts.d/25-libxml2.sh | 2 +- builder/scripts.d/35-fontconfig.sh | 2 +- builder/scripts.d/45-harfbuzz.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/20-libxau.sh | 2 +- builder/scripts.d/45-x11/40-libx11.sh | 2 +- builder/scripts.d/45-x11/50-libxrender.sh | 2 +- builder/scripts.d/45-x11/50-libxxf86vm.sh | 2 +- builder/scripts.d/45-x11/60-libxcursor.sh | 2 +- builder/scripts.d/45-x11/60-libxv.sh | 2 +- builder/scripts.d/50-dav1d.sh | 2 +- builder/scripts.d/50-libass.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-rkmpp.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-vulkan/45-vulkan.sh | 2 +- builder/scripts.d/50-vulkan/55-spirv-cross.sh | 2 +- builder/scripts.d/50-x264.sh | 2 +- builder/scripts.d/50-x265.sh | 3 ++- builder/scripts.d/50-zimg.sh | 2 +- builder/scripts.d/50-zvbi.sh | 2 +- docker-build-win64.sh | 9 +++++---- docker-build.sh | 12 ++++++------ msys2/PKGBUILD/30-mingw-w64-harfbuzz/PKGBUILD | 5 ++--- msys2/PKGBUILD/40-mingw-w64-libopenmpt/PKGBUILD | 4 ++-- msys2/PKGBUILD/40-mingw-w64-x264/PKGBUILD | 4 ++-- msys2/PKGBUILD/40-mingw-w64-x265/PKGBUILD | 5 ++++- 37 files changed, 53 insertions(+), 49 deletions(-) diff --git a/builder/scripts.d/10-mingw.sh b/builder/scripts.d/10-mingw.sh index dc5ca0bf478..cfa373a65f7 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="cdf6b16b805ce7d02f6b1b742911ba0770b49bbb" +SCRIPT_COMMIT="b45bcc136eaa697b5bde3a5949b45f3c91b4a1ff" ffbuild_enabled() { [[ $TARGET == win* ]] || return -1 diff --git a/builder/scripts.d/10-xorg-macros.sh b/builder/scripts.d/10-xorg-macros.sh index 91d14dee374..fda338c5439 100755 --- a/builder/scripts.d/10-xorg-macros.sh +++ b/builder/scripts.d/10-xorg-macros.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://gitlab.freedesktop.org/xorg/util/macros.git" -SCRIPT_COMMIT="91ece2a5f6408d34074522c8588ef1c53478daa0" +SCRIPT_COMMIT="a9d71e3fd8e6758b70be31c586921bbbcd2a8449" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/20-zlib.sh b/builder/scripts.d/20-zlib.sh index a50459b4a52..f729337cc42 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="d476828316d05d54c6fd6a068b121b30c147b5cd" +SCRIPT_COMMIT="ef24c4c7502169f016dcd2a26923dbaf3216748c" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/25-freetype.sh b/builder/scripts.d/25-freetype.sh index bd0c5522a01..9fb7cf5d549 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="139443663368617b30b70cf6912e9577ecbb845f" +SCRIPT_COMMIT="59320b2d3c2584ac01914ed0deff64bcc8fb23b2" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/25-fribidi.sh b/builder/scripts.d/25-fribidi.sh index ad235ce1216..8527f86c93f 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="68162babff4f39c4e2dc164a5e825af93bda9983" +SCRIPT_COMMIT="cfc71cda065db859d8b4f1e3c6fe5da7ab02469a" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/25-libxml2.sh b/builder/scripts.d/25-libxml2.sh index cbf1e0fea98..acb0338daae 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="513949293d7ee2a11acc36bcdf5016a8fc5cc438" +SCRIPT_COMMIT="169857ad264e51d9b34d7119d2e2e006e35e60c2" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/35-fontconfig.sh b/builder/scripts.d/35-fontconfig.sh index a41c756ee3b..9a947665194 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="6d0580b2427f50b45e1432ba0fb6128c19b6dbd4" +SCRIPT_COMMIT="f9c546ff3e4040a34a0ac27210d3cbdc64c367b5" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/45-harfbuzz.sh b/builder/scripts.d/45-harfbuzz.sh index 45ec0931567..798c8bcd01a 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="825bc1964374eed7d19ffa327989d0ee841dda71" +SCRIPT_COMMIT="c8050b3872d012adf0a64b5b39d9c67e7f4dfc94" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/45-x11/10-xproto.sh b/builder/scripts.d/45-x11/10-xproto.sh index 55ca579e8c1..e3ecbc9e9ea 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="af7cb6a643db810536605feab1402654a9818569" +SCRIPT_COMMIT="e312ab76c4d93f2e637ac0c73987b22cd43420c7" 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 c8008fa6caa..7d645297025 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="ae99ac32f61e0db92a45179579030a23fe1b5770" +SCRIPT_COMMIT="e58ae2d27f7baee28319faa02b77cdc344e2f0ca" 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 bd0fff45f7a..996204a4b8a 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="6b2e9a63d8306282a2b384762bea004c19f301a1" +SCRIPT_COMMIT="a9c65683e68b3a4349afee5d7673b393fb924d2e" 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 96c85457b49..1724c0d8c89 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="f2ebbce6d0978d2d84f840196b03ee35a3ca1736" +SCRIPT_COMMIT="5a7d94e07fc7e4a10d6399f5e44793fa0c896af6" 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 cfab41bb319..6f1175caeed 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="01e754610df2195536c5b31c1e8df756480599d1" +SCRIPT_COMMIT="46e12ff9e8e4d3f0313a2f097df93dbfdc14f92f" 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 2e204811538..971eda67df4 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="546c0e93adc535dfaaa66277928887c8dc1f8e13" +SCRIPT_COMMIT="4f7497ee3b0deb0418ce48dcd862fd6c23e20064" 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 b2a38186f0d..9fa45f2383e 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="833735e3232e28153411b3703dfe51883edf47ea" +SCRIPT_COMMIT="8ae6cf61b18ecddf26f72a07bbfbd1ea9f022c36" 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 f027a7ed93e..66cfc1d373b 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="fba7bf352678db2938f5a7b173d2a8823595ef3b" +SCRIPT_COMMIT="e1cde54538060c4fd3a3d02e3d2e2b7e5da7bff9" ffbuild_enabled() { [[ $TARGET != linux* ]] && return -1 diff --git a/builder/scripts.d/50-dav1d.sh b/builder/scripts.d/50-dav1d.sh index b207964cbbe..aa608f4cf4e 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="32cf02af50f32af108a3b281c452788dccdac648" +SCRIPT_COMMIT="d242c47b437c950b545e96e7872aa914edc50be5" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libass.sh b/builder/scripts.d/50-libass.sh index 7fbdf13096a..fc47905768d 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="6a759836e5e76bb7b69b0ac244eea76b0d290512" +SCRIPT_COMMIT="7d8e335b094f00c57fb557b01e93b60a17e63434" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libvpx.sh b/builder/scripts.d/50-libvpx.sh index 6fabec8105d..a243b98355b 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="906334ac1de2b0afa666472dce5545b82c1251fb" +SCRIPT_COMMIT="6f0c446c7b88d384a1c09caf33ec132e7ee24aea" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-libwebp.sh b/builder/scripts.d/50-libwebp.sh index 9dd41adc257..824a729bdf7 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="dfdcb7f95ca280b2555020115b8f288a5a3453c2" +SCRIPT_COMMIT="e4f7a9f0c7c9fbfae1568bc7fa5c94b989b50872" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-openmpt.sh b/builder/scripts.d/50-openmpt.sh index b87b1ed3516..7890497b096 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="21833" +SCRIPT_REV="22538" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-rkmpp.sh b/builder/scripts.d/50-rkmpp.sh index 4f0f160c463..16a9b975815 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="110d2660a18855656205cdda8f40527c8a9cc3c1" +SCRIPT_COMMIT="d109e6296989600cadd7b18acd0dbf3be73c33d4" SCRIPT_BRANCH="jellyfin-mpp" ffbuild_enabled() { diff --git a/builder/scripts.d/50-srt.sh b/builder/scripts.d/50-srt.sh index 8587c749f6a..ef913b6a6d9 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="e2f133b95c06dd3c157b1669de34b2432e640029" +SCRIPT_COMMIT="f109fb1354d6b31ba7cc6b6e72d75bc761a9cd31" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-svtav1.sh b/builder/scripts.d/50-svtav1.sh index 00f7da09076..e936a868846 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="6e69def4ec283fe0b71195671245c3b768bebdef" +SCRIPT_COMMIT="8f1f1b0dc52b063264838b51bc2299a5e44e31d5" 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 957d458ab7a..385a1f24fe4 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="0a1162e2af357be00610377f297600806b90deca" +SCRIPT_COMMIT="38ec7dbd4df3141441afafe5ac62dfc9df36a77e" 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 0f681266478..51e5eed6d34 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.298" +SCRIPT_COMMIT="v1.4.303" 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 1ab0aa1395f..c2036a70040 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="e670b39cfced2f7258c73dc7cd708c6c639beaf0" +SCRIPT_COMMIT="6173e24b31f09a0c3217103a130e74c4ddec14a6" ffbuild_enabled() { [[ $TARGET == mac* ]] && return -1 diff --git a/builder/scripts.d/50-x264.sh b/builder/scripts.d/50-x264.sh index f7ee8e2f0f9..46a7f937016 100755 --- a/builder/scripts.d/50-x264.sh +++ b/builder/scripts.d/50-x264.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/x264.git" -SCRIPT_COMMIT="1243d9ffb04dac7005ee9ecc79459034429dd5aa" +SCRIPT_COMMIT="da14df5535fd46776fb1c9da3130973295c87aca" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 diff --git a/builder/scripts.d/50-x265.sh b/builder/scripts.d/50-x265.sh index 17d43eb7971..25faa104fa5 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="487105dcd21d0f36a7a9e0ec50de85577b9bed04" +SCRIPT_COMMIT="fa2770934b8f3d88aa866c77f27cb63f69a9ed39" ffbuild_enabled() { [[ $VARIANT == lgpl* ]] && return -1 @@ -19,6 +19,7 @@ ffbuild_dockerbuild() { -DENABLE_SHARED=OFF -DENABLE_CLI=OFF -DCMAKE_ASM_NASM_FLAGS=-w-macro-params-legacy + -DENABLE_ALPHA=ON ) if [[ $TARGET != mac* ]]; then diff --git a/builder/scripts.d/50-zimg.sh b/builder/scripts.d/50-zimg.sh index 1433226bed0..fad84ce6082 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="71431815950664f1e11b9ee4e5d4ba23d6d997f1" +SCRIPT_COMMIT="30f368c57e963ac70170b6ab374ea69585bc3f20" ffbuild_enabled() { return 0 diff --git a/builder/scripts.d/50-zvbi.sh b/builder/scripts.d/50-zvbi.sh index 2ec3b582a40..a478ff0a746 100755 --- a/builder/scripts.d/50-zvbi.sh +++ b/builder/scripts.d/50-zvbi.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://github.com/zapping-vbi/zvbi.git" -SCRIPT_COMMIT="a48ab3a0d72efe9968ebafa34c425c892e4afa50" +SCRIPT_COMMIT="66a1c9bdf3a7f105a5c02070cc6de0d949513c58" ffbuild_enabled() { return 0 diff --git a/docker-build-win64.sh b/docker-build-win64.sh index 72609acf1f1..ca43aee996c 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="cdf6b16b805ce7d02f6b1b742911ba0770b49bbb" +mingw_commit="b45bcc136eaa697b5bde3a5949b45f3c91b4a1ff" git clone https://git.code.sf.net/p/mingw-w64/mingw-w64.git pushd mingw-w64/mingw-w64-headers git checkout ${mingw_commit} @@ -189,7 +189,7 @@ popd popd # HARFBUZZ -git clone -b 10.0.1 --depth=1 https://github.com/harfbuzz/harfbuzz.git +git clone -b 10.1.0 --depth=1 https://github.com/harfbuzz/harfbuzz.git meson setup harfbuzz harfbuzz_build \ --prefix=${FF_DEPS_PREFIX} \ --cross-file=${FF_MESON_TOOLCHAIN} \ @@ -320,7 +320,7 @@ popd # OPENMPT mkdir mpt pushd mpt -mpt_ver="0.7.10" +mpt_ver="0.7.12" mpt_link="https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${mpt_ver}+release.autotools.tar.gz" wget ${mpt_link} -O mpt.tar.gz tar xaf mpt.tar.gz @@ -390,7 +390,7 @@ make install popd # X265 -x265_commit="487105dcd21d0f36a7a9e0ec50de85577b9bed04" +x265_commit="fa2770934b8f3d88aa866c77f27cb63f69a9ed39" git clone https://bitbucket.org/multicoreware/x265_git.git pushd x265_git git checkout ${x265_commit} @@ -406,6 +406,7 @@ x265_conf=" -DENABLE_TESTS=OFF -DENABLE_CLI=OFF -DENABLE_PIC=ON + -DENABLE_ALPHA=ON " mkdir 8b 10b 12b cmake \ diff --git a/docker-build.sh b/docker-build.sh index 563bceb3ce8..5c4931a32b7 100755 --- a/docker-build.sh +++ b/docker-build.sh @@ -67,7 +67,7 @@ prepare_extra_common() { # LIBXML2 pushd ${SOURCE_DIR} - libxml2_ver="v2.13.3" + libxml2_ver="v2.13.5" if [[ $( lsb_release -c -s ) == "focal" ]]; then # newer versions require automake 1.16.3+ libxml2_ver="v2.9.14" @@ -140,7 +140,7 @@ prepare_extra_common() { # HARFBUZZ pushd ${SOURCE_DIR} - git clone -b 10.0.1 --depth=1 https://github.com/harfbuzz/harfbuzz.git + git clone -b 10.1.0 --depth=1 https://github.com/harfbuzz/harfbuzz.git meson setup harfbuzz harfbuzz_build \ ${MESON_CROSS_OPT} \ --prefix=${TARGET_DIR} \ @@ -313,7 +313,7 @@ prepare_extra_amd64() { pushd ${SOURCE_DIR} mkdir libdrm pushd libdrm - libdrm_ver="2.4.123" + libdrm_ver="2.4.124" libdrm_link="https://dri.freedesktop.org/libdrm/libdrm-${libdrm_ver}.tar.xz" wget ${libdrm_link} -O libdrm.tar.xz tar xaf libdrm.tar.xz @@ -376,7 +376,7 @@ prepare_extra_amd64() { # GMMLIB pushd ${SOURCE_DIR} - git clone -b intel-gmmlib-22.5.3 --depth=1 https://github.com/intel/gmmlib.git + git clone -b intel-gmmlib-22.5.5 --depth=1 https://github.com/intel/gmmlib.git pushd gmmlib mkdir build && pushd build cmake -DCMAKE_INSTALL_PREFIX=${TARGET_DIR} .. @@ -474,7 +474,7 @@ prepare_extra_amd64() { # Vulkan Headers pushd ${SOURCE_DIR} - git clone -b v1.3.298 --depth=1 https://github.com/KhronosGroup/Vulkan-Headers.git + git clone -b v1.4.303 --depth=1 https://github.com/KhronosGroup/Vulkan-Headers.git pushd Vulkan-Headers mkdir build && pushd build cmake \ @@ -487,7 +487,7 @@ prepare_extra_amd64() { # Vulkan ICD Loader pushd ${SOURCE_DIR} - git clone -b v1.3.298 --depth=1 https://github.com/KhronosGroup/Vulkan-Loader.git + git clone -b v1.4.303 --depth=1 https://github.com/KhronosGroup/Vulkan-Loader.git pushd Vulkan-Loader mkdir build && pushd build cmake \ diff --git a/msys2/PKGBUILD/30-mingw-w64-harfbuzz/PKGBUILD b/msys2/PKGBUILD/30-mingw-w64-harfbuzz/PKGBUILD index f428009b780..0aec7e57f95 100644 --- a/msys2/PKGBUILD/30-mingw-w64-harfbuzz/PKGBUILD +++ b/msys2/PKGBUILD/30-mingw-w64-harfbuzz/PKGBUILD @@ -4,7 +4,7 @@ _realname=harfbuzz pkgbase=mingw-w64-jellyfin-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-jellyfin-${_realname}") -pkgver=10.0.1 +pkgver=10.1.0 pkgrel=1 pkgdesc="OpenType text shaping engine" arch=('any') @@ -28,7 +28,7 @@ checkdepends=("${MINGW_PACKAGE_PREFIX}-python-fonttools" "${MINGW_PACKAGE_PREFIX}-python-setuptools") source=("https://github.com/harfbuzz/harfbuzz/releases/download/${pkgver}/harfbuzz-${pkgver}.tar.xz" "001-fix-build-with-chafa.patch") -sha256sums=('b2cb13bd351904cb9038f907dc0dee0ae07127061242fe3556b2795c4e9748fc' +sha256sums=('6ce3520f2d089a33cef0fc48321334b8e0b72141f6a763719aaaecd2779ecb82' '26b37a1ca9872973905ecb96bcbe3f054472252320956faa74428206900d360e') noextract=("harfbuzz-${pkgver}.tar.xz") @@ -66,7 +66,6 @@ build() { -Dintrospection=disabled \ -Dgobject=disabled \ -Dicu=disabled \ - -Dcpp_std=c++17 \ -Dfreetype=enabled \ -Dgdi=disabled \ -Dgraphite=disabled \ diff --git a/msys2/PKGBUILD/40-mingw-w64-libopenmpt/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-libopenmpt/PKGBUILD index 38044517d0a..1952b7daf77 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.10 +pkgver=0.7.12 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=('093713c1c1024f4f10c4779a66ceb2af51fb7c908a9e99feb892d04019220ba1') +sha256sums=('79ab3ce3672601e525b5cc944f026c80c03032f37d39caa84c8ca3fdd75e0c98') export MINGW_TOOLCHAIN_PREFIX="${MINGW_PREFIX}" export FF_MINGW_PREFIX="${MINGW_TOOLCHAIN_PREFIX}/ffbuild" diff --git a/msys2/PKGBUILD/40-mingw-w64-x264/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-x264/PKGBUILD index d4169de20c0..e629ccdd230 100644 --- a/msys2/PKGBUILD/40-mingw-w64-x264/PKGBUILD +++ b/msys2/PKGBUILD/40-mingw-w64-x264/PKGBUILD @@ -3,7 +3,7 @@ _realname=x264 pkgbase=mingw-w64-jellyfin-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-jellyfin-libx264") -pkgver=0.164.r3191.1243d9f +pkgver=0.164.r3191.da14df5 pkgrel=1 pkgdesc="Library for encoding H264/AVC video streams (mingw-w64)" arch=('any') @@ -17,7 +17,7 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc" || echo "${MINGW_PACKAGE_PREFIX}-nasm" ) "git") options=('strip' 'staticlibs') -_commit="1243d9ffb04dac7005ee9ecc79459034429dd5aa" +_commit="da14df5535fd46776fb1c9da3130973295c87aca" source=("${_realname}"::"git+https://code.videolan.org/videolan/${_realname}.git#commit=${_commit}" 0001-beautify-pc.all.patch 0002-install-avisynth_c.h.mingw.patch diff --git a/msys2/PKGBUILD/40-mingw-w64-x265/PKGBUILD b/msys2/PKGBUILD/40-mingw-w64-x265/PKGBUILD index ad3bc073086..75c6de638b1 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="487105dcd21d0f36a7a9e0ec50de85577b9bed04" +_commit="fa2770934b8f3d88aa866c77f27cb63f69a9ed39" source=("${_realname}"::"git+https://bitbucket.org/multicoreware/x265_git.git#commit=${_commit}") sha256sums=('SKIP') @@ -63,6 +63,7 @@ build() { -DEXPORT_C_API=OFF \ -DENABLE_CLI=OFF \ -DENABLE_SHARED=OFF \ + -DENABLE_ALPHA=ON \ -DENABLE_ASSEMBLY=${_ENABLE_ASM} \ ../x265_${pkgver}/source ${MINGW_TOOLCHAIN_PREFIX}/bin/cmake.exe --build . @@ -77,6 +78,7 @@ build() { -DEXPORT_C_API=OFF \ -DENABLE_CLI=OFF \ -DENABLE_SHARED=OFF \ + -DENABLE_ALPHA=ON \ -DENABLE_ASSEMBLY=${_ENABLE_ASM} \ ../x265_${pkgver}/source ${MINGW_TOOLCHAIN_PREFIX}/bin/cmake.exe --build . @@ -91,6 +93,7 @@ build() { -DCMAKE_INSTALL_PREFIX=${FF_MINGW_PREFIX} \ -DENABLE_SHARED=OFF \ -DCMAKE_DLL_NAME_WITH_SOVERSION=ON \ + -DENABLE_ALPHA=ON \ -DENABLE_ASSEMBLY=${_ENABLE_ASM} \ -DENABLE_HDR10_PLUS=ON \ -DEXTRA_LIB='x265_main10.a;x265_main12.a' \ From ff1a860fb326f1115a0c8ca4a9972cbaca06e14f Mon Sep 17 00:00:00 2001 From: nyanmisaka Date: Sat, 14 Dec 2024 18:36:44 +0800 Subject: [PATCH 2/2] Bump version to 7.0.2-8 Signed-off-by: nyanmisaka --- build.yaml | 2 +- debian/changelog | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/build.yaml b/build.yaml index a89086ea4fd..215c881193b 100644 --- a/build.yaml +++ b/build.yaml @@ -1,7 +1,7 @@ --- # We just wrap `build` so this is really it name: "jellyfin-ffmpeg" -version: "7.0.2-7" +version: "7.0.2-8" packages: - bullseye-amd64 - bullseye-armhf diff --git a/debian/changelog b/debian/changelog index 1a6cd95f985..d94197a6ddf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +jellyfin-ffmpeg (7.0.2-8) unstable; urgency=medium + + * avcodec/videotoolbox: backport AV1 hardware acceleration + * Fix some edge case issues in RKMPP + * fftools/ffmpeg_mux_init: default to input timebase for streamcopy + * avformat/assenc: do not copy null terminator + + -- nyanmisaka Sat, 14 Dec 2024 18:33:05 +0800 + jellyfin-ffmpeg (7.0.2-7) unstable; urgency=medium * Fix MppPacket being released before MppMeta