From fa70932ea8fcaf8c32b83eadc8c7a308b5af7069 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 16 Mar 2025 13:20:46 +0000 Subject: [PATCH 1/4] ffmpegx: update to 7.1.1 --- .../addons/addon-depends/ffmpegx/package.mk | 4 +- ...--unbreak-build-for-X265-BUILD---213.patch | 48 ------------------- 2 files changed, 2 insertions(+), 50 deletions(-) delete mode 100644 packages/addons/addon-depends/ffmpegx/patches/ffmpeg-04-lavc-libx265--unbreak-build-for-X265-BUILD---213.patch diff --git a/packages/addons/addon-depends/ffmpegx/package.mk b/packages/addons/addon-depends/ffmpegx/package.mk index 878208be57..216a04ed72 100644 --- a/packages/addons/addon-depends/ffmpegx/package.mk +++ b/packages/addons/addon-depends/ffmpegx/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="ffmpegx" -PKG_VERSION="7.1" -PKG_SHA256="40973d44970dbc83ef302b0609f2e74982be2d85916dd2ee7472d30678a7abe6" +PKG_VERSION="7.1.1" +PKG_SHA256="733984395e0dbbe5c046abda2dc49a5544e7e0e1e2366bba849222ae9e3a03b1" PKG_LICENSE="GPL-3.0-only" PKG_SITE="https://ffmpeg.org" PKG_URL="https://ffmpeg.org/releases/ffmpeg-${PKG_VERSION}.tar.xz" diff --git a/packages/addons/addon-depends/ffmpegx/patches/ffmpeg-04-lavc-libx265--unbreak-build-for-X265-BUILD---213.patch b/packages/addons/addon-depends/ffmpegx/patches/ffmpeg-04-lavc-libx265--unbreak-build-for-X265-BUILD---213.patch deleted file mode 100644 index 839a4d4193..0000000000 --- a/packages/addons/addon-depends/ffmpegx/patches/ffmpeg-04-lavc-libx265--unbreak-build-for-X265-BUILD---213.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 099f88b8641dfc299f3896d17d9addc5b9ae7799 Mon Sep 17 00:00:00 2001 -From: Gyan Doshi -Date: Sat, 5 Oct 2024 10:08:31 +0530 -Subject: [PATCH] avcodec/libx265: unbreak build for X265_BUILD >= 213 - -Earlier, x265 made an API change to support alpha and -other multiple layer pictures. We added guards to accommodate -that in 1f801dfdb5 - -They have now reverted that API change in -https://bitbucket.org/multicoreware/x265_git/commits/78e5b703b1 - -Updated our wrapper guards to unbreak build again. ---- - libavcodec/libx265.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c -index 513f4733079dd..63cc497f835f0 100644 ---- a/libavcodec/libx265.c -+++ b/libavcodec/libx265.c -@@ -661,7 +661,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, - { - libx265Context *ctx = avctx->priv_data; - x265_picture x265pic; --#if X265_BUILD >= 210 -+#if (X265_BUILD >= 210) && (X265_BUILD < 213) - x265_picture x265pic_layers_out[MAX_SCALABLE_LAYERS]; - x265_picture* x265pic_lyrptr_out[MAX_SCALABLE_LAYERS]; - #else -@@ -805,7 +805,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, - #endif - } - --#if X265_BUILD >= 210 -+#if (X265_BUILD >= 210) && (X265_BUILD < 213) - for (i = 0; i < MAX_SCALABLE_LAYERS; i++) - x265pic_lyrptr_out[i] = &x265pic_layers_out[i]; - -@@ -844,7 +844,7 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt, - pkt->flags |= AV_PKT_FLAG_KEY; - } - --#if X265_BUILD >= 210 -+#if (X265_BUILD >= 210) && (X265_BUILD < 213) - x265pic_out = x265pic_lyrptr_out[0]; - #else - x265pic_out = &x265pic_solo_out; From dfcd36a73bf97126e68a97d04f142295799ada84 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 16 Mar 2025 13:26:03 +0000 Subject: [PATCH 2/4] ffmpeg-tools: update ffmpeg to 7.1.1 and addon (6) --- packages/addons/tools/ffmpeg-tools/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/tools/ffmpeg-tools/package.mk b/packages/addons/tools/ffmpeg-tools/package.mk index 42ba2de2f3..6f5db4f877 100644 --- a/packages/addons/tools/ffmpeg-tools/package.mk +++ b/packages/addons/tools/ffmpeg-tools/package.mk @@ -3,7 +3,7 @@ PKG_NAME="ffmpeg-tools" PKG_VERSION="1.0" -PKG_REV="5" +PKG_REV="6" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" From d60513af8afd314f923fee5829222e67c8c43b46 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 16 Mar 2025 13:27:46 +0000 Subject: [PATCH 3/4] tvheadend43: update ffmpeg to 7.1.1 and addon (8) --- packages/addons/service/tvheadend43/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/service/tvheadend43/package.mk b/packages/addons/service/tvheadend43/package.mk index 09652ca90b..7310b0edf8 100644 --- a/packages/addons/service/tvheadend43/package.mk +++ b/packages/addons/service/tvheadend43/package.mk @@ -5,7 +5,7 @@ PKG_NAME="tvheadend43" PKG_VERSION="653bd0400b4413db96b80c807f0f7524f9248adb" PKG_SHA256="9c2e13a70f97cf4c9b37cd93bfd03a7a1e0b7f3b18080c40ef99b8917642dbd7" PKG_VERSION_NUMBER="4.3-2375" -PKG_REV="7" +PKG_REV="8" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.tvheadend.org" From 12534c9f2cdd12c329bf0fa28c8dfcf1767c92d7 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 16 Mar 2025 13:28:51 +0000 Subject: [PATCH 4/4] tvheadend42: update ffmpeg to 7.1.1 and addon (8) --- packages/addons/service/tvheadend42/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/service/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk index 689335c465..a8d62c038b 100644 --- a/packages/addons/service/tvheadend42/package.mk +++ b/packages/addons/service/tvheadend42/package.mk @@ -5,7 +5,7 @@ PKG_NAME="tvheadend42" PKG_VERSION="5bdcfd8ac97b3337e1c7911ae24127df76fa693a" PKG_SHA256="b562a26248cdc02dc94cc62038deea172668fa4c079b2ea4e1b4220f3b1d34f5" PKG_VERSION_NUMBER="4.2.8-36" -PKG_REV="7" +PKG_REV="8" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.tvheadend.org"