From patchwork Tue Jan 31 07:59:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan Gyarmati X-Patchwork-Id: 721836 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]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vCJj03C7xz9srY for ; Tue, 31 Jan 2017 19:05:24 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HXSKw6Ys"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id F04658A6CC; Tue, 31 Jan 2017 08:05:21 +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 cLYCIxubWUiz; Tue, 31 Jan 2017 08:05:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 25A5B8A670; Tue, 31 Jan 2017 08:05:20 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 6E3301BFCC3 for ; Tue, 31 Jan 2017 08:05:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 688AB3030F for ; Tue, 31 Jan 2017 08:05:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id d822U2OC1Dv2 for ; Tue, 31 Jan 2017 08:05:17 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wj0-f193.google.com (mail-wj0-f193.google.com [209.85.210.193]) by silver.osuosl.org (Postfix) with ESMTPS id 56650302B3 for ; Tue, 31 Jan 2017 08:05:17 +0000 (UTC) Received: by mail-wj0-f193.google.com with SMTP id ip10so9830608wjb.1 for ; Tue, 31 Jan 2017 00:05:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FBWW7Re9ECH+HBTtQXq3aprfHwSR0B8xasfSqW5FgsY=; b=HXSKw6Ys6rRi6doBSLT/pxr+0GzZZK67LE5LcBxtbwDHtKC4UVll7EqejCsCFLZJYl 5YFEYExwqVyzhiIrBKvBI4LQnKbFm0JZ76CPimsu1gyOimNWNdc9ms6Y1MT1tuabZACg D4vOuWsyK9quv9El7y0es89YlRnbvkzmUVwldOGfkVvihtkU8Pi79XcbGsvszaeS2GV7 gHP8TEYus+JMHYvgRZzLCNvWsJ6jHQdrxn6nB6iYwTgASPh/zsjEIfRs6iXu5zlcI3lJ NVktiW+5Ozk1y6EzWkASlMz3T7A4e+loDxfumcafixo0BMlv68fWJ1NhNuZhDKekKhJ3 YT7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FBWW7Re9ECH+HBTtQXq3aprfHwSR0B8xasfSqW5FgsY=; b=bO2Ys0JncWfzQiq6XG2sgUbDFTH6O+0aI4hg55QptxDInQyim9yma51HJqS42Y0Anw afdd5K1MIugybbVsbFL2HmRrVuQevObgvleQeF+NbX4hdaNbWBtDSxzCWA0RhyIeJr7h oOHDQ2Tugo6Hx7Z0CGStf9osIyx9BYLTPhw0dk+3d7bU9VzeBF+JKIqeBN+vB6UAaS+0 vRXDaQgH9hCAzR3D5yXoHgyFgwHMESF+R9jBHASxLudFrGqnuj2KZBF6NQBQ4OHn9+Wv 7blWMVOaRPuiKkyntJru1wQf0HiGYXUXfmQrsCyp9QXw+7/Bjzc4PkH0QqvhztFrlLex 2+pg== X-Gm-Message-State: AIkVDXKhacBfj+wbqirBa2hkRZYT6Ji1+PtQnf5LOY2Il0BJ4q3Bns6V+jbOgEfDVdg8lA== X-Received: by 10.223.171.149 with SMTP id s21mr21991145wrc.64.1485849577749; Mon, 30 Jan 2017 23:59:37 -0800 (PST) Received: from zgyarmati-ThinkPad-T510.localdomain (x5ce0da15.dyn.telefonica.de. [92.224.218.21]) by smtp.gmail.com with ESMTPSA id c202sm22269210wmd.10.2017.01.30.23.59.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Jan 2017 23:59:37 -0800 (PST) From: Zoltan Gyarmati To: buildroot@buildroot.org Date: Tue, 31 Jan 2017 08:59:07 +0100 Message-Id: <1485849551-20469-6-git-send-email-mr.zoltan.gyarmati@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485849551-20469-1-git-send-email-mr.zoltan.gyarmati@gmail.com> References: <1485849551-20469-1-git-send-email-mr.zoltan.gyarmati@gmail.com> Cc: Andreas Naumann Subject: [Buildroot] [PATCH v6 5/9] qt5declarative: enable Quick for non-GL platforms for Qt 5.8.0 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" From: Naumann Andreas Since Qt 5.8.0 provides a software rasterizer we can enable Quick for non-GL platforms. However, some modules provide less functionality without OpenGL, so install steps have to be limited for the softrender only backend: - qtmultimedia does not provide qml Signed-off-by: Andreas Naumann Signed-off-by: Zoltan Gyarmati --- package/qt5/qt5declarative/Config.in | 6 +++--- package/qt5/qt5multimedia/qt5multimedia.mk | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in index eba4c8d..a8accdb 100644 --- a/package/qt5/qt5declarative/Config.in +++ b/package/qt5/qt5declarative/Config.in @@ -15,11 +15,11 @@ config BR2_PACKAGE_QT5DECLARATIVE if BR2_PACKAGE_QT5DECLARATIVE comment "quick module needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE + depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_QT5_VERSION_5_6 config BR2_PACKAGE_QT5DECLARATIVE_QUICK bool "quick module" - select BR2_PACKAGE_QT5BASE_OPENGL - depends on BR2_PACKAGE_QT5_GL_AVAILABLE + select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5_GL_AVAILABLE + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_QT5_VERSION_5_8 endif diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 7ce947a..b11b8d1 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -58,11 +58,14 @@ define QT5MULTIMEDIA_INSTALL_TARGET_LIBS endef endif +# QtMultimedia QMLs have a hard dependency on OpenGL -> not available for softraster backends +ifeq ($(BR2_PACKAGE_QT5_GL_AVAILABLE),y) ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) define QT5MULTIMEDIA_INSTALL_TARGET_QMLS cp -dpfr $(STAGING_DIR)/usr/qml/QtMultimedia $(TARGET_DIR)/usr/qml/ endef endif +endif ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) define QT5MULTIMEDIA_INSTALL_TARGET_EXAMPLES