[{"id":4273,"web_url":"https://patchwork.libcamera.org/comment/4273/","msgid":"<0d13cf76-7079-9f95-ad40-272a7dc9475a@ideasonboard.com>","date":"2020-03-25T10:13:21","subject":"Re: [libcamera-devel] [PATCH 2/3] ipa: Move vimc to a subdirectory","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 25/03/2020 08:58, Laurent Pinchart wrote:\n> Give a subdirectory to all IPA moduels to make the structure of the\n\n/moduels/modules/\n\n> source tree more consistent. This will also simplify the implementation\n> of IPA module selection at build time.\n> \n\nReviewed-by: Kieran Bingham \n\n> Signed-off-by: Laurent Pinchart \n> ---\n> src/ipa/meson.build | 20 ++------------------\n> src/ipa/vimc/meson.build | 15 +++++++++++++++\n> src/ipa/{ipa_vimc.cpp => vimc/vimc.cpp} | 2 +-\n> 3 files changed, 18 insertions(+), 19 deletions(-)\n> create mode 100644 src/ipa/vimc/meson.build\n> rename src/ipa/{ipa_vimc.cpp => vimc/vimc.cpp} (98%)\n> \n> diff --git a/src/ipa/meson.build b/src/ipa/meson.build\n> index 421803243e32..9aaf92494d37 100644\n> --- a/src/ipa/meson.build\n> +++ b/src/ipa/meson.build\n> @@ -1,8 +1,3 @@\n> -ipa_vimc_sources = [\n> - ['ipa_vimc', 'LGPL-2.1-or-later'],\n> - ['ipa_vimc_isolate', 'Proprietary'],\n> -]\n> -\n> ipa_install_dir = join_paths(get_option('libdir'), 'libcamera')\n> \n> ipa_includes = [\n> @@ -10,20 +5,9 @@ ipa_includes = [\n> libcamera_internal_includes,\n> ]\n> \n> -subdir('libipa')\n> -\n> -foreach t : ipa_vimc_sources\n> - ipa = shared_module(t[0], 'ipa_vimc.cpp',\n> - name_prefix : '',\n> - include_directories : ipa_includes,\n> - dependencies : libcamera_dep,\n> - link_with : libipa,\n> - install : true,\n> - install_dir : ipa_install_dir,\n> - cpp_args : '-DLICENSE=\"' + t[1] + '\"')\n> -endforeach\n> -\n\nUgh - so Vimc shoudl probably already have had it's own directory anyway :-)\n\n\n> config_h.set('IPA_MODULE_DIR',\n> '\"' + join_paths(get_option('prefix'), ipa_install_dir) + '\"')\n> \n> +subdir('libipa')\n> subdir('rkisp1')\n> +subdir('vimc')\n> diff --git a/src/ipa/vimc/meson.build b/src/ipa/vimc/meson.build\n> new file mode 100644\n> index 000000000000..435c7d3160be\n> --- /dev/null\n> +++ b/src/ipa/vimc/meson.build\n> @@ -0,0 +1,15 @@\n> +ipa_vimc_sources = [\n> + ['ipa_vimc', 'LGPL-2.1-or-later'],\n> + ['ipa_vimc_isolate', 'Proprietary'],\n> +]\n> +\n> +foreach t : ipa_vimc_sources\n> + ipa = shared_module(t[0], 'vimc.cpp',\n> + name_prefix : '',\n> + include_directories : [ipa_includes, libipa_includes],\n> + dependencies : libcamera_dep,\n> + link_with : libipa,\n> + install : true,\n> + install_dir : ipa_install_dir,\n> + cpp_args : '-DLICENSE=\"' + t[1] + '\"')\n> +endforeach\n> diff --git a/src/ipa/ipa_vimc.cpp b/src/ipa/vimc/vimc.cpp\n> similarity index 98%\n> rename from src/ipa/ipa_vimc.cpp\n> rename to src/ipa/vimc/vimc.cpp\n> index 4751ad919a0f..6e2095b56bbc 100644\n> --- a/src/ipa/ipa_vimc.cpp\n> +++ b/src/ipa/vimc/vimc.cpp\n> @@ -17,7 +17,7 @@\n> #include \n> #include \n> \n> -#include \"libipa/ipa_interface_wrapper.h\"\n> +#include \n> \n> #include \"log.h\"\n> \n>","headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 62F5860410\n\tfor ;\n\tWed, 25 Mar 2020 11:13:26 +0100 (CET)","from [192.168.0.20]\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B481580C;\n\tWed, 25 Mar 2020 11:13:23 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"os8hV3HC\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1585131206;\n\tbh=9dlMPWnbyGZbur93iWIgPcrdoqXn8z6M+5xD3MEM2B0=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=os8hV3HCMnba4//8HOOAOXaR2MRRCCiUjGDFtUfvQF/m4RSDwjHzWSJeWyMlQqjIs\n\tURzdpx+9rhZcHH0i72pA8hujkozjbvOak7joVzzIiV2/uS9kArHp8RtfLuCfG3R3FT\n\tBPUC2C0gsNfgGdwbopoaT5JxL1z3PnenXZa6m/XA=","Reply-To":"kieran.bingham@ideasonboard.com","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20200325085805.11749-1-laurent.pinchart@ideasonboard.com>\n\t<20200325085805.11749-3-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Openpgp":"preference=signencrypt","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<0d13cf76-7079-9f95-ad40-272a7dc9475a@ideasonboard.com>","Date":"Wed, 25 Mar 2020 10:13:21 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101\n\tThunderbird/60.9.1","MIME-Version":"1.0","In-Reply-To":"<20200325085805.11749-3-laurent.pinchart@ideasonboard.com>","Content-Type":"text/plain; charset=utf-8","Content-Language":"en-GB","Content-Transfer-Encoding":"7bit","Subject":"Re: [libcamera-devel] [PATCH 2/3] ipa: Move vimc to a subdirectory","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Wed, 25 Mar 2020 10:13:26 -0000"}}]