From patchwork Sat Feb 18 11:32:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Seiderer X-Patchwork-Id: 729433 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 3vQSRT6BX5z9s8L for ; Sat, 18 Feb 2017 22:32:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 090628886E; Sat, 18 Feb 2017 11:32:17 +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 XOyYHWGENx1y; Sat, 18 Feb 2017 11:32:16 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id CA6EE8672E; Sat, 18 Feb 2017 11:32:15 +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 ED6611BFC90 for ; Sat, 18 Feb 2017 11:32:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EB2848272F for ; Sat, 18 Feb 2017 11:32:10 +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 hW+Ka0VtCbcz for ; Sat, 18 Feb 2017 11:32:08 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) by whitealder.osuosl.org (Postfix) with ESMTPS id 8E6F9826E6 for ; Sat, 18 Feb 2017 11:32:07 +0000 (UTC) Received: from linux.local ([188.110.53.157]) by mail.gmx.com (mrgmx002 [212.227.17.190]) with ESMTPSA (Nemesis) id 0LxPAo-1cHZGg1WQs-016z6F; Sat, 18 Feb 2017 12:32:04 +0100 From: Peter Seiderer To: buildroot@busybox.net Date: Sat, 18 Feb 2017 12:32:01 +0100 Message-Id: <20170218113202.14213-2-ps.report@gmx.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170218113202.14213-1-ps.report@gmx.net> References: <20170218113202.14213-1-ps.report@gmx.net> X-Provags-ID: V03:K0:bt648DHk35fyKyf/hPH5OQo8ChLrhlTNMySU4SF8oUj2MMZ2LIu 4SPazJ+rfu8758bJRVC/QhgQoZJ9O8+OI2oD6nYmH1xdAjJo0TnSY7J6Z5UkYilGS6G/ztw n4UTuAIEIFH68w6iC4NisR5wFskx20b95kzMsgv/vUH4bh/xgPJ2SMHeczvL+1xlBwU/gzm qqXZfIPZuNr8JzFT35cxg== X-UI-Out-Filterresults: notjunk:1; V01:K0:7oeWW8DteLo=:D839dZqAVwws0YdwX2uapa YNrFXuD71jmfGsmbYk/FUCXXlb3X6Q8VcbObCgDNuaGUKgFK41scd4PsP3rENxF0Ldw4CkDB8 iI2hKp+JsYA0AhO0KdFr76ysxt8nRsuUJ2Ekikf5fH95P1jbqvNQENnPlC4fDKzLmpMAXM88b Pber11FxqVgwi8uVeH8ueuKgRLMZRGIQivqGQ8zgIfYFzR2/WWWKI7u8B41KKKQXvOtrWyX/x vlUNkBh55V6jq2dM2mN71yJs2Q+TdUUrJ51cfZ3kwo4TQKj6nc5IZLfsCtXwyRaOgH4dVmuri 1G+IJbO5+Gz7JCvybqmcNFa0WVuTnNdnTrVpeUA9rTvrfuPxPGRiWCnDCcltnV/5X5dQzXRfi yMALhMaDRFN6Ya7WDvvhGQtawOh8iCrVVp6yBrVGZk5/47hTzDGfNAvnqntxSpoDMEMo8ogjC veOTzTxgg0TB97/GDds5+dEmuDxdOyDDQ205tNFJ/xr/AhijJUMY58G2pMP9addsC7eLGrsto RA52uJczCjOa1LzmG1udOVEJ604tnQqGrwnb3B6G6B5AjJLDlLvZJIhPWvtCWoj/iIrTQxq0g +9ELkXXyx3qpGeV+88onKIecyULmFZhDunVyngCVxCuk/H8krDZIbcaqEf0aB9WlcMGyomOcJ qYXAk9AMGt9kXdEoS9RbL7LZ3hVLRTfUshtu+Ym10p2R4X/RRIijbQgEeJVVIjfAYBqgJrhti qzXQVFPaQuu7hSBwn/0AVtSX/jDr9my8svTfr/Eic5lW7FpnY3YdmSriWrk= Subject: [Buildroot] [PATCH v3 2/3] qt5base: use system/buildroot provided freetype 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" Select (and use) builroot provided freetype in case qt5base gui is selected (gui without freetype/font support makes not much sense and gives compile errors). Qt 5.6 needs some support to find the include headers, 5.8 is clever enough inherently. Fixes [1] (by avoiding the build-in freetype library which depends on activated libpng support): Project ERROR: Library 'libpng' is not defined. make[3]: *** [sub-3rdparty-freetype-make_first] Error 3 [1] http://autobuild.buildroot.net/results/219162ba616289f799a5053c4dcc6b8574284283 Signed-off-by: Peter Seiderer Reviewed-by: Arnout Vandecappelle (Essensium/Mind) --- Changes v2 -> v3: - fix typo in patch description s/avtivated/activated (Arnout Vandecappelle) - group freetype related options into ifeq and only set freetype include path in case GUI is selected (Arnout Vandecappelle) - add Reviewed-by: Arnout Vandecappelle Changes v1 -> v2: - updated patch description - checked and fixed for Qt 5.6 --- package/qt5/qt5base/Config.in | 1 + package/qt5/qt5base/qt5base.mk | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/qt5/qt5base/Config.in b/package/qt5/qt5base/Config.in index f22e034b3..337dcf245 100644 --- a/package/qt5/qt5base/Config.in +++ b/package/qt5/qt5base/Config.in @@ -128,6 +128,7 @@ config BR2_PACKAGE_QT5BASE_XML config BR2_PACKAGE_QT5BASE_GUI bool "gui module" + select BR2_PACKAGE_FREETYPE # At least one graphic backend must be enabled, so enable # linuxfb if nothing is enabled. select BR2_PACKAGE_QT5BASE_LINUXFB if \ diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index 582421ac5..78db08ce4 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -97,7 +97,13 @@ QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),sqlite) QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_NONE),-no-sql-sqlite) endif -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GUI),-gui,-no-gui) +ifeq ($(BR2_PACKAGE_QT5BASE_GUI),y) +QT5BASE_CONFIGURE_OPTS += -gui -system-freetype +QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5_VERSION_5_6),-I$(STAGING_DIR)/usr/include/freetype2) +QT5BASE_DEPENDENCIES += freetype +else +QT5BASE_CONFIGURE_OPTS += -no-gui -no-freetype +endif QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets) # We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb # is to add a link against the "inuxfb" library.