From 202e177b4796ebc90b6392e24178812dfd7cfe7c Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Wed, 17 Jun 2020 19:34:36 +0200 Subject: [PATCH] media-video/ffmpeg: fix building without SSSE3 Closes: https://bugs.gentoo.org/728566 Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann --- media-video/ffmpeg/ffmpeg-4.3.ebuild | 1 + .../ffmpeg-4.3-fix-build-without-SSSE3.patch | 22 +++++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 media-video/ffmpeg/files/ffmpeg-4.3-fix-build-without-SSSE3.patch diff --git a/media-video/ffmpeg/ffmpeg-4.3.ebuild b/media-video/ffmpeg/ffmpeg-4.3.ebuild index 3536d79ae995b..6a6b7f4fb6cdd 100644 --- a/media-video/ffmpeg/ffmpeg-4.3.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.3.ebuild @@ -325,6 +325,7 @@ S=${WORKDIR}/${P/_/-} PATCHES=( "${FILESDIR}"/chromium-r1.patch + "${FILESDIR}"/${PN}-4.3-fix-build-without-SSSE3.patch ) MULTILIB_WRAPPED_HEADERS=( diff --git a/media-video/ffmpeg/files/ffmpeg-4.3-fix-build-without-SSSE3.patch b/media-video/ffmpeg/files/ffmpeg-4.3-fix-build-without-SSSE3.patch new file mode 100644 index 0000000000000..c3e6733160f64 --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-4.3-fix-build-without-SSSE3.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/728566 +http://ffmpeg.org/pipermail/ffmpeg-devel/2020-February/257474.html + +--- a/libswscale/x86/yuv2rgb.c ++++ b/libswscale/x86/yuv2rgb.c +@@ -83,6 +83,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) + #if HAVE_X86ASM + int cpu_flags = av_get_cpu_flags(); + ++#if HAVE_SSSE3 + if (EXTERNAL_SSSE3(cpu_flags)) { + switch (c->dstFormat) { + case AV_PIX_FMT_RGB32: +@@ -111,6 +112,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) + return yuv420_rgb15_ssse3; + } + } ++#endif + + if (EXTERNAL_MMXEXT(cpu_flags)) { + switch (c->dstFormat) { +