From patchwork Tue Feb 7 14:29:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1739005 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PB5C96Wnqz23hn for ; Wed, 8 Feb 2023 01:30:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id D5B0960FB0; Tue, 7 Feb 2023 14:30:43 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org D5B0960FB0 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XYOoFJSe2W_q; Tue, 7 Feb 2023 14:30:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 1445560F48; Tue, 7 Feb 2023 14:30:42 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 1445560F48 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 397C31BF2CA for ; Tue, 7 Feb 2023 14:30:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 1372E60B9A for ; Tue, 7 Feb 2023 14:30:15 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 1372E60B9A X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vBLnRFghtFEQ for ; Tue, 7 Feb 2023 14:30:14 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org E272260F48 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by smtp3.osuosl.org (Postfix) with ESMTPS id E272260F48 for ; Tue, 7 Feb 2023 14:30:13 +0000 (UTC) Received: by mail-wm1-x331.google.com with SMTP id m16-20020a05600c3b1000b003dc4050c94aso11604399wms.4 for ; Tue, 07 Feb 2023 06:30:13 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lRw4ipoY+e/3q6dOkmUIOZE4e/R/bJJzjHZclcmnEtQ=; b=lLV9guzI45R3cYo8HDuuBhyDcAyOyyK6nx8NM6dCJdGehx+2hCisEiO/qicOcL2e56 thzekt7KYXV8E4yIe8lY1jKl50YXm/K1o70QGRzmFPj0IYMWdxZ7WnaLvyZMxzlqxFDY tPoQBJpCNL3xXVbq1o5k6qy6W6rY4xg1VkNjGybO+I2c2GsHqVf5EWcSIo+QGNUGWm1f NP8R36e4YQ2hEjCVf98lyiAuEeIVq1FUVT2kLXadRHD8VTd53NFGOzdljyOpceBlF3Fe pR8BTACmDEQEf9DBgw5dg0NIdW9MTIDoRNykeC71Z7gPzkhyfNdP9HqWtDg9mXwS9lOO ll8Q== X-Gm-Message-State: AO0yUKULjdtJwX2Oeq00YQwZpqnMtRVxkxyCRtlHbOivtb4h7x28FPse C97JdgIwUqOHbIVHxvC5Qjy7JWJBCGSSU3RSWxumXA== X-Google-Smtp-Source: AK7set9CWMZpo7lw3YltdBCCt9AwRJFwBA8SP2n9q/22qP2e8GEVraLQhIcyc/eOEmVDxvrWGNcrSA== X-Received: by 2002:a05:600c:4383:b0:3dc:4cb5:41c with SMTP id e3-20020a05600c438300b003dc4cb5041cmr3363300wmn.0.1675780211829; Tue, 07 Feb 2023 06:30:11 -0800 (PST) Received: from angeloc.wifiguest.local (cpe1150018.bra.be.verixi.net. [85.119.216.19]) by smtp.gmail.com with ESMTPSA id l16-20020a1c7910000000b003dc1d668866sm18537074wme.10.2023.02.07.06.30.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 06:30:11 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 7 Feb 2023 15:29:56 +0100 Message-Id: <20230207143006.2681335-3-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230207143006.2681335-1-angelo@amarulasolutions.com> References: <20230207143006.2681335-1-angelo@amarulasolutions.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lRw4ipoY+e/3q6dOkmUIOZE4e/R/bJJzjHZclcmnEtQ=; b=DkfzFrEm46iX+ynzGFALVfFp/IHUet7XZWBoT1FwltQnDlm8UMYuHCpjKOil2stbIE LK9X2TfrmIY0MrsdyZCrz3sMU2GhM+I31ivku/Zkys/478uLI4Tl5gOmnLkZPe8PSXzd UJY+427BckffHRGxD0d3FoxwK130fadtk7+jM= X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=DkfzFrEm Subject: [Buildroot] [PATCH v5 02/12] package/qt6/qt6base: add support for fontconfig/harfbuzz X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jesseevg@gmail.com, Angelo Compagnucci Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Jesse Van Gavere Additionally the harfbuzz license file is added and the hash for this is also added to the hash file. Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 21 +++++++++++++++++++++ package/qt6/qt6base/qt6base.hash | 1 + package/qt6/qt6base/qt6base.mk | 23 +++++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 03e138b8e1..df9266ba31 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -36,6 +36,27 @@ config BR2_PACKAGE_QT6BASE_GUI help This option enables the Qt6Gui library. +if BR2_PACKAGE_QT6BASE_GUI + +config BR2_PACKAGE_QT6BASE_FONTCONFIG + bool "fontconfig support" + select BR2_PACKAGE_FONTCONFIG + help + This option enables Fontconfig and Freetype support using + the system fontconfig and freetype2 libraries. + +config BR2_PACKAGE_QT6BASE_HARFBUZZ + bool "harfbuzz support" + select BR2_PACKAGE_HARFBUZZ if \ + BR2_TOOLCHAIN_HAS_SYNC_4 && \ + BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + help + This option enables HarfBuzz support (either system harfbuzz + if the toolchain supports __sync for 4 bytes, or the qt + provided one which avoids this dependency by using QAtomic). + +endif + config BR2_PACKAGE_QT6BASE_NETWORK bool "network module" help diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash index 0c722ccded..dda7ff61c8 100644 --- a/package/qt6/qt6base/qt6base.hash +++ b/package/qt6/qt6base/qt6base.hash @@ -1,5 +1,6 @@ # Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.2/submodules/qtbase-everywhere-src-6.4.2.tar.xz.sha256 sha256 a88bc6cedbb34878a49a622baa79cace78cfbad4f95fdbd3656ddb21c705525d qtbase-everywhere-src-6.4.2.tar.xz +sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/harfbuzz-ng/COPYING # Hashes for license files sha256 e3ba223bb1423f0aad8c3dfce0fe3148db48926d41e6fbc3afbbf5ff9e1c89cb LICENSES/Apache-2.0.txt diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 38479dc106..d1e409f35c 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -148,6 +148,29 @@ ifeq ($(BR2_PACKAGE_QT6BASE_GUI),y) QT6BASE_CONF_OPTS += -DFEATURE_gui=ON -DFEATURE_freetype=ON -DINPUT_opengl=no -DFEATURE_vulkan=OFF QT6BASE_DEPENDENCIES += freetype +ifeq ($(BR2_PACKAGE_QT6BASE_HARFBUZZ),y) +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=ON +ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),y) +# system harfbuzz in case __sync for 4 bytes is supported +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=OFF +QT6BASE_DEPENDENCIES += harfbuzz +else #BR2_TOOLCHAIN_HAS_SYNC_4 +# qt harfbuzz otherwise (using QAtomic instead) +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=ON +QT6BASE_LICENSE += , MIT (harfbuzz) +QT6BASE_LICENSE_FILES += src/3rdparty/harfbuzz-ng/COPYING +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON +QT6BASE_DEPENDENCIES += fontconfig +else +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif