mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-12-15 08:56:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove remaining tabs from meson.build files

Browse source 
No changes, just tab-to-space replacement and a little bit of manual
twiddling.
This commit is contained in:
Peter Hutterer 2021-09-30 10:01:43 +10:00
parent fe79e684b7
commit abd5f9fbe8
7 changed files with 92 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

14
man/meson.build
View file

@ -27,13 +27,13 @@ endif
foreach m : manpages foreach m : manpages
file = m.split('.rst.in').get(0) file = m.split('.rst.in').get(0)
rst = configure_file(input : m, rst = configure_file(input : m,
output : file + '.rst', output : file + '.rst',
configuration : manpage_conf) configuration : manpage_conf)
section = file.split('.').get(-1) section = file.split('.').get(-1)
custom_target(file + '.target', custom_target(file + '.target',
output : file, output : file,
input : rst, input : rst,
command : [rst2man, '@INPUT@', '@OUTPUT@'], command : [rst2man, '@INPUT@', '@OUTPUT@'],
install : true, install : true,
install_dir : get_option('mandir') / 'man' + section) install_dir : get_option('mandir') / 'man' + section)
endforeach endforeach

8
meson.build
View file

@ -5,7 +5,7 @@ project('pipewire', ['c' ],
default_options : [ 'warning_level=3', default_options : [ 'warning_level=3',
'c_std=gnu99', 'c_std=gnu99',
'b_pie=true', 'b_pie=true',
#'b_sanitize=address,undefined', #'b_sanitize=address,undefined',
'buildtype=debugoptimized' ]) 'buildtype=debugoptimized' ])
pipewire_version = meson.project_version() pipewire_version = meson.project_version()
@ -122,9 +122,9 @@ if host_machine.cpu_family() == 'aarch64'
int main () { int main () {
float *s; float *s;
asm volatile( asm volatile(
" ld1 { v0.4s }, [%[s]], #16\n" " ld1 { v0.4s }, [%[s]], #16\n"
" fcvtzs v0.4s, v0.4s, #31\n" " fcvtzs v0.4s, v0.4s, #31\n"
: [s] "+r" (s) : :); : [s] "+r" (s) : :);
} }
''', ''',
name : 'aarch64 Neon Support') name : 'aarch64 Neon Support')
@ -140,7 +140,7 @@ elif cc.has_argument('-mfpu=neon')
asm volatile( asm volatile(
" vld1.32 { q0 }, [%[s]]!\n" " vld1.32 { q0 }, [%[s]]!\n"
" vcvt.s32.f32 q0, q0, #31\n" " vcvt.s32.f32 q0, q0, #31\n"
: [s] "+r" (s) : :); : [s] "+r" (s) : :);
} }
''', ''',
args: '-mfpu=neon', args: '-mfpu=neon',

80
spa/plugins/audiomixer/meson.build
View file

@ -1,56 +1,58 @@
audiomixer_sources = [ audiomixer_sources = [
'audiomixer.c', 'audiomixer.c',
'mix-ops.c', 'mix-ops.c',
'mixer-dsp.c', 'mixer-dsp.c',
'plugin.c'] 'plugin.c'
]
simd_cargs = [] simd_cargs = []
simd_dependencies = [] simd_dependencies = []
audiomixer_c = static_library('audiomixer_c', audiomixer_c = static_library('audiomixer_c',
['mix-ops-c.c' ], ['mix-ops-c.c' ],
c_args : ['-O3'], c_args : ['-O3'],
include_directories : [spa_inc], include_directories : [spa_inc],
install : false install : false
) )
simd_dependencies += audiomixer_c simd_dependencies += audiomixer_c
if have_sse if have_sse
audiomixer_sse = static_library('audiomixer_sse', audiomixer_sse = static_library('audiomixer_sse',
['mix-ops-sse.c' ], ['mix-ops-sse.c' ],
c_args : [sse_args, '-O3', '-DHAVE_SSE'], c_args : [sse_args, '-O3', '-DHAVE_SSE'],
include_directories : [spa_inc], include_directories : [spa_inc],
install : false install : false
) )
simd_cargs += ['-DHAVE_SSE'] simd_cargs += ['-DHAVE_SSE']
simd_dependencies += audiomixer_sse simd_dependencies += audiomixer_sse
endif endif
if have_sse2 if have_sse2
audiomixer_sse2 = static_library('audiomixer_sse2', audiomixer_sse2 = static_library('audiomixer_sse2',
['mix-ops-sse2.c' ], ['mix-ops-sse2.c' ],
c_args : [sse2_args, '-O3', '-DHAVE_SSE2'], c_args : [sse2_args, '-O3', '-DHAVE_SSE2'],
include_directories : [spa_inc], include_directories : [spa_inc],
install : false install : false
) )
simd_cargs += ['-DHAVE_SSE2'] simd_cargs += ['-DHAVE_SSE2']
simd_dependencies += audiomixer_sse2 simd_dependencies += audiomixer_sse2
endif endif
if have_avx and have_fma if have_avx and have_fma
audiomixer_avx = static_library('audiomixer_avx', audiomixer_avx = static_library('audiomixer_avx',
['mix-ops-avx.c'], ['mix-ops-avx.c'],
c_args : [avx_args, fma_args, '-O3', '-DHAVE_AVX', '-DHAVE_FMA'], c_args : [avx_args, fma_args, '-O3', '-DHAVE_AVX', '-DHAVE_FMA'],
include_directories : [spa_inc], include_directories : [spa_inc],
install : false install : false
) )
simd_cargs += ['-DHAVE_AVX', '-DHAVE_FMA'] simd_cargs += ['-DHAVE_AVX', '-DHAVE_FMA']
simd_dependencies += audiomixer_avx simd_dependencies += audiomixer_avx
endif endif
audiomixerlib = shared_library('spa-audiomixer', audiomixerlib = shared_library('spa-audiomixer',
audiomixer_sources, audiomixer_sources,
c_args : simd_cargs, c_args : simd_cargs,
link_with : simd_dependencies, link_with : simd_dependencies,
include_directories : [spa_inc], include_directories : [spa_inc],
dependencies : [ mathlib ], dependencies : [ mathlib ],
install : true, install : true,
install_dir : spa_plugindir / 'audiomixer') install_dir : spa_plugindir / 'audiomixer'
)

