commit: e02f29f80bd430356553845bdc2ebe5dda0d811a Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Thu Jul 17 10:42:09 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Thu Jul 17 11:02:04 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e02f29f8
dev-qt/qtmultimedia: fix build with ffmpeg-9999 Patch is very simple and unlikely to cause trouble for old versions, so might as well backport given qtmultimedia-6.9.2 is still far away and we do have a few ffmpeg-9999 users. No tested w/ 9999 at runtime, just checked that it builds. Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-qt/qtmultimedia/files/qtmultimedia-6.9.1-ffmpeg7.2.patch | 9 +++++++++ dev-qt/qtmultimedia/qtmultimedia-6.9.1.ebuild | 1 + 2 files changed, 10 insertions(+) diff --git a/dev-qt/qtmultimedia/files/qtmultimedia-6.9.1-ffmpeg7.2.patch b/dev-qt/qtmultimedia/files/qtmultimedia-6.9.1-ffmpeg7.2.patch new file mode 100644 index 000000000000..4769816d01fa --- /dev/null +++ b/dev-qt/qtmultimedia/files/qtmultimedia-6.9.1-ffmpeg7.2.patch @@ -0,0 +1,9 @@ +https://github.com/qt/qtmultimedia/commit/65b11b9f976 +--- a/src/plugins/multimedia/ffmpeg/qffmpegcodecstorage.cpp ++++ b/src/plugins/multimedia/ffmpeg/qffmpegcodecstorage.cpp +@@ -101,3 +101,5 @@ + { AV_CODEC_CAP_SMALL_LAST_FRAME, "SMALL_LAST_FRAME" }, ++#ifdef AV_CODEC_CAP_SUBFRAMES + { AV_CODEC_CAP_SUBFRAMES, "SUBFRAMES" }, ++#endif + { AV_CODEC_CAP_EXPERIMENTAL, "EXPERIMENTAL" }, diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9.1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9.1.ebuild index 7102275c7157..1731bfe8c9b1 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.9.1.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.9.1.ebuild @@ -95,6 +95,7 @@ CMAKE_SKIP_TESTS=( PATCHES=( "${FILESDIR}"/${PN}-6.7.3-eigen-ppc-no-vsx.patch "${FILESDIR}"/${PN}-6.8.1-qversionnumber.patch + "${FILESDIR}"/${PN}-6.9.1-ffmpeg7.2.patch ) src_configure() {
