From patchwork Thu Mar 24 20:19:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David PICARD X-Patchwork-Id: 601803 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 3qWHqb4M6yz9sDD for ; Fri, 25 Mar 2016 07:20:27 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=yahoo.fr header.i=@yahoo.fr header.b=fu68Ut6P; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CC39791218; Thu, 24 Mar 2016 20:20:26 +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 k3HJ6V4dLoHw; Thu, 24 Mar 2016 20:20:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id B111F9110B; Thu, 24 Mar 2016 20:20:23 +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 28C8E1C0E10 for ; Thu, 24 Mar 2016 20:20:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 24A00956BF for ; Thu, 24 Mar 2016 20:20:22 +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 rIatvF2fgraI for ; Thu, 24 Mar 2016 20:20:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from nm32.bullet.mail.ir2.yahoo.com (nm32.bullet.mail.ir2.yahoo.com [212.82.96.57]) by hemlock.osuosl.org (Postfix) with ESMTPS id D5531955EC for ; Thu, 24 Mar 2016 20:20:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.fr; s=s2048; t=1458850819; bh=FZx/FyBrSfgpk7cYIBY546/EzS2FCbGLJMeNWQhdFuI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject; b=fu68Ut6Px6AOYKOKg+i+oHNshzelpOhvJb5vNiBKs2B0uUiA+stQOboBPefzcqItPl/TX8VZRgjI42WL4in3cXX06KCDaDElyb/EXGpOvrIH59hIVLSOQh+U3TXvm99SXsId+U+/j2DnyfNYnlCbRXqFCqdBl8EQmXx9OPAn6o/l+Za/X/PHYSvG4oHBiVZ3NtAY+2Vp8N+f2mQX1OOc+M9csQD/1OqeEK1XnRQqDYPOiQm6npfxjQbjfdrsvPETNh+phs89u1sIROpXEwL4X0vSChSMHkScazuXbpQR0AvIvOHDs0vSzEiZRc9R9716U7wZMXllW4gO6LoF5nzYUg== Received: from [212.82.98.54] by nm32.bullet.mail.ir2.yahoo.com with NNFMP; 24 Mar 2016 20:20:19 -0000 Received: from [46.228.39.85] by tm7.bullet.mail.ir2.yahoo.com with NNFMP; 24 Mar 2016 20:20:19 -0000 Received: from [127.0.0.1] by smtp122.mail.ir2.yahoo.com with NNFMP; 24 Mar 2016 20:20:19 -0000 X-Yahoo-Newman-Id: 235228.38313.bm@smtp122.mail.ir2.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: F4L58YcVM1mHx9LvENMwfw3uZ0HFhYpImu5Wxqn7YoGKEj7 1jINyFtv54Sher1cBESs6pEpQlBWB_m9qGivmruZkwzxoZPev20uljP7gvNY dZh6TVKxK6M7znEcgJtcCxVLaUQ8DAwWPAb.TM6bmTG5mJGH5GLo3yoCPHxL KZ8gc54DSyfaYCAkVXSJofCzfOaC8x_3YhzwA.K6kvpJSBtbOfWkriKW6jSP i6sV4foM0A2hlv6jk3WUMY62DbR6ZNnKsita3gltkCRZflS6gBXTPA8hgDGX ATRmX52BCQrfsXBQN4hst5fT_eVJcvzE0s90xWbzPyic6mqmnOFPVLAHU668 3UBIC0im2fy3SWLHSPp.PoLeysrjI2Q4HrhASbZh5ZR5e.9g3LQ34T_.PS2e 9VrKnJ7pCJ9yX.9I6yeVGFnqYRg6t.sJJJKIdB2NCwujFNYaCCztkbyIcmQs uHgXJvs2TVJKJLwUpI3KuoGCdj6XOL3UhkBdOPJ69Tgxt0peQPDQvM5EFy3d uWOXu4hBYcyey60pIxyksCsLPbpHKd5hCKT.5 X-Yahoo-SMTP: aiskzS6swBAbO_93.DIFaPi3RPs- From: David Picard To: buildroot@buildroot.org Date: Thu, 24 Mar 2016 21:19:51 +0100 Message-Id: <1458850791-4205-2-git-send-email-davepiq@yahoo.fr> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1458850791-4205-1-git-send-email-davepiq@yahoo.fr> References: <1458850791-4205-1-git-send-email-davepiq@yahoo.fr> Cc: David Picard Subject: [Buildroot] [PATCH 2/2] package/qwt : added support for Qt5. 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 version of Qwt is compatible with both Qt and Qt5. This patch adds the option to compile it for Qt5. Signed-off-by: David Picard --- package/qwt/Config.in | 10 +++++++--- package/qwt/qwt.mk | 3 +++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/package/qwt/Config.in b/package/qwt/Config.in index 876d465..05d5253 100644 --- a/package/qwt/Config.in +++ b/package/qwt/Config.in @@ -1,7 +1,9 @@ config BR2_PACKAGE_QWT bool "qwt" - depends on BR2_PACKAGE_QT + depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5 select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT + select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_CONCURRENT if BR2_PACKAGE_QT5 help Qwt is a graphics extension to the Qt GUI application framework. It provides a 2D plotting widget and more. @@ -13,14 +15,16 @@ if BR2_PACKAGE_QWT config BR2_PACKAGE_QWT_SVG bool "SVG support" select BR2_PACKAGE_QT_SVG if BR2_PACKAGE_QT + select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5 config BR2_PACKAGE_QWT_MATHML bool "MathML support" config BR2_PACKAGE_QWT_OPENGL bool "OpenGL support" - depends on BR2_PACKAGE_HAS_LIBGLES - depends on BR2_PACKAGE_HAS_LIBEGL + depends on (BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEG) || \ + BR2_PACKAGE_QT5_GL_AVAILABLE select BR2_PACKAGE_QT_OPENGL_ES if BR2_PACKAGE_QT + select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5 endif diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk index 4d481fb..594b141 100644 --- a/package/qwt/qwt.mk +++ b/package/qwt/qwt.mk @@ -11,6 +11,9 @@ QWT_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_QT),y) QWT_DEPENDENCIES = qt QWT_QMAKE = $(QT_QMAKE) +else ifeq ($(BR2_PACKAGE_QT5),y) +QWT_DEPENDENCIES += qt5 +QWT_QMAKE = $(QT5_QMAKE) endif QWT_LICENSE = LGPLv2.1 with exceptions