commit: 60499ecc38f18f53ce65cce6474cbb82d2ac4705 Author: Craig Andrews <candrews <AT> gentoo <DOT> org> AuthorDate: Tue Mar 14 20:20:54 2023 +0000 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> CommitDate: Tue Mar 14 20:22:57 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60499ecc
media-video/ffmpeg: Fix build failure DECLARE_ALIGNED has been moved to mem_internal.h. Bug: https://trac.ffmpeg.org/ticket/10225 Closes: https://bugs.gentoo.org/900951 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> media-video/ffmpeg/ffmpeg-6.0.ebuild | 1 + .../ffmpeg/files/ffmpeg-6.0-DECLARE_ALIGNED.patch | 29 ++++++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-6.0.ebuild b/media-video/ffmpeg/ffmpeg-6.0.ebuild index 31684f96890d..5cc3230259b2 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.ebuild @@ -336,6 +336,7 @@ S=${WORKDIR}/${P/_/-} PATCHES=( "${FILESDIR}"/chromium-r1.patch + "${FILESDIR}/${P}-DECLARE_ALIGNED.patch" ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/files/ffmpeg-6.0-DECLARE_ALIGNED.patch b/media-video/ffmpeg/files/ffmpeg-6.0-DECLARE_ALIGNED.patch new file mode 100644 index 000000000000..88af1e58458c --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-6.0-DECLARE_ALIGNED.patch @@ -0,0 +1,29 @@ +From: Zhao Zhili <[email protected]> +Date: Tue, 28 Feb 2023 18:23:00 +0000 (+0800) +Subject: avcodec/aacps_tablegen: fix build error after avutil bump +X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=46970dd1555b3e50eee48ec95c893ee9a52f7fab + +avcodec/aacps_tablegen: fix build error after avutil bump + +Fix tickets #10225 + +DECLARE_ALIGNED has been moved to mem_internal.h. + +Signed-off-by: Zhao Zhili <[email protected]> +Reviewed-by: Anton Khirnov <[email protected]> +(cherry picked from commit 814178f92647be2411516bbb82f48532373d2554) +--- + +diff --git a/libavcodec/aacps_tablegen.h b/libavcodec/aacps_tablegen.h +index 0ac4f68d68..5fdd7f0a9d 100644 +--- a/libavcodec/aacps_tablegen.h ++++ b/libavcodec/aacps_tablegen.h +@@ -34,7 +34,7 @@ + #include "libavutil/common.h" + #include "libavutil/libm.h" + #include "libavutil/mathematics.h" +-#include "libavutil/mem.h" ++#include "libavutil/mem_internal.h" + #define NR_ALLPASS_BANDS20 30 + #define NR_ALLPASS_BANDS34 50 + #define PS_AP_LINKS 3
