Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump version to 7.0.2-8 #515

Merged
merged 2 commits into from
Dec 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/10-mingw.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/10-xorg-macros.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/20-zlib.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/madler/zlib.git"
SCRIPT_COMMIT="d476828316d05d54c6fd6a068b121b30c147b5cd"
SCRIPT_COMMIT="ef24c4c7502169f016dcd2a26923dbaf3216748c"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/25-freetype.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/25-fribidi.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/fribidi/fribidi.git"
SCRIPT_COMMIT="68162babff4f39c4e2dc164a5e825af93bda9983"
SCRIPT_COMMIT="cfc71cda065db859d8b4f1e3c6fe5da7ab02469a"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/25-libxml2.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/GNOME/libxml2.git"
SCRIPT_COMMIT="513949293d7ee2a11acc36bcdf5016a8fc5cc438"
SCRIPT_COMMIT="169857ad264e51d9b34d7119d2e2e006e35e60c2"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/35-fontconfig.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/45-harfbuzz.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/harfbuzz/harfbuzz.git"
SCRIPT_COMMIT="825bc1964374eed7d19ffa327989d0ee841dda71"
SCRIPT_COMMIT="c8050b3872d012adf0a64b5b39d9c67e7f4dfc94"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/45-x11/10-xproto.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/45-x11/10-xtrans.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/45-x11/20-libxau.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/45-x11/40-libx11.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/45-x11/50-libxrender.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/45-x11/50-libxxf86vm.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/45-x11/60-libxcursor.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/45-x11/60-libxv.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-dav1d.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-libass.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/libass/libass.git"
SCRIPT_COMMIT="6a759836e5e76bb7b69b0ac244eea76b0d290512"
SCRIPT_COMMIT="7d8e335b094f00c57fb557b01e93b60a17e63434"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-libvpx.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://chromium.googlesource.com/webm/libvpx"
SCRIPT_COMMIT="906334ac1de2b0afa666472dce5545b82c1251fb"
SCRIPT_COMMIT="6f0c446c7b88d384a1c09caf33ec132e7ee24aea"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-libwebp.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://chromium.googlesource.com/webm/libwebp"
SCRIPT_COMMIT="dfdcb7f95ca280b2555020115b8f288a5a3453c2"
SCRIPT_COMMIT="e4f7a9f0c7c9fbfae1568bc7fa5c94b989b50872"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-openmpt.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-rkmpp.sh
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-srt.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/Haivision/srt.git"
SCRIPT_COMMIT="e2f133b95c06dd3c157b1669de34b2432e640029"
SCRIPT_COMMIT="f109fb1354d6b31ba7cc6b6e72d75bc761a9cd31"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-svtav1.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-vaapi/40-libdrm.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-vulkan/45-vulkan.sh
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-vulkan/55-spirv-cross.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-x264.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 2 additions & 1 deletion builder/scripts.d/50-x265.sh
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-zimg.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-zvbi.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 9 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -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 <[email protected]> Sat, 14 Dec 2024 18:33:05 +0800

jellyfin-ffmpeg (7.0.2-7) unstable; urgency=medium

* Fix MppPacket being released before MppMeta
Expand Down
9 changes: 5 additions & 4 deletions docker-build-win64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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} \
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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}
Expand All @@ -406,6 +406,7 @@ x265_conf="
-DENABLE_TESTS=OFF
-DENABLE_CLI=OFF
-DENABLE_PIC=ON
-DENABLE_ALPHA=ON
"
mkdir 8b 10b 12b
cmake \
Expand Down
Loading
Loading