{"id":2955,"url":"https://patchwork.libcamera.org/api/patches/2955/?format=json","web_url":"https://patchwork.libcamera.org/patch/2955/","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":"<20200302163550.11640-1-kieran.bingham@ideasonboard.com>","date":"2020-03-02T16:35:50","name":"[libcamera-devel] libcamera: Move generated control and properry ids to the API","commit_ref":null,"pull_url":null,"state":"rejected","archived":false,"hash":"97d0a914129da81772551f59e60c0d08f0996bd1","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":{"id":11,"url":"https://patchwork.libcamera.org/api/users/11/?format=json","username":"kbingham","first_name":"Kieran","last_name":"Bingham","email":"kieran.bingham@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/2955/mbox/","series":[{"id":700,"url":"https://patchwork.libcamera.org/api/series/700/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=700","date":"2020-03-02T16:35:50","name":"[libcamera-devel] libcamera: Move generated control and properry ids to the API","version":1,"mbox":"https://patchwork.libcamera.org/series/700/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/2955/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/2955/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 F194162710\n\tfor ;\n\tMon, 2 Mar 2020 17:35:54 +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 2BDAC9D0;\n\tMon, 2 Mar 2020 17:35:54 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1583166954;\n\tbh=Yso1k/QkWExUa2sj3K8Pkme2zD6Ng/z/65DzMXJBBHQ=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=dq4UC66sWl8ncRFhsSk8ORVzLG8M181lcYIjMAxuc68PyKnTQM5OqHEQX06AIra4g\n\tKX/y/UtaU4i3gHcrARqUjiSgWfeeStIID+J+XOTZLuLfgIbd84h6JcAnIfTv+xnC0Z\n\tdG8z+kbGBkV8N9PBt518nd8PLVHP3POIf94oXB98=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Mon, 2 Mar 2020 16:35:50 +0000","Message-Id":"<20200302163550.11640-1-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.20.1","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH] libcamera: Move generated control and\n\tproperry ids to the API","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":"Mon, 02 Mar 2020 16:35:55 -0000"},"content":"As part of updating controls to support properties, the commit\nf870591a9bf5 (\"libcamera: properties: Add location property\")\ninadvertently moved the generated headers out of the libcamera_api\ndependency generation.\n\nThis allowed a race condition to occur in builds where objects are\nattempted to be built before the API definitions had been generated.\n\nMove the headers out of the libcamera_sources variable and into the\nlibcamera_api variable to match the other headers in this location.\n\nFixes: f870591a9bf5 (\"libcamera: properties: Add location property\")\n\nSigned-off-by: Kieran Bingham \n---\n include/libcamera/meson.build | 2 ++\n src/libcamera/meson.build | 1 -\n 2 files changed, 2 insertions(+), 1 deletion(-)","diff":"diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build\nindex f58c02d2cf35..c02e1d250aff 100644\n--- a/include/libcamera/meson.build\n+++ b/include/libcamera/meson.build\n@@ -43,6 +43,8 @@ foreach header : control_source_files\n install_dir : join_paths('include', include_dir))\n endforeach\n \n+libcamera_api += control_headers\n+\n gen_header = files('gen-header.sh')\n \n libcamera_h = custom_target('gen-header',\ndiff --git a/src/libcamera/meson.build b/src/libcamera/meson.build\nindex 88658ac563f7..b3a6a1aad659 100644\n--- a/src/libcamera/meson.build\n+++ b/src/libcamera/meson.build\n@@ -80,7 +80,6 @@ foreach source : control_source_files\n command : [gen_controls, '-o', '@OUTPUT@', '@INPUT@'])\n endforeach\n \n-libcamera_sources += control_headers\n libcamera_sources += control_sources\n \n gen_version = join_paths(meson.source_root(), 'utils', 'gen-version.sh')\n","prefixes":["libcamera-devel"]}