Skip to content

Commit

Permalink
Merge pull request #481 from nyanmisaka/rkmpp-fixes
Browse files Browse the repository at this point in the history
Sync RKMPP fixes from ffmpeg-rockchip
  • Loading branch information
gnattu authored Oct 16, 2024
2 parents 84a0ae4 + 01a9fdc commit 845992e
Show file tree
Hide file tree
Showing 34 changed files with 514 additions and 308 deletions.
9 changes: 5 additions & 4 deletions builder/images/base-linux64/ct-ng-config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# crosstool-NG 1.26.0.106_ed12fa6 Configuration
# crosstool-NG 1.26.0.120_4d36f27 Configuration
#
CT_CONFIGURE_has_static_link=y
CT_CONFIGURE_has_cxx11=y
Expand Down Expand Up @@ -29,7 +29,7 @@ CT_CONFIGURE_has_sha1sum=y
CT_CONFIGURE_has_sha256sum=y
CT_CONFIGURE_has_sha512sum=y
CT_CONFIGURE_has_install_with_strip_program=y
CT_VERSION="1.26.0.106_ed12fa6"
CT_VERSION="1.26.0.120_4d36f27"
CT_VCHECK=""
CT_CONFIG_VERSION_ENV="4"
CT_CONFIG_VERSION_CURRENT="4"
Expand Down Expand Up @@ -384,7 +384,8 @@ CT_BINUTILS_PATCH_GLOBAL=y
# CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set
# CT_BINUTILS_PATCH_NONE is not set
CT_BINUTILS_PATCH_ORDER="global"
CT_BINUTILS_V_2_42=y
CT_BINUTILS_V_2_43=y
# CT_BINUTILS_V_2_42 is not set
# CT_BINUTILS_V_2_41 is not set
# CT_BINUTILS_V_2_40 is not set
# CT_BINUTILS_V_2_39 is not set
Expand All @@ -401,7 +402,7 @@ CT_BINUTILS_V_2_42=y
# CT_BINUTILS_V_2_28 is not set
# CT_BINUTILS_V_2_27 is not set
# CT_BINUTILS_V_2_26 is not set
CT_BINUTILS_VERSION="2.42"
CT_BINUTILS_VERSION="2.43.1"
CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
Expand Down
9 changes: 5 additions & 4 deletions builder/images/base-linuxarm64/ct-ng-config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# crosstool-NG 1.26.0.106_ed12fa6 Configuration
# crosstool-NG 1.26.0.120_4d36f27 Configuration
#
CT_CONFIGURE_has_static_link=y
CT_CONFIGURE_has_cxx11=y
Expand Down Expand Up @@ -29,7 +29,7 @@ CT_CONFIGURE_has_sha1sum=y
CT_CONFIGURE_has_sha256sum=y
CT_CONFIGURE_has_sha512sum=y
CT_CONFIGURE_has_install_with_strip_program=y
CT_VERSION="1.26.0.106_ed12fa6"
CT_VERSION="1.26.0.120_4d36f27"
CT_VCHECK=""
CT_CONFIG_VERSION_ENV="4"
CT_CONFIG_VERSION_CURRENT="4"
Expand Down Expand Up @@ -390,7 +390,8 @@ CT_BINUTILS_PATCH_GLOBAL=y
# CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set
# CT_BINUTILS_PATCH_NONE is not set
CT_BINUTILS_PATCH_ORDER="global"
CT_BINUTILS_V_2_42=y
CT_BINUTILS_V_2_43=y
# CT_BINUTILS_V_2_42 is not set
# CT_BINUTILS_V_2_41 is not set
# CT_BINUTILS_V_2_40 is not set
# CT_BINUTILS_V_2_39 is not set
Expand All @@ -407,7 +408,7 @@ CT_BINUTILS_V_2_42=y
# CT_BINUTILS_V_2_28 is not set
# CT_BINUTILS_V_2_27 is not set
# CT_BINUTILS_V_2_26 is not set
CT_BINUTILS_VERSION="2.42"
CT_BINUTILS_VERSION="2.43.1"
CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
Expand Down
9 changes: 5 additions & 4 deletions builder/images/base-win64/ct-ng-config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# crosstool-NG 1.26.0.106_ed12fa6 Configuration
# crosstool-NG 1.26.0.120_4d36f27 Configuration
#
CT_CONFIGURE_has_static_link=y
CT_CONFIGURE_has_cxx11=y
Expand Down Expand Up @@ -29,7 +29,7 @@ CT_CONFIGURE_has_sha1sum=y
CT_CONFIGURE_has_sha256sum=y
CT_CONFIGURE_has_sha512sum=y
CT_CONFIGURE_has_install_with_strip_program=y
CT_VERSION="1.26.0.106_ed12fa6"
CT_VERSION="1.26.0.120_4d36f27"
CT_VCHECK=""
CT_CONFIG_VERSION_ENV="4"
CT_CONFIG_VERSION_CURRENT="4"
Expand Down Expand Up @@ -297,7 +297,8 @@ CT_BINUTILS_PATCH_GLOBAL=y
# CT_BINUTILS_PATCH_LOCAL_BUNDLED is not set
# CT_BINUTILS_PATCH_NONE is not set
CT_BINUTILS_PATCH_ORDER="global"
CT_BINUTILS_V_2_42=y
CT_BINUTILS_V_2_43=y
# CT_BINUTILS_V_2_42 is not set
# CT_BINUTILS_V_2_41 is not set
# CT_BINUTILS_V_2_40 is not set
# CT_BINUTILS_V_2_39 is not set
Expand All @@ -314,7 +315,7 @@ CT_BINUTILS_V_2_42=y
# CT_BINUTILS_V_2_28 is not set
# CT_BINUTILS_V_2_27 is not set
# CT_BINUTILS_V_2_26 is not set
CT_BINUTILS_VERSION="2.42"
CT_BINUTILS_VERSION="2.43.1"
CT_BINUTILS_MIRRORS="$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)"
CT_BINUTILS_ARCHIVE_FILENAME="@{pkg_name}-@{version}"
CT_BINUTILS_ARCHIVE_DIRNAME="@{pkg_name}-@{version}"
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="d2491a9358bddc9573d0ff2fa73989e3175c2009"
SCRIPT_COMMIT="cdf6b16b805ce7d02f6b1b742911ba0770b49bbb"

