From patchwork Sat Jul 4 19:06:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 491260 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 EDEF514099F for ; Sun, 5 Jul 2015 05:07:24 +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=apQkKpY1; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 36BFCA2941; Sat, 4 Jul 2015 19:07:24 +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 eGdUG8R-bTeV; Sat, 4 Jul 2015 19:07:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id B5DB4A2949; Sat, 4 Jul 2015 19:07:17 +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 DA08B1C1F38 for ; Sat, 4 Jul 2015 19:07:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D60BF8F96F for ; Sat, 4 Jul 2015 19:07:14 +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 wR8KIxlSSkOj for ; Sat, 4 Jul 2015 19:07:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f52.google.com (mail-wg0-f52.google.com [74.125.82.52]) by whitealder.osuosl.org (Postfix) with ESMTPS id 6532F8F6AA for ; Sat, 4 Jul 2015 19:07:13 +0000 (UTC) Received: by wguu7 with SMTP id u7so110470407wgu.3 for ; Sat, 04 Jul 2015 12:07:12 -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=/Ti89RMDtESmrqq1Yc1G6UxCF3r+dss0AiJAa6G6nNM=; b=apQkKpY1WWv3HEeOYMo68Fak7AoOCP0SwfW0zvkhXQbCxpLw4oOwUlaXz3NFW1IEBj IZj4bfx08LA/MmBcB57RucTv77gt3vJbvewKCgAVC3ZpFTFuN98zlUKhVmFsiy6kOyst 8wMS3u10wji/KImdqu/T5S34+SKIiZg4982aapOdWBWqDgpSGoRjnFkbXXRml/QQ/QuU bd3qtnZK4WE4EY23FJ+/9+rTXLMKbd4rPxH7/T7u0XIp+T4T37lnEAI0Kt0wi0egAAgB R0gu40FZbwhoTUa9M3HVU9aF6/xR6Cco3WrPDZwDO1EIAit2EBaHtA8djUTQxQmFzybx 7TUQ== X-Received: by 10.180.228.6 with SMTP id se6mr74102966wic.33.1436036832111; Sat, 04 Jul 2015 12:07:12 -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.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 04 Jul 2015 12:07:11 -0700 (PDT) From: Samuel Martin To: buildroot@buildroot.org Date: Sat, 4 Jul 2015 21:06:57 +0200 Message-Id: <1436036821-10073-4-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> Subject: [Buildroot] [PATCH v7 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 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 92a1306..9479b35 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