Patch Detail
Show a patch.
GET /api/1.1/patches/19283/?format=api
{ "id": 19283, "url": "https://patchwork.libcamera.org/api/1.1/patches/19283/?format=api", "web_url": "https://patchwork.libcamera.org/patch/19283/", "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": "<20231206004514.18474-1-laurent.pinchart@ideasonboard.com>", "date": "2023-12-06T00:45:14", "name": "[libcamera-devel] meson: Tag all installed files", "commit_ref": "9ba0c3fef81dd952dcc3913f82a98b961a81d643", "pull_url": null, "state": "accepted", "archived": false, "hash": "a0dec6b6102b4e33ea01f98312ab7651b7ac1633", "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/19283/mbox/", "series": [ { "id": 4104, "url": "https://patchwork.libcamera.org/api/1.1/series/4104/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4104", "date": "2023-12-06T00:45:14", "name": "[libcamera-devel] meson: Tag all installed files", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4104/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/19283/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/19283/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 8FF38C322E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 6 Dec 2023 00:45:09 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4092861D9F;\n\tWed, 6 Dec 2023 01:45:09 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7A8CF61D9C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 6 Dec 2023 01:45:07 +0100 (CET)", "from pendragon.ideasonboard.com (213-243-189-158.bb.dnainternet.fi\n\t[213.243.189.158])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1029F14DC\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 6 Dec 2023 01:44:26 +0100 (CET)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1701823509;\n\tbh=20tRpUEVHNyGqBSnxmCnpZixc6NaDA33hJZM7/dPuhE=;\n\th=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post:\n\tList-Help:List-Subscribe:From:Reply-To:From;\n\tb=EZfM4lyJTOTBSBY4nGqAuvBBW4dQXcFsbRRDU4a6B3tl9/ADD1RTrZUp7K1Be+kxK\n\t/GFMYuRosU+OlF+Ofu9rQaByFzDI61KlUqTFjiveunsyKu9CuhtjulqsSy5h25Tl1B\n\t2skOrtTL7NQhwWMeVowNWEa4+IepF5UdxlCn4bX7pfKzVbSQtUybG9TfQHstQSvjvG\n\thei80uTp4P1TBJ2ZgBrK9mU8MfXmjdukyO1QCvB0L5ByToUfNdHLZpsiQH/UuPaoEC\n\tbFlZTMfa6jtaH7Z0SEMtr5QS+Vs87VAxl44LS8ySnD2hF0rKoFrqBnoMn66QRENPZ2\n\tD23I/hcPNaYsA==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1701823467;\n\tbh=20tRpUEVHNyGqBSnxmCnpZixc6NaDA33hJZM7/dPuhE=;\n\th=From:To:Subject:Date:From;\n\tb=eWU9FCLkBjlHEG2xPGJ2c/IECozr5OKci7CO0yzBia+L6LIGWKptLsV7T4qZBUCzV\n\tYC0bBOk4hACvxs7Z7bbduZ+SeanrkZHaZT0z6mCq4Wp0JmvSWMwCSyd7QMh1n0kdXJ\n\t7Um+oHjn3rBo9e20dG8rTtXVpLY2bIljPIldwiIE=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"eWU9FCLk\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 6 Dec 2023 02:45:14 +0200", "Message-ID": "<20231206004514.18474-1-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.41.0", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH] meson: Tag all installed files", "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": "Meson uses tags to sort installed files in categories, and makes it\npossible to install a subset of the files using the '--tags' argument to\n'meson install'. This is typically used by distributions to split the\nruntime, development and documentation files into separate packages.\n\nBy default, meson tries to guess the correct tag for installed files,\nbut can't always do so properly. Mark the install targets that meson\ncan't guess with the correct install_tag.\n\nAs the feature has been introduced in meson 0.60, bump the minimum meson\nversion. The latest LTS release of all major distributions that\nlibcamera currently targets ship a recent enough meson version.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n Documentation/meson.build | 6 ++++--\n README.rst | 2 +-\n meson.build | 2 +-\n src/apps/cam/meson.build | 3 ++-\n src/apps/lc-compliance/meson.build | 3 ++-\n src/apps/qcam/meson.build | 1 +\n src/ipa/ipu3/data/meson.build | 3 ++-\n src/ipa/meson.build | 3 ++-\n src/ipa/rkisp1/data/meson.build | 3 ++-\n src/ipa/rpi/vc4/data/meson.build | 3 ++-\n src/ipa/vimc/data/meson.build | 3 ++-\n src/libcamera/pipeline/rpi/vc4/data/meson.build | 3 ++-\n src/py/libcamera/meson.build | 5 ++++-\n src/v4l2/meson.build | 3 ++-\n 14 files changed, 29 insertions(+), 14 deletions(-)\n\n\nbase-commit: 4eba2dc73c096d037a8a6390ff4a91ebbf1cedd4", "diff": "diff --git a/Documentation/meson.build b/Documentation/meson.build\nindex 3eb2897e6b2b..7a58fec8dc29 100644\n--- a/Documentation/meson.build\n+++ b/Documentation/meson.build\n@@ -49,7 +49,8 @@ if doxygen.found() and dot.found()\n output : 'api-html',\n command : [doxygen, doxyfile],\n install : true,\n- install_dir : doc_install_dir)\n+ install_dir : doc_install_dir,\n+ install_tag : 'doc')\n endif\n \n #\n@@ -91,7 +92,8 @@ if sphinx.found()\n output : 'html',\n build_by_default : true,\n install : true,\n- install_dir : doc_install_dir)\n+ install_dir : doc_install_dir,\n+ install_tag : 'doc')\n \n custom_target('documentation-linkcheck',\n command : [sphinx, '-W', '-b', 'linkcheck', meson.current_source_dir(), '@OUTPUT@'],\ndiff --git a/README.rst b/README.rst\nindex 4cb996375a9a..4db454de4e02 100644\n--- a/README.rst\n+++ b/README.rst\n@@ -47,7 +47,7 @@ A C++ toolchain: [required]\n Either {g++, clang}\n \n Meson Build system: [required]\n- meson (>= 0.57) ninja-build pkg-config\n+ meson (>= 0.60) ninja-build pkg-config\n \n for the libcamera core: [required]\n libyaml-dev python3-yaml python3-ply python3-jinja2\ndiff --git a/meson.build b/meson.build\nindex ee57cb780149..e49de4c259f2 100644\n--- a/meson.build\n+++ b/meson.build\n@@ -1,7 +1,7 @@\n # SPDX-License-Identifier: CC0-1.0\n \n project('libcamera', 'c', 'cpp',\n- meson_version : '>= 0.57',\n+ meson_version : '>= 0.60',\n version : '0.1.0',\n default_options : [\n 'werror=true',\ndiff --git a/src/apps/cam/meson.build b/src/apps/cam/meson.build\nindex 48c834ace71b..c70ca3cd2f8f 100644\n--- a/src/apps/cam/meson.build\n+++ b/src/apps/cam/meson.build\n@@ -58,4 +58,5 @@ cam = executable('cam', cam_sources,\n libyaml,\n ],\n cpp_args : cam_cpp_args,\n- install : true)\n+ install : true,\n+ install_tag : 'bin')\ndiff --git a/src/apps/lc-compliance/meson.build b/src/apps/lc-compliance/meson.build\nindex 51d9075ac30b..dd7b73abbcef 100644\n--- a/src/apps/lc-compliance/meson.build\n+++ b/src/apps/lc-compliance/meson.build\n@@ -26,4 +26,5 @@ lc_compliance = executable('lc-compliance', lc_compliance_sources,\n libevent,\n libgtest,\n ],\n- install : true)\n+ install : true,\n+ install_tag : 'bin-devel')\ndiff --git a/src/apps/qcam/meson.build b/src/apps/qcam/meson.build\nindex 2e77146cf73c..6cf4c171e668 100644\n--- a/src/apps/qcam/meson.build\n+++ b/src/apps/qcam/meson.build\n@@ -63,6 +63,7 @@ resources = qt5.preprocess(moc_headers : qcam_moc_headers,\n \n qcam = executable('qcam', qcam_sources, resources,\n install : true,\n+ install_tag : 'bin',\n link_with : apps_lib,\n dependencies : [\n libatomic,\ndiff --git a/src/ipa/ipu3/data/meson.build b/src/ipa/ipu3/data/meson.build\nindex 1f50b6301f77..0f7cd5c64caa 100644\n--- a/src/ipa/ipu3/data/meson.build\n+++ b/src/ipa/ipu3/data/meson.build\n@@ -5,4 +5,5 @@ conf_files = files([\n ])\n \n install_data(conf_files,\n- install_dir : ipa_data_dir / 'ipu3')\n+ install_dir : ipa_data_dir / 'ipu3',\n+ install_tag : 'runtime')\ndiff --git a/src/ipa/meson.build b/src/ipa/meson.build\nindex 903eb52ba60f..48793e07e04c 100644\n--- a/src/ipa/meson.build\n+++ b/src/ipa/meson.build\n@@ -72,5 +72,6 @@ if ipa_sign_module\n # install time, which invalidates the signatures.\n meson.add_install_script('ipa-sign-install.sh',\n ipa_priv_key.full_path(),\n- enabled_ipa_modules)\n+ enabled_ipa_modules,\n+ install_tag : 'runtime')\n endif\ndiff --git a/src/ipa/rkisp1/data/meson.build b/src/ipa/rkisp1/data/meson.build\nindex f5e9fa75eaa1..7150e1550422 100644\n--- a/src/ipa/rkisp1/data/meson.build\n+++ b/src/ipa/rkisp1/data/meson.build\n@@ -8,4 +8,5 @@ conf_files = files([\n ])\n \n install_data(conf_files,\n- install_dir : ipa_data_dir / 'rkisp1')\n+ install_dir : ipa_data_dir / 'rkisp1',\n+ install_tag : 'runtime')\ndiff --git a/src/ipa/rpi/vc4/data/meson.build b/src/ipa/rpi/vc4/data/meson.build\nindex bcf5658ba5d2..b4e45ad8d204 100644\n--- a/src/ipa/rpi/vc4/data/meson.build\n+++ b/src/ipa/rpi/vc4/data/meson.build\n@@ -23,4 +23,5 @@ conf_files = files([\n ])\n \n install_data(conf_files,\n- install_dir : ipa_data_dir / 'rpi' / 'vc4')\n+ install_dir : ipa_data_dir / 'rpi' / 'vc4',\n+ install_tag : 'runtime')\ndiff --git a/src/ipa/vimc/data/meson.build b/src/ipa/vimc/data/meson.build\nindex 42ec651ce81f..628d6a29e3ed 100644\n--- a/src/ipa/vimc/data/meson.build\n+++ b/src/ipa/vimc/data/meson.build\n@@ -5,4 +5,5 @@ conf_files = files([\n ])\n \n install_data(conf_files,\n- install_dir : ipa_data_dir / 'vimc')\n+ install_dir : ipa_data_dir / 'vimc',\n+ install_tag : 'runtime')\ndiff --git a/src/libcamera/pipeline/rpi/vc4/data/meson.build b/src/libcamera/pipeline/rpi/vc4/data/meson.build\nindex cca5e3885a4e..179feebc136d 100644\n--- a/src/libcamera/pipeline/rpi/vc4/data/meson.build\n+++ b/src/libcamera/pipeline/rpi/vc4/data/meson.build\n@@ -5,4 +5,5 @@ conf_files = files([\n ])\n \n install_data(conf_files,\n- install_dir : pipeline_data_dir / 'rpi' / 'vc4')\n+ install_dir : pipeline_data_dir / 'rpi' / 'vc4',\n+ install_tag : 'runtime')\ndiff --git a/src/py/libcamera/meson.build b/src/py/libcamera/meson.build\nindex 31af63ec0dc6..4807ca7d75ed 100644\n--- a/src/py/libcamera/meson.build\n+++ b/src/py/libcamera/meson.build\n@@ -90,6 +90,7 @@ pycamera = shared_module('_libcamera',\n pycamera_sources,\n install : true,\n install_dir : destdir,\n+ install_tag : 'python-runtime',\n name_prefix : '',\n dependencies : pycamera_deps,\n cpp_args : pycamera_args)\n@@ -105,7 +106,9 @@ run_command('ln', '-fsrT', meson.current_source_dir() / 'utils',\n meson.current_build_dir() / 'utils',\n check : true)\n \n-install_data(['__init__.py'], install_dir : destdir)\n+install_data(['__init__.py'],\n+ install_dir : destdir,\n+ install_tag : 'python-runtime')\n \n # \\todo Generate stubs when building. See https://peps.python.org/pep-0484/#stub-files\n # Note: Depends on pybind11-stubgen. To generate pylibcamera stubs:\ndiff --git a/src/v4l2/meson.build b/src/v4l2/meson.build\nindex ab4b35dd0e6b..e88e0b33c51c 100644\n--- a/src/v4l2/meson.build\n+++ b/src/v4l2/meson.build\n@@ -44,4 +44,5 @@ cdata.set('LIBCAMERA_V4L2_SO', get_option('prefix') / libcamera_libexecdir / 'v4\n configure_file(input : 'libcamerify.in',\n output : 'libcamerify',\n configuration : cdata,\n- install_dir : get_option('bindir'))\n+ install_dir : get_option('bindir'),\n+ install_tag : 'bin')\n", "prefixes": [ "libcamera-devel" ] }