{"id":3318,"url":"https://patchwork.libcamera.org/api/patches/3318/?format=json","web_url":"https://patchwork.libcamera.org/patch/3318/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200325085805.11749-3-laurent.pinchart@ideasonboard.com>","date":"2020-03-25T08:58:04","name":"[libcamera-devel,2/3] ipa: Move vimc to a subdirectory","commit_ref":"a25533089bda04daf0243eda7e316baea0737e19","pull_url":null,"state":"accepted","archived":false,"hash":"f22731924aad5fb35d0bf1941186079a04410184","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3318/mbox/","series":[{"id":773,"url":"https://patchwork.libcamera.org/api/series/773/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=773","date":"2020-03-25T08:58:02","name":"Make pipeline handlers selectable at compile time","version":1,"mbox":"https://patchwork.libcamera.org/series/773/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3318/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3318/checks/","tags":{},"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 A0E7762BD6\n\tfor ;\n\tWed, 25 Mar 2020 09:58:11 +0100 (CET)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id DCC7580C\n\tfor ;\n\tWed, 25 Mar 2020 09:58:10 +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=\"my49pYxK\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1585126691;\n\tbh=CjPPlt4XlUks04B+Xs1gzx4d/bmYIc7CrQTLUTZlVVw=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=my49pYxKgX13oo4H3raK8G5H+sSJS858zutJ7fqbETLdksSVAnvjAvy+kPEBsKxIJ\n\tjGNevfl8LKCu/RsE7MyF5XjX1RvbOZsKPuxhcRxoiVh0La43YpENv0/F3lGBkwsbJu\n\tg4YwHP/sALqlHdmIV6v5VHIxyIPfk8NhVU81tuDU=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 25 Mar 2020 10:58:04 +0200","Message-Id":"<20200325085805.11749-3-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20200325085805.11749-1-laurent.pinchart@ideasonboard.com>","References":"<20200325085805.11749-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[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 08:58:11 -0000"},"content":"Give a subdirectory to all IPA moduels to make the structure of the\nsource tree more consistent. This will also simplify the implementation\nof IPA module selection at build time.\n\nSigned-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%)","diff":"diff --git a/src/ipa/meson.build b/src/ipa/meson.build\nindex 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 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')\ndiff --git a/src/ipa/vimc/meson.build b/src/ipa/vimc/meson.build\nnew file mode 100644\nindex 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\ndiff --git a/src/ipa/ipa_vimc.cpp b/src/ipa/vimc/vimc.cpp\nsimilarity index 98%\nrename from src/ipa/ipa_vimc.cpp\nrename to src/ipa/vimc/vimc.cpp\nindex 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","prefixes":["libcamera-devel","2/3"]}