[packages/ffmpeg] up to 6.1.3
atler
atler at pld-linux.org
Sun Aug 17 23:06:24 CEST 2025
commit b66645b8543e8cbf12fb8e7e9ec2a84e4b61095e
Author: Jan Palus <atler at pld-linux.org>
Date: Sun Aug 17 23:06:07 2025 +0200
up to 6.1.3
binutils-2.43.patch | 58 ------------------------------
ffmpeg-x265-210.patch | 99 ---------------------------------------------------
ffmpeg.spec | 12 +++----
3 files changed, 4 insertions(+), 165 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 23f5e50..59b29f9 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -131,8 +131,8 @@ Summary: FFmpeg - a very fast video and audio converter
Summary(pl.UTF-8): FFmpeg - szybki konwerter audio/wideo
Name: ffmpeg
# NOTE: 7.x prepared on DEVEL-7.1 branch, but other software is not ready (e.g. xine-lib 1.2.13, gstreamer-libav 1.24.2)
-Version: 6.1.2
-Release: 4
+Version: 6.1.3
+Release: 1
# LGPL or GPL, chosen at configure time (GPL version is more featured)
# GPL: frei0r libcdio libdavs2 rubberband vidstab x264 x265 xavs xavs2 xvid
# v3 (allows *GPLv3 or Apache-licensed libs): gmp lensfun opencore-amr vmaf vo-*enc rkmpp
@@ -140,16 +140,14 @@ Release: 4
License: GPL v3+ with LGPL v3+ parts
Group: Applications/Multimedia
Source0: https://ffmpeg.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5: 42f9bb3aacdd5c5907d1af1811738c00
+# Source0-md5: f1fa311d96f576f700bc830d1ed86e0c
Patch0: %{name}-omx-libnames.patch
Patch1: %{name}-atadenoise.patch
Patch2: opencv4.patch
Patch3: v4l2-request-hwdec.patch
Patch4: ffmpeg-vulkan1.3.280.patch
Patch5: gcc14.patch
-Patch6: %{name}-x265-210.patch
-Patch7: binutils-2.43.patch
-Patch8: texinfo-7.2.patch
+Patch6: texinfo-7.2.patch
URL: https://ffmpeg.org/
%{?with_avisynth:BuildRequires: AviSynthPlus-devel >= 3.7.3}
%{?with_decklink:BuildRequires: Blackmagic_DeckLink_SDK >= 10.11}
@@ -579,8 +577,6 @@ Dokumentacja pakietu FFmpeg w formacie HTML.
%patch -P4 -p1
%patch -P5 -p1
%patch -P6 -p1
-%patch -P7 -p1
-%patch -P8 -p1
# package the grep result for mplayer, the result formatted as ./mplayer/configure
cat <<EOF > ffmpeg-avconfig
diff --git a/binutils-2.43.patch b/binutils-2.43.patch
deleted file mode 100644
index 750f350..0000000
--- a/binutils-2.43.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 654bd47716c4f36719fb0f3f7fd8386d5ed0b916 Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton at arm.com>
-Date: Fri, 9 Aug 2024 11:32:00 +0100
-Subject: [PATCH] libavcodec/arm/mlpdsp_armv5te: fix label format to work with
- binutils 2.43
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-binutils 2.43 has stricter validation for labels[1] and results in errors
-when building ffmpeg for armv5:
-
-src/libavcodec/arm/mlpdsp_armv5te.S:232: Error: junk at end of line, first unrecognized character is `0'
-
-Remove the leading zero in the "01" label to resolve this error.
-
-[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=226749d5a6ff0d5c607d6428d6c81e1e7e7a994b
-
-Signed-off-by: Ross Burton <ross.burton at arm.com>
-Signed-off-by: Martin Storsjö <martin at martin.st>
----
- libavcodec/arm/mlpdsp_armv5te.S | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/arm/mlpdsp_armv5te.S b/libavcodec/arm/mlpdsp_armv5te.S
-index 4f9aa485fd..d31568611c 100644
---- a/libavcodec/arm/mlpdsp_armv5te.S
-+++ b/libavcodec/arm/mlpdsp_armv5te.S
-@@ -229,7 +229,7 @@ A .endif
- .endif
-
- // Begin loop
--01:
-+1:
- .if TOTAL_TAPS == 0
- // Things simplify a lot in this case
- // In fact this could be pipelined further if it's worth it...
-@@ -241,7 +241,7 @@ A .endif
- str ST0, [PST, #-4]!
- str ST0, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)]
- str ST0, [PSAMP], #4 * MAX_CHANNELS
-- bne 01b
-+ bne 1b
- .else
- .if \fir_taps & 1
- .set LOAD_REG, 1
-@@ -333,7 +333,7 @@ T orr AC0, AC0, AC1
- str ST3, [PST, #-4]!
- str ST2, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)]
- str ST3, [PSAMP], #4 * MAX_CHANNELS
-- bne 01b
-+ bne 1b
- .endif
- b 99f
-
---
-2.30.2
-
diff --git a/ffmpeg-x265-210.patch b/ffmpeg-x265-210.patch
deleted file mode 100644
index c591045..0000000
--- a/ffmpeg-x265-210.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From f749aaf108696fcfc2be6a9f6c1059415474caf3 Mon Sep 17 00:00:00 2001
-From: Gyan Doshi <ffmpeg at gyani.pro>
-Date: Sun, 11 Aug 2024 12:51:50 +0530
-Subject: [PATCH] lavc/libx265: unbreak build for X265_BUILD >= 210
-
-x265 added support for alpha starting with build 210.
-While doing so, x265_encoder_encode() changed its fifth arg to
-an array of pointers to x265_picture. This broke building lavc/libx265.c
-
-This patch simply unbreaks the build and maintains existing single-layer
-non-alpha encoding support.
-
-Fixes #11130
----
- libavcodec/libx265.c | 40 ++++++++++++++++++++++++++++++----------
- 1 file changed, 30 insertions(+), 10 deletions(-)
-
-diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c
-index 447e6da25f..29fc26eab4 100644
---- a/libavcodec/libx265.c
-+++ b/libavcodec/libx265.c
-@@ -581,7 +581,13 @@ static int libx265_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
- {
- libx265Context *ctx = avctx->priv_data;
- x265_picture x265pic;
-- x265_picture x265pic_out = { 0 };
-+#if X265_BUILD >= 210 && X265_BUILD < 215
-+ x265_picture x265pic_layers_out[MAX_SCALABLE_LAYERS];
-+ x265_picture* x265pic_lyrptr_out[MAX_SCALABLE_LAYERS];
-+#else
-+ x265_picture x265pic_solo_out = { 0 };
-+#endif
-+ x265_picture* x265pic_out;
- x265_nal *nal;
- x265_sei *sei;
- uint8_t *dst;
-@@ -704,8 +710,16 @@ FF_ENABLE_DEPRECATION_WARNINGS
- }
- }
-
-+#if X265_BUILD >= 210 && X265_BUILD < 215
-+ for (i = 0; i < MAX_SCALABLE_LAYERS; i++)
-+ x265pic_lyrptr_out[i] = &x265pic_layers_out[i];
-+
-+ ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal,
-+ pic ? &x265pic : NULL, x265pic_lyrptr_out);
-+#else
- ret = ctx->api->encoder_encode(ctx->encoder, &nal, &nnal,
-- pic ? &x265pic : NULL, &x265pic_out);
-+ pic ? &x265pic : NULL, &x265pic_solo_out);
-+#endif
-
- for (i = 0; i < sei->numPayloads; i++)
- av_free(sei->payloads[i].payload);
-@@ -735,10 +749,16 @@ FF_ENABLE_DEPRECATION_WARNINGS
- pkt->flags |= AV_PKT_FLAG_KEY;
- }
-
-- pkt->pts = x265pic_out.pts;
-- pkt->dts = x265pic_out.dts;
-+#if X265_BUILD >= 210 && X265_BUILD < 215
-+ x265pic_out = x265pic_lyrptr_out[0];
-+#else
-+ x265pic_out = &x265pic_solo_out;
-+#endif
-+
-+ pkt->pts = x265pic_out->pts;
-+ pkt->dts = x265pic_out->dts;
-
-- switch (x265pic_out.sliceType) {
-+ switch (x265pic_out->sliceType) {
- case X265_TYPE_IDR:
- case X265_TYPE_I:
- pict_type = AV_PICTURE_TYPE_I;
-@@ -756,16 +776,16 @@ FF_ENABLE_DEPRECATION_WARNINGS
- }
-
- #if X265_BUILD >= 130
-- if (x265pic_out.sliceType == X265_TYPE_B)
-+ if (x265pic_out->sliceType == X265_TYPE_B)
- #else
-- if (x265pic_out.frameData.sliceType == 'b')
-+ if (x265pic_out->frameData.sliceType == 'b')
- #endif
- pkt->flags |= AV_PKT_FLAG_DISPOSABLE;
-
-- ff_side_data_set_encoder_stats(pkt, x265pic_out.frameData.qp * FF_QP2LAMBDA, NULL, 0, pict_type);
-+ ff_side_data_set_encoder_stats(pkt, x265pic_out->frameData.qp * FF_QP2LAMBDA, NULL, 0, pict_type);
-
-- if (x265pic_out.userData) {
-- int idx = (int)(intptr_t)x265pic_out.userData - 1;
-+ if (x265pic_out->userData) {
-+ int idx = (int)(intptr_t)x265pic_out->userData - 1;
- ReorderedData *rd = &ctx->rd[idx];
-
- #if FF_API_REORDERED_OPAQUE
---
-2.25.1
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/b66645b8543e8cbf12fb8e7e9ec2a84e4b61095e
More information about the pld-cvs-commit
mailing list