{"id":3046,"url":"https://patchwork.libcamera.org/api/1.1/patches/3046/?format=json","web_url":"https://patchwork.libcamera.org/patch/3046/","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":"<20200307211326.26994-7-laurent.pinchart@ideasonboard.com>","date":"2020-03-07T21:13:25","name":"[libcamera-devel,v3,6/7] v4l2: v4l2_compat: Use correct libcamera_dep dependency","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"febc8b8b803b263cdf6b108f2d6c54dc61dc58e2","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3046/mbox/","series":[{"id":710,"url":"https://patchwork.libcamera.org/api/1.1/series/710/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=710","date":"2020-03-07T21:13:19","name":"Fix race condition and other build issues","version":3,"mbox":"https://patchwork.libcamera.org/series/710/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3046/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3046/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 DE69162907\n\tfor ;\n\tSat, 7 Mar 2020 22:13:39 +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 7E2115F\n\tfor ;\n\tSat, 7 Mar 2020 22:13:39 +0100 (CET)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1583615619;\n\tbh=Zx0RHaXPXMPgr+SfAO1Sutx8mYbZOSirqQQ6DSYeDZU=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=mqYPD6MbyiYWukPhylJinUjvmsbFqq3DzXCEd48AMbrAvQoFA6Djn6ACJx/QUiRQL\n\txDXwAXP0oFM12cwG+xY2ZjCOGV/SURnA7VpqDPSDwKNajPuaxHtWPqamAiDT4qlQ6z\n\tv8cDbU116ItPj3qMJIkuBXnl66kz+wpbPu3yw/eg=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 7 Mar 2020 23:13:25 +0200","Message-Id":"<20200307211326.26994-7-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20200307211326.26994-1-laurent.pinchart@ideasonboard.com>","References":"<20200307211326.26994-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 6/7] v4l2: v4l2_compat: Use correct\n\tlibcamera_dep dependency","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":"Sat, 07 Mar 2020 21:13:40 -0000"},"content":"The v4l2-compat shared library is declared as depending on\nlibcamera_deps. This is not correct, as libcamera_deps contains the\ndependencies of libcamera itself. The correct dependency for users of\nlibcamera is libcamera_dep.\n\nFixing this allows dropping libcamera_includes from the list of includes\nrequired by v4l2-compat, and libcamera from the link_with list, as they\nare already contained in libcamera_dep. We however need to add an\nexplicit dependency on libdl which was previously provided by\nlibcamera_deps.\n\nSigned-off-by: Laurent Pinchart \n---\n src/v4l2/meson.build | 16 +++++++++-------\n 1 file changed, 9 insertions(+), 7 deletions(-)","diff":"diff --git a/src/v4l2/meson.build b/src/v4l2/meson.build\nindex 14ee3594747d..91f4170da852 100644\n--- a/src/v4l2/meson.build\n+++ b/src/v4l2/meson.build\n@@ -5,11 +5,6 @@ v4l2_compat_sources = files([\n 'v4l2_compat_manager.cpp',\n ])\n \n-v4l2_compat_includes = [\n- libcamera_includes,\n- libcamera_internal_includes,\n-]\n-\n v4l2_compat_cpp_args = [\n # Meson enables large file support unconditionally, which redirect file\n # operations to 64-bit versions. This results in some symbols being\n@@ -21,11 +16,18 @@ v4l2_compat_cpp_args = [\n '-fvisibility=hidden',\n ]\n \n+v4l2_compat_deps = [\n+ cc.find_library('dl'),\n+]\n+\n+v4l2_compat_includes = [\n+ libcamera_internal_includes,\n+]\n+\n v4l2_compat = shared_library('v4l2-compat',\n v4l2_compat_sources,\n name_prefix : '',\n install : true,\n- link_with : libcamera,\n include_directories : v4l2_compat_includes,\n- dependencies : libcamera_deps,\n+ dependencies : [ libcamera_dep, v4l2_compat_deps ],\n cpp_args : v4l2_compat_cpp_args)\n","prefixes":["libcamera-devel","v3","6/7"]}