26
spa/tests/meson.build
View file

@ -27,21 +27,23 @@ if find.found()
endif endif
benchmark_apps = [ benchmark_apps = [
'stress-ringbuffer', 'stress-ringbuffer',
'benchmark-pod', 'benchmark-pod',
'benchmark-dict', 'benchmark-dict',
] ]
foreach a : benchmark_apps foreach a : benchmark_apps
benchmark('spa-' + a, benchmark('spa-' + a,
executable('spa-' + a, a + '.c', executable('spa-' + a, a + '.c',
dependencies : [dl_lib, pthread_lib, mathlib ], dependencies : [dl_lib, pthread_lib, mathlib ],
include_directories : [spa_inc ], include_directories : [spa_inc ],
install : installed_tests_enabled, install : installed_tests_enabled,
install_dir : installed_tests_execdir), install_dir : installed_tests_execdir,
env : [ ),
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()), env : [
]) 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
]
)
if installed_tests_enabled if installed_tests_enabled
test_conf = configuration_data() test_conf = configuration_data()
@ -50,7 +52,7 @@ foreach a : benchmark_apps
input: installed_tests_template, input: installed_tests_template,
output: 'spa-' + a + '.test', output: 'spa-' + a + '.test',
install_dir: installed_tests_metadir, install_dir: installed_tests_metadir,
configuration: test_conf configuration: test_conf,
) )
endif endif
endforeach endforeach

28
src/modules/meson.build
View file

@ -346,19 +346,21 @@ pipewire_module_metadata = shared_library('pipewire-module-metadata',
) )
test('pw-test-protocol-native', test('pw-test-protocol-native',
executable('pw-test-protocol-native', executable('pw-test-protocol-native',
[ 'module-protocol-native/test-connection.c', [ 'module-protocol-native/test-connection.c',
'module-protocol-native/connection.c' ], 'module-protocol-native/connection.c' ],
c_args : libpipewire_c_args, c_args : libpipewire_c_args,
include_directories : [configinc, spa_inc ], include_directories : [configinc, spa_inc ],
dependencies : [pipewire_dep], dependencies : [pipewire_dep],
install : installed_tests_enabled, install : installed_tests_enabled,
install_dir : installed_tests_execdir), install_dir : installed_tests_execdir,
env : [ ),
'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()), env : [
'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.build_root()), 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()),
'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.build_root()) 'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.build_root()),
]) 'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.build_root())
]
)
if installed_tests_enabled if installed_tests_enabled
test_conf = configuration_data() test_conf = configuration_data()

2
src/tests/meson.build
View file

@ -1,7 +1,7 @@
test_apps = [ test_apps = [
'test-endpoint', 'test-endpoint',
'test-interfaces', 'test-interfaces',
# 'test-remote', # 'test-remote',
'test-stream', 'test-stream',
] ]

20
src/tools/meson.build
View file

@ -11,9 +11,9 @@ tools_sources = [
foreach t : tools_sources foreach t : tools_sources
executable(t.get(0), executable(t.get(0),
t.get(1), t.get(1),
install: true, install: true,
dependencies : [pipewire_dep, mathlib], dependencies : [pipewire_dep, mathlib],
) )
endforeach endforeach
@ -27,9 +27,9 @@ endif
if ncurses_dep.found() if ncurses_dep.found()
executable('pw-top', executable('pw-top',
'pw-top.c', 'pw-top.c',
install: true, install: true,
dependencies : [pipewire_dep, ncurses_dep], dependencies : [pipewire_dep, ncurses_dep],
) )
endif endif
@ -63,12 +63,12 @@ if not get_option('pw-cat').disabled() and sndfile_dep.found()
meson.add_install_script('sh', '-c', cmd) meson.add_install_script('sh', '-c', cmd)
endforeach endforeach
elif not sndfile_dep.found() and get_option('pw-cat').enabled() elif not sndfile_dep.found() and get_option('pw-cat').enabled()
error('pw-cat is enabled but required dependency `sndfile` was not found.') error('pw-cat is enabled but required dependency `sndfile` was not found.')
endif endif
summary({'Build pw-cat tool': build_pw_cat}, bool_yn: true, section: 'pw-cat/pw-play/pw-dump tool') summary({'Build pw-cat tool': build_pw_cat}, bool_yn: true, section: 'pw-cat/pw-play/pw-dump tool')
executable('pw-reserve', executable('pw-reserve',
'pw-reserve.c', 'pw-reserve.c',
install: true, install: true,
dependencies : [dbus_dep, pipewire_dep], dependencies : [dbus_dep, pipewire_dep],
) )