[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/

[Alexis Ballier]

commit:     1cb27768a8dc92100422dd4e83586ed219bb8cf5
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  8 11:15:59 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Oct  8 11:16:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cb27768

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

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 media-video/ffmpeg/ffmpeg-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild 
b/media-video/ffmpeg/ffmpeg-9999.ebuild
index ac3d4666a00..227453fbbd4 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 )
 "