From patchwork Mon May 8 13:45:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 18610 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id EC0DDBD16B for ; Mon, 8 May 2023 13:45:25 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6DB4A60544; Mon, 8 May 2023 15:45:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1683553525; bh=6xRNNKp9z9hKZnxIu+qxiDmisGJG1cpiumAt8Z49ObE=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=KLneA7eUINXHK8Q0EuweGYphcyYcRsNpbZNwkWwLHDB3elodFElGZz1F/M0GRORO1 wFG6IpO+3vO5NxgMKr8gvIAW4OgS/kBcmNmOvFjZD2FCF1tqgAf+/bUR158XtR+61p N2q2baLD1RUHMr9HMQdGYurMIMx/otwuDzhxMb/Ru87b5R+BgZUnbl6og1BPbPD48l 8bcYY4l4YOU5Zd/SHOM2gTrmmOdR6oPYgPeKxQijWKysR0ylT29iREvj4Z0Lz3Kafq CArgW9/72r702hDnNA81IomXbWNT6seACPrc46d11QjnDSnHX53RYtXPonJZZpgQ2D uh6DnBiyTIoPQ== Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 375916053A for ; Mon, 8 May 2023 15:45:24 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="v8is7lr7"; dkim-atps=neutral Received: from uno.lan (unknown [IPv6:2001:b07:5d2e:52c9:1cf0:b3bc:c785:4625]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id C245B7CE; Mon, 8 May 2023 15:45:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1683553518; bh=6xRNNKp9z9hKZnxIu+qxiDmisGJG1cpiumAt8Z49ObE=; h=From:To:Cc:Subject:Date:From; b=v8is7lr7Vs/IYOzyOvyQaUUCatCJOhqJPXqXMhI13TJmjoYtqOidxun4yS1zYgyAc pKp8i1UXcP8APvbPc+0fUr77wkB4cXitvyq+nyNfbf3HKaA/0qXPX+tOsaTjrwSzzf s/uslJvOMeXwm4tB7/hCnnqrjAnB6rdVQcOSBIYA= To: libcamera-devel@lists.libcamera.org Date: Mon, 8 May 2023 15:45:01 +0200 Message-Id: <20230508134501.23802-1-jacopo.mondi@ideasonboard.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: ipa_manager: Allow IPA loading in nested subdirs X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jacopo Mondi via libcamera-devel From: Jacopo Mondi Reply-To: Jacopo Mondi Cc: Jacopo Mondi Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Now that we allow IPA modules to live in nested directories for the RaspberryPi platform, it is required to allow parsing one more level to be able to run libcamera from the source directory. Without this patch the $(builddir)/src/ipa/rpi/vc4/ipa_rpi_vc4.so IPA module cannot be loaded. The issue is only present when running from the source directory as when libcamera is installed all IPA modules are deployed to a single $(prefix)/$(libcamera_libdir)/libamera/ location. Signed-off-by: Jacopo Mondi Reviewed-by: Laurent Pinchart Reviewed-by: Umang Jain --- src/libcamera/ipa_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.40.1 diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp index 030ef43fb994..ac5397003b50 100644 --- a/src/libcamera/ipa_manager.cpp +++ b/src/libcamera/ipa_manager.cpp @@ -138,7 +138,7 @@ IPAManager::IPAManager() std::string root = utils::libcameraBuildPath(); if (!root.empty()) { std::string ipaBuildPath = root + "src/ipa"; - constexpr int maxDepth = 1; + constexpr int maxDepth = 2; LOG(IPAManager, Info) << "libcamera is not installed. Adding '"