[libcamera-devel] [PATCH] meson: Fix space around colon issues
Kieran Bingham
kieran.bingham at ideasonboard.com
Fri Jul 7 13:08:33 CEST 2023
Quoting Umang Jain via libcamera-devel (2023-07-06 10:03:22)
> Hi Laurent,
>
> Thank you for the patch.
>
> On 7/6/23 9:48 AM, Laurent Pinchart via libcamera-devel wrote:
> > On Thu, Jul 06, 2023 at 10:30:04AM +0300, Laurent Pinchart via libcamera-devel wrote:
> >> The meson style, which libcamera follows, mandates a space before
> >> colons. Fix the style violations through the project.
> > The meson style isn't as coherent and universally enforced as this
> > implies. I'll rewrite the commit message as
> >
> > The meson style, which libcamera follows, recommends a space before
> > colons in function parameters. Fix the style violations through the
> > project.
I wonder if we'd get any false positives with a small regex in
checkstyle for this:
/([A-Z][a-z]):/\1 :/ or such.
Anyway, no objection for this:
Reviewed-by: Kieran Bingham <kieran.bingham at ideasonboard.com>
>
> Reviewed-by: Umang Jain <umang.jain at ideasonboard.com>
>
> >
> >> Signed-off-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
> >> ---
> >> Documentation/meson.build | 8 ++++----
> >> include/libcamera/base/meson.build | 2 +-
> >> include/libcamera/internal/meson.build | 6 +++---
> >> include/libcamera/ipa/meson.build | 2 +-
> >> meson.build | 12 ++++++------
> >> meson_options.txt | 4 ++--
> >> src/apps/qcam/meson.build | 4 ++--
> >> src/gstreamer/meson.build | 2 +-
> >> src/libcamera/meson.build | 4 ++--
> >> src/py/libcamera/meson.build | 4 ++--
> >> test/gstreamer/meson.build | 2 +-
> >> test/stream/meson.build | 2 +-
> >> 12 files changed, 26 insertions(+), 26 deletions(-)
> >>
> >> diff --git a/Documentation/meson.build b/Documentation/meson.build
> >> index d675f368cf79..b2a5bf15e6ea 100644
> >> --- a/Documentation/meson.build
> >> +++ b/Documentation/meson.build
> >> @@ -92,8 +92,8 @@ if sphinx.found()
> >> install_dir : doc_install_dir)
> >>
> >> custom_target('documentation-linkcheck',
> >> - command: [sphinx, '-W', '-b', 'linkcheck', meson.current_source_dir(), '@OUTPUT@'],
> >> - build_always_stale: true,
> >> - input: docs_sources,
> >> - output: 'linkcheck')
> >> + command : [sphinx, '-W', '-b', 'linkcheck', meson.current_source_dir(), '@OUTPUT@'],
> >> + build_always_stale : true,
> >> + input : docs_sources,
> >> + output : 'linkcheck')
> >> endif
> >> diff --git a/include/libcamera/base/meson.build b/include/libcamera/base/meson.build
> >> index 872de211d4a8..bace25d56b13 100644
> >> --- a/include/libcamera/base/meson.build
> >> +++ b/include/libcamera/base/meson.build
> >> @@ -37,4 +37,4 @@ libcamera_base_headers = [
> >> ]
> >>
> >> install_headers(libcamera_base_public_headers,
> >> - subdir: libcamera_base_include_dir)
> >> + subdir : libcamera_base_include_dir)
> >> diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build
> >> index 4b2756a4a251..7f1f344014c4 100644
> >> --- a/include/libcamera/internal/meson.build
> >> +++ b/include/libcamera/internal/meson.build
> >> @@ -4,9 +4,9 @@ subdir('tracepoints')
> >>
> >> libcamera_tracepoint_header = custom_target(
> >> 'tp_header',
> >> - input: ['tracepoints.h.in', tracepoint_files],
> >> - output: 'tracepoints.h',
> >> - command: [gen_tracepoints_header, include_build_dir, '@OUTPUT@', '@INPUT@'],
> >> + input : ['tracepoints.h.in', tracepoint_files],
> >> + output : 'tracepoints.h',
> >> + command : [gen_tracepoints_header, include_build_dir, '@OUTPUT@', '@INPUT@'],
> >> )
> >>
> >> libcamera_internal_headers = files([
> >> diff --git a/include/libcamera/ipa/meson.build b/include/libcamera/ipa/meson.build
> >> index 6a5ae68633d7..e72803b4e243 100644
> >> --- a/include/libcamera/ipa/meson.build
> >> +++ b/include/libcamera/ipa/meson.build
> >> @@ -9,7 +9,7 @@ libcamera_ipa_headers = files([
> >> ])
> >>
> >> install_headers(libcamera_ipa_headers,
> >> - subdir: libcamera_ipa_include_dir)
> >> + subdir : libcamera_ipa_include_dir)
> >>
> >> libcamera_generated_ipa_headers = []
> >>
> >> diff --git a/meson.build b/meson.build
> >> index 62db8ed8105d..29777529a0d9 100644
> >> --- a/meson.build
> >> +++ b/meson.build
> >> @@ -20,7 +20,7 @@ project('libcamera', 'c', 'cpp',
> >> libcamera_git_version = run_command('utils/gen-version.sh',
> >> meson.project_build_root(),
> >> meson.project_source_root(),
> >> - check: false).stdout().strip()
> >> + check : false).stdout().strip()
> >>
> >> # If the source tree isn't under git control, set libcamera_git_version to the
> >> # meson project version.
> >> @@ -49,7 +49,7 @@ if libcamera_version != project_version
> >> meson.project_build_root(),
> >> meson.project_source_root(),
> >> project_version,
> >> - check: false).stdout().strip()
> >> + check : false).stdout().strip()
> >> libcamera_version = project_version
> >>
> >> # Append a marker to show we have modified this version string.
> >> @@ -109,7 +109,7 @@ if cc.get_id() == 'clang'
> >>
> >> # Use libc++ by default if available instead of libstdc++ when compiling
> >> # with clang.
> >> - if cc.find_library('libc++', required: false).found()
> >> + if cc.find_library('libc++', required : false).found()
> >> cpp_arguments += [
> >> '-stdlib=libc++',
> >> ]
> >> @@ -236,7 +236,7 @@ subdir('test')
> >>
> >> if not meson.is_cross_build()
> >> kernel_version_req = '>= 5.0.0'
> >> - kernel_version = run_command('uname', '-r', check: true).stdout().strip()
> >> + kernel_version = run_command('uname', '-r', check : true).stdout().strip()
> >> if not kernel_version.version_compare(kernel_version_req)
> >> warning('The current running kernel version @0@ is too old to run libcamera.'
> >> .format(kernel_version))
> >> @@ -249,13 +249,13 @@ endif
> >> # running libcamera from the build directory to locate resources in the source
> >> # directory (such as IPA configuration files).
> >> run_command('ln', '-fsT', meson.project_source_root(), meson.project_build_root() / 'source',
> >> - check: true)
> >> + check : true)
> >>
> >> configure_file(output : 'config.h', configuration : config_h)
> >>
> >> # Check for python installation and modules.
> >> py_mod = import('python')
> >> -py_mod.find_installation('python3', modules: py_modules)
> >> +py_mod.find_installation('python3', modules : py_modules)
> >>
> >> ## Summarise Configurations
> >> summary({
> >> diff --git a/meson_options.txt b/meson_options.txt
> >> index c8cd53b49ba1..4405b401d7d3 100644
> >> --- a/meson_options.txt
> >> +++ b/meson_options.txt
> >> @@ -59,12 +59,12 @@ option('qcam',
> >> option('test',
> >> type : 'boolean',
> >> value : false,
> >> - description: 'Compile and include the tests')
> >> + description : 'Compile and include the tests')
> >>
> >> option('tracing',
> >> type : 'feature',
> >> value : 'auto',
> >> - description: 'Enable tracing (based on lttng)')
> >> + description : 'Enable tracing (based on lttng)')
> >>
> >> option('v4l2',
> >> type : 'boolean',
> >> diff --git a/src/apps/qcam/meson.build b/src/apps/qcam/meson.build
> >> index eb0712d91351..2e77146cf73c 100644
> >> --- a/src/apps/qcam/meson.build
> >> +++ b/src/apps/qcam/meson.build
> >> @@ -57,9 +57,9 @@ if ((cc.get_id() == 'gcc' and cc.version().version_compare('>=9.0') and
> >> qt5_cpp_args += ['-Wno-deprecated-copy']
> >> endif
> >>
> >> -resources = qt5.preprocess(moc_headers: qcam_moc_headers,
> >> +resources = qt5.preprocess(moc_headers : qcam_moc_headers,
> >> qresources : qcam_resources,
> >> - dependencies: qt5_dep)
> >> + dependencies : qt5_dep)
> >>
> >> qcam = executable('qcam', qcam_sources, resources,
> >> install : true,
> >> diff --git a/src/gstreamer/meson.build b/src/gstreamer/meson.build
> >> index 77c79140eb37..20784b71883d 100644
> >> --- a/src/gstreamer/meson.build
> >> +++ b/src/gstreamer/meson.build
> >> @@ -43,6 +43,6 @@ libcamera_gst = shared_library('gstlibcamera',
> >> libcamera_gst_sources,
> >> cpp_args : libcamera_gst_cpp_args,
> >> dependencies : [libcamera_public, gstvideo_dep, gstallocator_dep],
> >> - install: true,
> >> + install : true,
> >> install_dir : '@0@/gstreamer-1.0'.format(get_option('libdir')),
> >> )
> >> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
> >> index 3cd424779395..38fbb41e7d6c 100644
> >> --- a/src/libcamera/meson.build
> >> +++ b/src/libcamera/meson.build
> >> @@ -93,9 +93,9 @@ endif
> >> if not libcrypto.found()
> >> warning('Neither gnutls nor libcrypto found, all IPA modules will be isolated')
> >> summary({'IPA modules signed with': 'None (modules will run isolated)'},
> >> - section: 'Configuration')
> >> + section : 'Configuration')
> >> else
> >> - summary({'IPA modules signed with': libcrypto.name()}, section: 'Configuration')
> >> + summary({'IPA modules signed with' : libcrypto.name()}, section : 'Configuration')
> >> endif
> >>
> >> if liblttng.found()
> >> diff --git a/src/py/libcamera/meson.build b/src/py/libcamera/meson.build
> >> index b38a57d73c85..f58c7198ee9e 100644
> >> --- a/src/py/libcamera/meson.build
> >> +++ b/src/py/libcamera/meson.build
> >> @@ -93,11 +93,11 @@ pycamera = shared_module('_libcamera',
> >>
> >> run_command('ln', '-fsrT', files('__init__.py'),
> >> meson.current_build_dir() / '__init__.py',
> >> - check: true)
> >> + check : true)
> >>
> >> run_command('ln', '-fsrT', meson.current_source_dir() / 'utils',
> >> meson.current_build_dir() / 'utils',
> >> - check: true)
> >> + check : true)
> >>
> >> install_data(['__init__.py'], install_dir : destdir)
> >>
> >> diff --git a/test/gstreamer/meson.build b/test/gstreamer/meson.build
> >> index 745725864eef..64a632df8a37 100644
> >> --- a/test/gstreamer/meson.build
> >> +++ b/test/gstreamer/meson.build
> >> @@ -8,7 +8,7 @@ gstreamer_tests = [
> >> {'name': 'single_stream_test', 'sources': ['gstreamer_single_stream_test.cpp']},
> >> {'name': 'multi_stream_test', 'sources': ['gstreamer_multi_stream_test.cpp']},
> >> ]
> >> -gstreamer_dep = dependency('gstreamer-1.0', required: true)
> >> +gstreamer_dep = dependency('gstreamer-1.0', required : true)
> >>
> >> foreach test : gstreamer_tests
> >> exe = executable(test['name'], test['sources'], 'gstreamer_test.cpp',
> >> diff --git a/test/stream/meson.build b/test/stream/meson.build
> >> index a3b19bf592a5..dd77f2f7195b 100644
> >> --- a/test/stream/meson.build
> >> +++ b/test/stream/meson.build
> >> @@ -10,5 +10,5 @@ foreach test : stream_tests
> >> dependencies : libcamera_public,
> >> link_with : test_libraries,
> >> include_directories : test_includes_internal)
> >> - test(test['name'], exe, suite: 'stream')
> >> + test(test['name'], exe, suite : 'stream')
> >> endforeach
> >>
> >> base-commit: d06ed87d49ca3d734fd1c2f1409280abb499c625
>
More information about the libcamera-devel
mailing list