From db27029ce45b8c523aaaceb4ab1027cade228ebd Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 8 Feb 2021 23:43:05 +0200 Subject: meson: Fix coding style when declaring arrays MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The meson.build files mix array declarations with and without a space after the opening and before the closing square bracket. The vast majority of cases don't use spaces, so standardize on that. While it it, fix indentation in a few places. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund Reviewed-by: Kieran Bingham --- src/android/meson.build | 4 ++-- src/gstreamer/meson.build | 2 +- src/ipa/ipu3/meson.build | 6 +++--- src/ipa/raspberrypi/meson.build | 2 +- src/ipa/rkisp1/meson.build | 2 +- src/ipa/vimc/meson.build | 2 +- src/libcamera/meson.build | 4 ++-- src/meson.build | 4 ++-- src/qcam/meson.build | 8 ++++---- src/v4l2/meson.build | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/android/meson.build b/src/android/meson.build index 95d0f420..f5567a1c 100644 --- a/src/android/meson.build +++ b/src/android/meson.build @@ -32,9 +32,9 @@ if android_enabled libyuv_vars.append_link_args('-ljpeg') libyuv = cmake.subproject('libyuv', options : libyuv_vars) libyuv_dep = libyuv.dependency('yuv') - endif + endif - android_deps += [ libyuv_dep, ] + android_deps += [libyuv_dep] endif android_hal_sources = files([ diff --git a/src/gstreamer/meson.build b/src/gstreamer/meson.build index c9f0c13d..9e93ffac 100644 --- a/src/gstreamer/meson.build +++ b/src/gstreamer/meson.build @@ -29,7 +29,7 @@ if glib_dep.found() and gstvideo_dep.found() and gstallocator_dep.found() # complain about the ones we are not using. Silence the -Wunused-function # warning in that case. if cc.get_id() == 'clang' and glib_dep.version().version_compare('<2.63.0') - libcamera_gst_cpp_args += [ '-Wno-unused-function' ] + libcamera_gst_cpp_args += ['-Wno-unused-function'] endif libcamera_gst = shared_library('gstlibcamera', diff --git a/src/ipa/ipu3/meson.build b/src/ipa/ipu3/meson.build index 444c8245..d31594fc 100644 --- a/src/ipa/ipu3/meson.build +++ b/src/ipa/ipu3/meson.build @@ -5,8 +5,8 @@ ipa_name = 'ipa_ipu3' mod = shared_module(ipa_name, 'ipu3.cpp', name_prefix : '', - include_directories : [ ipa_includes, libipa_includes ], - dependencies : [ libatomic, libcamera_dep ], + include_directories : [ipa_includes, libipa_includes], + dependencies : [libatomic, libcamera_dep], link_with : libipa, install : true, install_dir : ipa_install_dir) @@ -15,7 +15,7 @@ if ipa_sign_module custom_target(ipa_name + '.so.sign', input : mod, output : ipa_name + '.so.sign', - command : [ ipa_sign, ipa_priv_key, '@INPUT@', '@OUTPUT@' ], + command : [ipa_sign, ipa_priv_key, '@INPUT@', '@OUTPUT@'], install : false, build_by_default : true) endif diff --git a/src/ipa/raspberrypi/meson.build b/src/ipa/raspberrypi/meson.build index 9445cd09..9e9ea80b 100644 --- a/src/ipa/raspberrypi/meson.build +++ b/src/ipa/raspberrypi/meson.build @@ -54,7 +54,7 @@ if ipa_sign_module custom_target(ipa_name + '.so.sign', input : mod, output : ipa_name + '.so.sign', - command : [ ipa_sign, ipa_priv_key, '@INPUT@', '@OUTPUT@' ], + command : [ipa_sign, ipa_priv_key, '@INPUT@', '@OUTPUT@'], install : false, build_by_default : true) endif diff --git a/src/ipa/rkisp1/meson.build b/src/ipa/rkisp1/meson.build index ed9a6b6b..95eb5393 100644 --- a/src/ipa/rkisp1/meson.build +++ b/src/ipa/rkisp1/meson.build @@ -15,7 +15,7 @@ if ipa_sign_module custom_target(ipa_name + '.so.sign', input : mod, output : ipa_name + '.so.sign', - command : [ ipa_sign, ipa_priv_key, '@INPUT@', '@OUTPUT@' ], + command : [ipa_sign, ipa_priv_key, '@INPUT@', '@OUTPUT@'], install : false, build_by_default : true) endif diff --git a/src/ipa/vimc/meson.build b/src/ipa/vimc/meson.build index 8c9df854..b1544c28 100644 --- a/src/ipa/vimc/meson.build +++ b/src/ipa/vimc/meson.build @@ -15,7 +15,7 @@ if ipa_sign_module custom_target(ipa_name + '.so.sign', input : mod, output : ipa_name + '.so.sign', - command : [ ipa_sign, ipa_priv_key, '@INPUT@', '@OUTPUT@' ], + command : [ipa_sign, ipa_priv_key, '@INPUT@', '@OUTPUT@'], install : false, build_by_default : true) endif diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index 5a4bf0d7..2b185089 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -111,9 +111,9 @@ libcamera_sources += version_cpp if ipa_sign_module ipa_pub_key_cpp = custom_target('ipa_pub_key_cpp', - input : [ ipa_priv_key, 'ipa_pub_key.cpp.in' ], + input : [ipa_priv_key, 'ipa_pub_key.cpp.in'], output : 'ipa_pub_key.cpp', - command : [ gen_ipa_pub_key, '@INPUT@', '@OUTPUT@' ]) + command : [gen_ipa_pub_key, '@INPUT@', '@OUTPUT@']) libcamera_sources += ipa_pub_key_cpp endif diff --git a/src/meson.build b/src/meson.build index 4b75f058..0b26ca70 100644 --- a/src/meson.build +++ b/src/meson.build @@ -3,8 +3,8 @@ openssl = find_program('openssl', required : true) if openssl.found() ipa_priv_key = custom_target('ipa-priv-key', - output : [ 'ipa-priv-key.pem' ], - command : [ gen_ipa_priv_key, '@OUTPUT@' ]) + output : ['ipa-priv-key.pem'], + command : [gen_ipa_priv_key, '@OUTPUT@']) config_h.set('HAVE_IPA_PUBKEY', 1) ipa_sign_module = true else diff --git a/src/qcam/meson.build b/src/qcam/meson.build index ebcd5ca0..8f3d50dd 100644 --- a/src/qcam/meson.build +++ b/src/qcam/meson.build @@ -32,12 +32,12 @@ if qt5_dep.found() qt5_dep, ] - qt5_cpp_args = [ '-DQT_NO_KEYWORDS' ] + qt5_cpp_args = ['-DQT_NO_KEYWORDS'] tiff_dep = dependency('libtiff-4', required : false) if tiff_dep.found() - qt5_cpp_args += [ '-DHAVE_TIFF' ] - qcam_deps += [ tiff_dep ] + qt5_cpp_args += ['-DHAVE_TIFF'] + qcam_deps += [tiff_dep] qcam_sources += files([ 'dng_writer.cpp', ]) @@ -62,7 +62,7 @@ if qt5_dep.found() if ((cc.get_id() == 'gcc' and cc.version().version_compare('>=9.0') and qt5_dep.version().version_compare('<5.13')) or (cc.get_id() == 'clang' and cc.version().version_compare('>=10.0'))) - qt5_cpp_args += [ '-Wno-deprecated-copy' ] + qt5_cpp_args += ['-Wno-deprecated-copy'] endif resources = qt5.preprocess(moc_headers: qcam_moc_headers, diff --git a/src/v4l2/meson.build b/src/v4l2/meson.build index dbe6a424..c8b79424 100644 --- a/src/v4l2/meson.build +++ b/src/v4l2/meson.build @@ -28,5 +28,5 @@ v4l2_compat = shared_library('v4l2-compat', v4l2_compat_sources, name_prefix : '', install : true, - dependencies : [ libcamera_dep, libdl ], + dependencies : [libcamera_dep, libdl], cpp_args : v4l2_compat_cpp_args) -- cgit v1.2.1