commit: 4ff9483983a8b1f98f3128b87647c6c536bbc86b
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 25 02:25:56 2026 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Jan 25 02:42:25 2026 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ff94839
media-video/ffmpeg: backport build fix for svt-av1-4.0.0
Not in-tree yet, but in preparation.
Not needed for ffmpeg-4 given it did not use the changed API.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
media-video/ffmpeg/Manifest | 4 ++--
media-video/ffmpeg/ffmpeg-6.1.4.ebuild | 2 +-
media-video/ffmpeg/ffmpeg-7.1.3.ebuild | 2 +-
media-video/ffmpeg/ffmpeg-8.0.1.ebuild | 3 ++-
media-video/ffmpeg/files/ffmpeg-8.0.1-svt-av1-4.patch | 13 +++++++++++++
5 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 93be78cfa441..85434633e2d2 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -4,10 +4,10 @@ DIST ffmpeg-4.4.5.tar.xz 9575596 BLAKE2B
546df09f7731d22e532a18d9ba9be184283f62b
DIST ffmpeg-4.4.5.tar.xz.asc 520 BLAKE2B
505987208ed58b548f910299adb1324e6eba655cc37e6f03cac32c8623e16a4a884e822c745fb72b1934129a8c0a2706bb8bfb785715e6a68e43f737cb8ed365
SHA512
bcfee8986681dfbefd3add741fcbbc5e223bb06c9800797e68fde968c114055ac3fc02ce8731ed269bf30c92d6c990c7f636f82d42379920012e8a0ace8d527e
DIST ffmpeg-4.4.6.tar.xz 9575932 BLAKE2B
c025f9b020b9881d5b00455a42aa9a591fa18c5b2010cf3ee4af6d5242ab0b28e18f05d43e0416ba280bbb1393cfeaf4aaadc0e7258bd0c9578720fd7a9052d9
SHA512
3805c5ff4661217cd2f85a7443a796b9dece67b6eba7686f5f348a1c6c4c678d26f97f9674bb9552b74cfa5bffaf8048885e57e765ad3e09a31274172c57725b
DIST ffmpeg-4.4.6.tar.xz.asc 520 BLAKE2B
6b16c806af2df78452c17cc81d254ba96056a2aeee24f41d17030aa268cd0176b94e72845092eef2c78fc436d91c881fa076155eadd9925726e478fbb2fb271c
SHA512
dc07824da6ce364cc3010cfc90a3f79f60be3ede454d5844a8d06f0a6fa0f7c2881e32d71c54488c0ec8edb3191aedde9a0302e95cb233b96ac219833c48a094
-DIST ffmpeg-6.1-patchset-3.tar.xz 11156 BLAKE2B
b926ad445372f1c5410925f320a472e73752dba357d517136e3c7d00746ac0285938a750ad2359ffc5b45a39e3763df8e84034e94814652eb270e8c78c1fb32b
SHA512
6705832a4e710795c8bdbfd0c14b1cae8d66389e80b5a0f4293e927b5337f9d2887845c2a33f51fc062a8a2af0cd6ea853814d7ef65b3e60a03e8a2cdba7777f
+DIST ffmpeg-6.1-patchset-4.tar.xz 10132 BLAKE2B
be96252aff302b3c46adeac712ba7cd9e90b1b49a8131d5e84d8e8150fab001e0bd041f20a7d0cca9485bfeb857d8bcd11b440de9257d922a8989c4817d7a3cc
SHA512
c17801becaba719712807eb529e201905e0ec4be2d643d0165f2ed90ef244ad940fbaaa6d69592e68587dabd683e554f95e9dd11f324efed0c600384b505b3a3
DIST ffmpeg-6.1.4.tar.xz 10479060 BLAKE2B
2d6c685aaa3bdf6449b4e403e1150e8b89496fc0794c85241a1482db4286610bae8b70e2ed517f3243d176358df5ce5202756bbec13a7152a87f74d7648b0516
SHA512
0d7d29fb170947805eb531f6c66641d0977d18831923d5a9c0442c160b02f94b890ccd04ecf350bb3dce59fe7bb64a426cab02bd65c05416c0d153f50104065f
DIST ffmpeg-6.1.4.tar.xz.asc 520 BLAKE2B
10d47aea434fa9e9f6af4d376e8c49f3073dc740ec38c7d76c4f773d2c224eb960fea7f7eef2b840dcac938df2f95f9ced2324fc10c9d5e6fb4f178fe5fc47de
SHA512
e7365d21518fb85b56717412f7aaed8607ab0112844cdfcaf4a8816b049fec5866751e3f9403755a918efcbb4def92c6ffa9c120019805265e5db5beb032f99a
-DIST ffmpeg-7.1-patchset-2.tar.xz 2056 BLAKE2B
56e6ed9c53ae90966a81beddd6eb3999cf983671a6abb8f25b21f17317dc8e8f5d8595a151a2a3d72f6a833d661911b43cb9c06be41d277ec551e4540a5d0b1e
SHA512
bde2e07e2284f9c59bfc3dd448d46f34e14e3983d01baac6b89efac1093dd804318c4770cebe16d84830b34325dcd0aa88cf56136b3529bd36651bb32d73632b
+DIST ffmpeg-7.1-patchset-3.tar.xz 968 BLAKE2B
0cb376d9f6f6b5a2f16d281b4e3ba810d820829ef2135d22b95eb05ca5c38de65320686d96511d6d51a17ff7abed457853de5a2197859846ab00014ad9a25598
SHA512
ad7806d32bab7982550fc1f624a1851dc863024a9617d4f8475c34904b103e7fb24f58cd256b1112b043e032bd1ef926d3ccf4a63410bea957f3fe067e2f4c57
DIST ffmpeg-7.1.3.tar.xz 11032252 BLAKE2B
c2cbc37407f5044b555e744671a75a1f6e4c57d8c9934f9b42abe9d5c86220eb33bcfb107947b4150c3714c7e539945a303647642395463477fed7032a106a6d
SHA512
1231cb6fe8305e040565d9c2a05228af6e90ded88b8548b24b1e7c46964ea25e43db44eb2b677837c0d68bc4e2a10ea5db101c2d2a24d2e3132cd20d599b0da0
DIST ffmpeg-7.1.3.tar.xz.asc 520 BLAKE2B
6d63b4b648cd4838293171fc147f5539c7ba1e45a7b0e54c0672db5abea0b73c35f70bfe53cb3262a4e15db66ff4062a52a8f482f74f594c18fcacfc0d8cb997
SHA512
60e99afea76b002ee6d6d8f2978b1f67e32165516106e36fb2ec362b45e929d30ef7b5a0a7765c720e392d40115d6ca0bb6911e194a8d4ddbf7edf51bb387ce1
DIST ffmpeg-8.0.1.tar.xz 11388848 BLAKE2B
fea49b663a3598d013969b22b34f7b0db677a90ef4bf27ff1ddf8b4e1d9c6eed598efa0f221baa50e4f0d9c877225b358b4192ecc9d2b725d853ef58e65379c9
SHA512
7af5cd1c7ba04f8d7ea1b54b64b9c235f2a606dc0c18d25cfdf20958bcad4851d3265b4894fc6ba5dd205c2309971c7e7fb890ee1d64e0a41a3faf159f77957f
diff --git a/media-video/ffmpeg/ffmpeg-6.1.4.ebuild
b/media-video/ffmpeg/ffmpeg-6.1.4.ebuild
index b75d342a6986..8f76a9b2d41b 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.4.ebuild
@@ -22,7 +22,7 @@ else
${FFMPEG_SOC_PATCH:+"
soc? (
https://dev.gentoo.org/~chewi/distfiles/${FFMPEG_SOC_PATCH} )
"}
- https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut
1-2)-patchset-3.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut
1-2)-patchset-4.tar.xz
"
S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv
~sparc x86 ~arm64-macos ~x64-macos"
diff --git a/media-video/ffmpeg/ffmpeg-7.1.3.ebuild
b/media-video/ffmpeg/ffmpeg-7.1.3.ebuild
index df095d5bdd16..086440f3aff5 100644
--- a/media-video/ffmpeg/ffmpeg-7.1.3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-7.1.3.ebuild
@@ -22,7 +22,7 @@ else
${FFMPEG_SOC_PATCH:+"
soc? (
https://dev.gentoo.org/~chewi/distfiles/${FFMPEG_SOC_PATCH} )
"}
- https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut
1-2)-patchset-2.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut
1-2)-patchset-3.tar.xz
"
S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat
KEYWORDS="amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~sparc
x86 ~arm64-macos ~x64-macos"
diff --git a/media-video/ffmpeg/ffmpeg-8.0.1.ebuild
b/media-video/ffmpeg/ffmpeg-8.0.1.ebuild
index 005d85285f36..b90647d85468 100644
--- a/media-video/ffmpeg/ffmpeg-8.0.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-8.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2025 Gentoo Authors
+# Copyright 2025-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -335,6 +335,7 @@ MULTILIB_WRAPPED_HEADERS=(
PATCHES=(
"${FILESDIR}"/ffmpeg-6.1-opencl-parallel-gmake-fix.patch
+ "${FILESDIR}"/ffmpeg-8.0.1-svt-av1-4.patch
)
pkg_pretend() {
diff --git a/media-video/ffmpeg/files/ffmpeg-8.0.1-svt-av1-4.patch
b/media-video/ffmpeg/files/ffmpeg-8.0.1-svt-av1-4.patch
new file mode 100644
index 000000000000..bdf4ff6d7f51
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-8.0.1-svt-av1-4.patch
@@ -0,0 +1,13 @@
+https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21567
+--- a/libavcodec/libsvtav1.c
++++ b/libavcodec/libsvtav1.c
+@@ -239,5 +239,9 @@
+ param->qp = svt_enc->qp;
+ param->rate_control_mode = 0;
++#if SVT_AV1_CHECK_VERSION(4, 0, 0)
++ param->aq_mode = 0;
++#else
+ param->enable_adaptive_quantization = 0;
++#endif
+ }
+
