From patchwork Sat Jul 4 19:06:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 491259 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 D366A140D19 for ; Sun, 5 Jul 2015 05:07:21 +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=sqIws2gg; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id F1BF9A293A; Sat, 4 Jul 2015 19:07:20 +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 1Hh4WTTK1nf1; Sat, 4 Jul 2015 19:07:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 86087A293E; Sat, 4 Jul 2015 19:07:15 +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 D4B0D1C1F38 for ; Sat, 4 Jul 2015 19:07:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D1C3C94D33 for ; Sat, 4 Jul 2015 19:07:13 +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 HC2Hm+dmDdN6 for ; Sat, 4 Jul 2015 19:07:12 +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 7B24A94CF2 for ; Sat, 4 Jul 2015 19:07:12 +0000 (UTC) Received: by wiwl6 with SMTP id l6so253105071wiw.0 for ; Sat, 04 Jul 2015 12:07:11 -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=Zi9KdpIIPxHpZlADNwZ+OvzRatZ6cN6M8oE4XAbTkDM=; b=sqIws2ggWK+iT+WoriD8QNNuZ6SRgVlGWF4zBpJw2uU+5yJAPmYTGEM52trVYdRWH6 /X4w+4FmA+XETf2mSYYjueV6c/YKY/xxI13ZeaSm321jmR7OcBPtCxZg0y+JjNMtx9kv fVeSv7/6exkPJz8TC/2GeSf3LXkW8xQg362O9dOjAl+qAA+o3APPVQ04BnR2vew4DTP4 ALRDT5AV7lYh2tOutyPLUGiSOY8b+RJjMlOZve0dxg/Amu+mmA9O1KTfkXM/4Y1gICJa Ytcy2cSRX4mVBhBU9sslh9olwZcvq6dxfHGEx58u0LdqWpNrO3Q1we0tzggj13aVs0FZ KQvw== X-Received: by 10.180.94.168 with SMTP id dd8mr76958639wib.76.1436036831216; Sat, 04 Jul 2015 12:07:11 -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:10 -0700 (PDT) From: Samuel Martin To: buildroot@buildroot.org Date: Sat, 4 Jul 2015 21:06:56 +0200 Message-Id: <1436036821-10073-3-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> Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH v7 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" --- 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 | 13 +++++++++++++ package/opencv/opencv.mk | 13 ++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/package/opencv/Config.in b/package/opencv/Config.in index c3b7535..92a1306 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -194,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 # libglib2 + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # 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..6b1a139 100644 --- a/package/opencv/opencv.mk +++ b/package/opencv/opencv.mk @@ -222,11 +222,18 @@ else OPENCV_CONF_OPTS += -DWITH_FFMPEG=OFF endif +ifeq ($(BR2_PACKAGE_OPENCV_WITH_GSTREAMER)$(BR2_PACKAGE_OPENCV_WITH_GSTREAMER1),) +OPENCV_CONF_OPTS += -DWITH_GSTREAMER=OFF -DWITH_GSTREAMER_0_10=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=OFF -DWITH_GSTREAMER_0_10=ON OPENCV_DEPENDENCIES += gstreamer gst-plugins-base -else -OPENCV_CONF_OPTS += -DWITH_GSTREAMER=OFF -DWITH_GSTREAMER_0_10=OFF +endif + +ifeq ($(BR2_PACKAGE_OPENCV_WITH_GSTREAMER1),y) +OPENCV_CONF_OPTS += -DWITH_GSTREAMER=ON -DWITH_GSTREAMER_0_10=OFF +OPENCV_DEPENDENCIES += gstreamer1 gst1-plugins-base endif ifeq ($(BR2_PACKAGE_OPENCV_WITH_GTK),y)