From patchwork Tue Mar 10 22:31:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1252461 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=gNl+cEZj; 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 48cVCt6c5Tz9s3x for ; Wed, 11 Mar 2020 09:30:34 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 04DF521532; Tue, 10 Mar 2020 22:30:33 +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 nLux4Kma26Uh; Tue, 10 Mar 2020 22:30:28 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id AF1E02154A; Tue, 10 Mar 2020 22:30:28 +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 984401BF5A7 for ; Tue, 10 Mar 2020 22:30:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9546B884E4 for ; Tue, 10 Mar 2020 22:30:26 +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 Bhj4Bfgv3SXT for ; Tue, 10 Mar 2020 22:30:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id 26BB0869B6 for ; Tue, 10 Mar 2020 22:30:22 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id e26so9555wme.5 for ; Tue, 10 Mar 2020 15:30:22 -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=V/N61cuNU0HeAvg/TCF/tTaNDR5i9YywcXL9MhJiHeM=; b=gNl+cEZjoN3hVhNUTS/tm54Uw9m+tvvfc+0sKRR5mvCio17KoRo8n/M0OOt+5MC4Qy UrQOhUH1cfqWxzmO89FJawb3jPKzSmM5dybeOXvHnmUJrBA5mTKnDtYfSCAolUoXwF17 fcy4FABG9yvt4nJa2KYf+LeSwlboHGDPXVlXnMd5P1wfNlZcMxW8k2SPptmpoCm0UOi2 f42Otmj7KPIouJGjXbhEB4MulMESHPVCsDzSjsBRk79tUm2Z8Lm+O9PtlnH/VfQfB3Lc ZOiG/iV2GA27/qy++4ByZ3500gKnjhVGUfwAYENIb0n+2WbShVlOF3VoNg8BENAzOBk3 IKag== 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=V/N61cuNU0HeAvg/TCF/tTaNDR5i9YywcXL9MhJiHeM=; b=h24SiXHKzdYklKdGB7H2bZBDI0NjEqIsasdbzianEv2BOzUwWEV8mhUCJQghh+ddDw YJ8tS15FXPmNggRNjkl7a/GNLEQIU/bW4GaEArBKhwc1csZ5Osarrl0uO1MRbzJoOGfp yyFkMsKsHrtfH/ANBLIwepSs0pj/9cAFis8fQZGuX19EVLGZX65mej/6XxtaT8YAQrdP uw94fCH6KQ5WMNJjfy5UGFtQaLfsnt264bAE7fIPP64ZZMfeQvueyC2066+Jb0tiqUm2 pkQVndlFv70IqqZgR7r8Mxqs2r8H42uCPljYXkELPFs2IQfu8PKF7JmWCQ+NOyl6hRuz uByQ== X-Gm-Message-State: ANhLgQ15msSQ4aAVjhipqb/V/8gsbB8y8tPnZoUIn2+mdLHj23C+2YEb c8nCNy5SbTntqu7gUVXDxOOcmEKx X-Google-Smtp-Source: ADFU+vsPI7L+wl6gu9MUxE7+dYYtLjCBbQjnqLizM8+73Y1AJYvPcAyMonuJnFgAysaErCKMcicaeA== X-Received: by 2002:a1c:6745:: with SMTP id b66mr4165660wmc.30.1583879420249; Tue, 10 Mar 2020 15:30:20 -0700 (PDT) Received: from kali.home (lfbn-ren-1-502-62.w2-10.abo.wanadoo.fr. [2.10.9.62]) by smtp.gmail.com with ESMTPSA id h20sm48992160wrc.47.2020.03.10.15.30.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Mar 2020 15:30:19 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Tue, 10 Mar 2020 23:31:32 +0100 Message-Id: <20200310223132.668486-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] Revert "package/opencv3: bump to version 4.2.0" 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: Samuel Martin , Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This reverts commit 5e51bb2756ee5063eff9a45a46033a449e2a6195. Indeed, version 4.x is not backward with opencv 3.x, most of the C API has been removed as stated in https://opencv.org/opencv-4-0. Moreover, these issues should also be fixed: - pkg-config file is not installed by default since https://github.com/opencv/opencv/commit/e755a2a6e48ae02dd5136a628cc4148566a08225 - layout of include files and pkg-config file name are different since https://github.com/opencv/opencv/commit/a95673287433fc810eda2d88b94bb234298c4cd5 As a result, ffmpeg fails to build with opencv 4.2.0. Moreover, it should be noted that -DPROTOBUF_UPDATE_FILES=ON should be applied in a separate patch to fix existing build failure with 3.4.9 as stated in https://patchwork.ozlabs.org/patch/1222308 Fixes: - http://autobuild.buildroot.org/results/ef1d09d8b234807dcd993422f9557e5c34506013 Signed-off-by: Fabrice Fontaine --- package/opencv3/opencv3.hash | 4 ++-- package/opencv3/opencv3.mk | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/opencv3/opencv3.hash b/package/opencv3/opencv3.hash index ef95f24ad3..4953d01a1c 100644 --- a/package/opencv3/opencv3.hash +++ b/package/opencv3/opencv3.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 9ccb2192d7e8c03c58fee07051364d94ed7599363f3b0dce1c5e6cc11c1bb0ec opencv3-4.2.0.tar.gz -sha256 c3596f2f886631ac49af2c9a201ca559f850bb5726bdc25eacbe2369a70caad9 LICENSE +sha256 b7ea364de7273cfb3b771a0d9c111b8b8dfb42ff2bcd2d84681902fb8f49892a opencv3-3.4.9.tar.gz +sha256 c3596f2f886631ac49af2c9a201ca559f850bb5726bdc25eacbe2369a70caad9 LICENSE diff --git a/package/opencv3/opencv3.mk b/package/opencv3/opencv3.mk index 300631ce51..d37cd45adf 100644 --- a/package/opencv3/opencv3.mk +++ b/package/opencv3/opencv3.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENCV3_VERSION = 4.2.0 +OPENCV3_VERSION = 3.4.9 OPENCV3_SITE = $(call github,opencv,opencv,$(OPENCV3_VERSION)) OPENCV3_INSTALL_STAGING = YES OPENCV3_LICENSE = BSD-3-Clause @@ -283,10 +283,10 @@ OPENCV3_CONF_OPTS += -DWITH_PNG=OFF endif ifeq ($(BR2_PACKAGE_OPENCV3_WITH_PROTOBUF),y) -OPENCV3_CONF_OPTS += -DWITH_PROTOBUF=ON -DPROTOBUF_UPDATE_FILES=ON +OPENCV3_CONF_OPTS += -DWITH_PROTOBUF=ON OPENCV3_DEPENDENCIES += protobuf else -OPENCV3_CONF_OPTS += -DWITH_PROTOBUF=OFF -DPROTOBUF_UPDATE_FILES=OFF +OPENCV3_CONF_OPTS += -DWITH_PROTOBUF=OFF endif ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT5),y)