From patchwork Sun Jun 7 10:26:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 481716 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 3BF1B140082 for ; Sun, 7 Jun 2015 20:27: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=NIHiBsic; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 38F71A449E; Sun, 7 Jun 2015 10:27:44 +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 SKON5Ft3xc_B; Sun, 7 Jun 2015 10:27:41 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 25163A44A0; Sun, 7 Jun 2015 10:27:20 +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 2DA7A1C2C9C for ; Sun, 7 Jun 2015 10:27:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2AB269208C for ; Sun, 7 Jun 2015 10:27:11 +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 rL9lRPKByJzA for ; Sun, 7 Jun 2015 10:27:10 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45]) by whitealder.osuosl.org (Postfix) with ESMTPS id 6C6F991FC7 for ; Sun, 7 Jun 2015 10:27:10 +0000 (UTC) Received: by wgme6 with SMTP id e6so83043820wgm.2 for ; Sun, 07 Jun 2015 03:27: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=HNHMxMRjOlxuAkV6nChX6ku+mvgNHyNpXenY4djDoJg=; b=NIHiBsic9uk85eV5WQL0p4neBOjgVGNFPm4fafNyh2SOO/78+arW1FzlqSNgsqQvP8 0Zp7ruFK4Ym9vJLe3O5Nx38eAuNurZlwlpR5jWfvesJz6MMNUXWvJsrf+qa4u1Qzh+oa d4sh5VM7sGw0PUKcw0533Q86i+alYa6vlM1i9EvxGwC7mm+GLFoL3NoaRVP7d39YjMia 9RbfwsnefmBm2VKg7AHZDzxc/d6bvTSjiE9VkI4t9HE8SM2CkQqom0qXq55pnN5Bc77f lmmkuWbdzr8O7YOZ1T1cqLXwyFnHhMXv8UH13OB5BGjSvGptRh+yKADJ/oFHXGjA+bfz xZ+w== X-Received: by 10.194.92.10 with SMTP id ci10mr21214420wjb.49.1433672829121; Sun, 07 Jun 2015 03:27: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 cd9sm10498089wjc.34.2015.06.07.03.27.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 07 Jun 2015 03:27:08 -0700 (PDT) From: Samuel Martin To: buildroot@buildroot.org Date: Sun, 7 Jun 2015 12:26:34 +0200 Message-Id: <1433672799-21387-9-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 2.4.2 In-Reply-To: <1433672799-21387-1-git-send-email-s.martin49@gmail.com> References: <1433672799-21387-1-git-send-email-s.martin49@gmail.com> Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH v5 08/13] package/opencv: add gstreamer-1.x 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" Starting with the 2.4.10 release, OpenCV supports both Gstreamer-0.10 and Gstreamer-1, but only one can be enabled at the same time (OpenCV uses Gstreamer-1 when available). Since Buildroot allows both Gstreamer versions to co-exist, the configure options and dependencies are set to reflect the OpenCV preference. Signed-off-by: Samuel Martin Cc: "Yann E. MORIN" Reviewed-by: "Yann E. MORIN" --- changes v4->v5: - rebase - rework gst-X backend selection (use similar structure for qt) - remove patch merged upstream changes v3->v4: - new patch --- package/opencv/Config.in | 34 ++++++++++++++++++++++++++-------- package/opencv/opencv.mk | 9 +++++++-- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/package/opencv/Config.in b/package/opencv/Config.in index db950f4..55e7580 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -170,17 +170,35 @@ config BR2_PACKAGE_OPENCV_WITH_FFMPEG Use ffmpeg from the target system. 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 - select BR2_PACKAGE_GSTREAMER + bool "gstreamer backend support" + depends on BR2_PACKAGE_GSTREAMER || BR2_PACKAGE_GSTREAMER1 + select BR2_PACKAGE_OPENCV_GSTREAMER_BACKEND if BR2_PACKAGE_GSTREAMER && \ + !BR2_PACKAGE_GSTREAMER1 + select BR2_PACKAGE_OPENCV_GSTREAMER1_BACKEND if BR2_PACKAGE_GSTREAMER1 + help + Enable Gstreamer support for OpenCV. + + This uses whatever Gstreamer version you enabled: Gstreamer-0.10 + or Gstreamer-1. + + If both Gstreamer version are enable, only Gstreamer-1 will be + used by OpenCV. + +config BR2_PACKAGE_OPENCV_GSTREAMER_BACKEND + bool + # no need to select gstreamer select BR2_PACKAGE_GST_PLUGINS_BASE select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP -comment "gstreamer support needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS +config BR2_PACKAGE_OPENCV_GSTREAMER1_BACKEND + bool + # no need to select gstreamer1 + select BR2_PACKAGE_GST1_PLUGINS_BASE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP + +comment "gstreamer backend needs either Gstreamer-0.10 or Gstreamer-1" + depends on !BR2_PACKAGE_GSTREAMER && !BR2_PACKAGE_GSTREAMER1 + depends on BR2_USE_MMU # gstreamer -> libglib2 config BR2_PACKAGE_OPENCV_WITH_GTK bool "gtk support" diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk index aa972dc..6162d1e 100644 --- a/package/opencv/opencv.mk +++ b/package/opencv/opencv.mk @@ -211,10 +211,15 @@ OPENCV_CONF_OPTS += -DWITH_FFMPEG=OFF endif ifeq ($(BR2_PACKAGE_OPENCV_WITH_GSTREAMER),y) -OPENCV_CONF_OPTS += -DWITH_GSTREAMER=ON +ifeq ($(BR2_PACKAGE_GSTREAMER1),y) +OPENCV_CONF_OPTS += -DWITH_GSTREAMER=ON -DWITH_GSTREAMER_0_10=OFF +OPENCV_DEPENDENCIES += gstreamer1 gst1-plugins-base +else +OPENCV_CONF_OPTS += -DWITH_GSTREAMER=OFF -DWITH_GSTREAMER_0_10=ON OPENCV_DEPENDENCIES += gstreamer gst-plugins-base +endif else -OPENCV_CONF_OPTS += -DWITH_GSTREAMER=OFF +OPENCV_CONF_OPTS += -DWITH_GSTREAMER=OFF -DWITH_GSTREAMER_0_10=OFF endif ifeq ($(BR2_PACKAGE_OPENCV_WITH_GTK),y)