From patchwork Sat Jul 4 19:06:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 491262 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 72BCD14099F for ; Sun, 5 Jul 2015 05:07:30 +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=E2XOBPR1; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B0C4FA2993; Sat, 4 Jul 2015 19:07:29 +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 OZ9iKJE_q0p3; Sat, 4 Jul 2015 19:07:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id D4225A2963; Sat, 4 Jul 2015 19:07:21 +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 34CAF1C1F38 for ; Sat, 4 Jul 2015 19:07:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 31B348F96F for ; Sat, 4 Jul 2015 19:07:17 +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 bOsesmvSXaqo for ; Sat, 4 Jul 2015 19:07:16 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f49.google.com (mail-wg0-f49.google.com [74.125.82.49]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8BF078F6AA for ; Sat, 4 Jul 2015 19:07:15 +0000 (UTC) Received: by wgck11 with SMTP id k11so110481548wgc.0 for ; Sat, 04 Jul 2015 12:07:14 -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=099FtQ+0L+fcNHQ0g3qWGFjF1sVlzkgpBZynLRNgrCk=; b=E2XOBPR1laQ0jC+gxg7pLVdFgtYp6hxfYwKtQp1P/c6ovmTVCl10AONQ8F5cz7Nhwl fnoV5Y/sEaDK0tWn52U8pNdu35LJLostK4Isv1T9vX7bYa4/g45JEeinMVGuGQUcfEe0 u4+LqNSPZc4JrWwY9QRpvmfShARbDShBedqBWTJem/bFPHyr+hpaDkbkrkr7qCpWGlhX 3Ma/Z54G0CbaZfgJl961qOBl7TQs1o3AaB/qWgHsrlP+bgYeQa6rk91S/JHUZmEdagG9 B9jOoGzVb+S5H7cVUaomNbzHHXFF/m7cq2aH2bF2+mjZ1AFrGfHPJ9DCyir5GpjEJhUS v03g== X-Received: by 10.180.39.131 with SMTP id p3mr39733522wik.82.1436036834318; Sat, 04 Jul 2015 12:07:14 -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.13 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 04 Jul 2015 12:07:13 -0700 (PDT) From: Samuel Martin To: buildroot@buildroot.org Date: Sat, 4 Jul 2015 21:06:59 +0200 Message-Id: <1436036821-10073-6-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 5/7] 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 --- changes v6->v7: - update A/R/T tags - rebase changes v5->v6: - update a/r/t tags - remove unneeded "default ..." (Yann) changes v4->v5: - new patch --- package/opencv/Config.in | 16 ++++++++++++++++ package/opencv/opencv.mk | 11 +++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/package/opencv/Config.in b/package/opencv/Config.in index 7bd11cf..e54d436 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -62,6 +62,7 @@ choice preference by the OpenCV build system): - Qt5 - Qt4 + - gtk3 - gtk2 Note that, whatever you choose here will be used by OpenCV, even @@ -89,6 +90,21 @@ comment "gtk2 needs X.org and 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_PACKAGE_QT diff --git a/package/opencv/opencv.mk b/package/opencv/opencv.mk index 79cf110..986e7b4 100644 --- a/package/opencv/opencv.mk +++ b/package/opencv/opencv.mk @@ -236,11 +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)