From: Alexis Ballier <aballier@gentoo.org>
Date: Sun, 8 Oct 2017 11:15:59 +0000 (+0200)
Subject: media-video/ffmpeg: add nasm as prefered asm compiler
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1cb27768a8dc92100422dd4e83586ed219bb8cf5;p=gentoo.git

media-video/ffmpeg: add nasm as prefered asm compiler

Package-Manager: Portage-2.3.11, Repoman-2.3.3
---

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index ac3d4666a006..227453fbbd4b 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -255,7 +255,7 @@ DEPEND="${RDEPEND}
 	doc? ( sys-apps/texinfo )
 	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
 	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
+	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
 	test? ( net-misc/wget sys-devel/bc )
 	v4l? ( sys-kernel/linux-headers )
 "