Patch Detail
Show a patch.
GET /api/1.1/patches/18792/?format=api
{ "id": 18792, "url": "https://patchwork.libcamera.org/api/1.1/patches/18792/?format=api", "web_url": "https://patchwork.libcamera.org/patch/18792/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20230706073004.984-1-laurent.pinchart@ideasonboard.com>", "date": "2023-07-06T07:30:04", "name": "[libcamera-devel] meson: Fix space around colon issues", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "0708fcd8b9d4d5e59b6d0303d18802e6e8b57709", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/18792/mbox/", "series": [ { "id": 3956, "url": "https://patchwork.libcamera.org/api/1.1/series/3956/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3956", "date": "2023-07-06T07:30:04", "name": "[libcamera-devel] meson: Fix space around colon issues", "version": 1, "mbox": "https://patchwork.libcamera.org/series/3956/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/18792/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/18792/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 26130C323E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 6 Jul 2023 07:30:08 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 23345628C0;\n\tThu, 6 Jul 2023 09:30:07 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 84A5761E33\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 6 Jul 2023 09:30:05 +0200 (CEST)", "from pendragon.ideasonboard.com (85-160-25-222.reb.o2.cz\n\t[85.160.25.222])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 194DA6C8\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 6 Jul 2023 09:29:19 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1688628607;\n\tbh=04FOtHDCMj/LUc8V2EFYclw3Tpq/9AC2PfjJjQdNMnE=;\n\th=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:\n\tList-Help:List-Subscribe:From:Reply-To:From;\n\tb=h+gZyOobUedGqloaO6TWOlgjXJTKeDcZWtxud49kQ6mom9vpdOTvjV7GSTTMsZrJc\n\tGI1UhtDf3wZNnwPoDD28aghJdX6dTh4J05to/BbGa1HS21vAc+0DwYvXOpc6sN8QPc\n\tm4FQjMQjpe0U8WffTAn/7C/4y79STh2eZYAbZUmrffMZlvcX5tqPCE61URYyCnoKck\n\t5dW2wih0nWBeElg8pucfsZt3RIjIbIauQsRsxR7IlKO47irwIkvP3gFgeOacquSn0i\n\tx1wmeyjfunOzoADuPEkCu7PGA4ar8dTFDY/pnOkWe1+56mVQ/7Gfq3BMboLPqDxfcZ\n\tapNN1r4s/8LLg==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1688628560;\n\tbh=04FOtHDCMj/LUc8V2EFYclw3Tpq/9AC2PfjJjQdNMnE=;\n\th=From:To:Subject:Date:From;\n\tb=TZQXIoKsvNTHWzGSRKweMlIT/x5P6la3PhkauLH2E+3kxNyyEzMM/5YYWKUWiksWa\n\tvnaEm+1ZWqpTcN+SBBQvVa/jOkQHA3nSzwY6NSbqS7v+vi+GitiFpbkzbTk3c3F8FI\n\tS16KJnXrN/MZ8Fw2xcLD3z2Ozz2qwI9QmQAvlSUM=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"TZQXIoKs\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 6 Jul 2023 10:30:04 +0300", "Message-Id": "<20230706073004.984-1-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.39.3", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH] meson: Fix space around colon issues", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Laurent Pinchart via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "The meson style, which libcamera follows, mandates a space before\ncolons. Fix the style violations through the project.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n Documentation/meson.build | 8 ++++----\n include/libcamera/base/meson.build | 2 +-\n include/libcamera/internal/meson.build | 6 +++---\n include/libcamera/ipa/meson.build | 2 +-\n meson.build | 12 ++++++------\n meson_options.txt | 4 ++--\n src/apps/qcam/meson.build | 4 ++--\n src/gstreamer/meson.build | 2 +-\n src/libcamera/meson.build | 4 ++--\n src/py/libcamera/meson.build | 4 ++--\n test/gstreamer/meson.build | 2 +-\n test/stream/meson.build | 2 +-\n 12 files changed, 26 insertions(+), 26 deletions(-)\n\n\nbase-commit: d06ed87d49ca3d734fd1c2f1409280abb499c625", "diff": "diff --git a/Documentation/meson.build b/Documentation/meson.build\nindex d675f368cf79..b2a5bf15e6ea 100644\n--- a/Documentation/meson.build\n+++ b/Documentation/meson.build\n@@ -92,8 +92,8 @@ if sphinx.found()\n install_dir : doc_install_dir)\n \n custom_target('documentation-linkcheck',\n- command: [sphinx, '-W', '-b', 'linkcheck', meson.current_source_dir(), '@OUTPUT@'],\n- build_always_stale: true,\n- input: docs_sources,\n- output: 'linkcheck')\n+ command : [sphinx, '-W', '-b', 'linkcheck', meson.current_source_dir(), '@OUTPUT@'],\n+ build_always_stale : true,\n+ input : docs_sources,\n+ output : 'linkcheck')\n endif\ndiff --git a/include/libcamera/base/meson.build b/include/libcamera/base/meson.build\nindex 872de211d4a8..bace25d56b13 100644\n--- a/include/libcamera/base/meson.build\n+++ b/include/libcamera/base/meson.build\n@@ -37,4 +37,4 @@ libcamera_base_headers = [\n ]\n \n install_headers(libcamera_base_public_headers,\n- subdir: libcamera_base_include_dir)\n+ subdir : libcamera_base_include_dir)\ndiff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build\nindex 4b2756a4a251..7f1f344014c4 100644\n--- a/include/libcamera/internal/meson.build\n+++ b/include/libcamera/internal/meson.build\n@@ -4,9 +4,9 @@ subdir('tracepoints')\n \n libcamera_tracepoint_header = custom_target(\n 'tp_header',\n- input: ['tracepoints.h.in', tracepoint_files],\n- output: 'tracepoints.h',\n- command: [gen_tracepoints_header, include_build_dir, '@OUTPUT@', '@INPUT@'],\n+ input : ['tracepoints.h.in', tracepoint_files],\n+ output : 'tracepoints.h',\n+ command : [gen_tracepoints_header, include_build_dir, '@OUTPUT@', '@INPUT@'],\n )\n \n libcamera_internal_headers = files([\ndiff --git a/include/libcamera/ipa/meson.build b/include/libcamera/ipa/meson.build\nindex 6a5ae68633d7..e72803b4e243 100644\n--- a/include/libcamera/ipa/meson.build\n+++ b/include/libcamera/ipa/meson.build\n@@ -9,7 +9,7 @@ libcamera_ipa_headers = files([\n ])\n \n install_headers(libcamera_ipa_headers,\n- subdir: libcamera_ipa_include_dir)\n+ subdir : libcamera_ipa_include_dir)\n \n libcamera_generated_ipa_headers = []\n \ndiff --git a/meson.build b/meson.build\nindex 62db8ed8105d..29777529a0d9 100644\n--- a/meson.build\n+++ b/meson.build\n@@ -20,7 +20,7 @@ project('libcamera', 'c', 'cpp',\n libcamera_git_version = run_command('utils/gen-version.sh',\n meson.project_build_root(),\n meson.project_source_root(),\n- check: false).stdout().strip()\n+ check : false).stdout().strip()\n \n # If the source tree isn't under git control, set libcamera_git_version to the\n # meson project version.\n@@ -49,7 +49,7 @@ if libcamera_version != project_version\n meson.project_build_root(),\n meson.project_source_root(),\n project_version,\n- check: false).stdout().strip()\n+ check : false).stdout().strip()\n libcamera_version = project_version\n \n # Append a marker to show we have modified this version string.\n@@ -109,7 +109,7 @@ if cc.get_id() == 'clang'\n \n # Use libc++ by default if available instead of libstdc++ when compiling\n # with clang.\n- if cc.find_library('libc++', required: false).found()\n+ if cc.find_library('libc++', required : false).found()\n cpp_arguments += [\n '-stdlib=libc++',\n ]\n@@ -236,7 +236,7 @@ subdir('test')\n \n if not meson.is_cross_build()\n kernel_version_req = '>= 5.0.0'\n- kernel_version = run_command('uname', '-r', check: true).stdout().strip()\n+ kernel_version = run_command('uname', '-r', check : true).stdout().strip()\n if not kernel_version.version_compare(kernel_version_req)\n warning('The current running kernel version @0@ is too old to run libcamera.'\n .format(kernel_version))\n@@ -249,13 +249,13 @@ endif\n # running libcamera from the build directory to locate resources in the source\n # directory (such as IPA configuration files).\n run_command('ln', '-fsT', meson.project_source_root(), meson.project_build_root() / 'source',\n- check: true)\n+ check : true)\n \n configure_file(output : 'config.h', configuration : config_h)\n \n # Check for python installation and modules.\n py_mod = import('python')\n-py_mod.find_installation('python3', modules: py_modules)\n+py_mod.find_installation('python3', modules : py_modules)\n \n ## Summarise Configurations\n summary({\ndiff --git a/meson_options.txt b/meson_options.txt\nindex c8cd53b49ba1..4405b401d7d3 100644\n--- a/meson_options.txt\n+++ b/meson_options.txt\n@@ -59,12 +59,12 @@ option('qcam',\n option('test',\n type : 'boolean',\n value : false,\n- description: 'Compile and include the tests')\n+ description : 'Compile and include the tests')\n \n option('tracing',\n type : 'feature',\n value : 'auto',\n- description: 'Enable tracing (based on lttng)')\n+ description : 'Enable tracing (based on lttng)')\n \n option('v4l2',\n type : 'boolean',\ndiff --git a/src/apps/qcam/meson.build b/src/apps/qcam/meson.build\nindex eb0712d91351..2e77146cf73c 100644\n--- a/src/apps/qcam/meson.build\n+++ b/src/apps/qcam/meson.build\n@@ -57,9 +57,9 @@ if ((cc.get_id() == 'gcc' and cc.version().version_compare('>=9.0') and\n qt5_cpp_args += ['-Wno-deprecated-copy']\n endif\n \n-resources = qt5.preprocess(moc_headers: qcam_moc_headers,\n+resources = qt5.preprocess(moc_headers : qcam_moc_headers,\n qresources : qcam_resources,\n- dependencies: qt5_dep)\n+ dependencies : qt5_dep)\n \n qcam = executable('qcam', qcam_sources, resources,\n install : true,\ndiff --git a/src/gstreamer/meson.build b/src/gstreamer/meson.build\nindex 77c79140eb37..20784b71883d 100644\n--- a/src/gstreamer/meson.build\n+++ b/src/gstreamer/meson.build\n@@ -43,6 +43,6 @@ libcamera_gst = shared_library('gstlibcamera',\n libcamera_gst_sources,\n cpp_args : libcamera_gst_cpp_args,\n dependencies : [libcamera_public, gstvideo_dep, gstallocator_dep],\n- install: true,\n+ install : true,\n install_dir : '@0@/gstreamer-1.0'.format(get_option('libdir')),\n )\ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 3cd424779395..38fbb41e7d6c 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -93,9 +93,9 @@ endif\n if not libcrypto.found()\n warning('Neither gnutls nor libcrypto found, all IPA modules will be isolated')\n summary({'IPA modules signed with': 'None (modules will run isolated)'},\n- section: 'Configuration')\n+ section : 'Configuration')\n else\n- summary({'IPA modules signed with': libcrypto.name()}, section: 'Configuration')\n+ summary({'IPA modules signed with' : libcrypto.name()}, section : 'Configuration')\n endif\n \n if liblttng.found()\ndiff --git a/src/py/libcamera/meson.build b/src/py/libcamera/meson.build\nindex b38a57d73c85..f58c7198ee9e 100644\n--- a/src/py/libcamera/meson.build\n+++ b/src/py/libcamera/meson.build\n@@ -93,11 +93,11 @@ pycamera = shared_module('_libcamera',\n \n run_command('ln', '-fsrT', files('__init__.py'),\n meson.current_build_dir() / '__init__.py',\n- check: true)\n+ check : true)\n \n run_command('ln', '-fsrT', meson.current_source_dir() / 'utils',\n meson.current_build_dir() / 'utils',\n- check: true)\n+ check : true)\n \n install_data(['__init__.py'], install_dir : destdir)\n \ndiff --git a/test/gstreamer/meson.build b/test/gstreamer/meson.build\nindex 745725864eef..64a632df8a37 100644\n--- a/test/gstreamer/meson.build\n+++ b/test/gstreamer/meson.build\n@@ -8,7 +8,7 @@ gstreamer_tests = [\n {'name': 'single_stream_test', 'sources': ['gstreamer_single_stream_test.cpp']},\n {'name': 'multi_stream_test', 'sources': ['gstreamer_multi_stream_test.cpp']},\n ]\n-gstreamer_dep = dependency('gstreamer-1.0', required: true)\n+gstreamer_dep = dependency('gstreamer-1.0', required : true)\n \n foreach test : gstreamer_tests\n exe = executable(test['name'], test['sources'], 'gstreamer_test.cpp',\ndiff --git a/test/stream/meson.build b/test/stream/meson.build\nindex a3b19bf592a5..dd77f2f7195b 100644\n--- a/test/stream/meson.build\n+++ b/test/stream/meson.build\n@@ -10,5 +10,5 @@ foreach test : stream_tests\n dependencies : libcamera_public,\n link_with : test_libraries,\n include_directories : test_includes_internal)\n- test(test['name'], exe, suite: 'stream')\n+ test(test['name'], exe, suite : 'stream')\n endforeach\n", "prefixes": [ "libcamera-devel" ] }