Bug 1515641 - Check for nasm >= 2.13 for dav1d. r=TD-Linux,nalexander

Depends on D18294

Differential Revision: https://phabricator.services.mozilla.com/D15229

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Mike Hommey 2019-02-01 20:57:09 +00:00
Родитель df9fa46b6d
Коммит 5d92a7a815
2 изменённых файлов: 11 добавлений и 2 удалений

Просмотреть файл

@ -28,8 +28,7 @@ SOURCES += [
# see: third_party/dav1d/include/dav1d/common.h
DEFINES['DAV1D_API'] = ''
# Enable ASM build only on Linux for now.
if CONFIG['OS_TARGET'] == 'Linux' and (CONFIG['CPU_ARCH'] in ('x86', 'x86_64')):
if CONFIG['MOZ_DAV1D_ASM']:
# Default stack aligment is 16 bytes
DIRS += ['asm']

Просмотреть файл

@ -437,6 +437,16 @@ def av1(value, target, c_compiler):
if enabled:
return True
@depends(target, nasm_version, when=av1 & compile_environment)
def dav1d_asm(target, nasm_version):
if target.os == 'GNU' and target.kernel == 'Linux' and target.cpu in ('x86', 'x86_64'):
if nasm_version < '2.13':
die('nasm 2.13 or greater is required for AV1 support. '
'Either install nasm or add --disable-av1 to your configure options.')
return True
set_config('MOZ_DAV1D_ASM', dav1d_asm)
set_config('MOZ_AV1', av1)
set_define('MOZ_AV1', av1)