From patchwork Sun Jul 5 09:40:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 491297 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 9620E140D19 for ; Sun, 5 Jul 2015 19:40:47 +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=y/9NYZRM; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 4354795015; Sun, 5 Jul 2015 09:40:46 +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 c3XmmkOIWIwB; Sun, 5 Jul 2015 09:40:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 9000895014; Sun, 5 Jul 2015 09:40:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 08EFF1C25F1 for ; Sun, 5 Jul 2015 09:40:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 065449500E for ; Sun, 5 Jul 2015 09:40:43 +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 sxD-kdXlVLd3 for ; Sun, 5 Jul 2015 09:40:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by hemlock.osuosl.org (Postfix) with ESMTPS id 5D92795004 for ; Sun, 5 Jul 2015 09:40:40 +0000 (UTC) Received: by widjy10 with SMTP id jy10so138352198wid.1 for ; Sun, 05 Jul 2015 02:40:39 -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=VSqlK93mKfLHXBHWcm7io9pHsoLeqq2OH5YgOojrAg0=; b=y/9NYZRM25HTS/4DPZFixjH+2eDM5CIU5Ic08ueZJg7H24yo+rn3/MzSp0miEhc+Ea hfADit2V6sci//w+rU3irdSjYwoJJGCmC8+oXsC2YoHd7s4CromCXFQ8DMTkzLAezj6/ mWaYcicfI6efLOrzIVj7lYeALQ/SoDJb0odjQTZF50RsEVWLjmuwA/pwcbd3I2Dk7ZtV JbJEOrketSmYeBVrVef/ppxd/vn34EFZcAaML0nV4Vwi/yDYAWq4I4GRUwgPRlrxs/qO Ow7LQ7QXVao+lT6zwgS9KGMKo5IhavrUPuutIiR/ZgsbtxEbQglzc1G00uXk9BLRurkK gicg== X-Received: by 10.194.71.105 with SMTP id t9mr86831621wju.128.1436089239115; Sun, 05 Jul 2015 02:40:39 -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.37 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 05 Jul 2015 02:40:38 -0700 (PDT) From: Samuel Martin To: buildroot@buildroot.org Date: Sun, 5 Jul 2015 11:40:24 +0200 Message-Id: <1436089229-21103-3-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> Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH v8 2/7] 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 chooses Gstreamer-1 over Gstreamer-0.10 when both are available). Signed-off-by: Samuel Martin Cc: "Yann E. MORIN" Reviewed-by: "Yann E. MORIN" --- changes v7->v8: - fix depends on comments (Yann) - fix help text (Yann) - rework gst/gst1 if-block in opencv.mk (Yann) changes v6->v7: - move gstreamer1 comment inside the choice (Yann) - remove extra endif in opencv.mk (catched by Yann) changes v5->v6: - rebase - use a choice changes v4->v5: - rebase - update a/r/t tags - rework gst-X backend selection (use similar structure for qt) - remove patch merged upstream changes v3->v4: - new patch --- package/opencv/Config.in | 15 +++++++++++++++ package/opencv/opencv.mk | 11 +++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/package/opencv/Config.in b/package/opencv/Config.in index 4838a0c..079730e 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -175,6 +175,8 @@ config BR2_PACKAGE_OPENCV_WITH_FFMPEG choice prompt "gstreamer support" + help + OpenCV prefers gstreamer-1 over gstreamer-0.10. config BR2_PACKAGE_OPENCV_WITHOUT_GSTREAMER bool "none" @@ -192,6 +194,19 @@ 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 +config BR2_PACKAGE_OPENCV_WITH_GSTREAMER1 + bool "gstreamer-1.x" + depends on BR2_USE_MMU # gstreamer1 -> libglib2 + depends on BR2_USE_WCHAR # gstreamer1 -> libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer1 -> libglib2 + select BR2_PACKAGE_GSTREAMER1 + select BR2_PACKAGE_GST1_PLUGINS_BASE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP + +comment "gstreamer-1.x 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 diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk index 633c2bf..0e5cf77 100644 --- a/package/opencv/opencv.mk +++ b/package/opencv/opencv.mk @@ -223,10 +223,17 @@ OPENCV_CONF_OPTS += -DWITH_FFMPEG=OFF endif ifeq ($(BR2_PACKAGE_OPENCV_WITH_GSTREAMER),y) -OPENCV_CONF_OPTS += -DWITH_GSTREAMER=ON -DWITH_GSTREAMER_0_10=ON +OPENCV_CONF_OPTS += -DWITH_GSTREAMER_0_10=ON OPENCV_DEPENDENCIES += gstreamer gst-plugins-base else -OPENCV_CONF_OPTS += -DWITH_GSTREAMER=OFF -DWITH_GSTREAMER_0_10=OFF +OPENCV_CONF_OPTS += -DWITH_GSTREAMER_0_10=OFF +endif + +ifeq ($(BR2_PACKAGE_OPENCV_WITH_GSTREAMER1),y) +OPENCV_CONF_OPTS += -DWITH_GSTREAMER=ON +OPENCV_DEPENDENCIES += gstreamer1 gst1-plugins-base +else +OPENCV_CONF_OPTS += -DWITH_GSTREAMER=OFF endif ifeq ($(BR2_PACKAGE_OPENCV_WITH_GTK),y)