ref: 96819a63a4be3a2d3589088096c88573c1122708
parent: 5d38e358408e070e884de57b2fbadb2fd87d625c
author: Nirbheek Chauhan <nirbheek@centricular.com>
date: Wed Jun 17 17:35:33 EDT 2020
meson: Bump req to 0.50, support Windows ARM/ARM64, update CI Bumping the meson requirement fixes a warning about usage of the `install:` kwarg in configure_file, and means we can use the `in` kwarg. ci: Update meson version to 0.50.1 Also install ninja using pip
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,8 @@
before_install:
- sudo apt-get update -qq
- - sudo apt-get install -qq nasm g++-multilib gcc-multilib libc6-dev-i386 python3-pip python3-setuptools unzip
- - sudo python3 -m pip install meson==0.47.0
- - wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip
- - unzip ninja-linux.zip
- - export PATH=$PATH:$PWD
+ - sudo apt-get install -qq nasm g++-multilib gcc-multilib libc6-dev-i386 python3-pip python3-setuptools
+ - sudo python3 -m pip install meson==0.50.1 ninja
install:
- make gmp-bootstrap
--- a/codec/common/meson.build
+++ b/codec/common/meson.build
@@ -18,7 +18,7 @@
]
objs_asm = []
-if ['x86', 'x86_64'].contains(cpu_family)
+if cpu_family in ['x86', 'x86_64']
asm_sources = [
'x86/cpuid.asm',
'x86/dct.asm',
@@ -33,7 +33,7 @@
]
objs_asm += asm_gen.process(asm_sources)
elif cpu_family == 'arm'
- cpp_sources += [
+ asm_sources = [
'arm/copy_mb_neon.S',
'arm/deblocking_neon.S',
'arm/expand_picture_neon.S',
@@ -40,8 +40,13 @@
'arm/intra_pred_common_neon.S',
'arm/mc_neon.S',
]
+ if system == 'windows'
+ objs_asm = asm_gen.process(asm_sources)
+ else
+ cpp_sources += asm_sources
+ endif
elif cpu_family == 'aarch64'
- cpp_sources += [
+ asm_sources = [
'arm64/copy_mb_aarch64_neon.S',
'arm64/deblocking_aarch64_neon.S',
'arm64/expand_picture_aarch64_neon.S',
@@ -48,6 +53,11 @@
'arm64/intra_pred_common_aarch64_neon.S',
'arm64/mc_aarch64_neon.S',
]
+ if system == 'windows'
+ objs_asm = asm_gen.process(asm_sources)
+ else
+ cpp_sources += asm_sources
+ endif
else
error('Unsupported cpu_family @0@'.format(cpu_family))endif
--- a/codec/decoder/meson.build
+++ b/codec/decoder/meson.build
@@ -23,7 +23,7 @@
]
objs_asm = []
-if ['x86', 'x86_64'].contains(cpu_family)
+if cpu_family in ['x86', 'x86_64']
asm_sources = [
'core/x86/dct.asm',
'core/x86/intra_pred.asm',
@@ -30,15 +30,25 @@
]
objs_asm = asm_gen.process(asm_sources)
elif cpu_family == 'arm'
- cpp_sources += [
+ asm_sources = [
'core/arm/block_add_neon.S',
'core/arm/intra_pred_neon.S',
]
+ if system == 'windows'
+ objs_asm = asm_gen.process(asm_sources)
+ else
+ cpp_sources += asm_sources
+ endif
elif cpu_family == 'aarch64'
- cpp_sources += [
+ asm_sources = [
'core/arm64/block_add_aarch64_neon.S',
'core/arm64/intra_pred_aarch64_neon.S',
]
+ if system == 'windows'
+ objs_asm = asm_gen.process(asm_sources)
+ else
+ cpp_sources += asm_sources
+ endif
else
error('Unsupported cpu family @0@'.format(cpu_family))endif
--- a/codec/encoder/meson.build
+++ b/codec/encoder/meson.build
@@ -34,7 +34,7 @@
]
objs_asm = []
-if ['x86', 'x86_64'].contains(cpu_family)
+if cpu_family in ['x86', 'x86_64']
asm_sources = [
'core/x86/coeff.asm',
'core/x86/dct.asm',
@@ -47,7 +47,7 @@
]
objs_asm = asm_gen.process(asm_sources)
elif cpu_family == 'arm'
- cpp_sources += [
+ asm_sources = [
'core/arm/intra_pred_neon.S',
'core/arm/intra_pred_sad_3_opt_neon.S',
'core/arm/memory_neon.S',
@@ -55,8 +55,13 @@
'core/arm/reconstruct_neon.S',
'core/arm/svc_motion_estimation.S',
]
+ if system == 'windows'
+ objs_asm = asm_gen.process(asm_sources)
+ else
+ cpp_sources += asm_sources
+ endif
elif cpu_family == 'aarch64'
- cpp_sources += [
+ asm_sources = [
'core/arm64/intra_pred_aarch64_neon.S',
'core/arm64/intra_pred_sad_3_opt_aarch64_neon.S',
'core/arm64/memory_aarch64_neon.S',
@@ -64,6 +69,11 @@
'core/arm64/reconstruct_aarch64_neon.S',
'core/arm64/svc_motion_estimation_aarch64_neon.S',
]
+ if system == 'windows'
+ objs_asm = asm_gen.process(asm_sources)
+ else
+ cpp_sources += asm_sources
+ endif
else
error('Unsupported cpu family @0@'.format(cpu_family))endif
--- a/codec/processing/meson.build
+++ b/codec/processing/meson.build
@@ -19,7 +19,7 @@
]
objs_asm = []
-if ['x86', 'x86_64'].contains(cpu_family)
+if cpu_family in ['x86', 'x86_64']
asm_sources = [
'src/x86/denoisefilter.asm',
'src/x86/downsample_bilinear.asm',
@@ -27,19 +27,29 @@
]
objs_asm = asm_gen.process(asm_sources)
elif cpu_family == 'arm'
- cpp_sources += [
+ asm_sources = [
'src/arm/adaptive_quantization.S',
'src/arm/down_sample_neon.S',
'src/arm/pixel_sad_neon.S',
'src/arm/vaa_calc_neon.S',
]
+ if system == 'windows'
+ objs_asm = asm_gen.process(asm_sources)
+ else
+ cpp_sources += asm_sources
+ endif
elif cpu_family == 'aarch64'
- cpp_sources += [
+ asm_sources = [
'src/arm64/adaptive_quantization_aarch64_neon.S',
'src/arm64/down_sample_aarch64_neon.S',
'src/arm64/pixel_sad_aarch64_neon.S',
'src/arm64/vaa_calc_aarch64_neon.S',
]
+ if system == 'windows'
+ objs_asm = asm_gen.process(asm_sources)
+ else
+ cpp_sources += asm_sources
+ endif
else
error('Unsupported cpu family @0@'.format(cpu_family))endif
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
project('openh264', ['c', 'cpp'],version : '2.1.0',
- meson_version : '>= 0.47',
+ meson_version : '>= 0.50',
default_options : [ 'warning_level=1',
'buildtype=debugoptimized' ])
@@ -36,8 +36,6 @@
join_paths('codec', 'encoder', 'plus', 'inc'),])
-nasm = find_program('nasm', 'nasm.exe')-
system = host_machine.system()
cpu_family = host_machine.cpu_family()
@@ -92,7 +90,7 @@
add_project_arguments('-DHAVE_NEON_ARM64', language: 'cpp') casm_inc = include_directories(join_paths('codec', 'common', 'arm64'))else
- error ('FIXME: unhandled CPU family @0@ for @1@'.format(cpu_family, system))+ error('FIXME: unhandled CPU family @0@ for @1@'.format(cpu_family, system))endif
if ['ios', 'darwin', 'android'].contains(system)
@@ -102,18 +100,35 @@
if cpu_family == 'x86'
asm_format = 'win32'
asm_args += ['-DPREFIX', '-DX86_32']
+ asm_inc = join_paths(meson.current_source_dir(), 'codec', 'common', 'x86', '')
elif cpu_family == 'x86_64'
asm_format = 'win64'
asm_args += ['-DWIN64']
+ asm_inc = join_paths(meson.current_source_dir(), 'codec', 'common', 'x86', '')
+ elif cpu_family == 'arm'
+ if cpp.get_argument_syntax() != 'msvc'
+ error('Windows ARM is currently only supported with Visual Studio-like compilers')+ endif
+ asm_format = 'armasm'
+ asm_args += ['-nologo', '-DHAVE_NEON', '-ignore', '4509']
+ asm_inc = join_paths(meson.current_source_dir(), 'codec', 'common', 'arm', '')
+ elif cpu_family == 'aarch64'
+ if cpp.get_argument_syntax() != 'msvc'
+ error('Windows ARM64 is currently only supported with Visual Studio-like compilers')+ endif
+ asm_format = 'armasm'
+ asm_args += ['-nologo', '-DHAVE_NEON_AARCH64']
+ asm_inc = join_paths(meson.current_source_dir(), 'codec', 'common', 'arm64', '')
else
- error ('FIXME: unhandled CPU family @0@ for Windows'.format(cpu_family))+ error('FIXME: unhandled CPU family @0@ for Windows'.format(cpu_family))endif
- asm_inc = join_paths(meson.current_source_dir(), 'codec', 'common', 'x86', '')
else
- error ('FIXME: Unhandled system @0@'.format(system))+ error('FIXME: Unhandled system @0@'.format(system))endif
-if ['x86', 'x86_64'].contains(cpu_family)
+if cpu_family in ['x86', 'x86_64']
+ nasm = find_program('nasm')+
asm_gen = generator(nasm,
output : '@BASENAME@.o',
arguments : [
@@ -121,6 +136,34 @@
'-i', asm_inc,
'@INPUT@',
'-o', '@OUTPUT@'] + asm_args)
+elif system == 'windows'
+ gasprep = find_program('gas-preprocessor.pl')+ if cpu_family == 'arm'
+ asm_gen = generator(gasprep,
+ output : '@BASENAME@.obj',
+ arguments : [
+ '-as-type', asm_format,
+ '-force-thumb',
+ '--',
+ 'armasm',
+ '-I' + asm_inc] + asm_args + [
+ '@INPUT@',
+ '-c', '-o', '@OUTPUT@'])
+ elif cpu_family == 'aarch64'
+ asm_gen = generator(gasprep,
+ output : '@BASENAME@.obj',
+ arguments : [
+ '-as-type', asm_format,
+ '-arch', 'aarch64',
+ '--',
+ 'armasm64',
+ '-I' + asm_inc] + asm_args + [
+ '@INPUT@',
+ '-c', '-o', '@OUTPUT@'])
+ else
+ # Windows only supports x86, x86_64, arm, arm64
+ error('unreachable code')+ endif
endif
api_headers = []