From abd5f9fbe8d79b1a6d3076ec50640c9a7c467b15 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Thu, 30 Sep 2021 10:01:43 +1000 Subject: [PATCH] Remove remaining tabs from meson.build files No changes, just tab-to-space replacement and a little bit of manual twiddling. --- man/meson.build | 14 +++--- meson.build | 8 +-- spa/plugins/audiomixer/meson.build | 80 +++++++++++++++--------------- spa/tests/meson.build | 26 +++++----- src/modules/meson.build | 28 ++++++----- src/tests/meson.build | 2 +- src/tools/meson.build | 20 ++++---- 7 files changed, 92 insertions(+), 86 deletions(-) diff --git a/man/meson.build b/man/meson.build index c51a0bdc0..638b12b51 100644 --- a/man/meson.build +++ b/man/meson.build @@ -27,13 +27,13 @@ endif foreach m : manpages file = m.split('.rst.in').get(0) rst = configure_file(input : m, - output : file + '.rst', - configuration : manpage_conf) + output : file + '.rst', + configuration : manpage_conf) section = file.split('.').get(-1) custom_target(file + '.target', - output : file, - input : rst, - command : [rst2man, '@INPUT@', '@OUTPUT@'], - install : true, - install_dir : get_option('mandir') / 'man' + section) + output : file, + input : rst, + command : [rst2man, '@INPUT@', '@OUTPUT@'], + install : true, + install_dir : get_option('mandir') / 'man' + section) endforeach diff --git a/meson.build b/meson.build index 307d7e67a..d153338bd 100644 --- a/meson.build +++ b/meson.build @@ -5,7 +5,7 @@ project('pipewire', ['c' ], default_options : [ 'warning_level=3', 'c_std=gnu99', 'b_pie=true', - #'b_sanitize=address,undefined', + #'b_sanitize=address,undefined', 'buildtype=debugoptimized' ]) pipewire_version = meson.project_version() @@ -122,9 +122,9 @@ if host_machine.cpu_family() == 'aarch64' int main () { float *s; asm volatile( - " ld1 { v0.4s }, [%[s]], #16\n" + " ld1 { v0.4s }, [%[s]], #16\n" " fcvtzs v0.4s, v0.4s, #31\n" - : [s] "+r" (s) : :); + : [s] "+r" (s) : :); } ''', name : 'aarch64 Neon Support') @@ -140,7 +140,7 @@ elif cc.has_argument('-mfpu=neon') asm volatile( " vld1.32 { q0 }, [%[s]]!\n" " vcvt.s32.f32 q0, q0, #31\n" - : [s] "+r" (s) : :); + : [s] "+r" (s) : :); } ''', args: '-mfpu=neon', diff --git a/spa/plugins/audiomixer/meson.build b/spa/plugins/audiomixer/meson.build index be257a731..214c2a887 100644 --- a/spa/plugins/audiomixer/meson.build +++ b/spa/plugins/audiomixer/meson.build @@ -1,56 +1,58 @@ audiomixer_sources = [ - 'audiomixer.c', - 'mix-ops.c', - 'mixer-dsp.c', - 'plugin.c'] + 'audiomixer.c', + 'mix-ops.c', + 'mixer-dsp.c', + 'plugin.c' +] simd_cargs = [] simd_dependencies = [] audiomixer_c = static_library('audiomixer_c', - ['mix-ops-c.c' ], - c_args : ['-O3'], - include_directories : [spa_inc], - install : false + ['mix-ops-c.c' ], + c_args : ['-O3'], + include_directories : [spa_inc], + install : false ) simd_dependencies += audiomixer_c if have_sse - audiomixer_sse = static_library('audiomixer_sse', - ['mix-ops-sse.c' ], - c_args : [sse_args, '-O3', '-DHAVE_SSE'], - include_directories : [spa_inc], - install : false - ) - simd_cargs += ['-DHAVE_SSE'] - simd_dependencies += audiomixer_sse + audiomixer_sse = static_library('audiomixer_sse', + ['mix-ops-sse.c' ], + c_args : [sse_args, '-O3', '-DHAVE_SSE'], + include_directories : [spa_inc], + install : false + ) + simd_cargs += ['-DHAVE_SSE'] + simd_dependencies += audiomixer_sse endif if have_sse2 - audiomixer_sse2 = static_library('audiomixer_sse2', - ['mix-ops-sse2.c' ], - c_args : [sse2_args, '-O3', '-DHAVE_SSE2'], - include_directories : [spa_inc], - install : false - ) - simd_cargs += ['-DHAVE_SSE2'] - simd_dependencies += audiomixer_sse2 + audiomixer_sse2 = static_library('audiomixer_sse2', + ['mix-ops-sse2.c' ], + c_args : [sse2_args, '-O3', '-DHAVE_SSE2'], + include_directories : [spa_inc], + install : false + ) + simd_cargs += ['-DHAVE_SSE2'] + simd_dependencies += audiomixer_sse2 endif if have_avx and have_fma - audiomixer_avx = static_library('audiomixer_avx', - ['mix-ops-avx.c'], - c_args : [avx_args, fma_args, '-O3', '-DHAVE_AVX', '-DHAVE_FMA'], - include_directories : [spa_inc], - install : false - ) - simd_cargs += ['-DHAVE_AVX', '-DHAVE_FMA'] - simd_dependencies += audiomixer_avx + audiomixer_avx = static_library('audiomixer_avx', + ['mix-ops-avx.c'], + c_args : [avx_args, fma_args, '-O3', '-DHAVE_AVX', '-DHAVE_FMA'], + include_directories : [spa_inc], + install : false + ) + simd_cargs += ['-DHAVE_AVX', '-DHAVE_FMA'] + simd_dependencies += audiomixer_avx endif audiomixerlib = shared_library('spa-audiomixer', - audiomixer_sources, - c_args : simd_cargs, - link_with : simd_dependencies, - include_directories : [spa_inc], - dependencies : [ mathlib ], - install : true, - install_dir : spa_plugindir / 'audiomixer') + audiomixer_sources, + c_args : simd_cargs, + link_with : simd_dependencies, + include_directories : [spa_inc], + dependencies : [ mathlib ], + install : true, + install_dir : spa_plugindir / 'audiomixer' +) diff --git a/spa/tests/meson.build b/spa/tests/meson.build index 98df31748..146cfe08a 100644 --- a/spa/tests/meson.build +++ b/spa/tests/meson.build @@ -27,21 +27,23 @@ if find.found() endif benchmark_apps = [ - 'stress-ringbuffer', - 'benchmark-pod', - 'benchmark-dict', + 'stress-ringbuffer', + 'benchmark-pod', + 'benchmark-dict', ] foreach a : benchmark_apps benchmark('spa-' + a, - executable('spa-' + a, a + '.c', - dependencies : [dl_lib, pthread_lib, mathlib ], - include_directories : [spa_inc ], - install : installed_tests_enabled, - install_dir : installed_tests_execdir), - env : [ - 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()), - ]) + executable('spa-' + a, a + '.c', + dependencies : [dl_lib, pthread_lib, mathlib ], + include_directories : [spa_inc ], + install : installed_tests_enabled, + install_dir : installed_tests_execdir, + ), + env : [ + 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()), + ] + ) if installed_tests_enabled test_conf = configuration_data() @@ -50,7 +52,7 @@ foreach a : benchmark_apps input: installed_tests_template, output: 'spa-' + a + '.test', install_dir: installed_tests_metadir, - configuration: test_conf + configuration: test_conf, ) endif endforeach diff --git a/src/modules/meson.build b/src/modules/meson.build index b2bb2da32..934dba856 100644 --- a/src/modules/meson.build +++ b/src/modules/meson.build @@ -346,19 +346,21 @@ pipewire_module_metadata = shared_library('pipewire-module-metadata', ) test('pw-test-protocol-native', - executable('pw-test-protocol-native', - [ 'module-protocol-native/test-connection.c', - 'module-protocol-native/connection.c' ], - c_args : libpipewire_c_args, - include_directories : [configinc, spa_inc ], - dependencies : [pipewire_dep], - install : installed_tests_enabled, - install_dir : installed_tests_execdir), - env : [ - 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.format(meson.build_root()), - 'PIPEWIRE_CONFIG_DIR=@0@/src/daemon/'.format(meson.build_root()), - 'PIPEWIRE_MODULE_DIR=@0@/src/modules/'.format(meson.build_root()) - ]) + executable('pw-test-protocol-native', + [ 'module-protocol-native/test-connection.c', + 'module-protocol-native/connection.c' ], + c_args : libpipewire_c_args, + include_directories : [configinc, spa_inc ], + dependencies : [pipewire_dep], + install : installed_tests_enabled, + install_dir : installed_tests_execdir, + ), + env : [ + 'SPA_PLUGIN_DIR=@0@/spa/plugins/'.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 test_conf = configuration_data() diff --git a/src/tests/meson.build b/src/tests/meson.build index dfb2f749c..1b03967fb 100644 --- a/src/tests/meson.build +++ b/src/tests/meson.build @@ -1,7 +1,7 @@ test_apps = [ 'test-endpoint', 'test-interfaces', - # 'test-remote', + # 'test-remote', 'test-stream', ] diff --git a/src/tools/meson.build b/src/tools/meson.build index dfed27e10..ac3e96cf5 100644 --- a/src/tools/meson.build +++ b/src/tools/meson.build @@ -11,9 +11,9 @@ tools_sources = [ foreach t : tools_sources executable(t.get(0), - t.get(1), - install: true, - dependencies : [pipewire_dep, mathlib], + t.get(1), + install: true, + dependencies : [pipewire_dep, mathlib], ) endforeach @@ -27,9 +27,9 @@ endif if ncurses_dep.found() executable('pw-top', - 'pw-top.c', - install: true, - dependencies : [pipewire_dep, ncurses_dep], + 'pw-top.c', + install: true, + dependencies : [pipewire_dep, ncurses_dep], ) endif @@ -63,12 +63,12 @@ if not get_option('pw-cat').disabled() and sndfile_dep.found() meson.add_install_script('sh', '-c', cmd) endforeach 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 summary({'Build pw-cat tool': build_pw_cat}, bool_yn: true, section: 'pw-cat/pw-play/pw-dump tool') executable('pw-reserve', - 'pw-reserve.c', - install: true, - dependencies : [dbus_dep, pipewire_dep], + 'pw-reserve.c', + install: true, + dependencies : [dbus_dep, pipewire_dep], )