From patchwork Sun Jun 7 10:26:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 481719 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 0B285140081 for ; Sun, 7 Jun 2015 20:28:02 +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=XRH0Uf0j; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 53E22A44C7; Sun, 7 Jun 2015 10:28:01 +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 aFLQfgq_9ndI; Sun, 7 Jun 2015 10:27:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 08956A4492; Sun, 7 Jun 2015 10:27:26 +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 233231C2238 for ; Sun, 7 Jun 2015 10:27:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 1EE40961C6 for ; Sun, 7 Jun 2015 10:27:15 +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 izZINjBd-02w for ; Sun, 7 Jun 2015 10:27:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com [209.85.212.179]) by hemlock.osuosl.org (Postfix) with ESMTPS id 4A160960CA for ; Sun, 7 Jun 2015 10:27:14 +0000 (UTC) Received: by wiwd19 with SMTP id d19so58368057wiw.0 for ; Sun, 07 Jun 2015 03:27: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=i612QD9hem+Oz+MM2RF4eg/bH3xQPIudxpNuJdXqyaE=; b=XRH0Uf0jHvg0bot1xdKAH54BZqxYZD9MikANjwfDpKFaJrKzXMjdI4mcGPN9EU21Da Y6DFsOsj6w5NKfxu/VdwgF8c5WWy1cFpLqKpMdHZG6dCk3ITwbw672A+Ee/YdoV8fwZs +1mR/5Gu9gFrNBzmnQCuwBpceMnecpVwIWO2loOIrNdqFsRruACCZScn96D2+F31L9s4 o5m2z8WXMei7FImyO3aPnZ9VUp2ZJaKixmSgZp6S+gL792+MEVRTQb8CL2rBJxGYvz0X EKP9sjfmnhuvvH6Fcj4MzydINaiN6/R+fFvHpTKZDxNVgwB9Poeb7/J1+c86DC19TIwW 3t4w== X-Received: by 10.180.82.135 with SMTP id i7mr12566706wiy.68.1433672832653; Sun, 07 Jun 2015 03:27: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 cd9sm10498089wjc.34.2015.06.07.03.27.11 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 07 Jun 2015 03:27:12 -0700 (PDT) From: Samuel Martin To: buildroot@buildroot.org Date: Sun, 7 Jun 2015 12:26:37 +0200 Message-Id: <1433672799-21387-12-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 2.4.2 In-Reply-To: <1433672799-21387-1-git-send-email-s.martin49@gmail.com> References: <1433672799-21387-1-git-send-email-s.martin49@gmail.com> Subject: [Buildroot] [PATCH v5 11/13] 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 v4->v5: - new patch --- package/opencv/Config.in | 38 +++++++++++++++++++++++++++++++------- package/opencv/opencv.mk | 10 ++++++++-- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/package/opencv/Config.in b/package/opencv/Config.in index f4072ef..ff834b9 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -200,17 +200,41 @@ comment "gstreamer backend needs either Gstreamer-0.10 or Gstreamer-1" depends on !BR2_PACKAGE_GSTREAMER && !BR2_PACKAGE_GSTREAMER1 depends on BR2_USE_MMU # gstreamer -> libglib2 + +choice + prompt "gtk support" + # common dependencies to libgtk2 and libgtk3 + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_MMU + depends on BR2_ARCH_HAS_ATOMICS + # GTK check is disabled when Qt support is on in the OpenCV's cmake code + depends on !BR2_PACKAGE_OPENCV_WITH_QT + default BR2_PACKAGE_OPENCV_WITHOUT_GTK + help + GTK support is disabled if Qt support is enabled. + +config BR2_PACKAGE_OPENCV_WITHOUT_GTK + bool "none" + config BR2_PACKAGE_OPENCV_WITH_GTK - bool "gtk support" + bool "libgtk2" 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_GTK3 + bool "libgtk3" + select BR2_PACKAGE_LIBGTK3 + +endchoice + +comment "gtk support needs wchar, threads, C++" + depends on !(BR2_USE_WCHAR || BR2_TOOLCHAIN_HAS_THREADS || \ + BR2_INSTALL_LIBSTDCPP) + depends on BR2_USE_MMU + depends on BR2_ARCH_HAS_ATOMICS + config BR2_PACKAGE_OPENCV_WITH_JASPER bool "jpeg2000 support" select BR2_PACKAGE_JASPER diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk index 81c5544..d3a0738 100644 --- a/package/opencv/opencv.mk +++ b/package/opencv/opencv.mk @@ -222,11 +222,17 @@ else OPENCV_CONF_OPTS += -DWITH_GSTREAMER=OFF -DWITH_GSTREAMER_0_10=OFF endif +ifeq ($(BR2_PACKAGE_OPENCV_WITH_GTK)$(BR2_PACKAGE_OPENCV_WITH_GTK3),y) +OPENCV_CONF_OPTS += -DWITH_GTK=ON ifeq ($(BR2_PACKAGE_OPENCV_WITH_GTK),y) -OPENCV_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=ON +OPENCV_CONF_OPTS += -DWITH_GTK_2_X=ON OPENCV_DEPENDENCIES += libgtk2 else -OPENCV_CONF_OPTS += -DWITH_GTK=OFF +OPENCV_CONF_OPTS += -DWITH_GTK_2_X=OFF +OPENCV_DEPENDENCIES += libgtk3 +endif +else +OPENCV_CONF_OPTS += -DWITH_GTK=OFF -DWITH_GTK_2_X=OFF endif ifeq ($(BR2_PACKAGE_OPENCV_WITH_JASPER),y)