{"id":19115,"url":"https://patchwork.libcamera.org/api/1.1/patches/19115/?format=json","web_url":"https://patchwork.libcamera.org/patch/19115/","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":"<20231006132000.23504-14-naush@raspberrypi.com>","date":"2023-10-06T13:19:53","name":"[libcamera-devel,13/20] build: ipa: Fix bug in building multiple IPA interfaces with the same mojom file","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"3d772969f02bb0e7aefa8f30e543126aaa60d5b4","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/1.1/people/34/?format=json","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/19115/mbox/","series":[{"id":4047,"url":"https://patchwork.libcamera.org/api/1.1/series/4047/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4047","date":"2023-10-06T13:19:40","name":"Raspberry Pi: Preliminary PiSP support","version":1,"mbox":"https://patchwork.libcamera.org/series/4047/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/19115/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/19115/checks/","tags":{},"headers":{"Return-Path":"","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 7E8AFC32B7\n\tfor ;\n\tFri, 6 Oct 2023 13:20:17 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1211862991;\n\tFri, 6 Oct 2023 15:20:17 +0200 (CEST)","from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com\n\t[IPv6:2a00:1450:4864:20::32b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9FC8F62970\n\tfor ;\n\tFri, 6 Oct 2023 15:20:13 +0200 (CEST)","by mail-wm1-x32b.google.com with SMTP id\n\t5b1f17b1804b1-405505b07dfso19729895e9.0\n\tfor ;\n\tFri, 06 Oct 2023 06:20:13 -0700 (PDT)","from localhost.localdomain ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\tm8-20020a056000180800b00321773bb933sm1639478wrh.77.2023.10.06.06.20.11\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 06 Oct 2023 06:20:12 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1696598417;\n\tbh=pkyf9QZ03S+r76EzK4eUM9gZP+AGWiIsUDgMjJi2Gp8=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=YXokXVGgGa+7syzBGkpN0NcsfNQiZvtr7gW0F44mPjUT5Eg0MgNeTnLIN+0TugvCW\n\tW3JRyS4WklaP8+loJzccDhLt/7jAETiOrB7uqArcNAiR2Y7iYHqCCafsqfYzZX0LwL\n\ts/nzMR2cdoM+d6KlJSBiGZ0OZho3WkDRUlm6Hay9Y33P5FobqfhQiQ3WfCJC92/Qgr\n\t1E4ReBgKcRv1RKiA2FmfKpq81r2bMfoR47JKJgmXmVAulUa3kPXcn7uuRAq+6PgSvh\n\tAhq3yuDxY9lLOxW8+J621cD7wHbYQFP1QDt+FGR5hccJvmIrzJ+JDCJzOT34bxlCPE\n\tStKj88RPNzocg==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1696598413; x=1697203213;\n\tdarn=lists.libcamera.org; \n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=6yici5UMvvwYWxOu71VoDQY6+Vl9nnQ+jk7k7pxhCEs=;\n\tb=e8nP080Nj63Vgi2oEn8WaSCmnOQJdLqltvujUcYEZe7BcqmRKqLx9h/SVe7pxkbWDb\n\tvttNnhaPyi2LdM497xkUnGqIErsojL9z2waSySl+wrKGkqZDHaez6ZAm3RYFBMKwfiIl\n\tk9bre5XW83WuW1wImcmcNh2sALEIqqDRWl//vC40pkgPDHqcTMsLuHfc77qOy7wgv2MZ\n\tT0af5CrzFd2v0kb+zHLLd0NAYBmOkHqyZsXj7ZqhS0G277JlbpNArzeCzHwb+fCMPDrM\n\tflaHRICbdU/Hxqc4lhoqZmwcZLcfap7XrNPYL1cK7ZQi1ViPhAt06aQKHrBj+PkyJ7N9\n\tq/eg=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"e8nP080N\"; dkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20230601; t=1696598413; x=1697203213;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=6yici5UMvvwYWxOu71VoDQY6+Vl9nnQ+jk7k7pxhCEs=;\n\tb=UojDQF3Ri/kruS6WirY8qfDRrrapZke+cD8W1JPBGhjCS0ynO4wO4odtqyT+qV3mE+\n\t3yIRHEzrWr+26YGSSVOPgp2buvphgweWw4VDW040wQ4QLU0/s1QiXn5a6gCatqLDfKqM\n\t7pnh+h2qoaO5QSLaOp1RGt2kEAmKZII50e72Wl5mWFJX99qjq61t9X5Ocl5gOuCRSv1t\n\tUsdRdImnmLFIbQ1PxHK0gtzV4PuI3JAtIKevp76Hfq17d4d5zJR2qb+xpMq5s1id7h7x\n\tf1AeGa2ykAn5DvS9AMmp+OL3w43Bbd7g4CYuJxoO4ju4c2YOpglBjlqy4OS7ONjL02tV\n\tsgRw==","X-Gm-Message-State":"AOJu0Yw40fM2nCViOw0DfGxaq3sfyC+A6+H31lGJn9/IGFdlZHdriu4l\n\tL7gRva7p+tzsuD1yJ530NQtAXBbVkYsojrjD9WtK3A==","X-Google-Smtp-Source":"AGHT+IHC+1xE9nXQCA0MH9oeoprxCLiGDMpuTwuDRyjEnnIqcGktT+SwUzGR9B2JNkFFFOxmLBhg+w==","X-Received":"by 2002:a5d:6b92:0:b0:31f:e02b:18ae with SMTP id\n\tn18-20020a5d6b92000000b0031fe02b18aemr4330483wrx.24.1696598412976; \n\tFri, 06 Oct 2023 06:20:12 -0700 (PDT)","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 6 Oct 2023 14:19:53 +0100","Message-Id":"<20231006132000.23504-14-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20231006132000.23504-1-naush@raspberrypi.com>","References":"<20231006132000.23504-1-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 13/20] build: ipa: Fix bug in building\n\tmultiple IPA interfaces with the same mojom file","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","From":"Naushir Patuck via libcamera-devel\n\t","Reply-To":"Naushir Patuck ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"In the existing meson scripts, an IPA mojom interface file may not be\nbuilt if:\n\n- There are duplicate entries for the mojom file shared by different\n pipeline handlers in pipeline_ipa_mojom_mapping, and\n- The IPA is not listed first in pipeline_ipa_mojom_mapping, and\n- The first listed IPA for the given mojom file is not selected in the\n build.\n\nFix this by using a separate list of already built mojom files\n(mojoms_built) instead of overloading use of the existing\nipa_mojom_files list. Now, ipa_mojom_files gets filled in outside of\nthe IPA list enumeration loop.\n\nFixes: 312e9910ba2e (\"meson: ipa: Add mapping for pipeline handler to mojom interface file\")\nSigned-off-by: Naushir Patuck \nReviewed-by: David Plowman \n---\n include/libcamera/ipa/meson.build | 19 ++++++++++++-------\n 1 file changed, 12 insertions(+), 7 deletions(-)","diff":"diff --git a/include/libcamera/ipa/meson.build b/include/libcamera/ipa/meson.build\nindex e72803b4e243..f3b4881c9c91 100644\n--- a/include/libcamera/ipa/meson.build\n+++ b/include/libcamera/ipa/meson.build\n@@ -68,29 +68,28 @@ pipeline_ipa_mojom_mapping = {\n 'vimc': 'vimc.mojom',\n }\n \n-ipa_mojom_files = []\n-ipa_mojoms = []\n-\n #\n # Generate headers from templates.\n #\n \n # TODO Define per-pipeline ControlInfoMap with yaml?\n \n+ipa_mojoms = []\n+mojoms_built = []\n foreach pipeline, file : pipeline_ipa_mojom_mapping\n name = file.split('.')[0]\n \n- # Ensure we do not build duplicate mojom modules\n- if file in ipa_mojom_files\n+ # Avoid building duplicate mojom interfaces with the same interface file\n+ if name in mojoms_built\n continue\n endif\n \n- ipa_mojom_files += file\n-\n if pipeline not in pipelines\n continue\n endif\n \n+ mojoms_built += name\n+\n # {interface}.mojom-module\n mojom = custom_target(name + '_mojom_module',\n input : file,\n@@ -155,6 +154,12 @@ foreach pipeline, file : pipeline_ipa_mojom_mapping\n libcamera_generated_ipa_headers += [header, serializer, proxy_header]\n endforeach\n \n+ipa_mojom_files = []\n+foreach pipeline, file : pipeline_ipa_mojom_mapping\n+ if file not in ipa_mojom_files\n+ ipa_mojom_files += file\n+ endif\n+endforeach\n ipa_mojom_files = files(ipa_mojom_files)\n \n # Pass this to the documentation generator in src/libcamera/ipa\n","prefixes":["libcamera-devel","13/20"]}