From patchwork Thu Jun 25 19:59:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 488541 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 B95C6140273 for ; Fri, 26 Jun 2015 06:01:00 +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=RbS9b6Ov; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 18EE695D62; Thu, 25 Jun 2015 20:01:00 +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 H0PB3YarhTHc; Thu, 25 Jun 2015 20:00:57 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id DC08A95D67; Thu, 25 Jun 2015 20:00:56 +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 31EC91CE50B for ; Thu, 25 Jun 2015 20:00:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2B22095D79 for ; Thu, 25 Jun 2015 20:00:34 +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 BiimLShOINdt for ; Thu, 25 Jun 2015 20:00:32 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f174.google.com (mail-wi0-f174.google.com [209.85.212.174]) by hemlock.osuosl.org (Postfix) with ESMTPS id EA39395D84 for ; Thu, 25 Jun 2015 20:00:23 +0000 (UTC) Received: by wibdq8 with SMTP id dq8so85903876wib.1 for ; Thu, 25 Jun 2015 13:00:22 -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=eqal1MTIaJ+LSgKZIEPJwzzg55NdvwBNAZVZ9nyKsJo=; b=RbS9b6OvSNB4lWJwGVOG3zkASUmG2nlWUs7P55/U2OvmdXU937EuW8/yF0MDkSAcYC 6ZKXwCOCTasZLvjG73QI08ytBu9SxV0LkEPsiR+9RgYHWn5PH602/9ueAoyV4RrCkIaF f48VwrnaEn0LdZ71tdKUvcy48pFuOx4poZASSapDuzCBRGualwCkCsmXM1fgAXIvwDVJ Hp2kSW43uEGnd/HoEMsRZ2bxHpvnt+QGP/GHO/af6VGQBrfj6su8p78IQSPHkZOYG8Ky YsD+j0enRhjVATcEoUXcETSiApTMAn31gKUjtG1SL4eWWgJI0gKF0yaCrab/xYT6GcDz uCAA== X-Received: by 10.180.149.240 with SMTP id ud16mr8666286wib.7.1435262422639; Thu, 25 Jun 2015 13:00:22 -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.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Jun 2015 13:00:21 -0700 (PDT) From: Samuel Martin To: buildroot@buildroot.org Date: Thu, 25 Jun 2015 21:59:55 +0200 Message-Id: <1435262397-888-15-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 14/16] package/opencv: add gtk3 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" Fully rework the GTK support in OpenCV because it now supports gtk-2 and gtk-3 (but only one at the time). Note that, in the build-system, the gtk support is only available when Qt support is disabled; so make sure the menuconfig reflects this. Signed-off-by: Samuel Martin Reviewed-by: "Yann E. MORIN" --- changes v5->v6: - update a/r/t tags - remove unneeded "default ..." (Yann) changes v4->v5: - new patch --- package/opencv/Config.in | 22 +++++++++++++++++++--- package/opencv/opencv.mk | 9 +++++++-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/package/opencv/Config.in b/package/opencv/Config.in index ac0443a..b738f71 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -215,6 +215,7 @@ choice OpenCV GUI toolkit preference (from the most to the least): - Qt5 - Qt4 + - gtk-3 - gtk-2 config BR2_PACKAGE_OPENCV_GUI_NONE @@ -222,12 +223,12 @@ config BR2_PACKAGE_OPENCV_GUI_NONE config BR2_PACKAGE_OPENCV_WITH_GTK bool "gtk2" - depends on BR2_PACKAGE_XORG7 + 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_USE_MMU # libgtk2 -> glib2 - depends on BR2_ARCH_HAS_ATOMICS # libgtk2 -> cairo + depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_LIBGTK2 comment "gtk2 depends on X.org and needs a toolchain w/ wchar, threads, C++" @@ -238,6 +239,21 @@ comment "gtk2 depends on X.org and needs a toolchain w/ wchar, threads, C++" !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_INSTALL_LIBSTDCPP +config BR2_PACKAGE_OPENCV_WITH_GTK3 + bool "gtk3" + depends on BR2_ARCH_HAS_ATOMICS # libgtk3 -> cairo + depends on BR2_USE_MMU # libgtk3 -> libglib2 + depends on BR2_USE_WCHAR # libgtk3 -> libglib2 + depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk3 -> libglib2 + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_LIBGTK3 + +comment "gtk3 needs a toolchain w/ wchar, threads, C++" + depends on BR2_USE_MMU # libgtk3 -> glib2 + depends on BR2_ARCH_HAS_ATOMICS # libgtk3 -> cairo + depends on !(BR2_USE_WCHAR || BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_INSTALL_LIBSTDCPP) + config BR2_PACKAGE_OPENCV_WITH_QT bool "qt4" depends on BR2_INSTALL_LIBSTDCPP diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk index 602b59a..986e7b4 100644 --- a/package/opencv/opencv.mk +++ b/package/opencv/opencv.mk @@ -236,13 +236,18 @@ OPENCV_CONF_OPTS += -DWITH_GSTREAMER=ON -DWITH_GSTREAMER_0_10=OFF OPENCV_DEPENDENCIES += gstreamer1 gst1-plugins-base endif +ifeq ($(BR2_PACKAGE_OPENCV_WITH_GTK)$(BR2_PACKAGE_OPENCV_WITH_GTK3),) +OPENCV_CONF_OPTS += -DWITH_GTK=OFF -DWITH_GTK_2_X=OFF endif ifeq ($(BR2_PACKAGE_OPENCV_WITH_GTK),y) OPENCV_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=ON OPENCV_DEPENDENCIES += libgtk2 -else -OPENCV_CONF_OPTS += -DWITH_GTK=OFF +endif + +ifeq ($(BR2_PACKAGE_OPENCV_WITH_GTK3),y) +OPENCV_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=OFF +OPENCV_DEPENDENCIES += libgtk3 endif ifeq ($(BR2_PACKAGE_OPENCV_WITH_JASPER),y)