From patchwork Tue Nov 15 17:13:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Corjon X-Patchwork-Id: 695145 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tJDXl5cBvz9t0X for ; Wed, 16 Nov 2016 04:15:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A9C1031D66; Tue, 15 Nov 2016 17:15:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YsQX7u+I0jaE; Tue, 15 Nov 2016 17:14:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id CE71A31DA9; Tue, 15 Nov 2016 17:14:01 +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 739101C1698 for ; Tue, 15 Nov 2016 17:13:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 692C692CAE for ; Tue, 15 Nov 2016 17:13:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hSY2gbZ7elT7 for ; Tue, 15 Nov 2016 17:13:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by hemlock.osuosl.org (Postfix) with ESMTPS id C50FC8ACAD for ; Tue, 15 Nov 2016 17:13:42 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id m203so2009904wma.3 for ; Tue, 15 Nov 2016 09:13:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=UjJx60MI0ThrvXC4pEnPvgUTdLkiVbMHy1gZGHdO8A4=; b=eHNBze5kXz1zF47OnW15nqLGZhbHcn5vNvo0+xNW3A2NabHaVw0bjU2HjZ/qeN2pN6 CdlrE8IY4dMLG3fDNYz+V+TEQCGiLAwg2ESXAADTPx+ohnT1YSUpvnXWHflgLTABk59c 1s+Cvp0vInoGM8iiud3Bx9POny9bcZ1D6CCLGPoFndhpTMpQ3jduCQF/NlQalEJfjHUr SiSRHwOcYn+gK2g+VgWUoGEyt+9z3wDmNcGsTeBpEIUAp1KsadG0zy8J+tVLxrGG5Awa NJGhx9pR1V0BiRc8DyHQk57iz8Vo1NowMsovsnee/G1C5UtEqrzWoBrIM1WIYQReiGHS VqdA== X-Gm-Message-State: ABUngvcOGi0rG8zZG/QIuFvDKx2IoX04IdO0+oD0y+grkm7olvuPyqtTajEgmqt2+F7dFQ== X-Received: by 10.194.142.243 with SMTP id rz19mr24738072wjb.132.1479230021241; Tue, 15 Nov 2016 09:13:41 -0800 (PST) Received: from mic341-linux.sinters-int.fr ([195.200.174.78]) by smtp.gmail.com with ESMTPSA id jx8sm35711025wjc.2.2016.11.15.09.13.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Nov 2016 09:13:40 -0800 (PST) From: Julien Corjon To: Buildroot , Andreas Naumann , Alexey Brodkin Date: Tue, 15 Nov 2016 18:13:06 +0100 Message-Id: <20161115171307.7499-7-corjon.j@ecagroup.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161115171307.7499-1-corjon.j@ecagroup.com> References: <20161115171307.7499-1-corjon.j@ecagroup.com> In-Reply-To: <1478601048-21388-1-git-send-email-anaumann@ultratronik.de> References: <1478601048-21388-1-git-send-email-anaumann@ultratronik.de> Cc: ECA SINTERS software , Peter Seiderer Subject: [Buildroot] [Rejected v2 6/7] qt5declarative: enable Quick for non-GL platforms 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" 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: Julien Corjon --- package/qt5/qt5declarative/Config.in | 4 +--- package/qt5/qt5multimedia/qt5multimedia.mk | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5declarative/Config.in b/package/qt5/qt5declarative/Config.in index eba4c8d..0604e85 100644 --- a/package/qt5/qt5declarative/Config.in +++ b/package/qt5/qt5declarative/Config.in @@ -14,12 +14,10 @@ config BR2_PACKAGE_QT5DECLARATIVE if BR2_PACKAGE_QT5DECLARATIVE -comment "quick module needs an OpenGL-capable backend" +comment "quick module without OpenGL-capable backend will use a less performant software backend" depends on !BR2_PACKAGE_QT5_GL_AVAILABLE config BR2_PACKAGE_QT5DECLARATIVE_QUICK bool "quick module" - select BR2_PACKAGE_QT5BASE_OPENGL - depends on BR2_PACKAGE_QT5_GL_AVAILABLE endif diff --git a/package/qt5/qt5multimedia/qt5multimedia.mk b/package/qt5/qt5multimedia/qt5multimedia.mk index 67e7968..41eb0f6 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.mk +++ b/package/qt5/qt5multimedia/qt5multimedia.mk @@ -53,11 +53,13 @@ define QT5MULTIMEDIA_INSTALL_TARGET_LIBS endef endif +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 define QT5MULTIMEDIA_INSTALL_TARGET_CMDS $(QT5MULTIMEDIA_INSTALL_TARGET_LIBS)