commit: 38d66d124c45525244dfeb7b994efda5e480549b Author: Alfred Wingate <parona <AT> protonmail <DOT> com> AuthorDate: Wed Jan 24 10:19:15 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jan 24 10:57:53 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38d66d12
media-video/ffmpeg: add patch for fixing lto-type-mismatch Bug: https://bugs.gentoo.org/907484 Signed-off-by: Alfred Wingate <parona <AT> protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/34986 Signed-off-by: Sam James <sam <AT> gentoo.org> ...mpeg-6.0.1-r1.ebuild => ffmpeg-6.0.1-r2.ebuild} | 1 + ...mpeg-6.1.1-r1.ebuild => ffmpeg-6.1.1-r2.ebuild} | 1 + .../files/ffmpeg-6.0-fix-lto-type-mismatch.patch | 41 ++++++++++++++++++++++ 3 files changed, 43 insertions(+) diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild rename to media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild index 654f768272b2..188b14013a42 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild @@ -345,6 +345,7 @@ PATCHES=( "${FILESDIR}"/chromium-r1.patch "${FILESDIR}"/${PN}-5.1.2-get_cabac_inline_x86-32-bit.patch "${FILESDIR}"/${PN}-6.0-libplacebo-remove-deprecated-field.patch + "${FILESDIR}"/${PN}-6.0-fix-lto-type-mismatch.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild similarity index 99% rename from media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild rename to media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild index 73cdd4b40c76..4d42b25f4162 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild @@ -355,6 +355,7 @@ S=${WORKDIR}/${P/_/-} PATCHES=( "${FILESDIR}"/chromium-r2.patch "${FILESDIR}"/${PN}-6.1-wint-conversion.patch + "${FILESDIR}"/${PN}-6.0-fix-lto-type-mismatch.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/files/ffmpeg-6.0-fix-lto-type-mismatch.patch b/media-video/ffmpeg/files/ffmpeg-6.0-fix-lto-type-mismatch.patch new file mode 100644 index 000000000000..9cc2dd732016 --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-6.0-fix-lto-type-mismatch.patch @@ -0,0 +1,41 @@ +https://ffmpeg.org//pipermail/ffmpeg-devel/2023-November/317055.html +https://bugs.gentoo.org/907484 + +From 408882a387f75ae57524073385b47d68339ec486 Mon Sep 17 00:00:00 2001 +From: Alfred Wingate <par...@protonmail.com> +Date: Tue, 14 Nov 2023 13:26:47 +0000 +Subject: [PATCH 1/1] swscale/x86/rgb_2_rgb: Add opaque pointer to missed + definitions of ff_nv12ToUV + +Opaque parameters were previously added to the original definition of +ff_nv12ToUV, leading to gcc noticing a type mismatch with -Wlto-type-mismatch. + +https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/f2de911818fbd7e73343803626b697fd0c968121 +https://bugs.gentoo.org/907484 + +Signed-off-by: Alfred Wingate <par...@protonmail.com> +Signed-off-by: Anton Khirnov <an...@khirnov.net> +--- a/libswscale/x86/rgb2rgb_template.c ++++ b/libswscale/x86/rgb2rgb_template.c +@@ -1823,7 +1823,8 @@ void RENAME(ff_nv12ToUV)(uint8_t *dstU, uint8_t *dstV, + const uint8_t *src1, + const uint8_t *src2, + int w, +- uint32_t *unused2); ++ uint32_t *unused2, ++ void *opq); + static void RENAME(deinterleaveBytes)(const uint8_t *src, uint8_t *dst1, uint8_t *dst2, + int width, int height, int srcStride, + int dst1Stride, int dst2Stride) +@@ -1831,7 +1832,7 @@ static void RENAME(deinterleaveBytes)(const uint8_t *src, uint8_t *dst1, uint8_t + int h; + + for (h = 0; h < height; h++) { +- RENAME(ff_nv12ToUV)(dst1, dst2, NULL, src, NULL, width, NULL); ++ RENAME(ff_nv12ToUV)(dst1, dst2, NULL, src, NULL, width, NULL, NULL); + src += srcStride; + dst1 += dst1Stride; + dst2 += dst2Stride; +-- +2.43.0 +
