From patchwork Thu Jun 25 19:59:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 488546 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 CA7261401E7 for ; Fri, 26 Jun 2015 06:01:16 +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=aC19vhbs; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1E7E7A41E9; Thu, 25 Jun 2015 20:01:16 +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 SyTpNU51QQ8W; Thu, 25 Jun 2015 20:01:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 97219A41C0; Thu, 25 Jun 2015 20:00:49 +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 E64721CE50B for ; Thu, 25 Jun 2015 20:00:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E26FB33634 for ; Thu, 25 Jun 2015 20:00:23 +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 eynHp+F4CYMF for ; Thu, 25 Jun 2015 20:00:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by silver.osuosl.org (Postfix) with ESMTPS id BB1E33396C for ; Thu, 25 Jun 2015 20:00:21 +0000 (UTC) Received: by wiga1 with SMTP id a1so174228544wig.0 for ; Thu, 25 Jun 2015 13:00:20 -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=h0GvrOCOMN6RnBhzmaZC8Xar7Pu95vIQeEtISkrNehs=; b=aC19vhbsITMhphFynR2gqpuVCs9/xI9faezymDr+otR2IO8wU2RnTSLmoyt7rIUkM5 VKDG6r98EyDxHRywIBY5PoZZIwYOk73Iit8ygSeTgGygbSs2L9zta3xBiXd2v17P+uu+ 4IWBb5R1T5ez9ECol99yJCBUVBIhUnZDBPDSeoVscHL49AUPSprEc7P/9vrplBo06G72 L0r3lZJGZ2QByIKqLSxPSGuT05BjKBvAHlowb1AQBUNzjzUMZ/4u/VL8Cf2RVZxxYjYx 1VWwa8K8kCX5I/V9YSSZdFTDjmiC4Qrh6BZbkWe04yVS5s0XtR2yvzgiCYMxKqIxx983 oNeQ== X-Received: by 10.180.99.71 with SMTP id eo7mr8387126wib.95.1435262420366; Thu, 25 Jun 2015 13:00:20 -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 hn7sm47218600wjc.16.2015.06.25.13.00.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Jun 2015 13:00:19 -0700 (PDT) From: Samuel Martin To: buildroot@buildroot.org Date: Thu, 25 Jun 2015 21:59:53 +0200 Message-Id: <1435262397-888-13-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 2.4.4 In-Reply-To: <1435262397-888-1-git-send-email-s.martin49@gmail.com> References: <1435262397-888-1-git-send-email-s.martin49@gmail.com> Subject: [Buildroot] [PATCH v6 12/16] package/opencv: add a choice for selecting the gui toolkit 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" This patch moves the existing Qt4 and gtk2 options in that choice because, in OpenCV, only one toolkik will be actually used at the time, given priority to Qt4. Suggested-by: "Yann E. MORIN" Signed-off-by: Samuel Martin --- changes v5->v6: - new patch --- package/opencv/Config.in | 53 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/package/opencv/Config.in b/package/opencv/Config.in index f89e62d..040ee55 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -206,17 +206,54 @@ config BR2_PACKAGE_OPENCV_WITH_GSTREAMER1 endchoice +choice + prompt "gui toolkit" + depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI + help + GUI toolkit for opencv_highgui module. + + OpenCV GUI toolkit preference (from the most to the least): + - Qt4 + - gtk-2 + +config BR2_PACKAGE_OPENCV_GUI_NONE + bool "none" + config BR2_PACKAGE_OPENCV_WITH_GTK - bool "gtk support" + bool "gtk2" depends on BR2_PACKAGE_XORG7 depends on BR2_USE_WCHAR # libgtk2 -> libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_MMU # libgtk2 -> glib2 depends on BR2_ARCH_HAS_ATOMICS # libgtk2 -> cairo - depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI select BR2_PACKAGE_LIBGTK2 +comment "gtk2 depends on X.org and needs a toolchain w/ wchar, threads, C++" + depends on BR2_USE_MMU # libgtk2 -> glib2 + depends on BR2_ARCH_HAS_ATOMICS # libgtk2 -> cairo + depends on !BR2_PACKAGE_XORG7 || \ + !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_HAS_THREADS || \ + !BR2_INSTALL_LIBSTDCPP + +config BR2_PACKAGE_OPENCV_WITH_QT + bool "qt4" + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_MMU # qt + select BR2_PACKAGE_QT + select BR2_PACKAGE_QT_STL + select BR2_PACKAGE_QT_GUI_MODULE + select BR2_PACKAGE_QT_TEST + help + Use Qt with QtTest module and STL support + +comment "qt4 needs a toolchain w/ C++" + depends on BR2_USE_MMU # qt + depends on !BR2_INSTALL_LIBSTDCPP + +endchoice + config BR2_PACKAGE_OPENCV_WITH_JASPER bool "jpeg2000 support" select BR2_PACKAGE_JASPER @@ -239,18 +276,6 @@ config BR2_PACKAGE_OPENCV_WITH_PNG help Use shared libpng from the target system. -config BR2_PACKAGE_OPENCV_WITH_QT - bool "qt backend support" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # qt - depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI - select BR2_PACKAGE_QT - select BR2_PACKAGE_QT_STL - select BR2_PACKAGE_QT_GUI_MODULE - select BR2_PACKAGE_QT_TEST - help - Use Qt with QtTest module and STL support - config BR2_PACKAGE_OPENCV_WITH_TIFF bool "tiff support" select BR2_PACKAGE_TIFF