gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

media-video/ffmpeg: add patch for fixing lto-type-mismatch

Browse Source 
Bug: https://bugs.gentoo.org/907484
Signed-off-by: Alfred Wingate <parona@protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34986
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Alfred Wingate
2024-01-24 12:19:15 +02:00
committed by Sam James
parent fadd2b024c
commit 38d66d124c
3 changed files with 43 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media-video/ffmpeg/ffmpeg-6.0.1-r1.ebuild → media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild
View File

@@ -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=(

1
media-video/ffmpeg/ffmpeg-6.1.1-r1.ebuild → media-video/ffmpeg/ffmpeg-6.1.1-r2.ebuild
View File

@@ -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=(

41
media-video/ffmpeg/files/ffmpeg-6.0-fix-lto-type-mismatch.patch Normal file
View File

@@ -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 <parona@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 <parona@protonmail.com>
Signed-off-by: Anton Khirnov <anton@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