ffbuild_enabled() {
[[ $TARGET == win* ]] || return -1
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="c82745878da1acef2ce6bd7e17a8d59b8612d509"
SCRIPT_COMMIT="139443663368617b30b70cf6912e9577ecbb845f"

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="d67833a3c5db7999820a73e356327d47ec76bea9"
SCRIPT_COMMIT="513949293d7ee2a11acc36bcdf5016a8fc5cc438"

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

SCRIPT_REPO="https://github.com/tukaani-project/xz.git"
SCRIPT_COMMIT="v5.6.2"
SCRIPT_COMMIT="v5.6.3"
SCRIPT_TAGFILTER="v?.*.*"

ffbuild_enabled() {
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="bd83c04aa6f3cb864ba60dc5eaf2b41c4c269c63"
SCRIPT_COMMIT="6d0580b2427f50b45e1432ba0fb6128c19b6dbd4"

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="c7ef6a2ed58ae8ec108ee0962bef46f42c73a60c"
SCRIPT_COMMIT="825bc1964374eed7d19ffa327989d0ee841dda71"

ffbuild_enabled() {
return 0
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/45-x11/10-xcbproto.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/xcbproto.git"
SCRIPT_COMMIT="77d7fc04da729ddc5ed4aacf30253726fac24dca"
SCRIPT_COMMIT="4d2879ad9e394ff832762e8961eca9415cc9934c"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
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="3076552555c32cb89ec20ddef638317f0ea303b9"
SCRIPT_COMMIT="af7cb6a643db810536605feab1402654a9818569"

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="0f153064bfa4bb69e86f3f2383f2f421f2360319"
SCRIPT_COMMIT="ae99ac32f61e0db92a45179579030a23fe1b5770"

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="86e71472bc826ac5c850e200cb3820485b5689cf"
SCRIPT_COMMIT="f2ebbce6d0978d2d84f840196b03ee35a3ca1736"

ffbuild_enabled() {
[[ $TARGET != linux* ]] && return -1
Expand Down
2 changes: 1 addition & 1 deletion builder/scripts.d/50-amf.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

SCRIPT_REPO="https://github.com/GPUOpen-LibrariesAndSDKs/AMF.git"
SCRIPT_COMMIT="3db6164375ca62337e068193658f7cb10f0c42f9"
SCRIPT_COMMIT="8e271daf1d6991337a87dec9355a2f11994d7292"

ffbuild_enabled() {
[[ $TARGET == mac* ]] && 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="f2c3ccd6a649a25d718cb0c8e8b6196fdbd2407f"
SCRIPT_COMMIT="389450f61ea0b2057fc9ea393d3065859c4ba7f2"

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="5298859c298d3c570d8d7e3b883a0d63490659b8"
SCRIPT_COMMIT="6a759836e5e76bb7b69b0ac244eea76b0d290512"

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="ff6dea5e1a72b8a2aeb7fc3656857d86a420ab89"
SCRIPT_COMMIT="7db26934e4156597cb0586bb4d2e44dccdde1a59"

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="32de9c2becdd5d96d84d37be9f7fb9de43f24a4d"
SCRIPT_COMMIT="906334ac1de2b0afa666472dce5545b82c1251fb"

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="220ee52967c121adf3c690fbd0605a7de6371943"
SCRIPT_COMMIT="dfdcb7f95ca280b2555020115b8f288a5a3453c2"

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="21767"
SCRIPT_REV="21833"

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="cfad02b76ad90e8e3ad765fef0382a1901e75895"
SCRIPT_COMMIT="ba5c98ac8dbf485de9f03e625e1dd024afdc2eb9"
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="a7b3711a8a862e697f641b296743cc7c921f5fba"
SCRIPT_COMMIT="e2f133b95c06dd3c157b1669de34b2432e640029"

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="aa853f1d4f31491916a9b6ccf16ab8be410de399"
SCRIPT_COMMIT="34d4d591d87aeba6d347f09bfb5a7429fe58bd46"

ffbuild_enabled() {
[[ $TARGET == win32 ]] && 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.296"
SCRIPT_COMMIT="v1.3.298"
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="b28b3559d3882f918825cd90342dcfa955770bad"
SCRIPT_COMMIT="e670b39cfced2f7258c73dc7cd708c6c639beaf0"

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="c24e06c2e184345ceb33eb20a15d1024d9fd3497"
SCRIPT_COMMIT="1243d9ffb04dac7005ee9ecc79459034429dd5aa"

ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
Expand Down
2 changes: 1 addition & 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="26d2bab0063cee453b7d8012e76539a7786c032f"
SCRIPT_COMMIT="487105dcd21d0f36a7a9e0ec50de85577b9bed04"

ffbuild_enabled() {
[[ $VARIANT == lgpl* ]] && return -1
Expand Down
Loading

0 comments on commit 845992e

Please sign in to comment.