From patchwork Sun Jul 5 09:40:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 491299 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 DE7E8140D4D for ; Sun, 5 Jul 2015 19:40:52 +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=R+Ra89ug; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1D3209505F; Sun, 5 Jul 2015 09:40:50 +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 cnfOiYVaJRWz; Sun, 5 Jul 2015 09:40:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 1244595066; Sun, 5 Jul 2015 09:40:49 +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 864261C2619 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 8326695004 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 VcHK+si3tHck for ; Sun, 5 Jul 2015 09:40:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by hemlock.osuosl.org (Postfix) with ESMTPS id 82AB695019 for ; Sun, 5 Jul 2015 09:40:41 +0000 (UTC) Received: by wicgi11 with SMTP id gi11so129596861wic.0 for ; Sun, 05 Jul 2015 02:40:40 -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=O1R5kUR56qI1ar0D3w3u8KO05Am1gvFqPOJZpQhbI6Q=; b=R+Ra89ugt5pqlKJSWY1A610s7w2t2E3YjdoiQeiHxv3A1NPFWv0nBjjKIEsib/Z0Fo MP0NiO/wrJBbYKHPHIHAqnaydaxCxpBVmceecB5TD1tD18PdB2eMl0LUfWOxQjnxPzzs pFnUFEb1XItXBkTmQDUZ3D/t4ku/pi7+bMe8NvE8HmTPTDQFJ7IAul4T2vGpw0dyM1Kd Pnjs9eezk96hKV8exLkJGpBobkNMW3fWlsrKGKQOj//qeHyjC+M/8E4qHfKkxKklTbBZ bi8uQMG2PTjsulByu4PF6kxULzrBFETadV6nK6pVucSDznLDqaeCWcirwRxXBkcMN2BO 9vZQ== X-Received: by 10.180.94.35 with SMTP id cz3mr42778240wib.85.1436089240186; Sun, 05 Jul 2015 02:40:40 -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.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 05 Jul 2015 02:40:39 -0700 (PDT) From: Samuel Martin To: buildroot@buildroot.org Date: Sun, 5 Jul 2015 11:40:25 +0200 Message-Id: <1436089229-21103-4-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> Subject: [Buildroot] [PATCH v8 3/7] 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 right after the highgui knob. In OpenCV, only one GUI toolkik will be actually used at the time by the highgui module, given priority to Qt4. Suggested-by: "Yann E. MORIN" Signed-off-by: Samuel Martin Reviewed-by: "Yann E. MORIN" --- changes v7->v8: - update a/r/t tags changes v6->v7: - move choice right after highgui knob (Yann) - reword help text and comment (Yann) changes v5->v6: - new patch --- package/opencv/Config.in | 76 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 53 insertions(+), 23 deletions(-) diff --git a/package/opencv/Config.in b/package/opencv/Config.in index 079730e..d317603 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -52,6 +52,59 @@ config BR2_PACKAGE_OPENCV_LIB_HIGHGUI Include opencv_highgui (high-level gui and media i/o) module into the OpenCV build. +choice + prompt "gui toolkit" + depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI + help + GUI toolkit for opencv_highgui module. + + The best toolkit to work with OpenCV are, in decreasing order of + preference by the OpenCV build system): + - Qt4 + - gtk2 + + Note that, whatever you choose here will be used by OpenCV, even + if you also enabled a more preferred toolkit in your Buildroot + configuration. + +config BR2_PACKAGE_OPENCV_GUI_NONE + bool "none" + +config BR2_PACKAGE_OPENCV_WITH_GTK + bool "gtk2" + depends on BR2_ARCH_HAS_ATOMICS # libgtk2 -> cairo + depends on BR2_USE_MMU # libgtk2 -> libglib2 + depends on BR2_USE_WCHAR # libgtk2 -> libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2 + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_LIBGTK2 + +comment "gtk2 needs X.org and 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_LIB_IMGCODECS bool "imgcodecs" select BR2_PACKAGE_OPENCV_LIB_IMGPROC @@ -209,17 +262,6 @@ comment "gstreamer-1.x support needs a toolchain w/ wchar, threads" endchoice -config BR2_PACKAGE_OPENCV_WITH_GTK - bool "gtk support" - 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 - config BR2_PACKAGE_OPENCV_WITH_JASPER bool "jpeg2000 support" select BR2_PACKAGE_JASPER @@ -242,18 +284,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