Skip to content

Commit

Permalink
Merge pull request #299 from nyanmisaka/next-5.1
Browse files Browse the repository at this point in the history
Bump version to 5.1.3-7
  • Loading branch information
nyanmisaka committed Nov 4, 2023
2 parents 56e2640 + 2831bba commit a631dfb
Show file tree
Hide file tree
Showing 20 changed files with 31 additions and 23 deletions.
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: "5.1.3-6"
version: "5.1.3-7"
packages:
- buster-amd64
- buster-armhf
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/20-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="4f132bcdb300850e94a723a4117cf0847a66d9a7"
SCRIPT_COMMIT="7a2d412f681fa4847c5351d7944a1de6959685da"

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="749b8f9d344105357b82766f8c555586a4b84e7c"
SCRIPT_COMMIT="9e86fb806d93240bb7235ce42201616b19ec59f8"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/25-openssl.sh
Original file line number Diff line number Diff line change
@@ -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() {
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="1f395cbaf91be284f443c27b8b35be0edd788c34"
SCRIPT_COMMIT="fd5eb10d3b4cfee1bb10614ff6719378c949492e"

ffbuild_enabled() {
return 0
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="47107e384bd1dc25674acf04d000a8cdc6195234"
SCRIPT_COMMIT="2179b30c84571ae5a4ecfe60821b2dd0050f355f"

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="358770835248e26241e4796f38f02073a3bae252"
SCRIPT_COMMIT="e64390522d9501a2c7e6a51c31a5b2a1f3a35cd1"

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

SCRIPT_REPO="https://github.com/xiph/opus.git"
SCRIPT_COMMIT="101a71e03bbf860aaafb7090a0e440675cb27660"
SCRIPT_COMMIT="c913dc38fd5eff4a9a7b8d6ea3b3add2da087284"

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="9c377eafbedd3911e83ee80793b4fba80710d4e0"
SCRIPT_COMMIT="f08d238867a24b8eced67ff4cf54871e2bc9e47e"

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="deadc339d59dfe64a00b51decce2f6d9337ddeec"
SCRIPT_COMMIT="24d7f9cb6ef1ef90a04d7b6c15d3477813f75ee0"

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="19865"
SCRIPT_REV="19907"

ffbuild_enabled() {
return 0
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="eb80f92cec5359b61a5849355ec8dcf16c820cef"
SCRIPT_COMMIT="cb362ee654f24545b218d6594e92b993236e1442"

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="a6f0981c2b82aea05205b96bfebb1e6cd53790de"
SCRIPT_COMMIT="2f00345865de8c345dd2a04ee06f536d12651cb5"

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="8d8357dc6482c771d2f9501257c29abe8b06ba9c"
SCRIPT_COMMIT="ee558cea20d1f9d822fe1a28e97beaf365bf9d38"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-vaapi/50-libva.sh
Original file line number Diff line number Diff line change
@@ -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
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.268"
SCRIPT_COMMIT="v1.3.269"
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="2de1265fca722929785d9acdec4ab728c47a0254"
SCRIPT_COMMIT="4818f7e7ef7b7078a3a7a5a52c4a338e0dda22f4"

ffbuild_enabled() {
return 0
Expand Down
8 changes: 8 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -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 <nst799610810@gmail.com> Sat, 4 Nov 2023 22:18:25 +0800

jellyfin-ffmpeg (5.1.3-6) unstable; urgency=medium

* Update dependencies
Expand Down
2 changes: 1 addition & 1 deletion docker-build-win64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
10 changes: 5 additions & 5 deletions docker-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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} \
Expand All @@ -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} \
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit a631dfb

Please sign in to comment.