NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

meson: Fix coding style when declaring arrays

Browse source 
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 <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2021-02-08 23:43:05 +02:00
parent 9e369da993
commit db27029ce4
19 changed files with 49 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/libcamera/internal/meson.build
View file

@ -4,9 +4,9 @@ subdir('tracepoints')
libcamera_tracepoint_header = custom_target( libcamera_tracepoint_header = custom_target(
'tp_header', 'tp_header',
input: [ 'tracepoints.h.in', tracepoint_files ], input: ['tracepoints.h.in', tracepoint_files],
output: 'tracepoints.h', output: 'tracepoints.h',
command: [ gen_tracepoints_header, '@OUTPUT@', '@INPUT@' ], command: [gen_tracepoints_header, '@OUTPUT@', '@INPUT@'],
) )
libcamera_internal_headers = files([ libcamera_internal_headers = files([

4
src/android/meson.build
View file

@ -32,9 +32,9 @@ if android_enabled
libyuv_vars.append_link_args('-ljpeg') libyuv_vars.append_link_args('-ljpeg')
libyuv = cmake.subproject('libyuv', options : libyuv_vars) libyuv = cmake.subproject('libyuv', options : libyuv_vars)
libyuv_dep = libyuv.dependency('yuv') libyuv_dep = libyuv.dependency('yuv')
endif endif
android_deps += [ libyuv_dep, ] android_deps += [libyuv_dep]
endif endif
android_hal_sources = files([ android_hal_sources = files([

2
src/gstreamer/meson.build
View file

@ -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 # complain about the ones we are not using. Silence the -Wunused-function
# warning in that case. # warning in that case.
if cc.get_id() == 'clang' and glib_dep.version().version_compare('<2.63.0') 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 endif
libcamera_gst = shared_library('gstlibcamera', libcamera_gst = shared_library('gstlibcamera',

6
src/ipa/ipu3/meson.build
View file

@ -5,8 +5,8 @@ ipa_name = 'ipa_ipu3'
mod = shared_module(ipa_name, mod = shared_module(ipa_name,
'ipu3.cpp', 'ipu3.cpp',
name_prefix : '', name_prefix : '',
include_directories : [ ipa_includes, libipa_includes ], include_directories : [ipa_includes, libipa_includes],
dependencies : [ libatomic, libcamera_dep ], dependencies : [libatomic, libcamera_dep],
link_with : libipa, link_with : libipa,
install : true, install : true,
install_dir : ipa_install_dir) install_dir : ipa_install_dir)
@ -15,7 +15,7 @@ if ipa_sign_module
custom_target(ipa_name + '.so.sign', custom_target(ipa_name + '.so.sign',
input : mod, input : mod,
output : ipa_name + '.so.sign', output : ipa_name + '.so.sign',
command : [ ipa_sign, ipa_priv_key, '@INPUT@', '@OUTPUT@' ], command : [ipa_sign, ipa_priv_key, '@INPUT@', '@OUTPUT@'],
install : false, install : false,
build_by_default : true) build_by_default : true)
endif endif

2
src/ipa/raspberrypi/meson.build
View file

@ -54,7 +54,7 @@ if ipa_sign_module
custom_target(ipa_name + '.so.sign', custom_target(ipa_name + '.so.sign',
input : mod, input : mod,
output : ipa_name + '.so.sign', output : ipa_name + '.so.sign',
command : [ ipa_sign, ipa_priv_key, '@INPUT@', '@OUTPUT@' ], command : [ipa_sign, ipa_priv_key, '@INPUT@', '@OUTPUT@'],
install : false, install : false,
build_by_default : true) build_by_default : true)
endif endif

2
src/ipa/rkisp1/meson.build
View file

@ -15,7 +15,7 @@ if ipa_sign_module
custom_target(ipa_name + '.so.sign', custom_target(ipa_name + '.so.sign',
input : mod, input : mod,
output : ipa_name + '.so.sign', output : ipa_name + '.so.sign',
command : [ ipa_sign, ipa_priv_key, '@INPUT@', '@OUTPUT@' ], command : [ipa_sign, ipa_priv_key, '@INPUT@', '@OUTPUT@'],
install : false, install : false,
build_by_default : true) build_by_default : true)
endif endif

2
src/ipa/vimc/meson.build
View file

@ -15,7 +15,7 @@ if ipa_sign_module
custom_target(ipa_name + '.so.sign', custom_target(ipa_name + '.so.sign',
input : mod, input : mod,
output : ipa_name + '.so.sign', output : ipa_name + '.so.sign',
command : [ ipa_sign, ipa_priv_key, '@INPUT@', '@OUTPUT@' ], command : [ipa_sign, ipa_priv_key, '@INPUT@', '@OUTPUT@'],
install : false, install : false,
build_by_default : true) build_by_default : true)
endif endif

4
src/libcamera/meson.build
View file

@ -111,9 +111,9 @@ libcamera_sources += version_cpp
if ipa_sign_module if ipa_sign_module
ipa_pub_key_cpp = custom_target('ipa_pub_key_cpp', 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', 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 libcamera_sources += ipa_pub_key_cpp
endif endif

4
src/meson.build
View file

@ -3,8 +3,8 @@
openssl = find_program('openssl', required : true) openssl = find_program('openssl', required : true)
if openssl.found() if openssl.found()
ipa_priv_key = custom_target('ipa-priv-key', ipa_priv_key = custom_target('ipa-priv-key',
output : [ 'ipa-priv-key.pem' ], output : ['ipa-priv-key.pem'],
command : [ gen_ipa_priv_key, '@OUTPUT@' ]) command : [gen_ipa_priv_key, '@OUTPUT@'])
config_h.set('HAVE_IPA_PUBKEY', 1) config_h.set('HAVE_IPA_PUBKEY', 1)
ipa_sign_module = true ipa_sign_module = true
else else

8
src/qcam/meson.build
View file

@ -32,12 +32,12 @@ if qt5_dep.found()
qt5_dep, qt5_dep,
] ]
qt5_cpp_args = [ '-DQT_NO_KEYWORDS' ] qt5_cpp_args = ['-DQT_NO_KEYWORDS']
tiff_dep = dependency('libtiff-4', required : false) tiff_dep = dependency('libtiff-4', required : false)
if tiff_dep.found() if tiff_dep.found()
qt5_cpp_args += [ '-DHAVE_TIFF' ] qt5_cpp_args += ['-DHAVE_TIFF']
qcam_deps += [ tiff_dep ] qcam_deps += [tiff_dep]
qcam_sources += files([ qcam_sources += files([
'dng_writer.cpp', 'dng_writer.cpp',
]) ])
@ -62,7 +62,7 @@ if qt5_dep.found()
if ((cc.get_id() == 'gcc' and cc.version().version_compare('>=9.0') and if ((cc.get_id() == 'gcc' and cc.version().version_compare('>=9.0') and
qt5_dep.version().version_compare('<5.13')) or qt5_dep.version().version_compare('<5.13')) or
(cc.get_id() == 'clang' and cc.version().version_compare('>=10.0'))) (cc.get_id() == 'clang' and cc.version().version_compare('>=10.0')))
qt5_cpp_args += [ '-Wno-deprecated-copy' ] qt5_cpp_args += ['-Wno-deprecated-copy']
endif endif
resources = qt5.preprocess(moc_headers: qcam_moc_headers, resources = qt5.preprocess(moc_headers: qcam_moc_headers,

2
src/v4l2/meson.build
View file

@ -28,5 +28,5 @@ v4l2_compat = shared_library('v4l2-compat',
v4l2_compat_sources, v4l2_compat_sources,
name_prefix : '', name_prefix : '',
install : true, install : true,
dependencies : [ libcamera_dep, libdl ], dependencies : [libcamera_dep, libdl],
cpp_args : v4l2_compat_cpp_args) cpp_args : v4l2_compat_cpp_args)

10
test/camera/meson.build
View file

@ -3,11 +3,11 @@
# Tests are listed in order of complexity. # Tests are listed in order of complexity.
# They are not alphabetically sorted. # They are not alphabetically sorted.
camera_tests = [ camera_tests = [
[ 'configuration_default', 'configuration_default.cpp' ], ['configuration_default', 'configuration_default.cpp'],
[ 'configuration_set', 'configuration_set.cpp' ], ['configuration_set', 'configuration_set.cpp'],
[ 'buffer_import', 'buffer_import.cpp' ], ['buffer_import', 'buffer_import.cpp'],
[ 'statemachine', 'statemachine.cpp' ], ['statemachine', 'statemachine.cpp'],
[ 'capture', 'capture.cpp' ], ['capture', 'capture.cpp'],
] ]
foreach t : camera_tests foreach t : camera_tests

8
test/controls/meson.build
View file

@ -1,10 +1,10 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
control_tests = [ control_tests = [
[ 'control_info', 'control_info.cpp' ], ['control_info', 'control_info.cpp'],
[ 'control_info_map', 'control_info_map.cpp' ], ['control_info_map', 'control_info_map.cpp'],
[ 'control_list', 'control_list.cpp' ], ['control_list', 'control_list.cpp'],
[ 'control_value', 'control_value.cpp' ], ['control_value', 'control_value.cpp'],
] ]
foreach t : control_tests foreach t : control_tests

2
test/ipc/meson.build
View file

@ -1,7 +1,7 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
ipc_tests = [ ipc_tests = [
[ 'unixsocket', 'unixsocket.cpp' ], ['unixsocket', 'unixsocket.cpp'],
] ]
foreach t : ipc_tests foreach t : ipc_tests

2
test/process/meson.build
View file

@ -1,7 +1,7 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
process_tests = [ process_tests = [
[ 'process_test', 'process_test.cpp' ], ['process_test', 'process_test.cpp'],
] ]
foreach t : process_tests foreach t : process_tests

2
test/serialization/meson.build
View file

@ -1,7 +1,7 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
serialization_tests = [ serialization_tests = [
[ 'control_serialization', 'control_serialization.cpp' ], ['control_serialization', 'control_serialization.cpp'],
] ]
foreach t : serialization_tests foreach t : serialization_tests

12
test/stream/meson.build
View file

@ -1,13 +1,13 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
stream_tests = [ stream_tests = [
[ 'stream_formats', 'stream_formats.cpp' ], ['stream_formats', 'stream_formats.cpp'],
] ]
foreach t : stream_tests foreach t : stream_tests
exe = executable(t[0], t[1], exe = executable(t[0], t[1],
dependencies : libcamera_dep, dependencies : libcamera_dep,
link_with : test_libraries, link_with : test_libraries,
include_directories : test_includes_internal) include_directories : test_includes_internal)
test(t[0], exe, suite: 'stream') test(t[0], exe, suite: 'stream')
endforeach endforeach

4
test/v4l2_subdevice/meson.build
View file

@ -1,8 +1,8 @@
# SPDX-License-Identifier: CC0-1.0 # SPDX-License-Identifier: CC0-1.0
v4l2_subdevice_tests = [ v4l2_subdevice_tests = [
[ 'list_formats', 'list_formats.cpp'], ['list_formats', 'list_formats.cpp'],
[ 'test_formats', 'test_formats.cpp'], ['test_formats', 'test_formats.cpp'],
] ]
foreach t : v4l2_subdevice_tests foreach t : v4l2_subdevice_tests

18
test/v4l2_videodevice/meson.build
View file

@ -3,15 +3,15 @@
# Tests are listed in order of complexity. # Tests are listed in order of complexity.
# They are not alphabetically sorted. # They are not alphabetically sorted.
v4l2_videodevice_tests = [ v4l2_videodevice_tests = [
[ 'double_open', 'double_open.cpp' ], ['double_open', 'double_open.cpp'],
[ 'controls', 'controls.cpp' ], ['controls', 'controls.cpp'],
[ 'formats', 'formats.cpp' ], ['formats', 'formats.cpp'],
[ 'request_buffers', 'request_buffers.cpp' ], ['request_buffers', 'request_buffers.cpp'],
[ 'buffer_cache', 'buffer_cache.cpp' ], ['buffer_cache', 'buffer_cache.cpp'],
[ 'stream_on_off', 'stream_on_off.cpp' ], ['stream_on_off', 'stream_on_off.cpp'],
[ 'capture_async', 'capture_async.cpp' ], ['capture_async', 'capture_async.cpp'],
[ 'buffer_sharing', 'buffer_sharing.cpp' ], ['buffer_sharing', 'buffer_sharing.cpp'],
[ 'v4l2_m2mdevice', 'v4l2_m2mdevice.cpp' ], ['v4l2_m2mdevice', 'v4l2_m2mdevice.cpp'],
] ]
foreach t : v4l2_videodevice_tests foreach t : v4l2_videodevice_tests