From patchwork Sat Jul 4 19:06:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 491258 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id B09A6140D19 for ; Sun, 5 Jul 2015 05:07:18 +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=CFe4OtA1; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id DD411A294A; Sat, 4 Jul 2015 19:07:17 +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 eFlTbHM5YPU6; Sat, 4 Jul 2015 19:07:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1E737A292C; Sat, 4 Jul 2015 19:07:14 +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 04A971C1F38 for ; Sat, 4 Jul 2015 19:07:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 00789A2679 for ; Sat, 4 Jul 2015 19:07:12 +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 Lt6fBrMrpD2w for ; Sat, 4 Jul 2015 19:07:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f44.google.com (mail-wg0-f44.google.com [74.125.82.44]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 41F8AA250E for ; Sat, 4 Jul 2015 19:07:11 +0000 (UTC) Received: by wgjx7 with SMTP id x7so110241701wgj.2 for ; Sat, 04 Jul 2015 12:07:09 -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=8TObOd7x0m2EYEZmK8AQkPTF+EL0iB+hqvqgYHPj4Sg=; b=CFe4OtA1rJdyI9d+0h4Q0N0TLs1sXTMxTzvim5n+5W+YNaTkYoh7ZegMyWSrYh8xLi jwHKQNMDo50JFuIplFsDH/2/HZpNnv6dDRao/FzcBjszUJeKhgCqwwb9WSaWjIvPtUb9 QhMY7CRGugyKsEoqjB1emEjID5137ZM+zUonuUGIBA8WTqVoz5IlwyUvwpeE1KXdSBfX AGEzz1i+onvXmkFTR4tH/cEQH4Kobbu/B9xwvzLMLd9ngJUIKO9zV8nK8+Z5kcctqG7K 0+w7qbqY0xo4NdH0yL4F5jWIbdOxMZ3th8Ufcse1bbUHXZAu/k7eMDiFkBft9taVOKwr TB1g== X-Received: by 10.180.76.8 with SMTP id g8mr73518857wiw.79.1436036829904; Sat, 04 Jul 2015 12:07:09 -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 ck18sm19278448wjb.47.2015.07.04.12.07.09 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 04 Jul 2015 12:07:09 -0700 (PDT) From: Samuel Martin To: buildroot@buildroot.org Date: Sat, 4 Jul 2015 21:06:55 +0200 Message-Id: <1436036821-10073-2-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 2.4.5 In-Reply-To: <1436036821-10073-1-git-send-email-s.martin49@gmail.com> References: <1436036821-10073-1-git-send-email-s.martin49@gmail.com> Subject: [Buildroot] [PATCH v7 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 v6->v7: - move gstreamer comment inside the choice (Yann) changes v5->v6: - new patch --- package/opencv/Config.in | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/package/opencv/Config.in b/package/opencv/Config.in index 576f667..c3b7535 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -173,19 +173,29 @@ config BR2_PACKAGE_OPENCV_WITH_FFMPEG help Use ffmpeg from the target system. +choice + prompt "gstreamer support" + help + OpenCV prefers gstreamer-1 over gstreamer-0.10. + +config BR2_PACKAGE_OPENCV_WITHOUT_GSTREAMER + bool "none" + config BR2_PACKAGE_OPENCV_WITH_GSTREAMER - bool "gstreamer support" - depends on BR2_USE_MMU # gstreamer -> libglib2 - depends on BR2_USE_WCHAR # gstreamer -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer -> libglib2 + bool "gstreamer-0.10" + depends on BR2_USE_MMU # libglib2 + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 select BR2_PACKAGE_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