| 1 |
commit: 60499ecc38f18f53ce65cce6474cbb82d2ac4705 |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 14 20:20:54 2023 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 14 20:22:57 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60499ecc |
| 7 |
|
| 8 |
media-video/ffmpeg: Fix build failure |
| 9 |
|
| 10 |
DECLARE_ALIGNED has been moved to mem_internal.h. |
| 11 |
|
| 12 |
Bug: https://trac.ffmpeg.org/ticket/10225 |
| 13 |
Closes: https://bugs.gentoo.org/900951 |
| 14 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 15 |
|
| 16 |
media-video/ffmpeg/ffmpeg-6.0.ebuild | 1 + |
| 17 |
.../ffmpeg/files/ffmpeg-6.0-DECLARE_ALIGNED.patch | 29 ++++++++++++++++++++++ |
| 18 |
2 files changed, 30 insertions(+) |
| 19 |
|
| 20 |
diff --git a/media-video/ffmpeg/ffmpeg-6.0.ebuild b/media-video/ffmpeg/ffmpeg-6.0.ebuild |
| 21 |
index 31684f96890d..5cc3230259b2 100644 |
| 22 |
--- a/media-video/ffmpeg/ffmpeg-6.0.ebuild |
| 23 |
+++ b/media-video/ffmpeg/ffmpeg-6.0.ebuild |
| 24 |
@@ -336,6 +336,7 @@ S=${WORKDIR}/${P/_/-} |
| 25 |
|
| 26 |
PATCHES=( |
| 27 |
"${FILESDIR}"/chromium-r1.patch |
| 28 |
+ "${FILESDIR}/${P}-DECLARE_ALIGNED.patch" |
| 29 |
) |
| 30 |
|
| 31 |
MULTILIB_WRAPPED_HEADERS=( |
| 32 |
|
| 33 |
diff --git a/media-video/ffmpeg/files/ffmpeg-6.0-DECLARE_ALIGNED.patch b/media-video/ffmpeg/files/ffmpeg-6.0-DECLARE_ALIGNED.patch |
| 34 |
new file mode 100644 |
| 35 |
index 000000000000..88af1e58458c |
| 36 |
--- /dev/null |
| 37 |
+++ b/media-video/ffmpeg/files/ffmpeg-6.0-DECLARE_ALIGNED.patch |
| 38 |
@@ -0,0 +1,29 @@ |
| 39 |
+From: Zhao Zhili <zhilizhao@×××××××.com> |
| 40 |
+Date: Tue, 28 Feb 2023 18:23:00 +0000 (+0800) |
| 41 |
+Subject: avcodec/aacps_tablegen: fix build error after avutil bump |
| 42 |
+X-Git-Url: http://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=46970dd1555b3e50eee48ec95c893ee9a52f7fab |
| 43 |
+ |
| 44 |
+avcodec/aacps_tablegen: fix build error after avutil bump |
| 45 |
+ |
| 46 |
+Fix tickets #10225 |
| 47 |
+ |
| 48 |
+DECLARE_ALIGNED has been moved to mem_internal.h. |
| 49 |
+ |
| 50 |
+Signed-off-by: Zhao Zhili <zhilizhao@×××××××.com> |
| 51 |
+Reviewed-by: Anton Khirnov <anton@×××××××.net> |
| 52 |
+(cherry picked from commit 814178f92647be2411516bbb82f48532373d2554) |
| 53 |
+--- |
| 54 |
+ |
| 55 |
+diff --git a/libavcodec/aacps_tablegen.h b/libavcodec/aacps_tablegen.h |
| 56 |
+index 0ac4f68d68..5fdd7f0a9d 100644 |
| 57 |
+--- a/libavcodec/aacps_tablegen.h |
| 58 |
++++ b/libavcodec/aacps_tablegen.h |
| 59 |
+@@ -34,7 +34,7 @@ |
| 60 |
+ #include "libavutil/common.h" |
| 61 |
+ #include "libavutil/libm.h" |
| 62 |
+ #include "libavutil/mathematics.h" |
| 63 |
+-#include "libavutil/mem.h" |
| 64 |
++#include "libavutil/mem_internal.h" |
| 65 |
+ #define NR_ALLPASS_BANDS20 30 |
| 66 |
+ #define NR_ALLPASS_BANDS34 50 |
| 67 |
+ #define PS_AP_LINKS 3 |
Archives