From patchwork Thu Jan 9 16:21:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 182795 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp3211490ile; Sun, 12 Jan 2020 09:55:28 -0800 (PST) X-Google-Smtp-Source: APXvYqxelPoogChy49Litovt1g51YgZCh/1w9i1aeyhZqP/KX72MaBYBrj5sX4BVEE8pETfLkjEN X-Received: by 2002:a63:590e:: with SMTP id n14mr16288415pgb.10.1578845856951; Sun, 12 Jan 2020 08:17:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1578845856; cv=none; d=google.com; s=arc-20160816; b=IgBzOyqO2AIOuS+sebYKzRW1Ef9ZFEOtGjKbp+drX6V7r0R9SrOAZLa+OM51o+UdUA dLo7xujmNBZHMOOvGnEuKM6DnkVcUXUIB3k6+fM85rqYSEKZQcKDiIIRLO8fCZ6dfwcS RKO54hNuJXUgmObCcmdLsD3ItjUx9I3vrMTjKWb6JwPKcIOJkDuWWVGSsHTfDuB9g+U1 Lc+AEE6/zV9Vjo8XdhzpgaHrzgrq4i2BGwAambYsxzxeQ2l8yCU+ZHD56duGZL8HIWap dHpj9soeh1EgB27cuU6kfp29Yo2thZVwr8Wxzh+4aBdf0DCoe+WfD6gV+s98Mnqv0I70 miiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=VxUGtDOfylSS51R0poSjDmhgxr6QVnsVVbtOYUiIrTI=; b=HSmnEMfQ042WW0VN4/xDQk1Td1uyINNC4ilR5PQsfT/c2kCMuGjPYHHIqxtErtEWVd o+8u7wgQjgmjFvgXAtpNElJWPPDojlHSSY0pdPAila/6ct3rqP8gQvmf+c2MU6rUZQiJ 87ip6rgFqEY7J+KI8552KPY4AQ1TYxkWqocPYjHt/bIYcZuqSscr1c6p+Xds7SABGAG9 xn3tU+Z+MnTrrXQgHdkmO5jHlhMJZe2FYw39cvTQMalo+oPUybQy2diDDCEQ80Kgjhgq EXFKNcnmB02CsKp8/5Yqg6Fjv7uf642zS5oeoirZcqWJQZdUo50TM2RlOPT+gkJAwHTI upSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=V9sqk7PO; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id m190si9169750pgm.511.2020.01.12.08.17.36 for ; Sun, 12 Jan 2020 08:17:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=V9sqk7PO; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id EB5F27FF0D; Thu, 9 Jan 2020 16:22:10 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mail.openembedded.org (Postfix) with ESMTP id DAC8D7FED4 for ; Thu, 9 Jan 2020 16:21:49 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id d16so7987726wre.10 for ; Thu, 09 Jan 2020 08:21:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=kSIcW1wlDT0WNGr9LHOACNjsr+SlDe0Gkja5VxXh8IQ=; b=V9sqk7POlmSkShEla43X9aOBG6hNiLa8KKf0vLZLj891Qxv3IbWqa6Kv8Z/nl2qLZ9 BD1mX8/R2ahAPf2T/mVrZdd5P73MnNURyHUKkxDm8oHO0EL05BbttyDi8Q/i1xeL6mAE T3V5WAPxotAI3FLqX5jR281pjfMRxdO1kmQS9AXZFcJdjV50zekS4qaGtluwvNuMch3z cxi219hFZaNSyD//sj+FVLO4+Br7DlZY+vbi6AK98ImMpnAaObWBSG/WUqjMN7XkHvXb M1tYMT/oTtDrjE7rB+09Q85tm/rjy788ZMAQ7IyB7Hv3ramReOZPltMXww6wd0xyCnFG VieQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kSIcW1wlDT0WNGr9LHOACNjsr+SlDe0Gkja5VxXh8IQ=; b=PIEeAdG+1PWJfnv98CyVdv9Ka823VBSaWbwyhbDD04YuC/FGaEG5il0WmzKZrU9wZn GAbVBsSOPEjtT4lndV9maqx7FcqFF/Bjc2BMpOfQbiAI2CbfMEGVBT5CGZ/fre5pY/1a uNIQ/2MvIX8UixhG3EycigEkacNiUG2iEFCViucfWwfhzbEv+hfsreY9tXAVJmoUf7C9 rBiBIqyKw454D5GmCFMTGwRY144M3nT4bMf771/sDCZtT5Uo+nJhlCYwLUtv0NRyBVuD 3avEn1KL3mlD2jaCBXvdCmNRhz6Xx9dqZRda8BGwmRaSbgoGwaAa95CoARLAsZM57O0K cv4A== X-Gm-Message-State: APjAAAWVK+F4z8O72XYWRtfmia2WvVS6X1szmsaDyv6hhFY4PKe4B80A peSiaCS7g66H1SVq2uxnKHID8ueRMGA= X-Received: by 2002:adf:ed83:: with SMTP id c3mr11419896wro.51.1578586910416; Thu, 09 Jan 2020 08:21:50 -0800 (PST) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id d14sm8655010wru.9.2020.01.09.08.21.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 08:21:49 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Date: Thu, 9 Jan 2020 16:21:40 +0000 Message-Id: <20200109162141.20579-3-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200109162141.20579-1-ross.burton@intel.com> References: <20200109162141.20579-1-ross.burton@intel.com> MIME-Version: 1.0 Subject: [oe] [PATCH 3/4] opencv: PACKAGECONFIG for G-API, use system ADE X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org The Graph API is enabled by default, and if ADE isn't present it will download a copy of the source during do_configure. Add a PACKAGECONFIG for the Graph API, and depend on the ADE that we package. Signed-off-by: Ross Burton --- meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.20.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb index 487393f388..03e4f58dca 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb @@ -93,10 +93,11 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ " EXTRA_OECMAKE_append_x86 = " -DX86=ON" -PACKAGECONFIG ??= "python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ +PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libav", "", d)}" +PACKAGECONFIG[gapi] = "-DWITH_ADE=ON -Dade_DIR=${STAGING_LIBDIR},-DWITH_ADE=OFF,ade" PACKAGECONFIG[amdblas] = "-DWITH_OPENCLAMDBLAS=ON,-DWITH_OPENCLAMDBLAS=OFF,libclamdblas," PACKAGECONFIG[amdfft] = "-DWITH_OPENCLAMDFFT=ON,-DWITH_OPENCLAMDFFT=OFF,libclamdfft," PACKAGECONFIG[dnn] = "-DBUILD_opencv_dnn=ON -DPROTOBUF_UPDATE_FILES=ON -DBUILD_PROTOBUF=OFF,-DBUILD_opencv_dnn=OFF,protobuf protobuf-native,"