From patchwork Sun Jul 5 09:40:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 491296 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 1347B14099F for ; Sun, 5 Jul 2015 19:40:45 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=EvzNcyFk; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 640839501C; Sun, 5 Jul 2015 09:40:44 +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 2h2ivanHQzlg; Sun, 5 Jul 2015 09:40:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 976329500E; Sun, 5 Jul 2015 09:40:43 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id E66FD1C25F1 for ; Sun, 5 Jul 2015 09:40:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E405F32C27 for ; Sun, 5 Jul 2015 09:40:40 +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 L+j-Bdm2q4ur for ; Sun, 5 Jul 2015 09:40:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) by silver.osuosl.org (Postfix) with ESMTPS id 42B3232C24 for ; Sun, 5 Jul 2015 09:40:39 +0000 (UTC) Received: by wgqq4 with SMTP id q4so117725801wgq.1 for ; Sun, 05 Jul 2015 02:40:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0Y9g+LCoFNom6OORBLtu78fLtklOFsNJpgLBCPjR5T4=; b=EvzNcyFkEIV98FwFqoc3kBe2h/Ppl5vZWxgOx14f+78yNcNvKOnlYJ3pBVMqvCkG8P WUOI8IC4j/lhxXB4cRDumUOxN8dQhl5sJ5yhsffOVl6dHp5hVofcdTmpynZcmtkKmaHp vY5CH21fDVWTZj18k9Erf9ZUO4f2Lyz1EAbQaouOqnaMEjyfUvvs6x5FhMs2/lmnMiTY yCtGe2RBUU55jDJVzclaWjus+NMBnNzyKL9n3YMPbwkAI77t3o0HYcDpdrLiZWJrNOy7 q1HGzat/jWSVyeoFeMhAm2ZG43hfiCQlSCRE5ZnUyBFHnfIp+AGmE6dAbD3DzCOfa7Xa OFUA== X-Received: by 10.180.218.227 with SMTP id pj3mr43034933wic.59.1436089237913; Sun, 05 Jul 2015 02:40:37 -0700 (PDT) Received: from bobook.localdomain (ivr94-4-82-229-165-48.fbx.proxad.net. [82.229.165.48]) by mx.google.com with ESMTPSA id z9sm41022473wiv.9.2015.07.05.02.40.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 05 Jul 2015 02:40:37 -0700 (PDT) From: Samuel Martin To: buildroot@buildroot.org Date: Sun, 5 Jul 2015 11:40:23 +0200 Message-Id: <1436089229-21103-2-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 2.4.5 In-Reply-To: <1436089229-21103-1-git-send-email-s.martin49@gmail.com> References: <1436089229-21103-1-git-send-email-s.martin49@gmail.com> Subject: [Buildroot] [PATCH v8 1/7] package/opencv: add a choice for selecting gstreamer support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" OpenCV 3.0 support both gstreamer-0.10 and gstreamer-1.x, but only one is used at the time. This patch turns the gstreamer support into a choice, in order to prepare adding the support for gstreamer-1 in a following patch. Signed-off-by: Samuel Martin Reviewed-by: "Yann E. MORIN" --- changes v7->v8: - fix depends on comments (Yann) - fix help text (Yann) - update a/r/t tags changes v6->v7: - move gstreamer comment inside the choice (Yann) changes v5->v6: - new patch --- package/opencv/Config.in | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/package/opencv/Config.in b/package/opencv/Config.in index 576f667..4838a0c 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -173,8 +173,14 @@ config BR2_PACKAGE_OPENCV_WITH_FFMPEG help Use ffmpeg from the target system. +choice + prompt "gstreamer support" + +config BR2_PACKAGE_OPENCV_WITHOUT_GSTREAMER + bool "none" + config BR2_PACKAGE_OPENCV_WITH_GSTREAMER - bool "gstreamer support" + bool "gstreamer-0.10" depends on BR2_USE_MMU # gstreamer -> libglib2 depends on BR2_USE_WCHAR # gstreamer -> libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer -> libglib2 @@ -182,10 +188,12 @@ config BR2_PACKAGE_OPENCV_WITH_GSTREAMER select BR2_PACKAGE_GST_PLUGINS_BASE select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP -comment "gstreamer support needs a toolchain w/ wchar, threads" +comment "gstreamer-0.10 support needs a toolchain w/ wchar, threads" depends on BR2_USE_MMU depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS +endchoice + config BR2_PACKAGE_OPENCV_WITH_GTK bool "gtk support" depends on BR2_PACKAGE_XORG7