From patchwork Thu Jan 9 16:21:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 182761 Delivered-To: patch@linaro.org Received: by 2002:ac9:44c4:0:0:0:0:0 with SMTP id t4csp3329835och; Sun, 12 Jan 2020 08:19:25 -0800 (PST) X-Google-Smtp-Source: APXvYqzYwjtIalTvIMWyDURNoJjc/ZJYpNWfqWst7BHd2eTT0uKqgvwBE75c0vuZbNV+3QBj7HTJ X-Received: by 2002:a63:a43:: with SMTP id z3mr16644840pgk.232.1578845856978; 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=w3gY9xPg4tF3g254tVMq3SUuKJMvgm/kLucFp4+2B4m5kU35t3M9tLxhCr6xX0QWHc AqG4c5TUCkl4rBB5RB+ZiLec5dqsm6M131+vGBENoWNyE+TjcQxdP6Gbn4KbDYl3OIiX y9pgC4oiDk5EBG48NZcHsqB655MIhW4QiIX8lzr7H96LAN2FoLb+lDB8BHQn7Hw1DKtw WGCUEINZa49IyBvrpy5biw3Ie7FPXMt/+AbGcXNC+/PI083ABU70oMHwHjVEM27z6OKP qQJjniW77yc+tZCN4PVmQn6bCaSV/8C+ufgEgb5Rg/PLyJrJue79y9hJbD8VdVn3EX+I Lk+Q== 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:message-id:date:to:from:dkim-signature:delivered-to; bh=n67iuNMfl34GTYmlVUWb9A2OAwgLh73g20eLcv+iiKE=; b=XkhlOJgZa0uP8PRPlFXVxeDt6PFqciYV5hTHHKG+sbN0aa7WK2oeN64xgX/IHnfWed XKrVZMr2bTGTgrqDd2NZO65GE2p2S9fmpROsUpWei5aZqb80U+2DFvtcI9xjedgvAHFf H1+IapoJVKSf2xcga7groWFUvjqrXhOzp24Vo8uEhod2MMrr3Ub7l/NKjj3+6HAsSuYs yDydK7hR8Y2RUh6tY1Sxnn2mLzAlGAWsIPNJTJ1YXygSXvtcpRG7+DZRXXfMC2qsLXkU fwDCS7d54P/v/0EtRlUd/WMVDK88Bv9myVpo/HYmD8my1w8kS6OuDcda4oP14/x25c/u E71A== 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=PDx7vWMz; 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 x190si9380553pfd.228.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=PDx7vWMz; 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 5CE017FEF9; Thu, 9 Jan 2020 16:21:50 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mail.openembedded.org (Postfix) with ESMTP id 407447FE07 for ; Thu, 9 Jan 2020 16:21:48 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id y11so8034768wrt.6 for ; Thu, 09 Jan 2020 08:21:49 -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:mime-version :content-transfer-encoding; bh=Z8j3pEzUjWAIMG4BjPYjuVC247I05KtSNrA8sltuMDQ=; b=PDx7vWMztCKUvooD3/mj5Btlp5qVVsJ0pZho+jdwk9H8Ypj9qyDR1P2UBWhhEhcChs n5Ve2dif3c6xRm1qj5Xl+uMnkceKOnBcosuesNCz9SZlNc1qoBVmbVAi2JtSuqw64TJr 2jBwFUKpMvXrL9x+AZz8k1efeaATQaknSbUO3A/AJSieAjH4SbiOeyAxQN94f09OqtX6 JSScGVkdH9xqSau+iFN7ci0neQUTBYzBkB3b06oyqENRZy3sOcyEE+BC2J34Ff4G0JPD vU5zPHNnn+5Q4HckAaOXCC27VOL34/HCFd7ee/qxNBPo2jycHDHVjvfMzGd+GUl3ErHP N6LA== 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:mime-version :content-transfer-encoding; bh=Z8j3pEzUjWAIMG4BjPYjuVC247I05KtSNrA8sltuMDQ=; b=tLybvga1F4cOqWMAL733WosEQq2OhFvUQwSAjU+2O+DQX7cktNjEQbBJRlbxdIV0Kv EZ9A0zFlVzBkClyLS+f3RycQHxUFJMCPjpXrHMsdllf6jWVtj/9ozJsJ3Srvys7GXkTY f8y8jyhTVwYexoZaV+vNYUn8mkIUMWeQDUGaMn4OR+twlGYO54gq5NAXMaTaWvXY5FIZ PKMB5dxtWXOl5M41SedJezQclRNrVs2rH31HUuE9mVqReGHOWzZY+NOMH2gEp18YSmu6 zLjC4/hsJXsdP0wdoLwPFIel2qfeTvyFRFjd2oOksl3TfB5rhu9EUq6EMj2zr1z8olVf P15w== X-Gm-Message-State: APjAAAXZbXTA8DEbbvy+PYWREtyk7+gOUT9kAGkrbH1hwOl3BHUgFBNA zGUgaa38QUu7sALdJTUv0yNaK70cCKw= X-Received: by 2002:a5d:410e:: with SMTP id l14mr11411406wrp.238.1578586908467; Thu, 09 Jan 2020 08:21:48 -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.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 08:21:47 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Date: Thu, 9 Jan 2020 16:21:38 +0000 Message-Id: <20200109162141.20579-1-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [oe] [PATCH 1/4] opencv: don't download during configure 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 OpenCV downloads data files during the CMake configure phase, which is bad because fetching should only happen in do_fetch (and if proxies are needed, won't be set in do_configure). The recipe attempts to solve this already by having the repositories in SRC_URI and moving the files to the correct place before do_configure(). However they are written to ${B} which is then wiped in do_configure so they're not used. The OpenCV download logic has a download cache with specially formatted filenames, so take the downloaded files and populate the cache. Signed-off-by: Ross Burton --- .../recipes-support/opencv/opencv_4.1.0.bb | 23 +++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) -- 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 5e89db0977..cfc7854e1d 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb @@ -51,10 +51,28 @@ PV = "4.1.0" S = "${WORKDIR}/git" +# OpenCV wants to download more files during configure. We download these in +# do_fetch and construct a source cache in the format it expects +OPENCV_DLDIR = "${WORKDIR}/downloads" + do_unpack_extra() { tar xzf ${WORKDIR}/ipp/ippicv/${IPP_FILENAME} -C ${WORKDIR} - cp ${WORKDIR}/vgg/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src - cp ${WORKDIR}/boostdesc/*.i ${WORKDIR}/contrib/modules/xfeatures2d/src + + md5() { + # Return the MD5 of $1 + echo $(md5sum $1 | cut -d' ' -f1) + } + cache() { + TAG=$1 + shift + mkdir --parents ${OPENCV_DLDIR}/$TAG + for F in $*; do + DEST=${OPENCV_DLDIR}/$TAG/$(md5 $F)-$(basename $F) + test -e $DEST || ln -s $F $DEST + done + } + cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i + cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i } addtask unpack_extra after do_unpack before do_patch @@ -65,6 +83,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ -DOPENCV_ICV_HASH=${IPP_MD5} \ -DIPPROOT=${WORKDIR}/ippicv_lnx \ -DOPENCV_GENERATE_PKGCONFIG=ON \ + -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \ From patchwork Thu Jan 9 16:21:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 182760 Delivered-To: patch@linaro.org Received: by 2002:ac9:44c4:0:0:0:0:0 with SMTP id t4csp3329730och; Sun, 12 Jan 2020 08:19:19 -0800 (PST) X-Google-Smtp-Source: APXvYqx4lhLIhKmwBQR1YdR2M/LLm+4z6JCHxdSAvuH11IVQmwU0ciakf4mn7H1Bw04v5nNx7+0e X-Received: by 2002:a65:538b:: with SMTP id x11mr16242362pgq.395.1578845856664; 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=ffMj1PQxwHmPtIsFOCNQToO13GnCcoSNSjBAtrEIunMUOrE79Xo6YTNlSPYpPCaY3s xo9D8Spz2bkYhXgkc8jf9pFR2Bm5/WrBBue0zHK3yYunTnFyjZnkXjcc6BV91rdJXoEE Z09QMAlIKLayF6P86y0C0xqdd/LXfnS/F40KJN2dEWuG5kl9Rs8cwA3rtV/R9fdX5v6D 8De8+2og7V8pYIHmV57/fk59yKUscrmxuOzq0x31Yh8/8pdy70tKpt7yDycz5ODRd2eA xosK0t8+ipRpHkyQtK63u3ountfaxWbI76qzg26P5RphCtB3oaIDKB4EZyNSg1HR5i8x Utxg== 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=UYbNQ1svXI7+uzXP6oMQ7sJJN85pG3e3rkqMo0bDdn4=; b=R94hKdP49euVdxvfBgXh13vC3pHAOt26FddK8S7v6ILxEiuA3anFAG1tzZT+oCuWGf tN5anDuC1p7J2GPiwGAHkXbf5NRAHyq5PGuxI+iWzfiTNorMmvEm4rioHQPEMBFPIh8Z uiLWQVJfF6tXkKyeSOOz8RdpxXrdLDkcIXOZLluM/r3ryWgU1mZsm4KSXv6v6YuSqZmj +POmQwR9j07+QwjV2jhGNb0KaQJzB6kFzIFfoTXA45j82FI8w7NRdAJurMYqAT6/HZNi M6CYzRSF2zEc9/Pxnx3E5JgyYTdNboSNTQbY74RYVT7rVyyuC6UgP0YKB4ACXAxwi9mY jSUw== 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="oX/+rnWN"; 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 a16si8999898pfl.19.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="oX/+rnWN"; 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 C0AB17FF05; Thu, 9 Jan 2020 16:22:09 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by mail.openembedded.org (Postfix) with ESMTP id 00F467FE07 for ; Thu, 9 Jan 2020 16:21:48 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id p9so3597563wmc.2 for ; Thu, 09 Jan 2020 08:21:50 -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=NSoc31leigEkunqVbYrgzdBp+s1gwduDKKhWtOgmBd0=; b=oX/+rnWNX8lWLZK2DpV5f/w79OSzdcOhWVP6bBfuDsp72lt/GTsUSGaqM4xSjD2Tyl LJh1Q/jcHGhocZW2GW1zan98oVZ5vFuL4Mw/m+pzYoWG2+hEWwP8jAgH5cngUOPRXPHW /JN9JnW7g10Nq7u3jPlpg53cERBejoLxgfGe2Li6KtjO5HdRIAEHrJ8Ivg6YIIxdZOZB c3Ljc6tYHNiAsgNP+itO8Qw4ZAlHiOqrhBBG8WrUo+5z2RiRUdP8ARsGXwA8wA7uvZp4 zNuCG3Ofn6b5j69WJrwRuf10gv466HeMJ1bGeGqOq2VN2TN4tnugY9P+ilxSKL6ycpe5 lpwQ== 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=NSoc31leigEkunqVbYrgzdBp+s1gwduDKKhWtOgmBd0=; b=V9C8m1bmpUGTIuRdPMQFdso3mNrqezEtFF4kAETTxTlxDI9VN+tS895eJ/5wBZXNco 8AkZAkvE4YeCTTpNFfja5vdJ7RDWjw+F8LH7RCoqU9Ak34f7GbgE3F7sMrTN6duzNjxF BX4ORLFGrSQBaaxEWSdEbAmZ3e9eSulNNZ0bDwAo7Cy7dJbAjp79dPySxI2/Vl9EuFbJ 55RvruAWh/rzT/ESbPsg3Iw/V5+dYGkRjw5awuiyJrzbEkQaj9g1IPOLmo3I6rsagELV 1elYZlKG8owqOLQIj3qgqOnPU+zzUOD7/8WQuuRrh3x6haZ2X9C0xSf18wh5d9AJwsox UY5Q== X-Gm-Message-State: APjAAAVPw42Pj/Qpqrx6z2Gk2ju2LLJLU6/F7PX/eE8TP5DS2l84KhcX 31XQMV+2K7NgXbjl56i73tuiNgO2pok= X-Received: by 2002:a7b:cfc2:: with SMTP id f2mr5820063wmm.44.1578586909450; Thu, 09 Jan 2020 08:21:49 -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.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 08:21:48 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Date: Thu, 9 Jan 2020 16:21:39 +0000 Message-Id: <20200109162141.20579-2-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 2/4] opencv: also download face alignment data in do_fetch() 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 face alignment data is downloaded in do_configure, so download it in do_fetch and add it to the cache. Signed-off-by: Ross Burton --- meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 3 +++ 1 file changed, 3 insertions(+) -- 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 cfc7854e1d..487393f388 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb @@ -15,6 +15,7 @@ SRCREV_contrib = "2c32791a9c500343568a21ea34bf2daeac2adae7" SRCREV_ipp = "32e315a5b106a7b89dbed51c28f8120a48b368b4" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" +SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" def ipp_filename(d): import re @@ -41,6 +42,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ git://github.com/opencv/opencv_3rdparty.git;branch=ippicv/master_20180723;destsuffix=ipp;name=ipp \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=boostdesc;name=boostdesc \ git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=vgg;name=vgg \ + git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=face;name=face \ file://0001-3rdparty-ippicv-Use-pre-downloaded-ipp.patch \ file://0002-Make-opencv-ts-create-share-library-intead-of-static.patch \ file://0003-To-fix-errors-as-following.patch \ @@ -73,6 +75,7 @@ do_unpack_extra() { } cache xfeatures2d/boostdesc ${WORKDIR}/boostdesc/*.i cache xfeatures2d/vgg ${WORKDIR}/vgg/*.i + cache data ${WORKDIR}/face/*.dat } addtask unpack_extra after do_unpack before do_patch 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," From patchwork Thu Jan 9 16:21:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 182762 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp3139862ile; Sun, 12 Jan 2020 08:25:17 -0800 (PST) X-Google-Smtp-Source: APXvYqxoifdZYJ37G8PDtsaAmoSJVm6UY+hFmDA4o7lMMTfhfGLDZ202XthoqAzPRP0uk7Ryx6Xa X-Received: by 2002:a17:902:9a08:: with SMTP id v8mr10190247plp.134.1578845856942; 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=KgmAk5XzRCVCO0nBjQO5maqPs5i/ytobw1sUvGaBBSCGc66zJs1tWt6A2UQc1AzqpG ul6r8vEx7zC1/oASkGCDfSbeO/c1oykpUj7yvqHNWLrzKTFpKgI/wdXIXdG1kYIWqKQt 08Ske0KuQHN9ju8tLR5+7ZS7iBV4WMqR5VVFQpFiWbcJwqX9fanQCgBpKkUp3qenZPXd u3WWpNkCz6dqmZh8M49HSMd6XI+59YGkI8OLOSfdgszCnEPD8gOFN5Z3cNXkdAtPggj2 p/4S6ij3KfgjAzRh67oDLTLnt77fcybOOQbBGJei1WmTHZ5NHewcph8ode53S2kLPhOp HAog== 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=3WVGgZbjjeclL+ZtX2IdNv3xgQlFEPmdhTytokkCXm4=; b=WNoc0L5usZV0hrkCE/I1e6mejkxpVpfV05KK+LGWVN4PhK6humVRbR7ku2yv11EY8e NXfRsfPTujs8LTyQYFh75npF69C9pOWd/DxAAZglfCwZnDPnHs3HEj1+fxEYLxLhyZuJ Yh+w0JxGjQq+gae1cXu6J+7oowW4M5wJqi+8NRcMiqEI5LIxnXlUjb7RpxUGDXRNULl8 jOFIDYvGEgd0flHAm1uYap+Z9Ie9NVnBtZIRINV9UB2eYWh62XCCVIybXiYYhOBqmtD6 JgdoX/J0xlmrtRMGNpd11MJ1oEu0dSWt6RfC+M30QMSyhmLuictjrkTQTgIZ/u3cbTze B8KQ== 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=1cZ1R0lJ; 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 a12si9220183pju.81.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=1cZ1R0lJ; 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 1A1107FF18; Thu, 9 Jan 2020 16:22:12 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mail.openembedded.org (Postfix) with ESMTP id BB9667FE07 for ; Thu, 9 Jan 2020 16:21:50 +0000 (UTC) Received: by mail-wr1-f50.google.com with SMTP id z3so8055613wru.3 for ; Thu, 09 Jan 2020 08:21:52 -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=F2U/ijBONX50ajLu2z07GmLerwICgnvB/LdOOfeL/c4=; b=1cZ1R0lJk53E9E31gvWnYY6RgDx6QK+Ays4tcfCILcTAaEbiuwYxVOzMHG5mzl1ANc BE1Gc4ngsLqmP5g1nRfZmyAG2Sh31Zu7/ID9lVyf4UYfYHOh0c2T3GL9iO56Rl6R32J/ aWd1g+Zt2RInQ/ph7yoJOhgMTthfSTo7N1QlJQEShw2iUQ/MGNEEjKKvgx5R/pj9CYz5 v4Vtfb6tJXRKmT54bdZuVfqbKMqeIGtBZ3z4naWfsnEeZ1HjCT0h+4tF+HIISwunL+Wz HjxksM4/JZhrrEkVPyyI+O85hTBw/2p+hBW9YCXlqydhgyJfZohPghQ+X1vfYbh5oPjD 6kOg== 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=F2U/ijBONX50ajLu2z07GmLerwICgnvB/LdOOfeL/c4=; b=Xu82y/DtP6hvwmgIqicIoX79xGOK4wd9Mjfrv/p5yqyWXqymsf+JAIiRqbYLqvxziZ 3gk3JBGYvTnt0WYD7VEkfzcJGiDwh08l9i8ZYVt4s4HkJlsdaccGDlQPKwAxx2D5njxP ZSxrWfK4HUeoqZ3ForXOVyeeZodz2EkDsCRjHKwSpQzRk6fwhxRtG65AQ227IyTicvzN ZEbi3Qxc8pGgGjzFdT2SstsOoLxLIY/UIV3Y1+CxJnuvxyVE2UaFmX/oW2wCRVwTqNfn e1/nx+LtCIKtfvG1ukjaHpyaoOjTTBgbQ1qa4BG50EazjjgjovjAX15pb8+hGWqWFIf+ sKcw== X-Gm-Message-State: APjAAAXzGJZAzirXOuyZzLX42uiCNkZ3bR+dFfILbUOYF2nSX2SvRwvL /x2FmFL5sEiej/XXUJBfqJIpk/hPaEA= X-Received: by 2002:adf:f3cc:: with SMTP id g12mr11862121wrp.236.1578586911198; Thu, 09 Jan 2020 08:21:51 -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.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2020 08:21:50 -0800 (PST) From: Ross Burton To: openembedded-devel@lists.openembedded.org Date: Thu, 9 Jan 2020 16:21:41 +0000 Message-Id: <20200109162141.20579-4-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 4/4] opencv: abort configure if we need to download 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 OpenCV's habit of downloading files during do_configure is bad form (as it becomes impossible to do offline builds), so add an option to error out if a download would be needed. Signed-off-by: Ross Burton --- meta-oe/recipes-support/opencv/opencv_4.1.0.bb | 2 ++ 1 file changed, 2 insertions(+) -- 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 03e4f58dca..f679ccb05f 100644 --- a/meta-oe/recipes-support/opencv/opencv_4.1.0.bb +++ b/meta-oe/recipes-support/opencv/opencv_4.1.0.bb @@ -48,6 +48,7 @@ SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \ file://0003-To-fix-errors-as-following.patch \ file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ file://0001-Dont-use-isystem.patch \ + file://download.patch \ " PV = "4.1.0" @@ -87,6 +88,7 @@ EXTRA_OECMAKE = "-DOPENCV_EXTRA_MODULES_PATH=${WORKDIR}/contrib/modules \ -DIPPROOT=${WORKDIR}/ippicv_lnx \ -DOPENCV_GENERATE_PKGCONFIG=ON \ -DOPENCV_DOWNLOAD_PATH=${OPENCV_DLDIR} \ + -DOPENCV_ALLOW_DOWNLOADS=OFF \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse3", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.1", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1", "", d)} \ ${@bb.utils.contains("TARGET_CC_ARCH", "-msse4.2", "-DENABLE_SSE=1 -DENABLE_SSE2=1 -DENABLE_SSE3=1 -DENABLE_SSSE3=1 -DENABLE_SSE41=1 -DENABLE_SSE42=1", "", d)} \