From patchwork Sun Aug 23 09:04:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1349822 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.133; helo=hemlock.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=mbBiIogK; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BZ8Tl1ZTGz9sT6 for ; Sun, 23 Aug 2020 19:04:56 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4596188091; Sun, 23 Aug 2020 09:04:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mY490SB00+wF; Sun, 23 Aug 2020 09:04:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 9B93887FDE; Sun, 23 Aug 2020 09:04:47 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 4764A1BF487 for ; Sun, 23 Aug 2020 09:04:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 3C6EC860C1 for ; Sun, 23 Aug 2020 09:04:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DC1Fqz26n4ox for ; Sun, 23 Aug 2020 09:04:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 4B436860B2 for ; Sun, 23 Aug 2020 09:04:43 +0000 (UTC) Received: by mail-wr1-f45.google.com with SMTP id l2so5741323wrc.7 for ; Sun, 23 Aug 2020 02:04:43 -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=f0QCgq0wmf5nsRTfWFy5EPbXMdlqsqio+xR3ohsp3XQ=; b=mbBiIogKS0uZK2mDnzud++H46OyFTlumCJ3i4RtItTh1ZqHZWF/YXJIh1KKlwD5Ht6 xipiF1Nk5Ahtf2sJuaxcKi3IMueXuZIW3oe9LKc5X2nYaDd1NF/ReOpfOzDl8+RePUJ4 P5MNxMjPZ6JZMijb7VTsIPhAGg7Pg913Nyjf4/d4uIk+F9hlh1X5PkpkrTRLBrFMVEgP PfwAoI4NFxUUMsOMWbPMd7GXhmioVaz/Xgmy3GsFJs/Opv9kxOkmCEgbmt2Dk7+7V5wh /EvWphVLUjAREoxVKrAaLUFu44/fVSuf9xD10P/kLZXhLkx5BMFUyM81JZBjDQ2AWgwk rmBg== 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=f0QCgq0wmf5nsRTfWFy5EPbXMdlqsqio+xR3ohsp3XQ=; b=D8HVARq042fHPD/IcmFYEunhDgCKjfCe723zSJsnfYxsUp+UOnUehL+vckrDt36MZn GFzF2+6QyBl/JumcWK08j1Fz2c7MZqC0sTDtAFI2+qvDXK+jCnqaYmpHEk3s0yL8qUY9 hYa76BXYXTYcKK2R9jUQ4Lpn46Sfg4ddrz7fkIHTecdZFWeo9C8Kz5TiE4KtIAYF00/q OPPINKkhTcTOB+GBV/JwrTFItyS2Php2f3YThsA6N3Wx7av4VmQ1j1tjkN0SPYzCqOSL SUKrnq1QfuknY4HvMjhis6hI+r5R3KO6XRRcJ+OKQ6kmJqQb7n7H2db8LmSHtcwmArmJ Y81g== X-Gm-Message-State: AOAM533KOonLXZYko9itOLj5BzCXsW5GTLMBQkQFHjSCLnb9rfc4PInt xqA9OltufmJi7RZbZ16tcv1Mzxv+TBk= X-Google-Smtp-Source: ABdhPJwesgEtGNza5fW39eHIIOFOO5QInA89KU2C4vBdexqXwYOb4NTIGzDJSUov/pNZ3cKwfFfEWQ== X-Received: by 2002:adf:ba52:: with SMTP id t18mr822119wrg.26.1598173481370; Sun, 23 Aug 2020 02:04:41 -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 x11sm15800899wrl.28.2020.08.23.02.04.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Aug 2020 02:04:40 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 23 Aug 2020 11:04:29 +0200 Message-Id: <20200823090429.2916770-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2, 1/1] package/gstreamer1/gst1-plugins-bad: fix deactivation of opencv 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 , Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Build can fail if opencv3 is built before gst1-plugins-bad because -Dopencv=disabled does not work in meson (i.e. since commit 5d6c408e9535be4b5ba0c8a49215d2d03dcb5cd5) Fixes: - http://autobuild.buildroot.org/results/19605057c4956d97e9e65068680485db637282db Signed-off-by: Fabrice Fontaine --- Changes v1 -> v2: - Update commit log: the issue is there since the switch to meson - Simplify patch ...son-allow-the-user-to-disable-opencv.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 package/gstreamer1/gst1-plugins-bad/0002-meson-allow-the-user-to-disable-opencv.patch diff --git a/package/gstreamer1/gst1-plugins-bad/0002-meson-allow-the-user-to-disable-opencv.patch b/package/gstreamer1/gst1-plugins-bad/0002-meson-allow-the-user-to-disable-opencv.patch new file mode 100644 index 0000000000..02e91e33ed --- /dev/null +++ b/package/gstreamer1/gst1-plugins-bad/0002-meson-allow-the-user-to-disable-opencv.patch @@ -0,0 +1,31 @@ +From 1bc387f8feaab9020be72e88cf26ccc1a67a6a10 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 22 Aug 2020 23:33:48 +0200 +Subject: [PATCH] meson: allow the user to disable opencv + +Allow the user to really disable opencv through meson (i.e. +-Dopencv=disabled). + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1533] +--- + gst-libs/gst/opencv/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gst-libs/gst/opencv/meson.build b/gst-libs/gst/opencv/meson.build +index 6cc4602f3..fb6c46e40 100644 +--- a/gst-libs/gst/opencv/meson.build ++++ b/gst-libs/gst/opencv/meson.build +@@ -13,7 +13,7 @@ opencv_dep = dependency('opencv', version : '>= 3.0.0', required : false) + if not opencv_dep.found() + opencv_dep = dependency('opencv4', version : '>= 4.0.0', required : false) + endif +-if opencv_dep.found() ++if not get_option('opencv').disabled() and opencv_dep.found() + gstopencv = library('gstopencv-' + api_version, + opencv_sources, + c_args : gst_plugins_bad_args + ['-DBUILDING_GST_OPENCV'], +-- +2.28.0 +