{"id":2863,"url":"https://patchwork.libcamera.org/api/1.1/patches/2863/?format=json","web_url":"https://patchwork.libcamera.org/patch/2863/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20200220165704.23600-5-kieran.bingham@ideasonboard.com>","date":"2020-02-20T16:57:02","name":"[libcamera-devel,v3,4/6] libcamera: ipa_manager: Re-arrange IPA precedence","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"24b0e1ef24b721593d1f75e34b59bc863ca4b22e","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/1.1/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/2863/mbox/","series":[{"id":688,"url":"https://patchwork.libcamera.org/api/1.1/series/688/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=688","date":"2020-02-20T16:56:58","name":"Support loading IPAs from the build tree","version":3,"mbox":"https://patchwork.libcamera.org/series/688/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2863/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2863/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 F1BD6625D9\n\tfor ;\n\tThu, 20 Feb 2020 17:57:08 +0100 (CET)","from localhost.localdomain\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 8D4A8563;\n\tThu, 20 Feb 2020 17:57:08 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1582217828;\n\tbh=ZNskuW//of/1/WzEfpG0WFIem2r0UAGZQUoZy0P2d/0=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=blXYgMI6dlnTyzzFK1zW7EY7jd2lKSNcTgwDytZ7UT0sS32dTcX8lhHYC9uSVsq4F\n\txQ9JU+Vg6wjWjpSeCuTNDbgS/kFUaXlJKnsQcX0BHDRGMiWs6HL3aOT1/bN3XSGEzD\n\thScAeVVmGwuM6XhTLWNDEEucZbAqy+R1ZbYgXUnQ=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Thu, 20 Feb 2020 16:57:02 +0000","Message-Id":"<20200220165704.23600-5-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20200220165704.23600-1-kieran.bingham@ideasonboard.com>","References":"<20200220165704.23600-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 4/6] libcamera: ipa_manager: Re-arrange\n\tIPA precedence","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":"Thu, 20 Feb 2020 16:57:09 -0000"},"content":"Setting a user environment path in LIBCAMERA_IPA_MODULE_PATH should take\nprecedence over the system loading locations.\n\nAdjust the IPA search orders accordingly.\n\nSigned-off-by: Kieran Bingham \n---\n src/libcamera/ipa_manager.cpp | 20 ++++++++++----------\n 1 file changed, 10 insertions(+), 10 deletions(-)","diff":"diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\nindex c30b4555290f..3b1d4c0b295e 100644\n--- a/src/libcamera/ipa_manager.cpp\n+++ b/src/libcamera/ipa_manager.cpp\n@@ -98,24 +98,24 @@ IPAManager::IPAManager()\n \tunsigned int ipaCount = 0;\n \tint ret;\n \n-\tret = addDir(IPA_MODULE_DIR);\n-\tif (ret > 0)\n-\t\tipaCount += ret;\n-\n+\t/* User specified paths take precedence. */\n \tconst char *modulePaths = utils::secure_getenv(\"LIBCAMERA_IPA_MODULE_PATH\");\n-\tif (!modulePaths) {\n+\tif (modulePaths) {\n+\t\tipaCount += addPath(modulePaths);\n+\n \t\tif (!ipaCount)\n \t\t\tLOG(IPAManager, Warning)\n-\t\t\t\t<< \"No IPA found in '\" IPA_MODULE_DIR \"'\";\n-\t\treturn;\n+\t\t\t\t<< \"No IPA found in '\" << modulePaths << \"'\";\n \t}\n \n-\tipaCount += addPath(modulePaths);\n+\t/* Load IPAs from the installed system path. */\n+\tret = addDir(IPA_MODULE_DIR);\n+\tif (ret > 0)\n+\t\tipaCount += ret;\n \n \tif (!ipaCount)\n \t\tLOG(IPAManager, Warning)\n-\t\t\t<< \"No IPA found in '\" IPA_MODULE_DIR \"' and '\"\n-\t\t\t<< modulePaths << \"'\";\n+\t\t\t<< \"No IPA found in '\" IPA_MODULE_DIR \"'\";\n }\n \n IPAManager::~IPAManager()\n","prefixes":["libcamera-devel","v3","4/6"]}