From patchwork Fri Oct 16 21:45:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1383543 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ourFDH1V; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CCfq66rFcz9sTm for ; Sat, 17 Oct 2020 08:46:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 5802C2E8B3; Fri, 16 Oct 2020 21:46:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8ebhqN6r2IQv; Fri, 16 Oct 2020 21:46:03 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 7D81F2E8B4; Fri, 16 Oct 2020 21:46:03 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 11B6B1BF3C1 for ; Fri, 16 Oct 2020 21:46:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0DD0588EBE for ; Fri, 16 Oct 2020 21:46:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id spmpsDzbdHe3 for ; Fri, 16 Oct 2020 21:46:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) by whitealder.osuosl.org (Postfix) with ESMTPS id 6803788EBD for ; Fri, 16 Oct 2020 21:46:00 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id s9so4618877wro.8 for ; Fri, 16 Oct 2020 14:46:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bzeHD0gP+azPePe67e38hArOTpE+gsLDVpSj+z0v+nE=; b=ourFDH1VYR/X1kE77yPdOjL1w4eXLX/OTXs6DcP7gBP4bkpkIEO5tgi0+Z32a/6gK7 ATheP8aOkHuEtSVxdxqDc123WLA2azP+H4NgoMEOkaDwxG2FwkGGmpYIA+LiF02veDvm JKOa6k6bhpn2jTEUtCQ8cCxbbVhDUjq1tFEt0u7KfoxtE7xnOxqnnQmRcYT1IaPNLE6Y 80Uky71SKLpO5OB9YiknNvtYmFr66ZdrRl11naUsxzJMfo0rmnPL9jMl9UdStPFWBSUS kBiw1tPbekooeL9kao9UvSIAkQLdLwVKp+mfYQE1d2k2821cAlcKV0NQqTYYvBBqihFY FCog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=bzeHD0gP+azPePe67e38hArOTpE+gsLDVpSj+z0v+nE=; b=TKwCiKE+4xOmPI1W1A/6oU//3Jgfw0HweL6nolQ/ALy2oLOgp4l76j6IYUHqJxy6qk Zh/XW/G1TYQOJbstkACDwXpOjeZjXD/KO4wH6EnhkcIgw12ShxfPGW/PtH5hgaDrAdKP 9ynKN1VHXhqBImB3fywuqLIQddTV4ImUi09k+OR1sYdh28w4NFU56m1Q9+U528rQeMGG 7l0i2Wq7CHwwfqWRYx8pu0meoMbuDt1vAms75vCjWGKLKDrOJTI1c3T70s+OeFU6mAnO RbsuW2kkJkjCYIM30o45zRPpFk3dx0tSdsvLOeKAGrJox7M51Xj6ZrYQu41JxVPEN8iB htpQ== X-Gm-Message-State: AOAM532A1CZ8cFnCvsn5G9yxaGHGVlQ5fO/0YBprF43kGF/0z7Y+YPdj I/uZdu8zwRuRlJYkNBlGIx4zQ2wDNnpigw== X-Google-Smtp-Source: ABdhPJxXiALRRpMteXBiuVKao3+bzPnaZ57T8E9YfVLSBLC5rxeWEsKqdN8yhFVlBelymt/3LnXCfw== X-Received: by 2002:adf:ff86:: with SMTP id j6mr6224598wrr.184.1602884758547; Fri, 16 Oct 2020 14:45:58 -0700 (PDT) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id j7sm5417426wrn.81.2020.10.16.14.45.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Oct 2020 14:45:57 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Fri, 16 Oct 2020 23:45:51 +0200 Message-Id: <20201016214551.2522338-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/zxing-cpp: add opencv3 optional dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Fabrice Fontaine --- package/zxing-cpp/zxing-cpp.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/zxing-cpp/zxing-cpp.mk b/package/zxing-cpp/zxing-cpp.mk index c138c925bb..316afd6ad2 100644 --- a/package/zxing-cpp/zxing-cpp.mk +++ b/package/zxing-cpp/zxing-cpp.mk @@ -16,8 +16,8 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y) ZXING_CPP_DEPENDENCIES += libiconv endif -ifeq ($(BR2_PACKAGE_OPENCV_LIB_HIGHGUI),y) -ZXING_CPP_DEPENDENCIES += opencv +ifeq ($(BR2_PACKAGE_OPENCV_LIB_HIGHGUI)$(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI),y) +ZXING_CPP_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENCV),opencv,opencv3) ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=ON else ZXING_CPP_CONF_OPTS += -DBUILD_OPENCV=OFF