From patchwork Sat Aug 22 22:04:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1349754 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.138; helo=whitealder.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=WMu3BM33; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BYsqc5bySz9sPB for ; Sun, 23 Aug 2020 08:04:28 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id E2F05877DD; Sat, 22 Aug 2020 22:04:25 +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 e-BV4lwW6oTB; Sat, 22 Aug 2020 22:04:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id BECBB877EA; Sat, 22 Aug 2020 22:04:24 +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 DF0AF1BF42C for ; Sat, 22 Aug 2020 22:04:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D4E88877EA for ; Sat, 22 Aug 2020 22:04:23 +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 f8VnL0svbbZK for ; Sat, 22 Aug 2020 22:04:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by whitealder.osuosl.org (Postfix) with ESMTPS id 27289877DD for ; Sat, 22 Aug 2020 22:04:22 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id a65so1409228wme.5 for ; Sat, 22 Aug 2020 15:04: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=cAriQAMqTpGWvP+0hwC6xsu41Z60UC1xJzBxqAgQIZw=; b=WMu3BM338FybQ7KzKrPRJRmC/BMxT6OoSrmsvkvNY6HHCu+WYGtkeYXVOp+q8l1ALU orMMpXhRUWomY2LlXkFyaHt+FmNrpTdiO9wB8+ds5CEv05afPwoReLliZMt0T9yN+Ssb uYv5KaGMzHX4Uaw13l0ZeUJvuMTqvYj5n3T+NnW0cIiFambFnMG8kgbJ/4mXr1TCJfkD 4XdHNJZBALCAc3HSo0lbmxwl9fFrlTCQfsiiSutCQHrWU9Kc/ryev/BuRS2lYFjXgLad aD1n9vynV2IFffPxD4e8mDMQfja0uYSO1sbt957TI5FenaRIGsuQ19WVhHVh6xoX5P0p 0lGg== 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=cAriQAMqTpGWvP+0hwC6xsu41Z60UC1xJzBxqAgQIZw=; b=hZTryiXwr+Q4RVtyTMEc5ruBSa8h/VyIL0MmdBn2j5PKhFGXvGHJlkoZeUmsOPsXBW HeProgsnMgdCX9hEMjy1ph4xzm7t60Ro/LzSKSmk7SInfLM14XLcsP1ieB9AIlqeRk8t dWT+8J4jpQEP2h/UrvuaM0aUX1T4ZGRNtX8evDJQxOlnkybJOVHsMKaHKQOJOV1ortgU wUfrLfL8SIOJ9DdBs87+KAsAw9Z50gkbaJJ8p/fBFHUf6s0zzpl+t5COT6DGqM9LrGqz s38yW8BhOjEOLIYbXoZLgKGOPQuwAqtDAMxOVCnyb2rWFXEXse/tEG4+N6zhIOr7NNN7 SuSQ== X-Gm-Message-State: AOAM530nFxoZMm4JS/QuHSgETDdgyZfaZm5bRxlYBRxdB1vcGHyrtKvR 84u7K6eUlib2LQEnOILzbEkD0V5Uqi8= X-Google-Smtp-Source: ABdhPJw81KOi9txfdWDN+1E4cQeO+ILyKnzmI+qnZQ7rLFPD4QJTGN4y/Gf31pZPxxUoQSdo4m6lqw== X-Received: by 2002:a1c:964b:: with SMTP id y72mr118161wmd.69.1598133860194; Sat, 22 Aug 2020 15:04:20 -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 c4sm13183698wrt.41.2020.08.22.15.04.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Aug 2020 15:04:19 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 23 Aug 2020 00:04:11 +0200 Message-Id: <20200822220411.2823899-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 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 since https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/commit/22c6a4085f8792d8af0cdabfe1664d55ca2dee11 Fixes: - http://autobuild.buildroot.org/results/19605057c4956d97e9e65068680485db637282db Signed-off-by: Fabrice Fontaine --- ...s-gst-opencv-meson.build-fix-disable.patch | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 package/gstreamer1/gst1-plugins-bad/0002-gst-libs-gst-opencv-meson.build-fix-disable.patch diff --git a/package/gstreamer1/gst1-plugins-bad/0002-gst-libs-gst-opencv-meson.build-fix-disable.patch b/package/gstreamer1/gst1-plugins-bad/0002-gst-libs-gst-opencv-meson.build-fix-disable.patch new file mode 100644 index 0000000000..c5227077cb --- /dev/null +++ b/package/gstreamer1/gst1-plugins-bad/0002-gst-libs-gst-opencv-meson.build-fix-disable.patch @@ -0,0 +1,73 @@ +From 507594ab8f21d6217446bb52c29a602318602246 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 22 Aug 2020 23:33:48 +0200 +Subject: [PATCH] gst-libs/gst/opencv/meson.build: fix disable + +opencv can't be disabled since commit +22c6a4085f8792d8af0cdabfe1664d55ca2dee11 + +Signed-off-by: Fabrice Fontaine +[Upstream status: +https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1533] +--- + gst-libs/gst/opencv/meson.build | 56 +++++++++++++++++---------------- + 1 file changed, 29 insertions(+), 27 deletions(-) + +diff --git a/gst-libs/gst/opencv/meson.build b/gst-libs/gst/opencv/meson.build +index 6cc4602f3..716ceaabf 100644 +--- a/gst-libs/gst/opencv/meson.build ++++ b/gst-libs/gst/opencv/meson.build +@@ -9,27 +9,29 @@ opencv_headers = [ + 'gstopencvvideofilter.h', + ] + +-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() ++ 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() +- gstopencv = library('gstopencv-' + api_version, +- opencv_sources, +- c_args : gst_plugins_bad_args + ['-DBUILDING_GST_OPENCV'], +- include_directories : [configinc, libsinc], +- version : libversion, +- soversion : soversion, +- darwin_versions : osxversion, +- install : true, +- dependencies : [gstbase_dep, gstvideo_dep, opencv_dep], +- ) ++ gstopencv = library('gstopencv-' + api_version, ++ opencv_sources, ++ c_args : gst_plugins_bad_args + ['-DBUILDING_GST_OPENCV'], ++ include_directories : [configinc, libsinc], ++ version : libversion, ++ soversion : soversion, ++ darwin_versions : osxversion, ++ install : true, ++ dependencies : [gstbase_dep, gstvideo_dep, opencv_dep], ++ ) + +- gstopencv_dep = declare_dependency(link_with: gstopencv, +- include_directories : [libsinc], +- dependencies : [gstvideo_dep, opencv_dep]) ++ gstopencv_dep = declare_dependency(link_with: gstopencv, ++ include_directories : [libsinc], ++ dependencies : [gstvideo_dep, opencv_dep]) + +- install_headers(opencv_headers, subdir : 'gstreamer-1.0/gst/opencv') +-elif get_option('opencv').enabled() +- error('OpenCV support enabled but required dependencies were not found.') ++ install_headers(opencv_headers, subdir : 'gstreamer-1.0/gst/opencv') ++ elif get_option('opencv').enabled() ++ error('OpenCV support enabled but required dependencies were not found.') ++ endif + endif +-- +2.28.0 +