From patchwork Tue Feb 7 17:17:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1739079 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 4PB8w12L2mz23j0 for ; Wed, 8 Feb 2023 04:17:53 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 72E7960BB1; Tue, 7 Feb 2023 17:17:51 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 72E7960BB1 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 o_wAW6hWhz7B; Tue, 7 Feb 2023 17:17:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 4CDE36100C; Tue, 7 Feb 2023 17:17:47 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 4CDE36100C X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 1CDA01BF5F6 for ; Tue, 7 Feb 2023 17:17:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id E998E8137A for ; Tue, 7 Feb 2023 17:17:33 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org E998E8137A X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YTHP83lgKBSM for ; Tue, 7 Feb 2023 17:17:32 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org CF51881371 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by smtp1.osuosl.org (Postfix) with ESMTPS id CF51881371 for ; Tue, 7 Feb 2023 17:17:31 +0000 (UTC) Received: by mail-wr1-x435.google.com with SMTP id i5so7102091wrc.0 for ; Tue, 07 Feb 2023 09:17:31 -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=3OUI0x3S6Rrz3zBbzqQrnMutWFXwim+Mi6Z5iQrxQn0=; b=G61yYVBWsEqcjS8TzCtCyCfQb02bJsUgBvfXts5NpHBBg9WPa0wJx7ct/mWuMboO8h RTN00vzTvb4dhiiue4bkFwYqE50cKUqMOH/uYeQ8jV6VYBcmHacH8/z+BBn1SVplJHYg oe3oVUeQErWgt/g/M6ub54sE7cN8wUmL5ERSSnfGVxKhSHoNYpEGgGGxR06UgpAIyegZ JwihjaafsyPgDTku09JDjFVCyjQU/Dpsx6wq4URgNTYjVI7EPW+EZk/NGAKEMAPONO8u Qm3baFZgmtxA3qeJDSxe8Dg2D+8kdT4OLO8+Ep4/pLKKqHK/RS3p6TRDyUb14AmMat4P mSWQ== X-Gm-Message-State: AO0yUKW2EdqC615cXgktG7tYk9SenRF0oVuVDr5ip7lhc5+d8NxMl7A8 hByq1aSIHOINPWaFq7GRwq9fzQHE7YIixJ5U7uvgag== X-Google-Smtp-Source: AK7set9KQZ8Cg2IGyfYRcoknKGh+iklUrwAvL+XwJRh9XBwMZeUO2FGVrNFL74pgMDd9Y6Rith00jg== X-Received: by 2002:a5d:6101:0:b0:2c1:2a1c:a8d2 with SMTP id v1-20020a5d6101000000b002c12a1ca8d2mr3429001wrt.27.1675790249783; Tue, 07 Feb 2023 09:17:29 -0800 (PST) Received: from angeloc.wifiguest.local (cpe1150018.bra.be.verixi.net. [85.119.216.19]) by smtp.gmail.com with ESMTPSA id q16-20020adff950000000b002bff574a250sm11708801wrr.2.2023.02.07.09.17.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 09:17:29 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 7 Feb 2023 18:17:09 +0100 Message-Id: <20230207171721.2973997-2-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-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=3OUI0x3S6Rrz3zBbzqQrnMutWFXwim+Mi6Z5iQrxQn0=; b=ZuILkLVddPcuRNyZPIjHif5Ry/sVnlbIAzf+gbsHRpgF/AdscQlO2C9+kmgDAyvJz5 lFHocsFPcVzJ20IRbuaD6vV/LoB5rGIFF8ko1fC0JuJA5/rQwoj8pgoGgLnVg+iVQz2D UMqcZNfxtPeAyP6KUpHzUbZZ5ilmnQQcR8dOA= X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=ZuILkLVd Subject: [Buildroot] [PATCH v6 01/13] package/qt6/qt6base: add support for gui module 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 Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- v6: * Moved the basic linuxfb, xcb backend support here (Thomas P.) package/qt6/qt6base/Config.in | 31 +++++++++++++++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index e8357a675c..1810b1586d 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -30,6 +30,37 @@ config BR2_PACKAGE_QT6BASE_DBUS help This option enables the D-Bus module. +config BR2_PACKAGE_QT6BASE_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_QT6BASE_LINUXFB if \ + !BR2_PACKAGE_QT6BASE_XCB + help + This option enables the Qt6Gui library. + +if BR2_PACKAGE_QT6BASE_GUI + +config BR2_PACKAGE_QT6BASE_LINUXFB + bool "linuxfb support" + +config BR2_PACKAGE_QT6BASE_XCB + bool "X.org XCB support" + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBX11 + select BR2_PACKAGE_LIBXCB + select BR2_PACKAGE_XCB_UTIL_IMAGE + select BR2_PACKAGE_XCB_UTIL_KEYSYMS + select BR2_PACKAGE_XCB_UTIL_RENDERUTIL + select BR2_PACKAGE_XCB_UTIL_WM + select BR2_PACKAGE_LIBXKBCOMMON + +comment "X.org XCB backend available if X.org is enabled" + depends on !BR2_PACKAGE_XORG7 + +endif + config BR2_PACKAGE_QT6BASE_NETWORK bool "network module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 2f159f380b..9bfb2a8420 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -141,6 +141,39 @@ else QT6BASE_CONF_OPTS += -DFEATURE_glib=OFF endif +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_LINUXFB),y) +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_XCB),y) +QT6BASE_CONF_OPTS += \ + -DFEATURE_xcb=ON \ + -DFEATURE_xcb_xlib=ON \ + -DFEATURE_xkbcommon=ON \ + -DFEATURE_xkbcommon_x11=ON +QT6BASE_DEPENDENCIES += \ + libxcb \ + xcb-util-wm \ + xcb-util-image \ + xcb-util-keysyms \ + xcb-util-renderutil \ + xlib_libX11 \ + libxkbcommon +QT6BASE_DEPENDENCIES += xlib_libXext +else +QT6BASE_CONF_OPTS += -DFEATURE_xcb=OFF +endif + +else +QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF +endif + ifeq ($(BR2_PACKAGE_OPENSSL),y) QT6BASE_CONF_OPTS += -DINPUT_openssl=yes QT6BASE_DEPENDENCIES += openssl From patchwork Tue Feb 7 17:17:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1739080 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 4PB8wF3YgFz23j0 for ; Wed, 8 Feb 2023 04:18:05 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id CC1F16100E; Tue, 7 Feb 2023 17:18:03 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org CC1F16100E 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 ghQTLC1ZjBbM; Tue, 7 Feb 2023 17:18:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id CD9BE6101C; Tue, 7 Feb 2023 17:18:00 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org CD9BE6101C X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id AB9AE1BF95C for ; Tue, 7 Feb 2023 17:17:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 92A0F418A3 for ; Tue, 7 Feb 2023 17:17:34 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 92A0F418A3 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 80fpAE0vFIWJ for ; Tue, 7 Feb 2023 17:17:33 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 327BD418A0 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by smtp4.osuosl.org (Postfix) with ESMTPS id 327BD418A0 for ; Tue, 7 Feb 2023 17:17:33 +0000 (UTC) Received: by mail-wr1-x434.google.com with SMTP id a2so13999822wrd.6 for ; Tue, 07 Feb 2023 09:17:33 -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=VDwUC6UISKevWtUWKvVezdAPutAEFiQ8AITGfDtGswE=; b=vhjdXz3w6pcVcFDJ+/egVBtTTyb19rsiR3Lv0qnAYwJbWfUN21ykrB/PTGsbXcMsyj yc9NPVuVWDCI8k3/5LTOH8oWn3t3450wRaZCTUPq4BHRTYVg2TJwYak53ewSAklxp1No ddnMcCxkqoov/mCNkCabxOiC+yxeDk5WdxWnm24dlEv1kwXcIFuieQNJ7GIT0KDZMvCq qWCADbHqLLRWaODV3DWZ2uD6I06Qkn3wbQT+YXt/4IIeG/wcfCMTOBr15z5jZUkYGkPW xhtzIgrWx3LmHtg+yT5BuJ5WMpL32bLkZq5YE3L08eWt9ageCGMCCRV81djEV7R9zgR+ JoyA== X-Gm-Message-State: AO0yUKU9z8pMFnm96bESFW1w+5qx8JyJvHundXEU57IUs2Yt9jH6iY82 yJJa41uJ8waN0XTENFiVh6qK6wlaMNHR+URk1dqBOQ== X-Google-Smtp-Source: AK7set8bCvKUeOTazKWYOKLJESQvDp96N22vMF/bjc3xNwGgNKx5ve3m5w3Vruxs5NJprAW9L70ydA== X-Received: by 2002:a5d:658a:0:b0:2c3:ea86:863b with SMTP id q10-20020a5d658a000000b002c3ea86863bmr3336941wru.29.1675790251016; Tue, 07 Feb 2023 09:17:31 -0800 (PST) Received: from angeloc.wifiguest.local (cpe1150018.bra.be.verixi.net. [85.119.216.19]) by smtp.gmail.com with ESMTPSA id q16-20020adff950000000b002bff574a250sm11708801wrr.2.2023.02.07.09.17.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 09:17:30 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 7 Feb 2023 18:17:10 +0100 Message-Id: <20230207171721.2973997-3-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-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=VDwUC6UISKevWtUWKvVezdAPutAEFiQ8AITGfDtGswE=; b=hd0QDrygmQLxCyyH6+HEIIJV+KtlnLrK8LKgF0M4rQV5vQw97LocCNpstukEJmg9ue FPvI1NwjWl17DGFjMnM0B1vL1R9M8pTEFJgYVuTTqzmcZxAsyrUqoeA6dSfXISIF199h VxMH6mka/M3kG0wqunhBbvd/2M52ITyO6+5IU= X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=hd0QDryg Subject: [Buildroot] [PATCH v6 02/13] 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 | 17 +++++++++++++++++ package/qt6/qt6base/qt6base.hash | 1 + package/qt6/qt6base/qt6base.mk | 23 +++++++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 1810b1586d..594221b792 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -59,6 +59,23 @@ config BR2_PACKAGE_QT6BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +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 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 9bfb2a8420..da67b12c99 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -170,6 +170,29 @@ else QT6BASE_CONF_OPTS += -DFEATURE_xcb=OFF endif +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 From patchwork Tue Feb 7 17:17:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1739082 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 4PB8wl2rtKz23j0 for ; Wed, 8 Feb 2023 04:18:31 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id BCB0F6100F; Tue, 7 Feb 2023 17:18:29 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org BCB0F6100F 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 Eum42QJ2IFbB; Tue, 7 Feb 2023 17:18:29 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id F0EF76100C; Tue, 7 Feb 2023 17:18:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org F0EF76100C X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D03C81BF5F6 for ; Tue, 7 Feb 2023 17:17:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id AA24381398 for ; Tue, 7 Feb 2023 17:17:35 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org AA24381398 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uMKdwNpkwBSN for ; Tue, 7 Feb 2023 17:17:34 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 11C0981371 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by smtp1.osuosl.org (Postfix) with ESMTPS id 11C0981371 for ; Tue, 7 Feb 2023 17:17:33 +0000 (UTC) Received: by mail-wr1-x42a.google.com with SMTP id y1so14288504wru.2 for ; Tue, 07 Feb 2023 09:17:33 -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=uzXwniSD35IXJw+2geGzA3K62SjPrn/GU6f21D9Eg88=; b=47KQapOG62VqUWm/sJmMrO40X92VL2CZ7iB7/piGRdh6BrsxEt86BwEp17PIQA1snP UYJ0YM5UxMhggR3o59R6//RdIAIasxi93Mu9PYmDMeT8jKLFhicv9F7BYfFWQ0yzF83q YdI1xCLuZ5R38XyCKaWapERMNu01JaQWjVSoIGoOmR7fvt4s3oIrCCaPphTnTGxNq/8z NhWj0LKbZZS697nFC/5o+UMcPTdPDtaHrLY0JKB3mkwZcl46f4dTShetCn5nu6j99oON Wi8i3Facx7C5weLVKaPpJrKa59YSfHL6XU/S6eiKm0Wdbl6A6XmJiyDvQb+pPnSodpfh rWGg== X-Gm-Message-State: AO0yUKVqa/DjCSz9ZNuiIsLgqlf9EJ6EXf840+MQcuwI8jQtRJccNj7B 3ADNXE0e1lz++BdfKaB8eCORxgMpfvXpoxZimJZ0gw== X-Google-Smtp-Source: AK7set+pr60QGGDZ+ev05RTdwCfNQVyBKa4+NBakPyY1Q74CuZLUzb6HAEp7DB+w0azq5B/CcIQoTw== X-Received: by 2002:adf:e98a:0:b0:2c3:ea95:4726 with SMTP id h10-20020adfe98a000000b002c3ea954726mr3682381wrm.34.1675790251969; Tue, 07 Feb 2023 09:17:31 -0800 (PST) Received: from angeloc.wifiguest.local (cpe1150018.bra.be.verixi.net. [85.119.216.19]) by smtp.gmail.com with ESMTPSA id q16-20020adff950000000b002bff574a250sm11708801wrr.2.2023.02.07.09.17.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 09:17:31 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 7 Feb 2023 18:17:11 +0100 Message-Id: <20230207171721.2973997-4-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-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=uzXwniSD35IXJw+2geGzA3K62SjPrn/GU6f21D9Eg88=; b=oLGkXve4EaQE3k51Fc1BSC2Bc+f0HBcpHX6XzIfcmq9IGkAHz0SYShMj7Dxxzur2mI xpSrPRa4+VI8McPB3dPAxUJzcsXaIiSyTloONbp6+9xwacJFeZgHzmCYN+tOcV7+kdjO /rTBjKsGsQhdScNrKrFmZOkB98mcXroJUEVPM= X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=oLGkXve4 Subject: [Buildroot] [PATCH v6 03/13] package/qt6/qt6base: Add support for jpeg/png/gif image format 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 Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 19 +++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 20 ++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 594221b792..6c5c60fa30 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -76,6 +76,25 @@ config BR2_PACKAGE_QT6BASE_HARFBUZZ if the toolchain supports __sync for 4 bytes, or the qt provided one which avoids this dependency by using QAtomic). +config BR2_PACKAGE_QT6BASE_GIF + bool "GIF support" + help + This compiles and installs the plugin for GIF reading support. + +config BR2_PACKAGE_QT6BASE_JPEG + bool "JPEG support" + select BR2_PACKAGE_JPEG + help + This option enables JPEG support using the system libjpeg + library. + +config BR2_PACKAGE_QT6BASE_PNG + bool "PNG support" + select BR2_PACKAGE_LIBPNG + help + This option enables PNG support using the system libpng + library. + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index da67b12c99..06ebbab8e7 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -186,6 +186,26 @@ else QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_PNG),y) +QT6BASE_CONF_OPTS += -DFEATURE_png=ON -DFEATURE_system_png=ON +QT6BASE_DEPENDENCIES += libpng +else +QT6BASE_CONF_OPTS += -DFEATURE_png=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_GIF),y) +QT6BASE_CONF_OPTS += -DFEATURE_gif=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_gif=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_JPEG),y) +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=ON +QT6BASE_DEPENDENCIES += jpeg +else +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON QT6BASE_DEPENDENCIES += fontconfig From patchwork Tue Feb 7 17:17:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1739081 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::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (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 4PB8wV1758z23j0 for ; Wed, 8 Feb 2023 04:18:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 5C0DD418C0; Tue, 7 Feb 2023 17:18:16 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 5C0DD418C0 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TH-1N0VlRFdB; Tue, 7 Feb 2023 17:18:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 4250B418A3; Tue, 7 Feb 2023 17:18:14 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 4250B418A3 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 073C81BF95C for ; Tue, 7 Feb 2023 17:17:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id E36E440A68 for ; Tue, 7 Feb 2023 17:17:35 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org E36E440A68 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QB5ZIhb-UwIA for ; Tue, 7 Feb 2023 17:17:35 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 2DA6940120 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by smtp2.osuosl.org (Postfix) with ESMTPS id 2DA6940120 for ; Tue, 7 Feb 2023 17:17:35 +0000 (UTC) Received: by mail-wr1-x42a.google.com with SMTP id g6so6290806wrv.1 for ; Tue, 07 Feb 2023 09:17:34 -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=tQ3ImKQlQXlQVIhQWhVMa2glT2ove3VTuyu/BvzPfs4=; b=21YPYPtdZM0FY81Xp/vnzzl2gFOByd3B8zD4OFE7RhtkA7gLJXPO27rNnIIRD72viH +KsqortL3OhGzmKViwP3VzwvSkr43r7MiWf9qvSQFYoOYLjIpmnWZqwMf9j1/08Wb8qw J/ShbODVj75xHS1n9wvxXfFbxBQapEh82d4WePgFiokVBrZQ/8+xxH9Q0JExT3hhAXUO vjTpev/jN1KVRl26ko8qO8WczUUJpKtY427F67slrEY4F5jxR5ZuXTpSH+Mctnxxwj0m I2Ar+JxSdQDpearwhAGon8bXsmqZUUbLg2A/w+DPCN9QkLhQSyTK5ZHVoC/Oeq3DdjaD xF7A== X-Gm-Message-State: AO0yUKUDcK2SAIPqHwrBYSIC2E4uLuid/a4dC7DQz0lEVpo1daj5aQ+a OTAuN2jngytMVHjOAvTz0uat53k6A/0+iOMDHTmx+w== X-Google-Smtp-Source: AK7set8vg9s947llooDL8aVIxV8CndN5dASArX66EZQRr8xx4VgtJiAk+j0qPP4tDvVsyM91eZg0jQ== X-Received: by 2002:a05:6000:118c:b0:2bf:bd43:aacc with SMTP id g12-20020a056000118c00b002bfbd43aaccmr2893458wrx.55.1675790253101; Tue, 07 Feb 2023 09:17:33 -0800 (PST) Received: from angeloc.wifiguest.local (cpe1150018.bra.be.verixi.net. [85.119.216.19]) by smtp.gmail.com with ESMTPSA id q16-20020adff950000000b002bff574a250sm11708801wrr.2.2023.02.07.09.17.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 09:17:32 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 7 Feb 2023 18:17:12 +0100 Message-Id: <20230207171721.2973997-5-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-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=tQ3ImKQlQXlQVIhQWhVMa2glT2ove3VTuyu/BvzPfs4=; b=B6hslwrr4r+ad1lWDsQgiLWTzzFNYg684dRYrGEdJ+58xwDtLo3aP7BJLmeniWfa5f lcJ4DeEZKGyBThclQ6g4vvYhqxa7gibVn4QRwStcGbms/Y60nPtU6NubAMXrvwNF78SJ JrScrGEgvAEg+shVzqg1+p1ACQeg6jpXkETf4= X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=B6hslwrr Subject: [Buildroot] [PATCH v6 04/13] package/qt6/qt6base: add support for widgets 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" Signed-off-by: Angelo Compagnucci --- v6: * Removed backend configuration options (Thomas P.) package/qt6/qt6base/Config.in | 6 ++++++ package/qt6/qt6base/qt6base.mk | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 6c5c60fa30..0f7e936162 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -95,6 +95,12 @@ config BR2_PACKAGE_QT6BASE_PNG This option enables PNG support using the system libpng library. +config BR2_PACKAGE_QT6BASE_WIDGETS + bool "widgets module" + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT6BASE_XCB + help + This option enables the Qt6Widgets library. + endif config BR2_PACKAGE_QT6BASE_NETWORK diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 06ebbab8e7..cf3c7b1ad1 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -213,6 +213,10 @@ else QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y) +QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif From patchwork Tue Feb 7 17:17:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1739083 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::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (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 4PB8x96GCvz23j0 for ; Wed, 8 Feb 2023 04:18:53 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 403A6813A2; Tue, 7 Feb 2023 17:18:52 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 403A6813A2 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f7dMSEMB1wJ7; Tue, 7 Feb 2023 17:18:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 7CAF081380; Tue, 7 Feb 2023 17:18:50 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 7CAF081380 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 0CDE31BF5F6 for ; Tue, 7 Feb 2023 17:17:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 9C9748138C for ; Tue, 7 Feb 2023 17:17:36 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 9C9748138C X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mfmEXTAHEkhL for ; Tue, 7 Feb 2023 17:17:36 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org C738A81371 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by smtp1.osuosl.org (Postfix) with ESMTPS id C738A81371 for ; Tue, 7 Feb 2023 17:17:35 +0000 (UTC) Received: by mail-wr1-x435.google.com with SMTP id i5so7102372wrc.0 for ; Tue, 07 Feb 2023 09:17:35 -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=sES87t5RZXLYfZSf9KyNEWtWU5IEeAi+zEeTbVAwZsc=; b=mzpmSDYwpepCMAgeOokbRWdlaI3Y1L9dpEij90gaEqv2IEn12UYlc23A/6b9cdG3Ql PAhQesM1owWUSDmwQ1pk0wf7mMROjHlfWUd0z/VLou1rVTtkVI8r9KqnNKLtJcHDwt66 T6Hn65oVqyY/2pI3pqvIcIs+pFA7H8og/FDgaWyVz5bsnW+g4FEwN7ktNvsd79SZaXdh MF5ALcNUr4B7l3+WiwhACFD0gO0wNAVUzh12SZP03B74zyMJLrxSB4kFWWT+eDAJ8otc QIXD1TyNMxrdlM91lS5BFYg2CZJoQ8r9/4JWVtz2/0p4sVMl/7EzuIf4SUVEiXEi5TDy sGdg== X-Gm-Message-State: AO0yUKXZl4+uilzGcUoAolgY1rkXYzBCBR8awUW0AhWSOWBPhwUTszZY 4vmDGGOz65g/JCCrTyjPc0aN+e8SwUmAGIlC88KZKA== X-Google-Smtp-Source: AK7set9KxRaQII4nJoKZv5RiIMLD44oUu73XzVUv5kk8J6jMX3smePBmLjOEzn9XoLFmJbMWtjN9iA== X-Received: by 2002:a5d:4452:0:b0:2c3:f2a3:c37c with SMTP id x18-20020a5d4452000000b002c3f2a3c37cmr3514618wrr.9.1675790254269; Tue, 07 Feb 2023 09:17:34 -0800 (PST) Received: from angeloc.wifiguest.local (cpe1150018.bra.be.verixi.net. [85.119.216.19]) by smtp.gmail.com with ESMTPSA id q16-20020adff950000000b002bff574a250sm11708801wrr.2.2023.02.07.09.17.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 09:17:33 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 7 Feb 2023 18:17:13 +0100 Message-Id: <20230207171721.2973997-6-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-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=sES87t5RZXLYfZSf9KyNEWtWU5IEeAi+zEeTbVAwZsc=; b=iZOk6PgZsySM30LDiVgpG1Boxj3d0EtpRMGCNJpxz2Gr0f7k6Rx9OfqPyqg/2LlNoj GUMb0MWhd0fOq51rv2icspACj1Vy3nMjBbu+taJH8Afj0n4sx0SXEYqW3Ye+85hpDep/ aF3Sbp/HWTbXakRPxAi0FFBBsHO2OxRApp9zo= X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=iZOk6PgZ Subject: [Buildroot] [PATCH v6 05/13] package/qt6/qt6base: add support for widgets gtk backend 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" Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/qt6base.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index cf3c7b1ad1..f936d19c68 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -215,6 +215,17 @@ endif ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y) QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON + +# only enable gtk support if libgtk3 X11 backend is enabled +ifeq ($(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_LIBGTK3_X11),yy) +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=ON +QT6BASE_DEPENDENCIES += libgtk3 +else +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=OFF +endif + +else +QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif else From patchwork Tue Feb 7 17:17:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1739084 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::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (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 4PB8xR2zwxz23j0 for ; Wed, 8 Feb 2023 04:19:07 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 6B70181E96; Tue, 7 Feb 2023 17:19:05 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 6B70181E96 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9A9lJkq6BOBd; Tue, 7 Feb 2023 17:19:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 94BAE813A2; Tue, 7 Feb 2023 17:19:03 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 94BAE813A2 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 65B9D1BF95C for ; Tue, 7 Feb 2023 17:17:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 4020B40A68 for ; Tue, 7 Feb 2023 17:17:37 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 4020B40A68 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NLmHnRuCYY3j for ; Tue, 7 Feb 2023 17:17:36 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 40FA440120 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by smtp2.osuosl.org (Postfix) with ESMTPS id 40FA440120 for ; Tue, 7 Feb 2023 17:17:36 +0000 (UTC) Received: by mail-wr1-x42a.google.com with SMTP id g6so6290934wrv.1 for ; Tue, 07 Feb 2023 09:17:36 -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=+in/pJMMsTvzZI+nrYKuTsPyvPD8XzJjqcUhmgGSO+E=; b=PPom9zcgVy9rp8g33Nt6cMvW7C0e0NKL08CQI+mu9HmmDNo8j5OZm1M41lKX13ScDB JcBIgzE9owUq2jXhpGsqb5ssuT+oaIw3NJpP1woyJaIUfRIHoaZ00pp16rBIj/FJUXLB eRpXDZkjLNNAEm392QOHF3vxWH6U5T219aCshLSZQJuGqt7/BZ4jLQMfWtRed/LHW/Ud SZQrSOPoPodhp+kijlW78Xmlt5w4YTJ57/qbSkjQnyzKcTdHOY4dW61BZwxZHgYNLECY KbqMAq6Uyf+ia9XQMtxMxtn0AHt7K859wLeUwzO50miDpu6bAyBLfplZ2gCnRIqTS0QC 9dMA== X-Gm-Message-State: AO0yUKWR8TJjanZeejPBLzkvw/xisVbj9QvUViV0I9CwVd9gX+ykqAKr stwtqzduRGPl74AqUO83b7azRrt2RllKXu31Q69mAA== X-Google-Smtp-Source: AK7set+w3Bd24I4USScnx2Wa/mXVg0EYBZy9x8OXBSp9VcolXaVhzLyVkplLcnGmU5EFOKeQgvgMcg== X-Received: by 2002:a5d:4a12:0:b0:2c3:c647:a520 with SMTP id m18-20020a5d4a12000000b002c3c647a520mr3898287wrq.36.1675790255374; Tue, 07 Feb 2023 09:17:35 -0800 (PST) Received: from angeloc.wifiguest.local (cpe1150018.bra.be.verixi.net. [85.119.216.19]) by smtp.gmail.com with ESMTPSA id q16-20020adff950000000b002bff574a250sm11708801wrr.2.2023.02.07.09.17.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 09:17:34 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 7 Feb 2023 18:17:14 +0100 Message-Id: <20230207171721.2973997-7-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-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=+in/pJMMsTvzZI+nrYKuTsPyvPD8XzJjqcUhmgGSO+E=; b=WOJEDhATZcifEmDHPppHO2bLjIlibpe38I5kK8wWj3O1c8WgjmHm8WEOnAU1XR9r8d s+C04hmbZmMcgzB75PUhWWR8sHgfJOrx5wS0XC6ViEVNpoxOfKSp4RUpirZigK1NrSkA DEkUVlIuxjr+ep1jzjm8OQz26zuKuusTmHPBQ= X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=WOJEDhAT Subject: [Buildroot] [PATCH v6 06/13] package/qt6/qt6base: add opengl support 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" Signed-off-by: Angelo Compagnucci --- v6: * Moving eglfs backend selection here (Thomas P.) package/qt6/Config.in | 5 ++++ package/qt6/qt6base/Config.in | 49 +++++++++++++++++++++++++++++++++- package/qt6/qt6base/qt6base.mk | 17 ++++++++++++ 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/package/qt6/Config.in b/package/qt6/Config.in index b0cc008df5..655fa8392a 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -12,6 +12,11 @@ config BR2_PACKAGE_QT6_ARCH_SUPPORTS default y if BR2_sparc64 depends on BR2_USE_MMU +config BR2_PACKAGE_QT6_GL_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES + comment "qt6 needs a toolchain w/ C++, threads, wchar, dynamic library, gcc >= 8, host gcc >= 8" depends on !BR2_PACKAGE_QT5 depends on BR2_PACKAGE_QT6_ARCH_SUPPORTS diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 0f7e936162..a33ffcd511 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -36,7 +36,8 @@ config BR2_PACKAGE_QT6BASE_GUI # At least one graphic backend must be enabled, so enable # linuxfb if nothing is enabled. select BR2_PACKAGE_QT6BASE_LINUXFB if \ - !BR2_PACKAGE_QT6BASE_XCB + !BR2_PACKAGE_QT6BASE_XCB && \ + !BR2_PACKAGE_QT6BASE_EGLFS help This option enables the Qt6Gui library. @@ -59,6 +60,52 @@ config BR2_PACKAGE_QT6BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_QT6BASE_OPENGL + bool "OpenGL support" + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + help + This option enables OpenGL support. + +comment "OpenGL support needs an OpenGL-capable backend" + depends on !BR2_PACKAGE_QT6_GL_SUPPORTS + +if BR2_PACKAGE_QT6BASE_OPENGL + +choice + prompt "OpenGL API" + help + Select OpenGL API. + +config BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP + bool "Desktop OpenGL" + depends on BR2_PACKAGE_HAS_LIBGL + help + Use desktop OpenGL. + +config BR2_PACKAGE_QT6BASE_OPENGL_ES2 + bool "OpenGL ES 2.0+" + depends on BR2_PACKAGE_HAS_LIBGLES + help + Use OpenGL ES 2.0 and later versions. + +endchoice + +config BR2_PACKAGE_QT6BASE_OPENGL_LIB + bool "opengl module" + select BR2_PACKAGE_QT6BASE_WIDGETS + help + This option enables the Qt6OpenGL library. This library + includes OpenGL support classes provided to ease porting + from Qt 4.x. + +config BR2_PACKAGE_QT6BASE_EGLFS + bool "eglfs support" + default y + depends on BR2_PACKAGE_HAS_LIBGBM + select BR2_PACKAGE_QT6BASE_OPENGL + +endif + config BR2_PACKAGE_QT6BASE_FONTCONFIG bool "fontconfig support" select BR2_PACKAGE_FONTCONFIG diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index f936d19c68..e9a3396fb6 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -228,6 +228,23 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) +QT6BASE_CONF_OPTS += -DFEATURE_egl=ON -DFEATURE_eglfs=ON +QT6BASE_DEPENDENCIES += libegl +else +QT6BASE_CONF_OPTS += -DFEATURE_eglfs=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP),y) +QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengl_desktop=ON +QT6BASE_DEPENDENCIES += libgl +else ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_ES2),y) +QT6BASE_CONF_OPTS += -DFEATURE_opengl=ON -DFEATURE_opengles2=ON +QT6BASE_DEPENDENCIES += libgles +else +QT6BASE_CONF_OPTS += -DFEATURE_opengl=OFF -DINPUT_opengl=no +endif + else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif From patchwork Tue Feb 7 17:17:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1739085 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=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (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 4PB8xk0zZ8z23j0 for ; Wed, 8 Feb 2023 04:19:22 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 55CA5418A0; Tue, 7 Feb 2023 17:19:20 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 55CA5418A0 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id quNbAmeQqZrW; Tue, 7 Feb 2023 17:19:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 460BB418C0; Tue, 7 Feb 2023 17:19:18 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 460BB418C0 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 240F21BF5F6 for ; Tue, 7 Feb 2023 17:17:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 0B93240A68 for ; Tue, 7 Feb 2023 17:17:40 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 0B93240A68 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YdRIxA7IVcss for ; Tue, 7 Feb 2023 17:17:39 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 3176E40120 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by smtp2.osuosl.org (Postfix) with ESMTPS id 3176E40120 for ; Tue, 7 Feb 2023 17:17:39 +0000 (UTC) Received: by mail-wr1-x430.google.com with SMTP id h3so6431956wrp.10 for ; Tue, 07 Feb 2023 09:17:39 -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=CT9fxk0HFbYt2zMQ30QJ3hxYUP6ca7tpI0QLhgB7kLU=; b=N/5ezmNPmVUpxjE/mupFr1aHMfKRyNm6Wrzx/ssjhDNjPRROOsS2wLUzFf7N0luhWn LF0Y+0tnT3rYPmv0tWWrzPJAH3LjhKU59of4qonGGhDg2lr48Yjj7awD3rZwT3R+VltU cAWAyKeMAkPe/hlQJsiRBHwRWbNA2OqePuHpTfDx6mkfYgFw0jJL2NCkU33Op+kYQTv4 xKaV721mbJSRIm5iANzSPYgIH7eeAXdnKuswr2rleY+ZISLLFcgc971jKgN6/Zk/qKAE NaRp+cJsYOdPaC/5GVvxV4saMXk7dwmfmIjoEupbblDqKJnq/13e8KG/EgomgpA68/sc K2MQ== X-Gm-Message-State: AO0yUKWBx5RWXqxK/5+zNur6LOhZo7SWWgVmD8EEm4MpYgQiasuZhR9G d0m7dlIIM0Q/I2h4ghjfALuMY6tj2Fp8qk0NS+vsbw== X-Google-Smtp-Source: AK7set9GF6+HJWfByK7DbD9djpcymxQXF0a3mSnVAopH80AzD92rWnrIniT54K/69FmSh3C/bMsckQ== X-Received: by 2002:adf:ea81:0:b0:2c3:f90a:7076 with SMTP id s1-20020adfea81000000b002c3f90a7076mr1241229wrm.57.1675790256726; Tue, 07 Feb 2023 09:17:36 -0800 (PST) Received: from angeloc.wifiguest.local (cpe1150018.bra.be.verixi.net. [85.119.216.19]) by smtp.gmail.com with ESMTPSA id q16-20020adff950000000b002bff574a250sm11708801wrr.2.2023.02.07.09.17.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 09:17:36 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 7 Feb 2023 18:17:15 +0100 Message-Id: <20230207171721.2973997-8-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-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=CT9fxk0HFbYt2zMQ30QJ3hxYUP6ca7tpI0QLhgB7kLU=; b=O1/+2xOQUcAKirqVRWE3p+L/tlDkV2Fr8Wrj0XVHdMoEk56AxrwCVDaDm2661i44VN mIkcCYlo/O0Av7p3i7V0PD0hsFEZwJU8rBdPangsMjKoi7K4KuCrLMKgx0qae2RDnJbH iGW0vc0Zueb+xnY0eal5DZQdtmw7KT1iuvWeo= X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=O1/+2xOQ Subject: [Buildroot] [PATCH v6 07/13] package/qt6/qt6base: add QPA backend selection 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" Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 13 +++++++++++++ package/qt6/qt6base/qt6base.mk | 3 +++ 2 files changed, 16 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index a33ffcd511..065725049d 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -60,6 +60,19 @@ config BR2_PACKAGE_QT6BASE_XCB comment "X.org XCB backend available if X.org is enabled" depends on !BR2_PACKAGE_XORG7 +config BR2_PACKAGE_QT6BASE_DEFAULT_QPA + string "Default graphical platform" + help + Choose the default platform abstraction to use for graphical + applications (e.g xcb, linuxfb, eglfs, ...). If this is + empty, the default for your architecture will be used + (usually this is eglfs). + + You can get a list of supported platforms by running a Qt + application with the option "-platform help" on your + target. You can choose a different platform at runtime with + the -platform option. + config BR2_PACKAGE_QT6BASE_OPENGL bool "OpenGL support" depends on BR2_PACKAGE_QT6_GL_SUPPORTS diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index e9a3396fb6..a3c0c20d6e 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -249,6 +249,9 @@ else QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif +QT6BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT6BASE_DEFAULT_QPA)) +QT6BASE_CONF_OPTS += $(if $(QT6BASE_DEFAULT_QPA),-DQT_QPA_DEFAULT_PLATFORM=$(QT6BASE_DEFAULT_QPA)) + ifeq ($(BR2_PACKAGE_OPENSSL),y) QT6BASE_CONF_OPTS += -DINPUT_openssl=yes QT6BASE_DEPENDENCIES += openssl From patchwork Tue Feb 7 17:17:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1739087 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=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (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 4PB8yD5YSlz23j0 for ; Wed, 8 Feb 2023 04:19:48 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 0B0F881E2D; Tue, 7 Feb 2023 17:19:47 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 0B0F881E2D X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FapjnsXpdUQ1; Tue, 7 Feb 2023 17:19:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 5A62181398; Tue, 7 Feb 2023 17:19:45 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 5A62181398 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 487261BF5F6 for ; Tue, 7 Feb 2023 17:17:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 2FCFE418BD for ; Tue, 7 Feb 2023 17:17:41 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 2FCFE418BD X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wMzRLNAXF5Nz for ; Tue, 7 Feb 2023 17:17:40 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 2B0ED418A0 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [IPv6:2a00:1450:4864:20::433]) by smtp4.osuosl.org (Postfix) with ESMTPS id 2B0ED418A0 for ; Tue, 7 Feb 2023 17:17:40 +0000 (UTC) Received: by mail-wr1-x433.google.com with SMTP id m14so14237139wrg.13 for ; Tue, 07 Feb 2023 09:17:40 -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=KV3CO5Ox99yX+ORx3yMEOYmOGIyaUEjytjr2OZmGDl8=; b=mZhb1VDFj5vFhkB2XKfUvuimER1wSCRQmQLYv22r5Ddii4guoxr7pyluk20qp+mOS4 ncXBf2y4GhgYisC3xJ05NgYJ2SL4t+IoZfEvYpApZX5BMtj3esfGFi8Eb4NtSM3izDM7 rxCGt9xwXztRln1JaFsGIn4HoiP1eABwoq6Eu/OHcvIpDDBN0gDioivfL3pYelh6dolU xiHImo5ObKKsRIz1dCrXGCu+v4g3rsqvflsgyKntesfNKR1BntDhIqIFwaV/u4F6VHcN A92mfUEZAoa44VCuuiPDZNOyd42DsPp/94HufrEEHGTel+Ya4M8oQI+PXRrgqs4ZhlJW 65KA== X-Gm-Message-State: AO0yUKWl2wJUDXWO7zOHvbNa6htvosPAiT6IN7OnJXyBL7egP/k14Hu8 VAm0lp+wfEvAMonwMC7TxG9ruYvp2P5ejaolWk6Ycw== X-Google-Smtp-Source: AK7set/VdwQv96GxQCM/+lwz/tcmUFppQIJpKb5WYbGp0FDtPTHhXGArspiTxeH7qUOffDleY9BTkg== X-Received: by 2002:a5d:58d8:0:b0:2c3:f5a2:d179 with SMTP id o24-20020a5d58d8000000b002c3f5a2d179mr2809061wrf.15.1675790257849; Tue, 07 Feb 2023 09:17:37 -0800 (PST) Received: from angeloc.wifiguest.local (cpe1150018.bra.be.verixi.net. [85.119.216.19]) by smtp.gmail.com with ESMTPSA id q16-20020adff950000000b002bff574a250sm11708801wrr.2.2023.02.07.09.17.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 09:17:37 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 7 Feb 2023 18:17:16 +0100 Message-Id: <20230207171721.2973997-9-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-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=KV3CO5Ox99yX+ORx3yMEOYmOGIyaUEjytjr2OZmGDl8=; b=jICWLAdQDWuRE21PM75I+ziAufSakzchw2ZNHyOhTGzXOUa03PI0tpbkr9HvoWD1TV K+XZBnvQr8VNdsJAyWWJrP/7ATeCgiTva8bDK1gQ1lLRg+trVXnzCJe3QVjwyMcrbrCq 4um8UG80ihr6V8cRquTnd54WuEHZ7eR9p7D2o= X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=jICWLAdQ Subject: [Buildroot] [PATCH v6 08/13] package/qt6/qt6base: add support for tslib 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 Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 6 ++++++ package/qt6/qt6base/qt6base.mk | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 065725049d..d5d6d3569d 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -224,6 +224,12 @@ config BR2_PACKAGE_QT6BASE_TEST help This options enables the Qt6Test library. +config BR2_PACKAGE_QT6BASE_TSLIB + bool "Enable Tslib support" + select BR2_PACKAGE_TSLIB + help + This options enables the Tslib plugin + config BR2_PACKAGE_QT6BASE_XML bool "XML module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index a3c0c20d6e..3942af6758 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -228,6 +228,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y) +QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON +QT6BASE_DEPENDENCIES += tslib +else +QT6BASE_CONF_OPTS += -DFEATURE_tslib=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) QT6BASE_CONF_OPTS += -DFEATURE_egl=ON -DFEATURE_eglfs=ON QT6BASE_DEPENDENCIES += libegl From patchwork Tue Feb 7 17:17:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1739086 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::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (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 4PB8xz4tmdz23j0 for ; Wed, 8 Feb 2023 04:19:35 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D625240A80; Tue, 7 Feb 2023 17:19:33 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org D625240A80 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rDte1_hORMvI; Tue, 7 Feb 2023 17:19:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 280B640A68; Tue, 7 Feb 2023 17:19:32 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 280B640A68 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C96AA1BF95C for ; Tue, 7 Feb 2023 17:17:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id A35C18137A for ; Tue, 7 Feb 2023 17:17:40 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org A35C18137A X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LeaSkn_LQkc7 for ; Tue, 7 Feb 2023 17:17:40 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org C812281371 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by smtp1.osuosl.org (Postfix) with ESMTPS id C812281371 for ; Tue, 7 Feb 2023 17:17:39 +0000 (UTC) Received: by mail-wr1-x435.google.com with SMTP id i5so7102581wrc.0 for ; Tue, 07 Feb 2023 09:17:39 -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=7HEE9riIaaabn81p9ufFHwyuoMoVg3jHiOnqk6fIhVc=; b=uc5y+kDT9psD8fHec2eUKYxGza3q/zynrZwaaYoZNDaSgfTfC2B1lJ/NpK01dDu7wH rWS9CWyVDsU9CrCChLvHGzs0+SmbBWsDiN/b9k6gIrOHfuYWtIW6AZFB98sgwumFBUov 7V2L4ZpJ+fQRDHrZ3FxRZS1F6/qj/PSpvEGQ6vzh7LAdGOtUt7oN+51klGrk6dRN0vJs /IsMX+vrRoy8HRIkb8rZX4w/qwXGm1gjbXjdxlMwWdvAyZE4Cg4/QdzFT4uaAnshYWrx 7SVkF76IiVd/36JOcW0J+oekFfr4Wdj2drlZrWyVnzkAnp3zZd4W4PSvNBOWdwQqQXIi 2OWA== X-Gm-Message-State: AO0yUKUYvlHbmTTNE4wMC47E8lNUfzivnkcTpdiuLs3fYrzwfl0aMAut XwFJd2vPY5CBD1nyzTK0seRRMA26V+Dmy7aNKhqftg== X-Google-Smtp-Source: AK7set925NKjTEWuvGjOwJy72tO1mmft/wd4jclPFO7+9EvcDizCVGLvQs9HXLpss9W6/4Hd7LTjDw== X-Received: by 2002:a05:6000:d1:b0:2bf:eb67:4774 with SMTP id q17-20020a05600000d100b002bfeb674774mr3653465wrx.11.1675790259105; Tue, 07 Feb 2023 09:17:39 -0800 (PST) Received: from angeloc.wifiguest.local (cpe1150018.bra.be.verixi.net. [85.119.216.19]) by smtp.gmail.com with ESMTPSA id q16-20020adff950000000b002bff574a250sm11708801wrr.2.2023.02.07.09.17.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 09:17:38 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 7 Feb 2023 18:17:17 +0100 Message-Id: <20230207171721.2973997-10-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-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=7HEE9riIaaabn81p9ufFHwyuoMoVg3jHiOnqk6fIhVc=; b=IwUQJK/5iXRT6VAWRwVLCVxq+XA952VsB4hJMhpGhF06XCISwUMbbgAckqup58mEJs szqxSuDrqIEniEs5vCEUto/LsgR0cQ5hwKNkER8DdB9FWT363jJam3Kp8SwUPmMw+R7C iV6fNzjZ1XhSkLXwsCXexToFjs7Fqvkjno40s= X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=IwUQJK/5 Subject: [Buildroot] [PATCH v6 09/13] package/qt6/qt6base: add support for libinput 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 Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/qt6base.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 3942af6758..fb452b0b7d 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -228,6 +228,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF endif +ifeq ($(BR2_PACKAGE_LIBINPUT),y) +QT6BASE_CONF_OPTS += -DFEATURE_libinput=ON +QT6BASE_DEPENDENCIES += libinput +else +QT6BASE_CONF_OPTS += -DFEATURE_libinput=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y) QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON QT6BASE_DEPENDENCIES += tslib From patchwork Tue Feb 7 17:17:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1739088 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::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (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 4PB8yT5jWcz23j0 for ; Wed, 8 Feb 2023 04:20:01 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 2DB4040A83; Tue, 7 Feb 2023 17:20:00 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 2DB4040A83 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SvltFAlG3cLe; Tue, 7 Feb 2023 17:19:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 1B85C40A71; Tue, 7 Feb 2023 17:19:58 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 1B85C40A71 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 389F21BF95C for ; Tue, 7 Feb 2023 17:17:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id CF94E418A0 for ; Tue, 7 Feb 2023 17:17:41 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org CF94E418A0 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4wmRcVre8Z_T for ; Tue, 7 Feb 2023 17:17:41 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org BD860418A3 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by smtp4.osuosl.org (Postfix) with ESMTPS id BD860418A3 for ; Tue, 7 Feb 2023 17:17:40 +0000 (UTC) Received: by mail-wr1-x434.google.com with SMTP id a2so14000289wrd.6 for ; Tue, 07 Feb 2023 09:17:40 -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=CBiXdMXAjvQU7QBtSEtF9hveQETM9+1iMpe8ltpTc2U=; b=WOhNi5p2l1qMTBKABw4vFDGSEsbJj7HfeddqUb+jOKWuFnA61C6skwg0D932OXx28D WfzQV9kG/fktzxe8LQKArPdxHCrCcezAnD9Dl0Odwe+dcuCBzvgrGJWA4tuvrZ/f4OtG LtZgsegCmvr7eJW9EPPJJe8qGtLjxOuybloc97BLJPSASlnuXbdz6AoMd2UukZgZi7iV cMdB/1wChG5SKhn+4sVsnQuyENmiOI4fUjvkXF/HCeu+GKZaIGXJg/lr0qzvw6vtBvaq 8gkMTQSGH7+l+ONVKOVky8fTgQF/aS99eXvfOWtvA9gOwphnhSm+n6U8F6sSfZZ4JK/U DtdA== X-Gm-Message-State: AO0yUKW+Znz8H7+uhKzF97wrdyg/wYd5rA6Vfe1ttK0DOk+hb87rfV8c 0x2Xhm/RuMJcBn2Mb0IJH5SzuEhDrkrFftbmD+KuaA== X-Google-Smtp-Source: AK7set8vG5nGtJNxfS6ZCwD1mPuIPhJelYhpU/PTSf3fzkpcXmm/zc7wdmfTogF/8OE53TVADue3Iw== X-Received: by 2002:a5d:4605:0:b0:2c3:ea68:9107 with SMTP id t5-20020a5d4605000000b002c3ea689107mr3169626wrq.64.1675790259998; Tue, 07 Feb 2023 09:17:39 -0800 (PST) Received: from angeloc.wifiguest.local (cpe1150018.bra.be.verixi.net. [85.119.216.19]) by smtp.gmail.com with ESMTPSA id q16-20020adff950000000b002bff574a250sm11708801wrr.2.2023.02.07.09.17.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 09:17:39 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 7 Feb 2023 18:17:18 +0100 Message-Id: <20230207171721.2973997-11-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-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=CBiXdMXAjvQU7QBtSEtF9hveQETM9+1iMpe8ltpTc2U=; b=Uqs/RuvuOnfhybDznIdoNAyl8rN8C5e8nmQw9Su3fnbz0khXpanMjqtkUUShh6weWu C5DxMA/Hzz5XfKeIIBjJ0kfjWO4XtuNjoH8peBRWT74nZlc6ZSr6DRxFCsESL/C6z/tQ zd2ASycgm1XjwzXku1lr2eDROlS6IPACf0wkA= X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=Uqs/Ruvu Subject: [Buildroot] [PATCH v6 10/13] package/qt6/qt6base: add support for kms 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 Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/qt6base.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index fb452b0b7d..4a64886a3f 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -206,6 +206,13 @@ else QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF endif +ifeq ($(BR2_PACKAGE_LIBDRM),y) +QT6BASE_CONF_OPTS += -DFEATURE_kms=ON +QT6BASE_DEPENDENCIES += libdrm +else +QT6BASE_CONF_OPTS += -DFEATURE_kms=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON QT6BASE_DEPENDENCIES += fontconfig From patchwork Tue Feb 7 17:17:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1739089 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::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (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 4PB8yl1tTnz23j7 for ; Wed, 8 Feb 2023 04:20:15 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 5E51B40A71; Tue, 7 Feb 2023 17:20:13 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 5E51B40A71 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tIVvq8SdjB1F; Tue, 7 Feb 2023 17:20:12 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 9136840AA1; Tue, 7 Feb 2023 17:20:11 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 9136840AA1 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 04E511BF5F6 for ; Tue, 7 Feb 2023 17:17:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id D05E2418A0 for ; Tue, 7 Feb 2023 17:17:42 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org D05E2418A0 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4m0u7Ajwxy6m for ; Tue, 7 Feb 2023 17:17:42 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org D3CCE418BD Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by smtp4.osuosl.org (Postfix) with ESMTPS id D3CCE418BD for ; Tue, 7 Feb 2023 17:17:41 +0000 (UTC) Received: by mail-wr1-x434.google.com with SMTP id a2so14000349wrd.6 for ; Tue, 07 Feb 2023 09:17:41 -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=vyREN/yozjt7byg437S3Yz/Vb1hitehJLbYXJdpiuzU=; b=CPRe2AFd/K9fcBb22mtzkSV4VKkKaU3VjplmZg48rmwiabQAxC92IgyUeLTuGReUeK 6G7TAdi7Es4yrCbnKG1yykZqMpOcZRDsRYuWml4G7yB20AK7W/Rt0rgU+C+rI6cKvAou jL+TA5BXDmhTqmHJ8ls61odXGqpKgml5k/qYFL4G9IiTV0v6DJG6It+3rmX9Om7E/tnM lHDoeZKkgDGUlL+mkmMv4GFMCNPh6kXBSkxjm0s4pZo/ZMlCNzJqQCEGBSf5oKN02SK1 mIBcfXsXq7eyrINMpaBlJuiiF3QEwaqLtGgaCPxlj9JrQ6OyldLcBytavsBQUtarDC7a caug== X-Gm-Message-State: AO0yUKXkKBqZwYVqs/ZrU2FkRTsuim1SLJeuowURwOPRr8k3DG2Z+4+s JbyKAT4JjppuLAhHDPRVlbUowT1jzv8DkiCSDCdNsA== X-Google-Smtp-Source: AK7set/JoOEH+xATt4/U8glAeIs+Mp4Kt7LKBkd2r54vCnTXpDcQT5wyQKyVfhGIfyO8N6A+eZuHiA== X-Received: by 2002:a5d:54c5:0:b0:242:5563:c3b with SMTP id x5-20020a5d54c5000000b0024255630c3bmr3452609wrv.59.1675790261019; Tue, 07 Feb 2023 09:17:41 -0800 (PST) Received: from angeloc.wifiguest.local (cpe1150018.bra.be.verixi.net. [85.119.216.19]) by smtp.gmail.com with ESMTPSA id q16-20020adff950000000b002bff574a250sm11708801wrr.2.2023.02.07.09.17.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 09:17:40 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 7 Feb 2023 18:17:19 +0100 Message-Id: <20230207171721.2973997-12-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-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=vyREN/yozjt7byg437S3Yz/Vb1hitehJLbYXJdpiuzU=; b=Qz9bHEUK1rczSQiNEhMamSy9DHT1YQdSgm7UTJD2WZvRZXQ3UcRJ+6VyhLTQCM6uWL zYqo2MZvC9zVU5n086RpD3ZArvF94YrZw9MPCGu+hiJ5udeP+8xkzokuahrbFAktSOMy 1qKA3gd0zcntmypaGejVbGAOT6GlJdgQAOrLs= X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=Qz9bHEUK Subject: [Buildroot] [PATCH v6 11/13] package/qt6/qt6base: add support for printsupport/cups 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 Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 4 ++++ package/qt6/qt6base/qt6base.mk | 12 ++++++++++++ 2 files changed, 16 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index d5d6d3569d..4d13128661 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -168,6 +168,10 @@ config BR2_PACKAGE_QT6BASE_NETWORK help This options enables the Qt6Network library. +config BR2_PACKAGE_QT6BASE_PRINTSUPPORT + depends on BR2_PACKAGE_QT6BASE_WIDGETS + def_bool y + config BR2_PACKAGE_QT6BASE_SQL bool "sql module" help diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 4a64886a3f..97986a3c2b 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -206,6 +206,18 @@ else QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_PRINTSUPPORT), y) +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=ON +ifeq ($(BR2_PACKAGE_CUPS), y) +QT6BASE_CONF_OPTS += -DFEATURE_cups=ON +QT6BASE_DEPENDENCIES += cups +else +QT6BASE_CONF_OPTS += -DFEATURE_cups=OFF +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=OFF +endif + ifeq ($(BR2_PACKAGE_LIBDRM),y) QT6BASE_CONF_OPTS += -DFEATURE_kms=ON QT6BASE_DEPENDENCIES += libdrm From patchwork Tue Feb 7 17:17:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1739091 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=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (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 4PB8zF4hQ2z23j7 for ; Wed, 8 Feb 2023 04:20:41 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id DF99F40A90; Tue, 7 Feb 2023 17:20:39 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org DF99F40A90 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TQ5cs9ACJkwG; Tue, 7 Feb 2023 17:20:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 8C41540A68; Tue, 7 Feb 2023 17:20:37 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 8C41540A68 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 EE0C01BF5F6 for ; Tue, 7 Feb 2023 17:17:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id C2F0860BB1 for ; Tue, 7 Feb 2023 17:17:46 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org C2F0860BB1 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 suxPzX3oV7Mq for ; Tue, 7 Feb 2023 17:17:44 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 269656100E Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by smtp3.osuosl.org (Postfix) with ESMTPS id 269656100E for ; Tue, 7 Feb 2023 17:17:44 +0000 (UTC) Received: by mail-wr1-x42c.google.com with SMTP id z11so274482wrl.8 for ; Tue, 07 Feb 2023 09:17:43 -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=VPf6sURic2FPDLE+R5nDIeFGx2B/rjkRm1lXntLmMtE=; b=knmKkKjjPzYFzyWHt2gE5JOOcbmtmoSWfPMB8adUaMHv9ubRai/ecF0qfmCyniMDGv IYe7aB3dw5SC1QIee4MfUYJawTYNBdVTAwqwHBXqHQs/fFF0HPA96KXKk1dIoEPMIKGr sPH8ApWryFuQGmPxpAVOINb8HLuA+pY1lgyqbpl/GDK+w70bh5jvu3k+Big+CcwtaqWT 16QAhDg4eXTk0Konk25lmdz83+JyPL6jqBHCw0AEby8yB2JpDGZCVerYDzB+4fbSZsns c+Rmj5URyLYLCAk0cYqXZ6vx0q4doVc34JwbA4AMbMElOlYQZu7k7tB0+PvJjPJVnHx9 UXdw== X-Gm-Message-State: AO0yUKVEdGEUgTEBaxygxVn8y1tdohUYOO8hyUEXPm9ijvZcc8VvLnIL G5hY+NxmrExQkyMbQ4YkdQ5dzvanzbThLhFNj3uQKg== X-Google-Smtp-Source: AK7set+Mf1QcuXb+d1ul0lL8iVjxseIqFlKvX0PazmqYa4FUBJzdK3iMftMxsfbTQLkLYB6sVHDBFQ== X-Received: by 2002:adf:f9ca:0:b0:2be:3501:3645 with SMTP id w10-20020adff9ca000000b002be35013645mr3528993wrr.38.1675790262033; Tue, 07 Feb 2023 09:17:42 -0800 (PST) Received: from angeloc.wifiguest.local (cpe1150018.bra.be.verixi.net. [85.119.216.19]) by smtp.gmail.com with ESMTPSA id q16-20020adff950000000b002bff574a250sm11708801wrr.2.2023.02.07.09.17.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 09:17:41 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 7 Feb 2023 18:17:20 +0100 Message-Id: <20230207171721.2973997-13-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-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=VPf6sURic2FPDLE+R5nDIeFGx2B/rjkRm1lXntLmMtE=; b=YZKxq2wPzZnF7XYr993ep1Wv0AyGwzfgdjCr56yA9De51KMhMPeHp+0PZj+bb4wicf kgxi1btresTqDKes7GQqky6r0SmqLqU8HIGSPQjTFm9hII1fOzXijg8Q9MyJxwhxSuma agtIEQ22zMgVsqAZbFyRWC1X118warWTqloV4= 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=YZKxq2wP Subject: [Buildroot] [PATCH v6 12/13] package/qt6/qt6base: add support for building examples 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 The selected options make the default examples set to actually compile. Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- package/qt6/qt6base/Config.in | 18 ++++++++++++++++++ package/qt6/qt6base/qt6base.mk | 6 ++++++ 2 files changed, 24 insertions(+) diff --git a/package/qt6/qt6base/Config.in b/package/qt6/qt6base/Config.in index 4d13128661..4ae5e96ef0 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -30,6 +30,24 @@ config BR2_PACKAGE_QT6BASE_DBUS help This option enables the D-Bus module. +config BR2_PACKAGE_QT6BASE_EXAMPLES + bool "Compile and install examples " + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + select BR2_PACKAGE_QT6BASE_DBUS + select BR2_PACKAGE_QT6BASE_NETWORK + select BR2_PACKAGE_QT6BASE_XML + select BR2_PACKAGE_QT6BASE_DBUS + select BR2_PACKAGE_QT6BASE_GUI + select BR2_PACKAGE_QT6BASE_WIDGETS + select BR2_PACKAGE_QT6BASE_OPENGL + select BR2_PACKAGE_QT6BASE_OPENGL_LIB + select BR2_PACKAGE_QT6BASE_CONCURRENT + help + If unsure, say N. + +comment "Building examples needs OpenGL/DBus support" + depends on !BR2_PACKAGE_QT6_GL_SUPPORTS || !BR2_PACKAGE_DBUS + config BR2_PACKAGE_QT6BASE_GUI bool "gui module" select BR2_PACKAGE_FREETYPE diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 97986a3c2b..ec1c65f827 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -310,6 +310,12 @@ QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF HOST_QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF endif +ifeq ($(BR2_PACKAGE_QT6BASE_EXAMPLES),y) +QT6BASE_CONF_OPTS += -DQT_BUILD_EXAMPLES=ON +else +QT6BASE_CONF_OPTS += -DQT_BUILD_EXAMPLES=OFF +endif + ifeq ($(BR2_PACKAGE_QT6BASE_NETWORK),y) QT6BASE_CONF_OPTS += -DFEATURE_network=ON else From patchwork Tue Feb 7 17:17:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Angelo Compagnucci X-Patchwork-Id: 1739090 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=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (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 4PB8z00p8Gz23j7 for ; Wed, 8 Feb 2023 04:20:28 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 5B429813C6; Tue, 7 Feb 2023 17:20:26 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 5B429813C6 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id CHu7_s0kIiFw; Tue, 7 Feb 2023 17:20:25 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 6942881398; Tue, 7 Feb 2023 17:20:24 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 6942881398 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 5DE9A1BF5F6 for ; Tue, 7 Feb 2023 17:17:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 4545040A68 for ; Tue, 7 Feb 2023 17:17:46 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 4545040A68 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2lZi866LFVFz for ; Tue, 7 Feb 2023 17:17:45 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 14C0640120 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by smtp2.osuosl.org (Postfix) with ESMTPS id 14C0640120 for ; Tue, 7 Feb 2023 17:17:45 +0000 (UTC) Received: by mail-wr1-x435.google.com with SMTP id o18so14281893wrj.3 for ; Tue, 07 Feb 2023 09:17:44 -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=L5k4t9f++6/O23kLPEe7tge1fl2Dc83BXnN8AhQEtDI=; b=KCYMUtZFwyiWcj9s2chQvxf7R/MT7U14+fYaAmM2DyfbBXOmOU7UtYAVYMpdTjHOi7 HcunAn6M3SmLZvfuQ1L1xq1OSZglys0YTtCeWmACcHV70jJzgf7pEmeBh2bz9z3k0hXh p95/YQ9fWOMN+pAWZfWME/gWjaW5jopdVQ1HvrQLz7ug4R4Z2BFhDhCPG6CYGelt8Cst ULFyv+axA97lIt1Z7s9JYhfQw1GVwPwAkONkrWpl66ZBrtiRTDtZdcOO6AGwp6qMZNOT rzf1xDvy+HoscInG5MGSj8il2fGWHHlDpkrWpBpPf+uOe9cXc0SEzvoCee6tJrkuHVBV fgAw== X-Gm-Message-State: AO0yUKWGUrhpCsxOB6rXuk3yXwAjuPiXNXc71+mgMXHWTfPJFRa3IKiF tdesAktSyJYf62gjC3nXQx7LvbDWNUkADKL1Ow5e8Q== X-Google-Smtp-Source: AK7set/JGv5ygVCnOoaPM6uT+kcfQq5P/5m2W2kuCSqX2Y+ak0HulIDrpf+yQhspF0zx7TaBG2krhQ== X-Received: by 2002:adf:d081:0:b0:2c3:e4f5:18a with SMTP id y1-20020adfd081000000b002c3e4f5018amr3570429wrh.33.1675790263073; Tue, 07 Feb 2023 09:17:43 -0800 (PST) Received: from angeloc.wifiguest.local (cpe1150018.bra.be.verixi.net. [85.119.216.19]) by smtp.gmail.com with ESMTPSA id q16-20020adff950000000b002bff574a250sm11708801wrr.2.2023.02.07.09.17.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Feb 2023 09:17:42 -0800 (PST) From: Angelo Compagnucci To: buildroot@buildroot.org Date: Tue, 7 Feb 2023 18:17:21 +0100 Message-Id: <20230207171721.2973997-14-angelo@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230207171721.2973997-1-angelo@amarulasolutions.com> References: <20230207171721.2973997-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=L5k4t9f++6/O23kLPEe7tge1fl2Dc83BXnN8AhQEtDI=; b=GIpSYYgtwWnA1YOv0i+kWp3fiyy8lHNY9zDIPx+PF0K3ubXclZngzG3+KKWES39RxW lxHZSie/y+N9Y5J7QTixaSvITyuKNpOBTulGO5DtxD/h0aa1K8yVlMbz8Qf+TWaxzneq m9UpHNbIWJCpxe2VIZWCws/t31a7N3euCkpEc= X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.a=rsa-sha256 header.s=google header.b=GIpSYYgt Subject: [Buildroot] [PATCH v6 13/13] package/qt6: Add qmake functionality 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 The qmake functionality had been missing due to the new host/target build requirement, to get it working the main parts of the qt5 qmake has been kept, we're still making our own device spec which we use to run qmake with along with passing some additional device options for our flags/cross-compiler the biggest difference is that where previously qt.conf was used to fixup per-paths builds, this is now always created with changed contents so qmake looks at the correct target directories. Signed-off-by: Jesse Van Gavere Signed-off-by: Angelo Compagnucci --- v6: * Removing EGLFS_DEVICE mangling because is not working right now and should be added later. package/qt6/qt6.mk | 12 ++++++++++ package/qt6/qt6base/qmake.conf.in | 34 +++++++++++++++++++++++++++++ package/qt6/qt6base/qplatformdefs.h | 1 + package/qt6/qt6base/qt.conf.in | 7 ++++++ package/qt6/qt6base/qt6base.mk | 16 ++++++++++++++ 5 files changed, 70 insertions(+) create mode 100644 package/qt6/qt6base/qmake.conf.in create mode 100644 package/qt6/qt6base/qplatformdefs.h create mode 100644 package/qt6/qt6base/qt.conf.in diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk index 431bb8c9d3..847286a3fc 100644 --- a/package/qt6/qt6.mk +++ b/package/qt6/qt6.mk @@ -10,3 +10,15 @@ QT6_SOURCE_TARBALL_PREFIX = everywhere-src QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules include $(sort $(wildcard package/qt6/*/*.mk)) + +# The file "qt.conf" can be used to override the hard-coded paths that are +# compiled into the Qt library. We need it to make "qmake" relocatable due +# to the host/target build and tweak the per-package install pathes +define QT6_INSTALL_QT_CONF + rm -f $(HOST_DIR)/bin/qt.conf + sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \ + $(QT6BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf +endef + +# Variable for other Qt applications to use +QT6_QMAKE = $(HOST_DIR)/bin/qmake -spec devices/linux-buildroot-g++ diff --git a/package/qt6/qt6base/qmake.conf.in b/package/qt6/qt6base/qmake.conf.in new file mode 100644 index 0000000000..e0d53d755d --- /dev/null +++ b/package/qt6/qt6base/qmake.conf.in @@ -0,0 +1,34 @@ +# Qt6 has a mechanism to support "device" profiles, so that people can +# specify the compiler, compiler flags and so on for a specific device. + +# We leverage this mechanism in the Buildroot packaging of qt6 to +# simplify cross-compilation: we have our own "device" definition, which +# allows us to easily pass the cross-compiler paths and flags from our +# qt6.mk. + +include(../common/linux_device_pre.conf) + +# modifications to g++-unix.conf +QMAKE_CC = $${CROSS_COMPILE}gcc +QMAKE_CXX = $${CROSS_COMPILE}g++ +QMAKE_LINK = $${CROSS_COMPILE}g++ + +# modifications to gcc-base.conf +QMAKE_CFLAGS += $${BR_COMPILER_CFLAGS} +QMAKE_CXXFLAGS += $${BR_COMPILER_CXXFLAGS} +# Remove all optimisation flags, we really only want our own. +QMAKE_CFLAGS_OPTIMIZE = +QMAKE_CFLAGS_OPTIMIZE_DEBUG = +QMAKE_CFLAGS_OPTIMIZE_FULL = +QMAKE_CFLAGS_OPTIMIZE_SIZE = +QMAKE_CFLAGS_DEBUG = +QMAKE_CXXFLAGS_DEBUG = +QMAKE_CFLAGS_RELEASE = +QMAKE_CXXFLAGS_RELEASE = +CONFIG += nostrip + +QMAKE_LIBS += -lrt -lpthread -ldl +QMAKE_CFLAGS_ISYSTEM = + +include(../common/linux_device_post.conf) +load(qt_config) diff --git a/package/qt6/qt6base/qplatformdefs.h b/package/qt6/qt6base/qplatformdefs.h new file mode 100644 index 0000000000..99e9a27923 --- /dev/null +++ b/package/qt6/qt6base/qplatformdefs.h @@ -0,0 +1 @@ +#include "../../linux-g++/qplatformdefs.h" diff --git a/package/qt6/qt6base/qt.conf.in b/package/qt6/qt6base/qt.conf.in new file mode 100644 index 0000000000..4842bcb462 --- /dev/null +++ b/package/qt6/qt6base/qt.conf.in @@ -0,0 +1,7 @@ +[Paths] +Prefix=/usr +HostPrefix=@@HOST_DIR@@ +HostData=../target/usr +Sysroot=@@STAGING_DIR@@ +SysrootifyPrefix=true +TargetSpec=devices/linux-buildroot-g++ diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index ec1c65f827..f37b2bafce 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -54,6 +54,9 @@ QT6BASE_CONF_OPTS = \ -DFEATURE_system_zlib=ON \ -DFEATURE_system_libb2=ON +QT6BASE_CFLAGS = $(TARGET_CFLAGS) +QT6BASE_CXXFLAGS = $(TARGET_CXXFLAGS) + # x86 optimization options. While we have a BR2_X86_CPU_HAS_AVX512, it # is not clear yet how it maps to all the avx512* options of Qt, so we # for now keeps them disabled. @@ -384,5 +387,18 @@ else QT6BASE_CONF_OPTS += -DFEATURE_zstd=OFF endif +define QT6BASE_MAKE_BR_SPEC + $(INSTALL) -m 0644 -D $(QT6BASE_PKGDIR)/qmake.conf.in \ + $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf + $(INSTALL) -m 0644 -D $(QT6BASE_PKGDIR)/qplatformdefs.h \ + $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h +endef + +QT6BASE_CONF_OPTS += -DQT_QMAKE_DEVICE_OPTIONS=CROSS_COMPILE="$(TARGET_CROSS)";BR_COMPILER_CFLAGS="$(QT6BASE_CFLAGS)";BR_COMPILER_CXXFLAGS="$(QT6BASE_CXX_FLAGS)" + +QT6BASE_PRE_CONFIGURE_HOOKS += QT6BASE_MAKE_BR_SPEC + +QT6BASE_POST_INSTALL_STAGING_HOOKS += QT6_INSTALL_QT_CONF + $(eval $(cmake-package)) $(eval $(host-cmake-package))