From patchwork Mon May 13 22:03:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Kollen Svendsen X-Patchwork-Id: 1934816 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VdYRN6wWgz20KD for ; Tue, 14 May 2024 08:04:00 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 5595A415A8; Mon, 13 May 2024 22:03:57 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id JmO6A0qBFhKw; Mon, 13 May 2024 22:03:56 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org D885240B19 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id D885240B19; Mon, 13 May 2024 22:03:55 +0000 (UTC) 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 452561BF2C0 for ; Mon, 13 May 2024 22:03:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 3196B81264 for ; Mon, 13 May 2024 22:03:54 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 9wBCuxzSWN_f for ; Mon, 13 May 2024 22:03:53 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::22c; helo=mail-lj1-x22c.google.com; envelope-from=roykollensvendsen@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 6757080F73 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 6757080F73 Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by smtp1.osuosl.org (Postfix) with ESMTPS id 6757080F73 for ; Mon, 13 May 2024 22:03:52 +0000 (UTC) Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2e3b1b6e9d1so60172981fa.2 for ; Mon, 13 May 2024 15:03:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715637830; x=1716242630; 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=uGesLcWFGiv6pzDaHZEVKIb2XkTy4mvm7iXzE/OWCuM=; b=n7p2vVtVqaJEf+NpFTB69uXa+sfYH2L39IYEtzdnDw1bxdfRrKzEYXsL8/xjhY/7I7 gssV1/n4WioER3QIFewsNDeN/uIbSmeTtRAiHbVh381x7t16YHFzYO3+V3FZAMuTajk9 dPOtp8K7jVXdTKUdb8BRwqtfzwFxC7x+F/1xlscVnNgxVIoN5dI1fourCqrpQc5YtNYR v9+9i1gds9wUumIIS1hYPmvRjPoz0yyj9M3Rw2rW3yFSGopRglrQBZ7jRrm0Ycxd71Ni Jt9ztT2+SyAhfwZgYRGMgiktdUwvoKiHcaz17Tr+VWZO5TuNofSrSa2scP8czDm8T7rV dAUw== X-Gm-Message-State: AOJu0YzmDSWVCk6YSx5dJ7vfxcUHNCifdd2D1IdqZs6D7UAnajRyhJj3 u8dlI1M7Z+n7p0571Z6BnTQKH81taMItLxl8CbkZua/EyWU8nAnv4IIjZWZf X-Google-Smtp-Source: AGHT+IE3qb6gR5LKQgEy/Sj2HfhL4k2Au3nv0qlbGoEVirJFm48WPjBCodSL6RmA91BMnhCbAXGhXQ== X-Received: by 2002:a2e:3218:0:b0:2d8:3e60:b9c9 with SMTP id 38308e7fff4ca-2e5204b2e71mr68094251fa.33.1715637829649; Mon, 13 May 2024 15:03:49 -0700 (PDT) Received: from precision7530-arch-roy.lan ([2a01:799:1a22:4401:9825:b52b:4cba:665e]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e4d0ce3488sm15548401fa.52.2024.05.13.15.03.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 15:03:48 -0700 (PDT) From: Roy Kollen Svendsen To: buildroot@buildroot.org Date: Tue, 14 May 2024 00:03:06 +0200 Message-ID: <20240513220328.1085629-1-roykollensvendsen@gmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <1934329> References: <1934329> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715637830; x=1716242630; darn=buildroot.org; 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=uGesLcWFGiv6pzDaHZEVKIb2XkTy4mvm7iXzE/OWCuM=; b=JrcgzBBLLHXxdpKOqxbl5dwlC3IFSZLpCDcCKsdb1DSNAn3kjIwRQYqP/vOFf8y+7a mJlJzHqVQt5gC7jvA/mtVWq4bIyRO2u5bO0HKjF3KN3T/PhjX157TupYBvqqUxj3gflt pA1LY0DWj+v6Zk0ItHoMd8rM03flPHFfdi05UWhmkgQvAb4HvixhbFV+j0kBCnyT0Z0r 4N5FCn2Fv36offkI7Sl5Y3HdUrVR1+7HR7/hOvL3kbxrZIHpocZIhCmhkBDAC71oLO8U 7P/t4gwMNk1gYmSUU5WH77TTO3ZJ3pscZgPz+NtxQE0nnzsHIZ/Yl16/DT/go7S17t80 QPfw== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=JrcgzBBL Subject: [Buildroot] [PATCH v4 01/14] package/qt6: bump version to 6.7.0 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: Roy Kollen Svendsen , Samuel Martin , Roy Kollen Svendsen , Thomas Petazzoni , Zoltan Gyarmati , Jesse Van Gavere Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Roy Kollen Svendsen For details see [1], [2], [3], [4], [5], [6], [7], [8] and [9]. [1] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.0/release-note.md [2] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.1/release-note.md [3] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.2/release-note.md [4] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.5.3/release-note.md [5] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.0/release-note.md [6] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.1/release-note.md [7] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.2/release-note.md [8] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.3/release-note.md [9] https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.7.0/release-note.md We also apply the associated CVE-2024-33861 patch from: https://download.qt.io/archive/qt/6.7/ As Jesse Van Gavere noted: "This is not applicable to 6.4.3, the affected versions are detailed in the bugzilla report below and it's only 6.5.0+ So this seems perfectly valid to go along with the version bump. OpenSUSE report: https://www.suse.com/security/cve/CVE-2024-33861.html Bugzilla report clarifying affected versions https://bugzilla.suse.com/show_bug.cgi?id=1223917" Signed-off-by: Roy Kollen Svendsen Acked-by: Jesse Van Gavere --- Changes v3 -> v4: - Explain why the associated CVE-patch should be part of this series (suggested by Thomas) - Squash the CVE-patch into this patch. - Add CVE-ID to QT6BASE_IGNORE_CVES. (suggested by Thomas) package/qt6/qt6.mk | 4 +-- .../0001-Fix-CVE-2024-33861-for-Qt6.7.patch | 36 +++++++++++++++++++ package/qt6/qt6base/qt6base.hash | 4 +-- package/qt6/qt6base/qt6base.mk | 2 +- .../qt6/qt6core5compat/qt6core5compat.hash | 4 +-- package/qt6/qt6serialbus/qt6serialbus.hash | 4 +-- package/qt6/qt6serialport/qt6serialport.hash | 4 +-- package/qt6/qt6svg/qt6svg.hash | 4 +-- 8 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 package/qt6/qt6base/0001-Fix-CVE-2024-33861-for-Qt6.7.patch diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk index 1edb252c96..b87cb6748d 100644 --- a/package/qt6/qt6.mk +++ b/package/qt6/qt6.mk @@ -4,8 +4,8 @@ # ################################################################################ -QT6_VERSION_MAJOR = 6.4 -QT6_VERSION = $(QT6_VERSION_MAJOR).3 +QT6_VERSION_MAJOR = 6.7 +QT6_VERSION = $(QT6_VERSION_MAJOR).0 QT6_SOURCE_TARBALL_PREFIX = everywhere-src QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules diff --git a/package/qt6/qt6base/0001-Fix-CVE-2024-33861-for-Qt6.7.patch b/package/qt6/qt6base/0001-Fix-CVE-2024-33861-for-Qt6.7.patch new file mode 100644 index 0000000000..f016788017 --- /dev/null +++ b/package/qt6/qt6base/0001-Fix-CVE-2024-33861-for-Qt6.7.patch @@ -0,0 +1,36 @@ +From 7f88945625f560796c86a267086f163e74c1407b Mon Sep 17 00:00:00 2001 +From: Roy Kollen Svendsen +Date: Sun, 12 May 2024 07:15:32 +0200 +Subject: [PATCH] Fix CVE-2024-33861 for Qt6.7 + +Signed-off-by: Roy Kollen Svendsen +Upstream: https://download.qt.io/archive/qt/6.7/CVE-2024-33861-qtbase-6.7.diff +--- + src/corelib/text/qstringconverter.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/corelib/text/qstringconverter.cpp b/src/corelib/text/qstringconverter.cpp +index b5749843..fd45ccf2 100644 +--- a/src/corelib/text/qstringconverter.cpp ++++ b/src/corelib/text/qstringconverter.cpp +@@ -1954,7 +1954,7 @@ struct QStringConverterICU : QStringConverter + const void *context; + ucnv_getToUCallBack(icu_conv, &action, &context); + if (context != state) +- ucnv_setToUCallBack(icu_conv, action, &state, nullptr, nullptr, &err); ++ ucnv_setToUCallBack(icu_conv, action, state, nullptr, nullptr, &err); + + ucnv_toUnicode(icu_conv, &target, targetLimit, &source, sourceLimit, nullptr, flush, &err); + // We did reserve enough space: +@@ -1987,7 +1987,7 @@ struct QStringConverterICU : QStringConverter + const void *context; + ucnv_getFromUCallBack(icu_conv, &action, &context); + if (context != state) +- ucnv_setFromUCallBack(icu_conv, action, &state, nullptr, nullptr, &err); ++ ucnv_setFromUCallBack(icu_conv, action, state, nullptr, nullptr, &err); + + ucnv_fromUnicode(icu_conv, &target, targetLimit, &source, sourceLimit, nullptr, flush, &err); + // We did reserve enough space: +-- +2.45.0 + diff --git a/package/qt6/qt6base/qt6base.hash b/package/qt6/qt6base/qt6base.hash index cb111bd405..0f45826a45 100644 --- a/package/qt6/qt6base/qt6base.hash +++ b/package/qt6/qt6base/qt6base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtbase-everywhere-src-6.4.3.tar.xz.sha256 -sha256 5087c9e5b0165e7bc3c1a4ab176b35d0cd8f52636aea903fa377bdba00891a60 qtbase-everywhere-src-6.4.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtbase-everywhere-src-6.7.0.tar.xz.sha256 +sha256 11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254 qtbase-everywhere-src-6.7.0.tar.xz # 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 6857725ef5..b8040e395b 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -9,7 +9,7 @@ QT6BASE_SITE = $(QT6_SITE) QT6BASE_SOURCE = qtbase-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6BASE_VERSION).tar.xz QT6BASE_CPE_ID_VENDOR = qt QT6BASE_CPE_ID_PRODUCT = qt - +QT6BASE_IGNORE_CVES = CVE-2024-33861 QT6BASE_CMAKE_BACKEND = ninja QT6BASE_LICENSE = \ diff --git a/package/qt6/qt6core5compat/qt6core5compat.hash b/package/qt6/qt6core5compat/qt6core5compat.hash index 0735df3af2..1eb0b5b460 100644 --- a/package/qt6/qt6core5compat/qt6core5compat.hash +++ b/package/qt6/qt6core5compat/qt6core5compat.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256 -sha256 d4b249abb823d575eee9045c24d924ba8d1276e6be7735b287689991d998aa7a qt5compat-everywhere-src-6.4.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qt5compat-everywhere-src-6.7.0.tar.xz.sha256 +sha256 9d49d4fd8345d8a40b63e0b65cd49c1d8286e33a7f1409bf1316763f654e19f5 qt5compat-everywhere-src-6.7.0.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6serialbus/qt6serialbus.hash b/package/qt6/qt6serialbus/qt6serialbus.hash index 98c8931962..17d5090076 100644 --- a/package/qt6/qt6serialbus/qt6serialbus.hash +++ b/package/qt6/qt6serialbus/qt6serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtserialbus-everywhere-src-6.4.3.tar.xz.sha256 -sha256 b6446a7516d1f04e561c00f9c50ce4d39dad72150f067722ba759f00b4b34366 qtserialbus-everywhere-src-6.4.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtserialbus-everywhere-src-6.7.0.tar.xz.sha256 +sha256 498193a9860664f8a55f676656c45af179ac13d48184af43fc58ddf795bb76dd qtserialbus-everywhere-src-6.7.0.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6serialport/qt6serialport.hash b/package/qt6/qt6serialport/qt6serialport.hash index 9341978d86..cd51fbe435 100644 --- a/package/qt6/qt6serialport/qt6serialport.hash +++ b/package/qt6/qt6serialport/qt6serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtserialport-everywhere-src-6.4.3.tar.xz.sha256 -sha256 5f97ad9067efa39a8a2a39fbbc1e03d2191f305733d9c2f3060f8017ecfc95de qtserialport-everywhere-src-6.4.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtserialport-everywhere-src-6.7.0.tar.xz.sha256 +sha256 b1f02a3d8c9cc8ba2ffa7cca3749f1f147d327e8dfc633fd4ec3cb770d7981c9 qtserialport-everywhere-src-6.7.0.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt diff --git a/package/qt6/qt6svg/qt6svg.hash b/package/qt6/qt6svg/qt6svg.hash index bb239cb012..32c1a79a5c 100644 --- a/package/qt6/qt6svg/qt6svg.hash +++ b/package/qt6/qt6svg/qt6svg.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/6.4/6.4.3/submodules/qtsvg-everywhere-src-6.4.3.tar.xz.sha256 -sha256 88315f886cf81898705e487cedba6e6160724359d23c518c92c333c098879a4a qtsvg-everywhere-src-6.4.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtsvg-everywhere-src-6.7.0.tar.xz.sha256 +sha256 1518f40e08ff5e6153a6e26e5b95b033413ac143b70795dc1317e7f73ebf922d qtsvg-everywhere-src-6.7.0.tar.xz # Hashes for license files: sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt From patchwork Mon May 13 22:03:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Kollen Svendsen X-Patchwork-Id: 1934817 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VdYRT5j17z20KD for ; Tue, 14 May 2024 08:04:05 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 5FEC340B19; Mon, 13 May 2024 22:04:01 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id CetpU-o579LL; Mon, 13 May 2024 22:04:00 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 28949415B0 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 28949415B0; Mon, 13 May 2024 22:04:00 +0000 (UTC) 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 7872E1BF2C0 for ; Mon, 13 May 2024 22:03:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 646AF81264 for ; Mon, 13 May 2024 22:03:55 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 8HwS4uUUrrc8 for ; Mon, 13 May 2024 22:03:54 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::232; helo=mail-lj1-x232.google.com; envelope-from=roykollensvendsen@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 501BE80F73 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 501BE80F73 Received: from mail-lj1-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) by smtp1.osuosl.org (Postfix) with ESMTPS id 501BE80F73 for ; Mon, 13 May 2024 22:03:54 +0000 (UTC) Received: by mail-lj1-x232.google.com with SMTP id 38308e7fff4ca-2e0a34b2899so75599751fa.3 for ; Mon, 13 May 2024 15:03:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715637832; x=1716242632; 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=q7HlFM96imoWqLn7ogz4CP7CS74Ze91J2sJaR1PTZ2Q=; b=XogaKkjKbcFm8ixBa0yuGOzQ9vhcdJyPV+Hrb8nG0Vzuiqlg+YeJDKkCaN6rftVn8e /z+qwfLv+0NklBoob7mFj6zZJ9EIxGMbanqWR1uPpnjD4Hv0ztY1uYdaLfX+ShDrDLG9 +8JNv7C1WlX+DukO91PY6pbgLxG8I7FjxQGbuqH82xFJIoXnPeQ7DvsplRYx7xQPDjor UzwJ5y299boBitjM7vbjPBtnQIR3TOHRcmQkBNxOQH+mVsGlANsjxnqQ46Naosw/Ppol rTHFagbboHiReDsEapl2VlEq4ACVifxOLarKwPq1OU9g+gS0FbwdmhJCnv1BU90dkggV OOhA== X-Gm-Message-State: AOJu0Yygniyv2W85yO0Rd88qIRLPcZk+GXp8Co/UDqVP63n1/7UrdH0M IkSC4/7k4rKOd0xsixZTEkxiQFqaLOmMqH5jLGqjezCSAu2afkDYu5IxGfRR X-Google-Smtp-Source: AGHT+IEaSP0E2rgaKwwGdJqpinamP4E8ExDwzRdj1eMbfJf4kkvDpHAi4IObWO/CC0vWdqIiI6oYWw== X-Received: by 2002:a2e:81c3:0:b0:2e1:ae29:f28a with SMTP id 38308e7fff4ca-2e5203b41d4mr97844311fa.34.1715637831762; Mon, 13 May 2024 15:03:51 -0700 (PDT) Received: from precision7530-arch-roy.lan ([2a01:799:1a22:4401:9825:b52b:4cba:665e]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e4d0ce3488sm15548401fa.52.2024.05.13.15.03.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 15:03:51 -0700 (PDT) From: Roy Kollen Svendsen To: buildroot@buildroot.org Date: Tue, 14 May 2024 00:03:07 +0200 Message-ID: <20240513220328.1085629-2-roykollensvendsen@gmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240513220328.1085629-1-roykollensvendsen@gmail.com> References: <1934329> <20240513220328.1085629-1-roykollensvendsen@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715637832; x=1716242632; darn=buildroot.org; 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=q7HlFM96imoWqLn7ogz4CP7CS74Ze91J2sJaR1PTZ2Q=; b=j/UxzIdT9PZx/Blh27LrQ90Nv9nU2jdxgohz3OumMv47ZwhxTGTwBrCLuBKE/OijaS rNcVKV13mePeQehdkGEmi9oyYmD8byrrSZt9LbvcDAxuOpvhFnqxdRTyZwnYkBkJoVce yqb+tJOJHng6tRRj/+iOuKFD2Ue7G5kP3dshkPXPV/Drbt1nyWcmZCp6r0Kdi2r75ufV PE4lW5GNkkSblXqO3V0xjApmPOIrODN+ZwgNC7YIDadbRr/6trqfzxyqeFu7AaRtGViQ 4QILP4kWyerfao246pm8tpFmPCgUm3SJ1aatK5KsoqWoV3MB80tC48cwmF4sWsg8dfSp GSFA== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=j/UxzIdT Subject: [Buildroot] [PATCH v4 02/14] package/qt6/qt6base: add blind option to enable GUI support on host 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: Roy Kollen Svendsen , Samuel Martin , Roy Kollen Svendsen , Thomas Petazzoni , Zoltan Gyarmati , Jesse Van Gavere Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Roy Kollen Svendsen The Qt6::Gui module is needed when building the 'Qt Shader Baker' (qsb) host tool. Qsb is needed for converting the Qt6 Vulkan GLSL source code to platform specific shader languages which is then later copied to target. For more details take a look at: https://doc.qt.io/qt-6/qtshadertools-overview.html and https://doc.qt.io/qt-6/qshaderbaker.html Signed-off-by: Roy Kollen Svendsen --- package/Config.in.host | 1 + package/qt6/Config.in.host | 5 +++++ package/qt6/qt6base/Config.in.host | 4 ++++ package/qt6/qt6base/qt6base.mk | 7 ++++++- 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 package/qt6/Config.in.host create mode 100644 package/qt6/qt6base/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index 986b2854d0..cbf54f5752 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -95,6 +95,7 @@ menu "Host utilities" source "package/python3/Config.in.host" source "package/qemu/Config.in.host" source "package/qoriq-rcw/Config.in.host" + source "package/qt6/Config.in.host" source "package/raspberrypi-usbboot/Config.in.host" source "package/rauc/Config.in.host" source "package/riscv-isa-sim/Config.in.host" diff --git a/package/qt6/Config.in.host b/package/qt6/Config.in.host new file mode 100644 index 0000000000..dfe7865c57 --- /dev/null +++ b/package/qt6/Config.in.host @@ -0,0 +1,5 @@ +if BR2_PACKAGE_QT6 + +source "package/qt6/qt6base/Config.in.host" + +endif diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host new file mode 100644 index 0000000000..326c06278e --- /dev/null +++ b/package/qt6/qt6base/Config.in.host @@ -0,0 +1,4 @@ +# Select this if you need host qt6 tools that require the Qt::Gui module (e.g. +# Qt Shader Baker(qsb)). +config BR2_PACKAGE_HOST_QT6BASE_GUI + bool diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index b8040e395b..36ec05b394 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -84,7 +84,6 @@ HOST_QT6BASE_DEPENDENCIES = \ host-pcre2 \ host-zlib HOST_QT6BASE_CONF_OPTS = \ - -DFEATURE_gui=OFF \ -DFEATURE_concurrent=OFF \ -DFEATURE_xml=ON \ -DFEATURE_sql=OFF \ @@ -98,6 +97,12 @@ HOST_QT6BASE_CONF_OPTS = \ -DFEATURE_system_pcre2=ON \ -DFEATURE_system_zlib=ON +ifeq ($(BR2_PACKAGE_HOST_QT6BASE_GUI),y) +HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=ON +else +HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF +endif + # Conditional blocks below are ordered by alphabetic ordering of the # BR2_PACKAGE_* option. From patchwork Mon May 13 22:03:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Kollen Svendsen X-Patchwork-Id: 1934818 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VdYRX4LhRz20KD for ; Tue, 14 May 2024 08:04:08 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 0F128415B6; Mon, 13 May 2024 22:04:05 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 8AS-jzjmLfal; Mon, 13 May 2024 22:04:04 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org B8C39415BB Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id B8C39415BB; Mon, 13 May 2024 22:04:03 +0000 (UTC) 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 2134E1BF2C0 for ; Mon, 13 May 2024 22:03:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id EC46D415A9 for ; Mon, 13 May 2024 22:03:57 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 51fW3E295jmT for ; Mon, 13 May 2024 22:03:57 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::22f; helo=mail-lj1-x22f.google.com; envelope-from=roykollensvendsen@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 5DC184159D DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 5DC184159D Received: from mail-lj1-x22f.google.com (mail-lj1-x22f.google.com [IPv6:2a00:1450:4864:20::22f]) by smtp2.osuosl.org (Postfix) with ESMTPS id 5DC184159D for ; Mon, 13 May 2024 22:03:56 +0000 (UTC) Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2e3b1b6e9d1so60173341fa.2 for ; Mon, 13 May 2024 15:03:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715637834; x=1716242634; 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=ZtLdtmFSTcpznGBsTX1jvi1u+pxhGFyRGPkLCzGBFBI=; b=XfSW6ynwOsSjbB2USx8VpN7ePmtMp1uUu5EqLJjyZk9p7rZ9n6b4SGtY0s2OpT+jHv msSHzUMLQFSoz5O0jdxflk/eqmxHjTD0ATyYUkvoF83A3WeVyNvNlJssyWky0AMySL26 tVA2pBkKBShmYV9H8ao84tdAwLTTjRncGVXGdgmfzVrNMUtG/Mu8Z5/IPRji2KPhCwdJ pTqacnkLukrT224/9JfliQSAgh13XDwixdV3o5NZ5PkJs8eAH+I2sfZMdBaI1exWCJAk V3FC1psi4hKk6SODpbfPy2cXMHzGIkYhNwom97/E+EOxFZU4m0N9BYsGSfyqNB7Z+m3c MXvg== X-Gm-Message-State: AOJu0YwWOLgysNGqooQwQrqNWjBmnM9Vk8UUoJI2MPVC8B5vSOsGlgYH Uew3wdgVT8hx11aqsKUCOSli3vKpKiNd/ihi6wJkgqAYD3R76duORRpMDfK+ X-Google-Smtp-Source: AGHT+IEEYYd2QGGnVEvVOB4G0j6sAIAbl7FYPHJrxzNFE0KpyPqCTfQmdQuwb3TBU9MXZJHraYUNpA== X-Received: by 2002:a2e:9ed5:0:b0:2e0:e129:7011 with SMTP id 38308e7fff4ca-2e51ff4d5ecmr62501661fa.16.1715637833553; Mon, 13 May 2024 15:03:53 -0700 (PDT) Received: from precision7530-arch-roy.lan ([2a01:799:1a22:4401:9825:b52b:4cba:665e]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e4d0ce3488sm15548401fa.52.2024.05.13.15.03.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 15:03:52 -0700 (PDT) From: Roy Kollen Svendsen To: buildroot@buildroot.org Date: Tue, 14 May 2024 00:03:08 +0200 Message-ID: <20240513220328.1085629-3-roykollensvendsen@gmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240513220328.1085629-1-roykollensvendsen@gmail.com> References: <1934329> <20240513220328.1085629-1-roykollensvendsen@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715637834; x=1716242634; darn=buildroot.org; 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=ZtLdtmFSTcpznGBsTX1jvi1u+pxhGFyRGPkLCzGBFBI=; b=GjDpCUJTDQ7b8A0kvbG7pvWvoyRp7Tpvj5moV0B8X0npdtQ3VUjpaJSbVPAADNS9M8 tpYwFmOoYCIwPg6NoUdzdbXi0gABmLntp5RT0M6NxbTBEFSkKmDs2QrqBeP3qC0jGjd4 /qKW6iAmftmm82JqTomQxP/N5FgGScjy/7dF4GN4v/oNneZZpSbcHqH6Z4Dwn7tTrteZ pYP4w5AxdTIv0fxUdSCz7e0kSucTMHMU9jMxe5SWfhqard/wB12TQ29ji6vvN8gQyEdE bTr/tWvMjvJqeOP9+6EOAGVQipNQ+tYu/BGoZU9rCkF+4lNP34L+qk+NgoUO+caqv/sr TNfQ== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=GjDpCUJT Subject: [Buildroot] [PATCH v4 03/14] package/qt6/qt6base: add blind option to enable Network support on host 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: Roy Kollen Svendsen , Samuel Martin , Roy Kollen Svendsen , Thomas Petazzoni , Zoltan Gyarmati , Jesse Van Gavere Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Roy Kollen Svendsen Qt Network is a required dependency of Qt Tools. Therefor we need a way to enable the Qt Network module when building for host. Signed-off-by: Roy Kollen Svendsen --- package/qt6/qt6base/Config.in.host | 5 +++++ package/qt6/qt6base/qt6base.mk | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host index 326c06278e..286da0ff03 100644 --- a/package/qt6/qt6base/Config.in.host +++ b/package/qt6/qt6base/Config.in.host @@ -2,3 +2,8 @@ # Qt Shader Baker(qsb)). config BR2_PACKAGE_HOST_QT6BASE_GUI bool + +# Select this if you need host qt6 tools that require the Qt::Network module +# (e.g. Qt Tools). +config BR2_PACKAGE_HOST_QT6BASE_NETWORK + bool diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 36ec05b394..684bb86bc9 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -88,7 +88,6 @@ HOST_QT6BASE_CONF_OPTS = \ -DFEATURE_xml=ON \ -DFEATURE_sql=OFF \ -DFEATURE_testlib=OFF \ - -DFEATURE_network=OFF \ -DFEATURE_dbus=OFF \ -DFEATURE_icu=OFF \ -DFEATURE_glib=OFF \ @@ -103,6 +102,12 @@ else HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF endif +ifeq ($(BR2_PACKAGE_HOST_QT6BASE_NETWORK),y) +HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=ON +else +HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF +endif + # Conditional blocks below are ordered by alphabetic ordering of the # BR2_PACKAGE_* option. From patchwork Mon May 13 22:03:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Kollen Svendsen X-Patchwork-Id: 1934819 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VdYRZ3s6Lz20KD for ; Tue, 14 May 2024 08:04:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id A3949415B1; Mon, 13 May 2024 22:04:08 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 8V5jPvGhUNDg; Mon, 13 May 2024 22:04:07 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 46277415D6 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 46277415D6; Mon, 13 May 2024 22:04:07 +0000 (UTC) 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 1BEF71BF2C0 for ; Mon, 13 May 2024 22:04:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id CB584415B1 for ; Mon, 13 May 2024 22:03:59 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 1aacEUZjtIcm for ; Mon, 13 May 2024 22:03:59 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::22c; helo=mail-lj1-x22c.google.com; envelope-from=roykollensvendsen@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 9B7EC415A9 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 9B7EC415A9 Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by smtp2.osuosl.org (Postfix) with ESMTPS id 9B7EC415A9 for ; Mon, 13 May 2024 22:03:58 +0000 (UTC) Received: by mail-lj1-x22c.google.com with SMTP id 38308e7fff4ca-2e0b2ddc5d1so71836861fa.3 for ; Mon, 13 May 2024 15:03:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715637836; x=1716242636; 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=zfToIYT7yA0jUMs9H0HIm0OUBcvGZYYoyuhVtx4cze4=; b=dF/deAdHia/J+6gBNkiEU9bJ62zv0wtzx2bKvFnETYIlKAaXGbg30eAvCvuWFFBC14 PsSfJcAAPZ4+o9jo6XXChSpQfSMz9dT1elUrFAg3TJNX76pVqPPwcaGcR/2wIeg5wUpk I+3Z5QwdqDDMz0Gkyb4MRJUKiG9R/xZX4eTlBr7Te64yf8BYPvqdonEOAy4zgH+xdjr8 5NNGNLn45y5qf03rzRJ+EfSCZhNEOsXJKrbDR9MDTo1/+qWhFnSsCj64Y/aiQOlYw4Si 78zRdifuQnxkfW3XN4J7igKwINz/EPEsXjUVOjHb67/eLRPUMuX945o306w7sMk3dIYK OzMA== X-Gm-Message-State: AOJu0YxSi6dGGE76Kf+2NefKrXGDQDafoACBFWT+2eVASK353fHLPGsw qcIX20oe+Bo3PQXguyYD9DavPIWioWwV1kmqSfSr32GWH6ZiR1bi1hRCCBq9 X-Google-Smtp-Source: AGHT+IGCNEuIZiFni+Vgq8mUW9hA/a02HOwn8auYHA0/0GB+AHpXb66W6tWVDJSDewmJk/VfrQ2oBQ== X-Received: by 2002:a2e:9b8b:0:b0:2e5:59a:591d with SMTP id 38308e7fff4ca-2e51fd3fe2emr77227431fa.4.1715637835680; Mon, 13 May 2024 15:03:55 -0700 (PDT) Received: from precision7530-arch-roy.lan ([2a01:799:1a22:4401:9825:b52b:4cba:665e]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e4d0ce3488sm15548401fa.52.2024.05.13.15.03.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 15:03:54 -0700 (PDT) From: Roy Kollen Svendsen To: buildroot@buildroot.org Date: Tue, 14 May 2024 00:03:09 +0200 Message-ID: <20240513220328.1085629-4-roykollensvendsen@gmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240513220328.1085629-1-roykollensvendsen@gmail.com> References: <1934329> <20240513220328.1085629-1-roykollensvendsen@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715637836; x=1716242636; darn=buildroot.org; 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=zfToIYT7yA0jUMs9H0HIm0OUBcvGZYYoyuhVtx4cze4=; b=UPZRSPeUhNWIpz1tIkakBTgdsgdSE5N98hVNpX2hfuD284r6kH9CIE0EAsy/0tZayj uOeRoVqpwbb7xcQuJVlCopfdV2+pz5WTLTxVGdKryOWlBpBxpt0qOQcs3S/6Z05Y1/mM q7LW6qXycLpwf/QTjitVJn1ns9r6VSzWEsWU5c7jMXpgEIB19VDIrCFzZ8W0re/ADdzM 40dfqYcTTeD4Rx6H3DhuLQcy8zyVsrpVVjQ6YcRXMaGXXbiPiecIBTgFD6JpPXnGK/WQ kv+PN+O7CGefKitq4hzyWN6m0LOLrtVTnYAQ/79naWuqyVgWk+2SvJTtKVZFN6LRNxxB n+MA== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=UPZRSPeU Subject: [Buildroot] [PATCH v4 04/14] package/qt6/qt6base: add blind option to enable Test support on host 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: Zoltan Gyarmati , Jesse Van Gavere , Samuel Martin , Roy Kollen Svendsen , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: Roy Kollen Svendsen --- Changes v3 -> v4: - This patch was added in v4. Required by patch 9/14. package/qt6/qt6base/Config.in.host | 5 +++++ package/qt6/qt6base/qt6base.mk | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host index 286da0ff03..80bc13c7dc 100644 --- a/package/qt6/qt6base/Config.in.host +++ b/package/qt6/qt6base/Config.in.host @@ -7,3 +7,8 @@ config BR2_PACKAGE_HOST_QT6BASE_GUI # (e.g. Qt Tools). config BR2_PACKAGE_HOST_QT6BASE_NETWORK bool + +# Select this if you need host qt6 tools that require the Qt::Test module +# (e.g. qmltestrunner). +config BR2_PACKAGE_HOST_QT6BASE_TEST + bool diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 684bb86bc9..b19cce26f8 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -87,7 +87,6 @@ HOST_QT6BASE_CONF_OPTS = \ -DFEATURE_concurrent=OFF \ -DFEATURE_xml=ON \ -DFEATURE_sql=OFF \ - -DFEATURE_testlib=OFF \ -DFEATURE_dbus=OFF \ -DFEATURE_icu=OFF \ -DFEATURE_glib=OFF \ @@ -108,6 +107,12 @@ else HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF endif +ifeq ($(BR2_PACKAGE_HOST_QT6BASE_TEST),y) +HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=ON +else +HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=OFF +endif + # Conditional blocks below are ordered by alphabetic ordering of the # BR2_PACKAGE_* option. From patchwork Mon May 13 22:03:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Kollen Svendsen X-Patchwork-Id: 1934820 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VdYRd4lCtz20KD for ; Tue, 14 May 2024 08:04:13 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id F19DC4168E; Mon, 13 May 2024 22:04:11 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id TROBBT4GfqtF; Mon, 13 May 2024 22:04:11 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 8682C41693 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 8682C41693; Mon, 13 May 2024 22:04:10 +0000 (UTC) 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 DBF261BF2C0 for ; Mon, 13 May 2024 22:04:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id C888A60600 for ; Mon, 13 May 2024 22:04:00 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id TLbvOJvhGTYk for ; Mon, 13 May 2024 22:04:00 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::22d; helo=mail-lj1-x22d.google.com; envelope-from=roykollensvendsen@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org F1671605D1 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org F1671605D1 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by smtp3.osuosl.org (Postfix) with ESMTPS id F1671605D1 for ; Mon, 13 May 2024 22:03:59 +0000 (UTC) Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2e3b1b6e9d1so60173861fa.2 for ; Mon, 13 May 2024 15:03:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715637837; x=1716242637; 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=1d5vvbjxlNjUxOgnNN+1JGOHBUbKaa7WwM7vyMElePo=; b=lDVfjVDu1NpufiCSBSGdy2Ga7ziDljRNO0C5KnNlpy/SZjZIrZuKM0Y/ALx5roHJUH c6ApTpNBq2QuJih4ULoLL00nmDEvcdczrAT9jX9IsmoXPH0eSq4I7U5BsQI4SAWW/TbI 6EXmIftgDnKMnTRFTEwpnITveK4vjiiOdqo5FHDtS6m2AO77YVUdtFzRsrC+AZJeI6/y YH6Zc/ARwS6TBj7Wd/wwIqU3zwznHcpmXDF0EeJGUTnlEsF8lm01DYK6aqheb/Wb3qxl JVnlBgUzfvubACeVH6hrknb8q4XXlGFHIx6j9hudp7u88BrPY5gHUEpsvc0QP/W/Cnxm 0Vmg== X-Gm-Message-State: AOJu0YxHcleMacJ+KoqPJ4+KkEniARsBGlQckbl3NqD0ugy7AuAnvctt uxaBqwf268wLwKiXO//pvenxRJbpVFiNqTrCiFj8lT+j7jX/fM4hEJELOwR+ X-Google-Smtp-Source: AGHT+IF9GhVK5iCZeVMJ58iKNIO8VJbJYNcJJo+hTMn0VhmNe3zcbHpuLuVCWWVpHv1IgWPfGd3/UQ== X-Received: by 2002:a2e:a58b:0:b0:2e2:891d:5f62 with SMTP id 38308e7fff4ca-2e51ff6692amr78150681fa.29.1715637837502; Mon, 13 May 2024 15:03:57 -0700 (PDT) Received: from precision7530-arch-roy.lan ([2a01:799:1a22:4401:9825:b52b:4cba:665e]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e4d0ce3488sm15548401fa.52.2024.05.13.15.03.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 15:03:56 -0700 (PDT) From: Roy Kollen Svendsen To: buildroot@buildroot.org Date: Tue, 14 May 2024 00:03:10 +0200 Message-ID: <20240513220328.1085629-5-roykollensvendsen@gmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240513220328.1085629-1-roykollensvendsen@gmail.com> References: <1934329> <20240513220328.1085629-1-roykollensvendsen@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715637837; x=1716242637; darn=buildroot.org; 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=1d5vvbjxlNjUxOgnNN+1JGOHBUbKaa7WwM7vyMElePo=; b=Y1toBDWAOZRE/QQHt9gGoYOMyeHiQ/tR1WnPDJ8jcrwYtqJYTUiGNsq/day7ZZjTjQ kx3pddtij63H8kLaxYeUxvbI1vlMNQ+QR4NfvBhqKnYR25AXLLXG/l1quuSxsI7rFt7g 14LJ3rN1g1IJxUBZytQ0P1etP9pHlNFayxKuYuE2aRYFUXB+Cbvk+s2q6/S1KEKDycBU fm6Hs3jeAhk6E4V5xB67fS1hMeqjaqdybLzcuI2hj10DTHYqNqWsMK+biGiv4u9c88yl hWufcEhL++mXE+bkIrDcYfkxfYnyLZ/vdghsvODHwe//FpSdjjwHLK8L+2eazyw2Yjzy wE4Q== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=Y1toBDWA Subject: [Buildroot] [PATCH v4 05/14] package/qt6/qt6base: add blind option to enable Sql support on host 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: Zoltan Gyarmati , Jesse Van Gavere , Samuel Martin , Roy Kollen Svendsen , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: Roy Kollen Svendsen --- Changes v3 -> v4: - This patch was added in v4. Required by patch 12/14. package/qt6/qt6base/Config.in.host | 5 +++++ package/qt6/qt6base/qt6base.mk | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/package/qt6/qt6base/Config.in.host b/package/qt6/qt6base/Config.in.host index 80bc13c7dc..46fb668817 100644 --- a/package/qt6/qt6base/Config.in.host +++ b/package/qt6/qt6base/Config.in.host @@ -12,3 +12,8 @@ config BR2_PACKAGE_HOST_QT6BASE_NETWORK # (e.g. qmltestrunner). config BR2_PACKAGE_HOST_QT6BASE_TEST bool + +# Select this if you need host qt6 tools that require the Qt::Sql module +# (e.g. qhelpgenerator). +config BR2_PACKAGE_HOST_QT6BASE_SQL + bool diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index b19cce26f8..c927b06482 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -86,7 +86,6 @@ HOST_QT6BASE_DEPENDENCIES = \ HOST_QT6BASE_CONF_OPTS = \ -DFEATURE_concurrent=OFF \ -DFEATURE_xml=ON \ - -DFEATURE_sql=OFF \ -DFEATURE_dbus=OFF \ -DFEATURE_icu=OFF \ -DFEATURE_glib=OFF \ @@ -107,6 +106,12 @@ else HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF endif +ifeq ($(BR2_PACKAGE_HOST_QT6BASE_SQL),y) +HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=ON +else +HOST_QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF +endif + ifeq ($(BR2_PACKAGE_HOST_QT6BASE_TEST),y) HOST_QT6BASE_CONF_OPTS += -DFEATURE_testlib=ON else From patchwork Mon May 13 22:03:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Kollen Svendsen X-Patchwork-Id: 1934821 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VdYRk3FZkz20KD for ; Tue, 14 May 2024 08:04:18 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D61D24159D; Mon, 13 May 2024 22:04:16 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id qrEcDTysSQBu; Mon, 13 May 2024 22:04:14 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 179E9416A2 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 179E9416A2; Mon, 13 May 2024 22:04:14 +0000 (UTC) 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 2F3831BF2C0 for ; Mon, 13 May 2024 22:04:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 1AED54052F for ; Mon, 13 May 2024 22:04:03 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id rWrp1HM3SAaA for ; Mon, 13 May 2024 22:04:01 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::22d; helo=mail-lj1-x22d.google.com; envelope-from=roykollensvendsen@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 6FB9B40520 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6FB9B40520 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by smtp4.osuosl.org (Postfix) with ESMTPS id 6FB9B40520 for ; Mon, 13 May 2024 22:04:01 +0000 (UTC) Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2e1fa824504so65128571fa.0 for ; Mon, 13 May 2024 15:04:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715637839; x=1716242639; 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=yI1RqdxRfM8jRChr1dAiyQizm1CEHhri/WdnZnPx8gs=; b=icFVdgsP8IBEC7u/9Ugd1wR0+oxX/ul9ZwZmcEvUYe5GdLwF+0QKHctTD9uO0jwAxY oeuHXRUCfCYrfWE+9apIjQEmw0rBQ3DTVMgnxSXdGRj9AKDGaCpfffSWgTZGmxmpGCTw oBUChoCL8Hvb3NhHic9q7sxwMj2whEKH6cWwku1BxNCSEfvUvqFKiM1f/KP4E1ilUAO3 otIkpl9Sbr8C1NM6z7vmHHJN1XS4JYEfXBnX/N5kj+g6zQWzus1hBYWJhMxZGv5xPp44 khwfL7oRqW68szHxvv4CECvlRE1/y6hGFiLX2IBYYpTzXkGVtwlGfo2AO51lKxr7Dwcb lumQ== X-Gm-Message-State: AOJu0Ywog7QVNB++5K/blkTkkMv+CNV5TmwOFuqM545tJBufCIckL1wE M15FzbgKepzXJKyI8g8v754cDOgCMdhTz8PF5JVdHXiQ+HuyM8aY8hsAWTGY X-Google-Smtp-Source: AGHT+IGtBv8jwYIQTbbcJQ+ltzCaVDL0U4FcCieBB/ZbHqk9htkPYAF+xc7xtM7P2FsRIpCFWuY2QA== X-Received: by 2002:a2e:80a:0:b0:2e6:cb01:aef8 with SMTP id 38308e7fff4ca-2e6cb01b165mr4760721fa.36.1715637839228; Mon, 13 May 2024 15:03:59 -0700 (PDT) Received: from precision7530-arch-roy.lan ([2a01:799:1a22:4401:9825:b52b:4cba:665e]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e4d0ce3488sm15548401fa.52.2024.05.13.15.03.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 15:03:58 -0700 (PDT) From: Roy Kollen Svendsen To: buildroot@buildroot.org Date: Tue, 14 May 2024 00:03:11 +0200 Message-ID: <20240513220328.1085629-6-roykollensvendsen@gmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240513220328.1085629-1-roykollensvendsen@gmail.com> References: <1934329> <20240513220328.1085629-1-roykollensvendsen@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715637839; x=1716242639; darn=buildroot.org; 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=yI1RqdxRfM8jRChr1dAiyQizm1CEHhri/WdnZnPx8gs=; b=hjn6KF6M9H3KSHcjoloSb+XKu4SNR6maLmk5iDcc310+icClmqr6ExXqSHbBF2r3g/ NGRUDRVdwxrlMZdOL11UmHKqc/74WActXntvqKRvqLqWdrCc+/RxdMHsU9eskHbbpqvf 91JhPWJUAfFVpfZzm2vMsHZzGMyU9wDFbVmdEj61KWVAkggqg0gEpIqUIb1xNlSxINFj FP54XFwaQbkKK0o4l5MHya/sCcuiWb1qKi58lY9ABk2QNv6wsSpzfOAR3ThYrCp5XHhE mcSomkBz05IfSHh94IeCeFBbRC5P8qJDvTCem8Z1myzgsXO7URSeOZc5ZOLKSXs+qKqE BGUQ== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=hjn6KF6M Subject: [Buildroot] [PATCH v4 06/14] package/qt6/qt6shadertools: new package 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: Roy Kollen Svendsen , Samuel Martin , Roy Kollen Svendsen , Thomas Petazzoni , Zoltan Gyarmati , Jesse Van Gavere Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Roy Kollen Svendsen Signed-off-by: Roy Kollen Svendsen --- package/qt6/Config.in | 1 + package/qt6/qt6shadertools/Config.in | 13 +++++++ .../qt6/qt6shadertools/qt6shadertools.hash | 10 +++++ package/qt6/qt6shadertools/qt6shadertools.mk | 39 +++++++++++++++++++ 4 files changed, 63 insertions(+) create mode 100644 package/qt6/qt6shadertools/Config.in create mode 100644 package/qt6/qt6shadertools/qt6shadertools.hash create mode 100644 package/qt6/qt6shadertools/qt6shadertools.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 276a0217ab..b7e95a6885 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in" source "package/qt6/qt6core5compat/Config.in" source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" +source "package/qt6/qt6shadertools/Config.in" source "package/qt6/qt6svg/Config.in" endif diff --git a/package/qt6/qt6shadertools/Config.in b/package/qt6/qt6shadertools/Config.in new file mode 100644 index 0000000000..1b47dc6132 --- /dev/null +++ b/package/qt6/qt6shadertools/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_QT6SHADERTOOLS + bool "qt6shadertools" + select BR2_PACKAGE_HOST_QT6BASE_GUI + select BR2_PACKAGE_QT6BASE_GUI + help + Qt is a cross-platform application and UI framework for + developers using C++. + + The Qt Shader Tools module builds on the SPIR-V Open + Source Ecosystem as described at the Khronos SPIR-V web + site. + + https://doc.qt.io/qt-6/qtshadertools-index.html diff --git a/package/qt6/qt6shadertools/qt6shadertools.hash b/package/qt6/qt6shadertools/qt6shadertools.hash new file mode 100644 index 0000000000..90313163fa --- /dev/null +++ b/package/qt6/qt6shadertools/qt6shadertools.hash @@ -0,0 +1,10 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtshadertools-everywhere-src-6.7.0.tar.xz.sha256 +sha256 3e13f967c62f0815c901e754cbc472a2e19170da0c7a505230d559615f7998af qtshadertools-everywhere-src-6.7.0.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6shadertools/qt6shadertools.mk b/package/qt6/qt6shadertools/qt6shadertools.mk new file mode 100644 index 0000000000..108f409380 --- /dev/null +++ b/package/qt6/qt6shadertools/qt6shadertools.mk @@ -0,0 +1,39 @@ +################################################################################ +# +# qt6shadertools +# +################################################################################ + +QT6SHADERTOOLS_VERSION = $(QT6_VERSION) +QT6SHADERTOOLS_SITE = $(QT6_SITE) +QT6SHADERTOOLS_SOURCE = qtshadertools-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SHADERTOOLS_VERSION).tar.xz +QT6SHADERTOOLS_INSTALL_STAGING = YES +QT6SHADERTOOLS_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6SHADERTOOLS_CMAKE_BACKEND = ninja + +QT6SHADERTOOLS_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0, GFDL-1.3 no invariants (docs) + +QT6SHADERTOOLS_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt + +QT6SHADERTOOLS_CONF_OPTS = \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6SHADERTOOLS_DEPENDENCIES = \ + host-pkgconf \ + qt6base \ + host-qt6shadertools + +HOST_QT6SHADERTOOLS_DEPENDENCIES = \ + host-qt6base + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) From patchwork Mon May 13 22:03:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Kollen Svendsen X-Patchwork-Id: 1934822 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VdYRm4bc9z20KD for ; Tue, 14 May 2024 08:04:20 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 1A0A6416B9; Mon, 13 May 2024 22:04:19 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id PSNwLo8Rb_9P; Mon, 13 May 2024 22:04:18 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org B92E2416AF Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id B92E2416AF; Mon, 13 May 2024 22:04:17 +0000 (UTC) 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 11FD21BF2C0 for ; Mon, 13 May 2024 22:04:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id F29B4812F1 for ; Mon, 13 May 2024 22:04:05 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id vtP8VdMw1RHQ for ; Mon, 13 May 2024 22:04:05 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::234; helo=mail-lj1-x234.google.com; envelope-from=roykollensvendsen@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 3E206812E3 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 3E206812E3 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by smtp1.osuosl.org (Postfix) with ESMTPS id 3E206812E3 for ; Mon, 13 May 2024 22:04:05 +0000 (UTC) Received: by mail-lj1-x234.google.com with SMTP id 38308e7fff4ca-2e564cad1f6so37661451fa.1 for ; Mon, 13 May 2024 15:04:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715637843; x=1716242643; 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=a1xod2PvMaNb4Y1r96kdpq3NkTrY9nOMMh/a6KuYdnk=; b=Jm7mlHX9yky62722jygFjRPL9wnnJk9mnzzb06CX1yN/sgHbyDYz3xe+aqPTY3V81w yPNyZ3KARVrwoZnMXNhDiQcLT+8SZ7zHTXJHHYY47Df6oFm7w3RkfUceTe7DndVQAhFE HahVTXZ0uxlzXgD2EEcqCvun877+XyBZu3txLiEubVTeUfMJZJ1WG1QpQd3laeS1EulX weqZ58XImg4CiU+UzPUTk3FnwKpIbKL/c1PO70zlYj6qoJL240O24b5KxPzWANJ49nao k3FhcMcDz7F1+I9iR3eh0SGDg1ERvvnLlvdXd2ucd+DE3Z9vIccGGL2OU+X2ykDzMaPs XgTA== X-Gm-Message-State: AOJu0YxhR+QfsWKRZCqLMX/k1zrgYsp40lgrLMv+JiTwLF5FwTnGROlo y38uNkaAefdHkavTuDo9zPT70ytViYNe84Rq/tcsvhO8ZqOP13QZrbZKBsTp X-Google-Smtp-Source: AGHT+IEmi9VmDMWvwa1oBXoUeFJr8FYcOKOPLKwf6Q/IV6sO0GbmGEWedF7twN05ZyYh1SzpTDHzgQ== X-Received: by 2002:a2e:a555:0:b0:2e1:a8db:2bca with SMTP id 38308e7fff4ca-2e5205e2972mr88763451fa.48.1715637841042; Mon, 13 May 2024 15:04:01 -0700 (PDT) Received: from precision7530-arch-roy.lan ([2a01:799:1a22:4401:9825:b52b:4cba:665e]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e4d0ce3488sm15548401fa.52.2024.05.13.15.04.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 15:04:00 -0700 (PDT) From: Roy Kollen Svendsen To: buildroot@buildroot.org Date: Tue, 14 May 2024 00:03:12 +0200 Message-ID: <20240513220328.1085629-7-roykollensvendsen@gmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240513220328.1085629-1-roykollensvendsen@gmail.com> References: <1934329> <20240513220328.1085629-1-roykollensvendsen@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715637843; x=1716242643; darn=buildroot.org; 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=a1xod2PvMaNb4Y1r96kdpq3NkTrY9nOMMh/a6KuYdnk=; b=TX6wQWZYOlJTBVJBvjhDthqoXVIPnokn8H42t17an9DAZwYHsP9qR5qb5P/P4xuW4u w0rkqc3GflrDAbWgVbzuMzP46+x+aBWbs/+9LH2qL0KY3QoDEbdV/JOlq9ncCMvaFg9R hWLz/TaCIj7vIuvGaVTGZCRH9f7nKNMkJegDujCjzzVhemZ1EYlCBc90HNY/z5BFk325 N/AMUre5kEspjbK6ie3umR83XMlmNkFa8oXbHxjT7ByF9YnplywN9xcZYBxoNvko04W0 rNRzgA4/nsKAIPUP7Xp+Sh717+IcYTBixQo/fSaoQ6JHjt/Y29cOA4kfgVK3eUyCt39J pjTg== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=TX6wQWZY Subject: [Buildroot] [PATCH v4 07/14] package/qt6/qt6svg: allow building for host 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: Roy Kollen Svendsen , Samuel Martin , Roy Kollen Svendsen , Thomas Petazzoni , Zoltan Gyarmati , Jesse Van Gavere Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Roy Kollen Svendsen Signed-off-by: Roy Kollen Svendsen --- package/qt6/qt6svg/qt6svg.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qt6/qt6svg/qt6svg.mk b/package/qt6/qt6svg/qt6svg.mk index 25e87dd208..a9d7eaef51 100644 --- a/package/qt6/qt6svg/qt6svg.mk +++ b/package/qt6/qt6svg/qt6svg.mk @@ -37,3 +37,4 @@ QT6SVG_DEPENDENCIES = \ qt6base $(eval $(cmake-package)) +$(eval $(host-cmake-package)) From patchwork Mon May 13 22:03:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Kollen Svendsen X-Patchwork-Id: 1934823 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VdYRr4rjrz20KD for ; Tue, 14 May 2024 08:04:24 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 1C15141686; Mon, 13 May 2024 22:04:23 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id lWd-bvsTM4mS; Mon, 13 May 2024 22:04:22 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org D8B1F416B0 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id D8B1F416B0; Mon, 13 May 2024 22:04:21 +0000 (UTC) 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 A4EE61BF2C0 for ; Mon, 13 May 2024 22:04:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 923A0605D1 for ; Mon, 13 May 2024 22:04:08 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id ZN4rpTUInEko for ; Mon, 13 May 2024 22:04:07 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::22a; helo=mail-lj1-x22a.google.com; envelope-from=roykollensvendsen@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 4B33960600 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 4B33960600 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [IPv6:2a00:1450:4864:20::22a]) by smtp3.osuosl.org (Postfix) with ESMTPS id 4B33960600 for ; Mon, 13 May 2024 22:04:06 +0000 (UTC) Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2e09138a2b1so68876611fa.3 for ; Mon, 13 May 2024 15:04:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715637845; x=1716242645; 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=sB9wnuwuny3PYtziZmHnKeBlK5n1ajfAvP7hBvpAqWs=; b=YCvadbDu3zEUueRm+nWCdF8X7voyAUR0CF006efmPV0B0cvPatWesPSdjuhL71A+2m L2Vs/0Eo2evhreEGBmQ+VrqEBjWa2IDbhLrQrXwG5q89AOZBgpM0M25xZdiR6XdVat3C vBsY/yQJvS6ynM25ji5hKcCwqAMNlhCZQvbj1ACNXrD0Ccp95TScH6BXB6RIpoznduLE SacoDCJuWqQBzB3N9us9Iq7sf1MzPN91OA3phrK1zKVL9jBKhaQov3eSaSahNetdcBB0 EGHqaGwnKMHnGkocWk2Tg7aH5S+d9uyByLOZrjAdd2ClbTJpPBJgnijPUYQiGcp+3hTA I9Xg== X-Gm-Message-State: AOJu0Yzuxe8kCkRgCVQTIO9J5uyltFKKG+RvvwzLQfm2Jn5hKnopeiXW IJEK0t4w5NRWkx3fIUyyrnPWKDz8GPqAS5VMnmHkUYOnG+++9iWuk6E+OoK8 X-Google-Smtp-Source: AGHT+IFit/P2GkGix6aJxJSipBoeUNbPJuJjCwarDI7oRggmeBvnMBZtOrx493rLCm6sDXHZOljkpA== X-Received: by 2002:a05:651c:50f:b0:2df:7ac1:b27 with SMTP id 38308e7fff4ca-2e52006399cmr83591971fa.28.1715637844765; Mon, 13 May 2024 15:04:04 -0700 (PDT) Received: from precision7530-arch-roy.lan ([2a01:799:1a22:4401:9825:b52b:4cba:665e]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e4d0ce3488sm15548401fa.52.2024.05.13.15.04.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 15:04:04 -0700 (PDT) From: Roy Kollen Svendsen To: buildroot@buildroot.org Date: Tue, 14 May 2024 00:03:13 +0200 Message-ID: <20240513220328.1085629-8-roykollensvendsen@gmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240513220328.1085629-1-roykollensvendsen@gmail.com> References: <1934329> <20240513220328.1085629-1-roykollensvendsen@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715637845; x=1716242645; darn=buildroot.org; 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=sB9wnuwuny3PYtziZmHnKeBlK5n1ajfAvP7hBvpAqWs=; b=CmMXuezJLfeS+YXyBE+J+xBde+3rk/SBIkLjAnIcFUg7wd3/2k4TSfRH2kDXRdeAHe c1g62lpvAIZQs4wXm/I3u0sGJgHubkppKb79JtPsxFTyXdBh8O2swvDcqy3wdD+qj2VK 4oCj8UpHw0foGEZFgwPdmPHiqnu23K3BDUimZRafLRqgjz7/f3c2j85LyaG2GLmoazH9 3eGurzM/l3o4HJ2Fo/KJpCJM92yQw4iJzNECz5oJPd/G7l+X5vZ9EFXfJUms5LU25ZOm U6zc0fwqU4B9MdjthRICRYUuiJN/qU82TW3QVJwz85cjBtjB0wRObYMruuydqss6mfq3 1qNQ== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=CmMXuezJ Subject: [Buildroot] [PATCH v4 08/14] package/qt6/qt6languageserver: new package 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: Roy Kollen Svendsen , Samuel Martin , Roy Kollen Svendsen , Thomas Petazzoni , Zoltan Gyarmati , Jesse Van Gavere Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Roy Kollen Svendsen Signed-off-by: Roy Kollen Svendsen --- package/qt6/Config.in | 1 + package/qt6/qt6languageserver/Config.in | 9 +++++ .../qt6languageserver/qt6languageserver.hash | 11 ++++++ .../qt6languageserver/qt6languageserver.mk | 34 +++++++++++++++++++ 4 files changed, 55 insertions(+) create mode 100644 package/qt6/qt6languageserver/Config.in create mode 100644 package/qt6/qt6languageserver/qt6languageserver.hash create mode 100644 package/qt6/qt6languageserver/qt6languageserver.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index b7e95a6885..81682af476 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -45,6 +45,7 @@ if BR2_PACKAGE_QT6 source "package/qt6/qt6base/Config.in" source "package/qt6/qt6core5compat/Config.in" +source "package/qt6/qt6languageserver/Config.in" source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" source "package/qt6/qt6shadertools/Config.in" diff --git a/package/qt6/qt6languageserver/Config.in b/package/qt6/qt6languageserver/Config.in new file mode 100644 index 0000000000..8a54ae1911 --- /dev/null +++ b/package/qt6/qt6languageserver/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_QT6LANGUAGESERVER + bool "qt6languageserver" + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6languageserver module. + + https://doc.qt.io/qt-6/qtlanguageserver-index.html diff --git a/package/qt6/qt6languageserver/qt6languageserver.hash b/package/qt6/qt6languageserver/qt6languageserver.hash new file mode 100644 index 0000000000..2d40426c6f --- /dev/null +++ b/package/qt6/qt6languageserver/qt6languageserver.hash @@ -0,0 +1,11 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtlanguageserver-everywhere-src-6.7.0.tar.xz.sha256 +sha256 a99ecb342abdf7b7ac24804c89830a7991de95f9402f45a1e337ae851f76c9fc qtlanguageserver-everywhere-src-6.7.0.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6languageserver/qt6languageserver.mk b/package/qt6/qt6languageserver/qt6languageserver.mk new file mode 100644 index 0000000000..6f96feb275 --- /dev/null +++ b/package/qt6/qt6languageserver/qt6languageserver.mk @@ -0,0 +1,34 @@ +################################################################################ +# +# qt6languageserver +# +################################################################################ + +QT6LANGUAGESERVER_VERSION = $(QT6_VERSION) +QT6LANGUAGESERVER_SITE = $(QT6_SITE) +QT6LANGUAGESERVER_SOURCE = qtlanguageserver-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6LANGUAGESERVER_VERSION).tar.xz +QT6LANGUAGESERVER_INSTALL_STAGING = YES +QT6LANGUAGESERVER_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6LANGUAGESERVER_CMAKE_BACKEND = ninja + +QT6LANGUAGESERVER_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0, GFDL-1.3 no invariants (docs) + +QT6LANGUAGESERVER_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt + +QT6LANGUAGESERVER_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6LANGUAGESERVER_DEPENDENCIES = \ + qt6base + +$(eval $(cmake-package)) From patchwork Mon May 13 22:03:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Kollen Svendsen X-Patchwork-Id: 1934824 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VdYRz3N8Nz20KD for ; Tue, 14 May 2024 08:04:31 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id A43A4416D3; Mon, 13 May 2024 22:04:29 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 3_5woVDyH09h; Mon, 13 May 2024 22:04:25 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 09FC8416CF Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 09FC8416CF; Mon, 13 May 2024 22:04:25 +0000 (UTC) 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 866321BF2C0 for ; Mon, 13 May 2024 22:04:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 7249B81370 for ; Mon, 13 May 2024 22:04:10 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id wTUrxS7ZZAL6 for ; Mon, 13 May 2024 22:04:09 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::22e; helo=mail-lj1-x22e.google.com; envelope-from=roykollensvendsen@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org EE84681310 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org EE84681310 Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by smtp1.osuosl.org (Postfix) with ESMTPS id EE84681310 for ; Mon, 13 May 2024 22:04:08 +0000 (UTC) Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2e6792ea67fso18861481fa.1 for ; Mon, 13 May 2024 15:04:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715637847; x=1716242647; 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=/jBzLofZooZ1JZVlsOJygoWY3ZaUituddSiHa8Gv7j8=; b=DqzS4bw4TDGo+tEiwy5fyMTQ+ieB3E4Yl/6OXvyCq4mbBN4jumqCtmVdPrBEu3M++e mASM6G0t7Dw/5fq5QBEtI3jfeDAeixff4SISJOZ6fBv9fsCdw2GIFeyzJz1pqEwgswwO Bm/bJhdnkVsqfaLY76VRZBAGDTFWtxfbRqON8KpAM4biJMuy0dAfVWIielC81s86XFYK AqZXIr38A8ZN+5cnbV7kkHtvCqZAeqOZwXC/hi4K9nV5m+oe8ikLHIf+4QhIqP+rwYV2 sBm9Oq2nQabYiXa0zNCKm8nsJfAsy8KzyU24fPAAAw4kg1pdAkBgmS8tze+r78L7dn+i i/PA== X-Gm-Message-State: AOJu0YxfC58DmS4IkyiTuS69rLdldXQRzUg7j0qSunJDP8mPNwZpXn50 ctEgg0m9zIFu4ZgExVHRofBzFXx0WKW20B+JYpZMNMrgQZAelco66bjdIvSZ X-Google-Smtp-Source: AGHT+IFSepM7UYgoVSajQyM0N2EQ8PIOeLbljLj1T9uF4TUeZIVAFmcWV416VRGC6Sol0aY0fE0orA== X-Received: by 2002:a2e:b889:0:b0:2db:381a:bf6e with SMTP id 38308e7fff4ca-2e51ff5d117mr79526281fa.16.1715637846663; Mon, 13 May 2024 15:04:06 -0700 (PDT) Received: from precision7530-arch-roy.lan ([2a01:799:1a22:4401:9825:b52b:4cba:665e]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e4d0ce3488sm15548401fa.52.2024.05.13.15.04.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 15:04:06 -0700 (PDT) From: Roy Kollen Svendsen To: buildroot@buildroot.org Date: Tue, 14 May 2024 00:03:14 +0200 Message-ID: <20240513220328.1085629-9-roykollensvendsen@gmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240513220328.1085629-1-roykollensvendsen@gmail.com> References: <1934329> <20240513220328.1085629-1-roykollensvendsen@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715637847; x=1716242647; darn=buildroot.org; 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=/jBzLofZooZ1JZVlsOJygoWY3ZaUituddSiHa8Gv7j8=; b=gP9HN9yJpDzZzkn+p3o+oqxswGT1Hti2mJWZDjIxn3tC2a5744YdxRUK6YqBwSqQI3 fcNYB0Nkr1v6qUTx+RCaDUrT1BF5UVdtUQQJji0Qm2ceip1q86tGc3o49/srkJT6UkbN IF5QXTgTYQieWpcrBQA+j2MX+0f9UUeSMc4PYgiay+T4BueKSl/JZd+8mt4XOqaglQj6 1iw7KV34kyoRxNNaMgdjIId+MXo3AprLKBBWlSZ7tQv2s2WeeCFAfXfHOAzaEk/pa9dX Oi5Vw4ex9XLXc+FM7GrGwY/Ow/t/IbiBqpuX2lMuRlFffxs+uAHNeH+bQ4Mn4ASZOUf2 VOqw== X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=gP9HN9yJ Subject: [Buildroot] [PATCH v4 09/14] package/qt6/qt6declarative: new package 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: Roy Kollen Svendsen , Samuel Martin , Roy Kollen Svendsen , Thomas Petazzoni , Zoltan Gyarmati , Jesse Van Gavere Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Roy Kollen Svendsen We add the patch to avoid checking for FEATURE_ssl when FEATURE_network is not available. FEATURE_ssl is defined by the Qt Network module. So we will get the following build failure if the patch is not applied and FEATURE_network=ON: CMake Error at qt6base-6.7.0/cmake/QtFeature.cmake:376 (message): Attempting to evaluate feature ssl but its definition is missing. Either the feature does not exist or a dependency to the module that defines it is missing Call Stack (most recent call first): qt6base-6.7.0/cmake/QtFeature.cmake:141 (qt_evaluate_feature) qt6base-6.7.0/cmake/QtFeature.cmake:180 (qt_internal_evaluate_config_expression) qt6base-6.7.0/cmake/QtFeature.cmake:396 (qt_evaluate_config_expression) qt6base-6.7.0/cmake/QtFeature.cmake:711 (qt_evaluate_feature) qt6base-6.7.0/cmake/QtFeature.cmake:680 (qt_feature_module_end) src/qml/CMakeLists.txt:13 (qt_feature_evaluate_features) To avoid the following build error, we also make sure the host qt6base is built with Testlib enabled: CMake Error at buildroot/output/build/qt6base-6.7.0/cmake/QtToolHelpers.cmake:684 (message): Failed to find the host tool "Qt6::qmltestrunner". It is part of the Qt6QmlTools package, but the package did not contain the tool. Make sure that the host module Qml was built with all features enabled (no explicitly disabled tools). Call Stack (most recent call first): buildroot/output/build/qt6base-6.7.0/cmake/QtToolHelpers.cmake:72 (qt_internal_find_tool) tools/qmltestrunner/CMakeLists.txt:11 (qt_internal_add_tool) Signed-off-by: Roy Kollen Svendsen --- Changes v3 -> v4: - Fix build failure when Testlib enabled for target. (suggested by Jesse) - Squash the 'Fix build with -no-feature-network'-patch into this commit, since no earlier version of the qt6declarative package exist. package/qt6/Config.in | 1 + ...1-Fix-build-with--no-feature-network.patch | 28 ++++++++++ package/qt6/qt6declarative/Config.in | 24 ++++++++ .../qt6/qt6declarative/qt6declarative.hash | 11 ++++ package/qt6/qt6declarative/qt6declarative.mk | 56 +++++++++++++++++++ 5 files changed, 120 insertions(+) create mode 100644 package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch create mode 100644 package/qt6/qt6declarative/Config.in create mode 100644 package/qt6/qt6declarative/qt6declarative.hash create mode 100644 package/qt6/qt6declarative/qt6declarative.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 81682af476..625134d281 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -45,6 +45,7 @@ if BR2_PACKAGE_QT6 source "package/qt6/qt6base/Config.in" source "package/qt6/qt6core5compat/Config.in" +source "package/qt6/qt6declarative/Config.in" source "package/qt6/qt6languageserver/Config.in" source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" diff --git a/package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch b/package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch new file mode 100644 index 0000000000..bef5794229 --- /dev/null +++ b/package/qt6/qt6declarative/0001-Fix-build-with--no-feature-network.patch @@ -0,0 +1,28 @@ +From 8377691a0998fd84e6fc8349a5db450bf2d79164 Mon Sep 17 00:00:00 2001 +From: Tasuku Suzuki +Date: Tue, 21 Nov 2023 23:58:43 +0900 +Subject: Fix build with -no-feature-network + +Change-Id: Ib21012301da6afb5458f707b39a9a8079d93eb93 +Reviewed-by: Ulf Hermann +Upstream: https://code.qt.io/cgit/qt/qtdeclarative.git/commit/?id=8377691a0998fd84e6fc8349a5db450bf2d79164 +Signed-off-by: Roy Kollen Svendsen +--- + src/qml/configure.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/qml/configure.cmake b/src/qml/configure.cmake +index 2d0434643a..d1ff90bd54 100644 +--- a/src/qml/configure.cmake ++++ b/src/qml/configure.cmake +@@ -82,7 +82,7 @@ qt_feature("qml-ssl" PUBLIC + SECTION "QML" + LABEL "QML SSL support" + PURPOSE "Provides ssl support in QML." +- CONDITION QT_FEATURE_ssl ++ CONDITION QT_FEATURE_qml_network AND QT_FEATURE_ssl + ) + + # On arm and arm64 we need a specialization of cacheFlush() for each OS to be +-- +cgit v1.2.3 diff --git a/package/qt6/qt6declarative/Config.in b/package/qt6/qt6declarative/Config.in new file mode 100644 index 0000000000..1daa645413 --- /dev/null +++ b/package/qt6/qt6declarative/Config.in @@ -0,0 +1,24 @@ +config BR2_PACKAGE_QT6DECLARATIVE + bool "qt6declarative" + # Enable host test module to ensure that qmltestrunner is built + select BR2_PACKAGE_HOST_QT6BASE_TEST if BR2_PACKAGE_QT6BASE_TEST + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6declarative module. + + https://doc.qt.io/qt-6/qtdeclarative-index.html + +if BR2_PACKAGE_QT6DECLARATIVE + +config BR2_PACKAGE_QT6DECLARATIVE_QUICK + bool "quick module" + select BR2_PACKAGE_QT6BASE_GUI + select BR2_PACKAGE_QT6LANGUAGESERVER + select BR2_PACKAGE_QT6SHADERTOOLS + select BR2_PACKAGE_QT6BASE_OPENGL if BR2_PACKAGE_QT6_GL_SUPPORTS + select BR2_PACKAGE_HOST_QT6SVG + select BR2_PACKAGE_HOST_QT6DECLARATIVE + +endif diff --git a/package/qt6/qt6declarative/qt6declarative.hash b/package/qt6/qt6declarative/qt6declarative.hash new file mode 100644 index 0000000000..ae9925509b --- /dev/null +++ b/package/qt6/qt6declarative/qt6declarative.hash @@ -0,0 +1,11 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtdeclarative-everywhere-src-6.7.0.tar.xz.sha256 +sha256 5a0c39579a74d7cca581162c866ed0887287d4f8d5abff7ab9492d4a58fa9e2c qtdeclarative-everywhere-src-6.7.0.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6declarative/qt6declarative.mk b/package/qt6/qt6declarative/qt6declarative.mk new file mode 100644 index 0000000000..2348ff2dae --- /dev/null +++ b/package/qt6/qt6declarative/qt6declarative.mk @@ -0,0 +1,56 @@ +################################################################################ +# +# qt6declaratve +# +################################################################################ + +QT6DECLARATIVE_VERSION = $(QT6_VERSION) +QT6DECLARATIVE_SITE = $(QT6_SITE) +QT6DECLARATIVE_SOURCE = qtdeclarative-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6DECLARATIVE_VERSION).tar.xz +QT6DECLARATIVE_INSTALL_STAGING = YES + +QT6DECLARATIVE_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6DECLARATIVE_CMAKE_BACKEND = ninja + +QT6DECLARATIVE_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0, GFDL-1.3 no invariants (docs) + +QT6DECLARATIVE_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt + +QT6DECLARATIVE_CONF_OPTS = \ + -DQT_FEATURE_qml_profiler=OFF \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +HOST_QT6DECLARATIVE_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF \ + -DQT_FEATURE_ssl=OFF + +QT6DECLARATIVE_DEPENDENCIES = \ + host-qt6base \ + host-qt6svg \ + host-qt6shadertools \ + host-qt6declarative \ + qt6base \ + qt6shadertools \ + qt6languageserver \ + qt6svg + +HOST_QT6DECLARATIVE_DEPENDENCIES = \ + host-qt6base \ + host-qt6svg \ + host-qt6shadertools + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) From patchwork Mon May 13 22:03:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Kollen Svendsen X-Patchwork-Id: 1934825 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VdYS14QVHz20KD for ; Tue, 14 May 2024 08:04:33 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D7684416DF; Mon, 13 May 2024 22:04:31 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id Hg6A0BELT8_T; Mon, 13 May 2024 22:04:29 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 24859416CD Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 24859416CD; Mon, 13 May 2024 22:04:29 +0000 (UTC) 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 56C8B1BF2C0 for ; Mon, 13 May 2024 22:04:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 3B8C6405C6 for ; Mon, 13 May 2024 22:04:13 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id tbuX3RJ6q0cS for ; Mon, 13 May 2024 22:04:12 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::229; helo=mail-lj1-x229.google.com; envelope-from=roykollensvendsen@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org BE39A4053C DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org BE39A4053C Received: from mail-lj1-x229.google.com (mail-lj1-x229.google.com [IPv6:2a00:1450:4864:20::229]) by smtp4.osuosl.org (Postfix) with ESMTPS id BE39A4053C for ; Mon, 13 May 2024 22:04:11 +0000 (UTC) Received: by mail-lj1-x229.google.com with SMTP id 38308e7fff4ca-2e3efa18e6aso44966371fa.0 for ; Mon, 13 May 2024 15:04:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715637849; x=1716242649; 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=fuHyG9TQy+ISXS++YtIRoivCLJAxD4fiovsBX61jgaE=; b=astHW6wDEc0eNk2nxkyTGPvLuUddYAzzb8E4AaBRPE+TPT6WFAI+ZeEtZvVSJ6vwCP jkj21XnZ7Nte0SLBov1p0xK8KJXz1X0+bEKELzmuaWXkFzaSzqOakmmCx4jswSI++GhL PeHSTnn/NNoV9skr7S40iUoA+nYEZNf2aDpwESxvAw3MtlAZ+b827YRPccWzLovc/7If cy+0aSnygBX90GUEheg0dryoo8rnBLyKrhA3ZsLwTK1WTKZgDuLKOHwkgk8oVHTD6SQY 27DI53uY46xKaElmh6lRLr/vtMQByctWEQHn+QgZVVbXh8okMDJUI+5a1UwST/SIuctK 6YFQ== X-Gm-Message-State: AOJu0YxgTPxviTIvBeOgsIv6kIeRhqOpkEv2vakdueuN73xU19VXY1cE RI8EPXgFpsR80aQ/+uitvFQyG3NLbD+mOSmn+26wOwnWmECtfT8aolTHcH1+ X-Google-Smtp-Source: AGHT+IE97DY0k+p7JQm+dVqXplXnqjiWjanG0DIsVbQiJLTfHmnyZqBoYyeOuVi5YjLngLMfLE7vfg== X-Received: by 2002:a2e:9792:0:b0:2e1:f38c:b598 with SMTP id 38308e7fff4ca-2e4b17916f3mr46180001fa.18.1715637848565; Mon, 13 May 2024 15:04:08 -0700 (PDT) Received: from precision7530-arch-roy.lan ([2a01:799:1a22:4401:9825:b52b:4cba:665e]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e4d0ce3488sm15548401fa.52.2024.05.13.15.04.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 15:04:07 -0700 (PDT) From: Roy Kollen Svendsen To: buildroot@buildroot.org Date: Tue, 14 May 2024 00:03:15 +0200 Message-ID: <20240513220328.1085629-10-roykollensvendsen@gmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240513220328.1085629-1-roykollensvendsen@gmail.com> References: <1934329> <20240513220328.1085629-1-roykollensvendsen@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715637849; x=1716242649; darn=buildroot.org; 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=fuHyG9TQy+ISXS++YtIRoivCLJAxD4fiovsBX61jgaE=; b=IzKjXZjO/FNo6duQP7cXTL1DqxLaMuVDSB9CTux0Osll4kuiTVq8g2DHuiFNj8TRBi jqRaGp8ki2VWLjoYW4A8W+gHIFh9V25n2tdAIH5ZTWSOHdvVqRckLkLyCBkI/tCvcrZP L9h7mvJUyr5uK3MxHwzN8VllHI6cBn2E1y7WqLqpcHTUQAwOfrl9m8MqMPzm5exeL5hz 21F7kDtfdQRD3Khvo3PE5QHHW6zvQxs62+HileX4qDfaLdDUqMW6aHJDeY//VO5KqODF j/Rel/DUbf/dWtTKHpekvIr9veDvq9KiTcMf2h+T0gzMPqbRBFfsb0mKk5voB7MkZH8d S1Ug== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=IzKjXZjO Subject: [Buildroot] [PATCH v4 10/14] package/qt6/qt6websockets: new package 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: Roy Kollen Svendsen , Samuel Martin , Roy Kollen Svendsen , Thomas Petazzoni , Zoltan Gyarmati , Jesse Van Gavere Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Roy Kollen Svendsen Signed-off-by: Roy Kollen Svendsen --- package/qt6/Config.in | 1 + package/qt6/qt6websockets/Config.in | 9 ++++ package/qt6/qt6websockets/qt6websockets.hash | 11 +++++ package/qt6/qt6websockets/qt6websockets.mk | 46 ++++++++++++++++++++ 4 files changed, 67 insertions(+) create mode 100644 package/qt6/qt6websockets/Config.in create mode 100644 package/qt6/qt6websockets/qt6websockets.hash create mode 100644 package/qt6/qt6websockets/qt6websockets.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 625134d281..16f792cff3 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -51,5 +51,6 @@ source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" source "package/qt6/qt6shadertools/Config.in" source "package/qt6/qt6svg/Config.in" +source "package/qt6/qt6websockets/Config.in" endif diff --git a/package/qt6/qt6websockets/Config.in b/package/qt6/qt6websockets/Config.in new file mode 100644 index 0000000000..a201483922 --- /dev/null +++ b/package/qt6/qt6websockets/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_QT6WEBSOCKETS + bool "qt6websockets" + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6websockets module. + + https://doc.qt.io/qt-6/qtwebsockets-index.html diff --git a/package/qt6/qt6websockets/qt6websockets.hash b/package/qt6/qt6websockets/qt6websockets.hash new file mode 100644 index 0000000000..4e36eb4257 --- /dev/null +++ b/package/qt6/qt6websockets/qt6websockets.hash @@ -0,0 +1,11 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtwebsockets-everywhere-src-6.7.0.tar.xz.sha256 +sha256 5ffc77da6b36cdf18e04c975a0fbf243968806a93a6291bcd2e9cd0b26139736 qtwebsockets-everywhere-src-6.7.0.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6websockets/qt6websockets.mk b/package/qt6/qt6websockets/qt6websockets.mk new file mode 100644 index 0000000000..cc17085d10 --- /dev/null +++ b/package/qt6/qt6websockets/qt6websockets.mk @@ -0,0 +1,46 @@ +################################################################################ +# +# qt6websockets +# +################################################################################ + +QT6WEBSOCKETS_VERSION = $(QT6_VERSION) +QT6WEBSOCKETS_SITE = $(QT6_SITE) +QT6WEBSOCKETS_SOURCE = qtwebsockets-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6WEBSOCKETS_VERSION).tar.xz +QT6WEBSOCKETS_INSTALL_STAGING = YES + +QT6WEBSOCKETS_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6WEBSOCKETS_CMAKE_BACKEND = ninja + +QT6WEBSOCKETS_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0, GFDL-1.3 no invariants (docs) + +QT6WEBSOCKETS_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt + +QT6WEBSOCKETS_CONF_OPTS = \ + -DQT_FEATURE_thread=ON \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +HOST_QT6WEBSOCKETS_CONF_OPTS = \ + -DQT_FEATURE_thread=ON \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6WEBSOCKETS_DEPENDENCIES = \ + qt6base \ + qt6declarative \ + host-qt6declarative + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) From patchwork Mon May 13 22:03:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Kollen Svendsen X-Patchwork-Id: 1934826 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VdYS43SsRz20KD for ; Tue, 14 May 2024 08:04:36 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 05DA3416E7; Mon, 13 May 2024 22:04:35 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id GUxPA8qkt-91; Mon, 13 May 2024 22:04:34 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 943C0416E1 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 943C0416E1; Mon, 13 May 2024 22:04:33 +0000 (UTC) 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 54EE91BF2C0 for ; Mon, 13 May 2024 22:04:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 4115E4053C for ; Mon, 13 May 2024 22:04:16 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id p1WF4fOtwgxs for ; Mon, 13 May 2024 22:04:14 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::22b; helo=mail-lj1-x22b.google.com; envelope-from=roykollensvendsen@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org BF6C440546 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org BF6C440546 Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) by smtp4.osuosl.org (Postfix) with ESMTPS id BF6C440546 for ; Mon, 13 May 2024 22:04:13 +0000 (UTC) Received: by mail-lj1-x22b.google.com with SMTP id 38308e7fff4ca-2df83058d48so64136441fa.1 for ; Mon, 13 May 2024 15:04:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715637851; x=1716242651; 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=aCfpcSlifdq79wM1w6kEXDROJh4QVH5Gwv6gtxalcfo=; b=ooU93CXyYfxZKi/LMnay1+Bf7K1qv3TRN0011T0wp5MTraJh8RF45qfnAmjRlVWUE4 Kd2wZ/RhuIIazDlRyxZOS+2RFyB9TJUVnxUDzuezw7EdNg8eQqn9+ol80BD8Tsrs14Ic 8sq0pyp9wEuUlVWM5YyFtxrE3lm5gftBwAlYIN2fn173H9SJ8bpIXx22ENwHYRHr9IQ7 Uagwnqusob7ygASDORzKz82E0x4z0iZTvSIPmmCZ6u6PWADW5In7ufwFE29QKGwz6gZK ak7+kJJ+dq9xg+zou86lpBHtlZKr1gFj67GwnKQQw5s/I4TCzhRLhP/RIQYktizLRQF8 /YHQ== X-Gm-Message-State: AOJu0YxTLPxTTEkagPvLnMJ1kwahxWkxBqBaOoUSOWOy9qCC//k3ScLW xXV+1sc2VRnBzSJiQB1w3FyzHxvnT2/xRQYeq/L8NW4tO1Q8oV5UP06MxCd+ X-Google-Smtp-Source: AGHT+IGqBgAl7X1Mn/3oxa1mw4Y+JKjQJ1UOdzBFlx20U17WUPCfoGJ3C4lgOULCA9Amo8qN8Wm5oQ== X-Received: by 2002:a2e:3a0f:0:b0:2e0:37be:b70f with SMTP id 38308e7fff4ca-2e51fe57d31mr64062981fa.26.1715637851319; Mon, 13 May 2024 15:04:11 -0700 (PDT) Received: from precision7530-arch-roy.lan ([2a01:799:1a22:4401:9825:b52b:4cba:665e]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e4d0ce3488sm15548401fa.52.2024.05.13.15.04.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 15:04:10 -0700 (PDT) From: Roy Kollen Svendsen To: buildroot@buildroot.org Date: Tue, 14 May 2024 00:03:16 +0200 Message-ID: <20240513220328.1085629-11-roykollensvendsen@gmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240513220328.1085629-1-roykollensvendsen@gmail.com> References: <1934329> <20240513220328.1085629-1-roykollensvendsen@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715637851; x=1716242651; darn=buildroot.org; 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=aCfpcSlifdq79wM1w6kEXDROJh4QVH5Gwv6gtxalcfo=; b=mFG9NVfC84zBVLKEY5GXFAbKFT52DfB+gkzSKReBM5DIY8Gt/dADvOW79ACRHlhNJ4 GJfsKBiuhMcU3Xw7XEf8wvCtcFZyvgPFx/0nIa6sX5El1S7MQtqg86GZVZxGWXKeM6HF yqf1wErHWDWce6s6qujTX91tURr6VM2TeLbkvYUmjiyGSKN+pCKEZOCQGkDyCCRCOcOr hMmxcOkaDw4Tf3MawqEmCoVaD1YgoY3W5MSFStUAiB4ka+hV1rmowsyvALXqK3DBP2N3 lJNMobnnUihUPv/5ZFVo4iB1jMSbNpLKicNmEFwYHekdqzGNa2ZTRrfCA7BnauN0wSkj 6I4w== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=mFG9NVfC Subject: [Buildroot] [PATCH v4 11/14] package/qt6/qt6wayland: new package 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: Roy Kollen Svendsen , Samuel Martin , Roy Kollen Svendsen , Thomas Petazzoni , Zoltan Gyarmati , Jesse Van Gavere Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Roy Kollen Svendsen Signed-off-by: Roy Kollen Svendsen --- Changes v3 -> v4: - Fix compositor build by letting this package select libxkbcommon. package/qt6/Config.in | 1 + package/qt6/qt6wayland/Config.in | 25 ++++++++++++ package/qt6/qt6wayland/qt6wayland.hash | 11 ++++++ package/qt6/qt6wayland/qt6wayland.mk | 53 ++++++++++++++++++++++++++ 4 files changed, 90 insertions(+) create mode 100644 package/qt6/qt6wayland/Config.in create mode 100644 package/qt6/qt6wayland/qt6wayland.hash create mode 100644 package/qt6/qt6wayland/qt6wayland.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 16f792cff3..69ce0b3f6a 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -51,6 +51,7 @@ source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" source "package/qt6/qt6shadertools/Config.in" source "package/qt6/qt6svg/Config.in" +source "package/qt6/qt6wayland/Config.in" source "package/qt6/qt6websockets/Config.in" endif diff --git a/package/qt6/qt6wayland/Config.in b/package/qt6/qt6wayland/Config.in new file mode 100644 index 0000000000..a47c9e888c --- /dev/null +++ b/package/qt6/qt6wayland/Config.in @@ -0,0 +1,25 @@ +comment "qt6wayland needs an OpenGL-capable backend" + depends on !BR2_PACKAGE_QT6_GL_SUPPORTS + +config BR2_PACKAGE_QT6WAYLAND + bool "qt6wayland" + depends on BR2_PACKAGE_QT6_GL_SUPPORTS + select BR2_PACKAGE_WAYLAND + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6wayland module. + + https://doc.qt.io/qt-6/qtwayland-index.html + +if BR2_PACKAGE_QT6WAYLAND + +config BR2_PACKAGE_QT6WAYLAND_COMPOSITOR + bool "Enable compositor (experimental)" + select BR2_PACKAGE_LIBXKBCOMMON + help + The compositor API is still experimental, and not built by + default. + +endif diff --git a/package/qt6/qt6wayland/qt6wayland.hash b/package/qt6/qt6wayland/qt6wayland.hash new file mode 100644 index 0000000000..13a6ba15eb --- /dev/null +++ b/package/qt6/qt6wayland/qt6wayland.hash @@ -0,0 +1,11 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtwayland-everywhere-src-6.7.0.tar.xz.sha256 +sha256 d73470e4217da388d8cd2a517ee8bb373853f33c569306e80f04397845157aea qtwayland-everywhere-src-6.7.0.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6wayland/qt6wayland.mk b/package/qt6/qt6wayland/qt6wayland.mk new file mode 100644 index 0000000000..cf8727287e --- /dev/null +++ b/package/qt6/qt6wayland/qt6wayland.mk @@ -0,0 +1,53 @@ +################################################################################ +# +# qt6wayland +# +################################################################################ + +QT6WAYLAND_VERSION = $(QT6_VERSION) +QT6WAYLAND_SITE = $(QT6_SITE) +QT6WAYLAND_SOURCE = qtwayland-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6WAYLAND_VERSION).tar.xz +QT6WAYLAND_INSTALL_STAGING = YES + +QT6WAYLAND_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6WAYLAND_CMAKE_BACKEND = ninja + +QT6WAYLAND_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0, GFDL-1.3 no invariants (docs) + +QT6WAYLAND_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt + +QT6WAYLAND_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF \ + -DFEATURE_wayland_client=ON + +ifeq ($(BR2_PACKAGE_QT6WAYLAND_COMPOSITOR),y) +QT6WAYLAND_CONF_OPTS += -DFEATURE_wayland_server=ON +else +QT6WAYLAND_CONF_OPTS += -DFEATURE_wayland_server=OFF +endif + +HOST_QT6WAYLAND_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6WAYLAND_DEPENDENCIES = \ + qt6base \ + qt6declarative \ + host-qt6wayland \ + wayland \ + host-wayland + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) From patchwork Mon May 13 22:03:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Kollen Svendsen X-Patchwork-Id: 1934828 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VdYSD4zcXz20KD for ; Tue, 14 May 2024 08:04:44 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 38A7D416EE; Mon, 13 May 2024 22:04:43 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id f1VXGuYSnEtL; Mon, 13 May 2024 22:04:42 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 40A54416F7 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 40A54416F7; Mon, 13 May 2024 22:04:41 +0000 (UTC) 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 83C7B1BF2C0 for ; Mon, 13 May 2024 22:04:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id DB3DC6066A for ; Mon, 13 May 2024 22:04:16 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id CbmCnXMAYV9S for ; Mon, 13 May 2024 22:04:16 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::236; helo=mail-lj1-x236.google.com; envelope-from=roykollensvendsen@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 8C3C760645 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 8C3C760645 Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [IPv6:2a00:1450:4864:20::236]) by smtp3.osuosl.org (Postfix) with ESMTPS id 8C3C760645 for ; Mon, 13 May 2024 22:04:15 +0000 (UTC) Received: by mail-lj1-x236.google.com with SMTP id 38308e7fff4ca-2df848f9325so62303851fa.1 for ; Mon, 13 May 2024 15:04:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715637853; x=1716242653; 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=MtoMGRlWJto4pPOWkeecsezTjlS31ImRnSHtRDneGHc=; b=lqh5UgZYSdFwwAEMZt1zRSMPSnNEHBrX0YBLhz2kt5A80Aw7KzT4JzlYtnReREzaTE ykSyoG60eBHvcsho8uGnKfQLK3ZEuxEih1M5iauucuTyD4laFmJ5/CavU8RJdqKuFFca 0NvEJ8XaokykGY8hyHZQAE1UAmr2eOAu6A7OoHC+Yhyyh8GgF3Ko1bezXWdYpMU680nA BPbOMBsyxzQhjh+yMWM/TLLsV40WXnn62aLSfZ9iazfQMQs48aJBIU/ZifvNj0mbK6lZ 7bE1v54p//xcbAmJManZUbltShvBpInY1ciuXrOuMoN7XSSasquKJZLsXAkgzstG8aGA 6sKQ== X-Gm-Message-State: AOJu0Yw+Q5WaNQ9/3KXUzezPjTRogekVHI2nPdFKxCJxc4x1JPXva9gW uHiMetcZX8toUIwbV0psZeyQ+gk9V34SFD1g5KURgYlmUxweAJwWKGHhW5VC X-Google-Smtp-Source: AGHT+IEC9myx2E/Fu69GRBh15dUdWzuqIZpbB431ImteZF3n/aU69c8WIrCgo3WLIRFDcorEv0vlYQ== X-Received: by 2002:a2e:a175:0:b0:2df:6e6d:2c22 with SMTP id 38308e7fff4ca-2e5204b1e57mr69773601fa.47.1715637853076; Mon, 13 May 2024 15:04:13 -0700 (PDT) Received: from precision7530-arch-roy.lan ([2a01:799:1a22:4401:9825:b52b:4cba:665e]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e4d0ce3488sm15548401fa.52.2024.05.13.15.04.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 15:04:12 -0700 (PDT) From: Roy Kollen Svendsen To: buildroot@buildroot.org Date: Tue, 14 May 2024 00:03:17 +0200 Message-ID: <20240513220328.1085629-12-roykollensvendsen@gmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240513220328.1085629-1-roykollensvendsen@gmail.com> References: <1934329> <20240513220328.1085629-1-roykollensvendsen@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715637853; x=1716242653; darn=buildroot.org; 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=MtoMGRlWJto4pPOWkeecsezTjlS31ImRnSHtRDneGHc=; b=LiBSL74xZDq2duCzPvTwbdmFa9BR33LhmSx5Tsr8mJtCRur8iZ4I15/PMTp0aF927v HZ0myZIl2PeNdUCY5OSiXUdpZRTEWPaaQtff/tvH3RvtfbhOLoExRAxMvYzgPGGmMuNm qa0rVw/zNZdbBuuZ11zBRRvsb/fGcxOus4s72zgrCdB1ECAuGxbJjrXRBoiNfAjz4vy0 7YFYsZBkx0VG+pg1Tu7QjgtdfMUU9fJD5rTmxcngAGTfYRKTREaMpZyEp16QPCDZyLh5 UUU2qmKnmwaVL2uXSqY6ymBf8QqQbAsWDhL3CY2ASxG0yQfDDzaWLFd4povXay2O1jfp jUwA== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=LiBSL74x Subject: [Buildroot] [PATCH v4 12/14] package/qt6/qt6tools: new package 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: Roy Kollen Svendsen , Samuel Martin , Roy Kollen Svendsen , Thomas Petazzoni , Zoltan Gyarmati , Jesse Van Gavere Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Roy Kollen Svendsen Signed-off-by: Roy Kollen Svendsen --- Changes v3 -> v4: - Fix build by selecting the Sql module on host so that the required host tool qhelpgenerator is built. package/qt6/Config.in | 1 + package/qt6/qt6tools/Config.in | 13 +++++++++++ package/qt6/qt6tools/qt6tools.hash | 11 +++++++++ package/qt6/qt6tools/qt6tools.mk | 37 ++++++++++++++++++++++++++++++ 4 files changed, 62 insertions(+) create mode 100644 package/qt6/qt6tools/Config.in create mode 100644 package/qt6/qt6tools/qt6tools.hash create mode 100644 package/qt6/qt6tools/qt6tools.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 69ce0b3f6a..48366f5fd1 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -51,6 +51,7 @@ source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" source "package/qt6/qt6shadertools/Config.in" source "package/qt6/qt6svg/Config.in" +source "package/qt6/qt6tools/Config.in" source "package/qt6/qt6wayland/Config.in" source "package/qt6/qt6websockets/Config.in" diff --git a/package/qt6/qt6tools/Config.in b/package/qt6/qt6tools/Config.in new file mode 100644 index 0000000000..6e5298de35 --- /dev/null +++ b/package/qt6/qt6tools/Config.in @@ -0,0 +1,13 @@ +config BR2_PACKAGE_QT6TOOLS + bool "qt6tools" + select BR2_PACKAGE_QT6BASE_NETWORK + select BR2_PACKAGE_HOST_QT6BASE_NETWORK + select BR2_PACKAGE_HOST_QT6BASE_SQL + help + Qt is a cross-platform application and UI framework for + developers using C++. + + Qt Tools provides tools facilitate the development + and design of applications. + + https://doc.qt.io/qt-6/qtmodules.html#qt-tools diff --git a/package/qt6/qt6tools/qt6tools.hash b/package/qt6/qt6tools/qt6tools.hash new file mode 100644 index 0000000000..6f2c962740 --- /dev/null +++ b/package/qt6/qt6tools/qt6tools.hash @@ -0,0 +1,11 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qttools-everywhere-src-6.7.0.tar.xz.sha256 +sha256 c8da6b239e82fe1e23465cbf0936c0da5a334438d3fb433e19c503cbb1abee7b qttools-everywhere-src-6.7.0.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSES/GPL-2.0-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 LICENSES/LGPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6tools/qt6tools.mk b/package/qt6/qt6tools/qt6tools.mk new file mode 100644 index 0000000000..8779e8c00f --- /dev/null +++ b/package/qt6/qt6tools/qt6tools.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# qt6tools +# +################################################################################ + +QT6TOOLS_VERSION = $(QT6_VERSION) +QT6TOOLS_SITE = $(QT6_SITE) +QT6TOOLS_SOURCE = qttools-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6TOOLS_VERSION).tar.xz +QT6TOOLS_INSTALL_STAGING = YES +QT6TOOLS_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6TOOLS_CMAKE_BACKEND = ninja + +QT6TOOLS_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0, GFDL-1.3 no invariants (docs) + +QT6TOOLS_LICENSE_FILES = \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt + +QT6TOOLS_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6TOOLS_DEPENDENCIES = \ + qt6base \ + qt6declarative \ + host-qt6tools + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) From patchwork Mon May 13 22:03:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Kollen Svendsen X-Patchwork-Id: 1934827 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VdYS85tFyz20KD for ; Tue, 14 May 2024 08:04:40 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 3FC32416F9; Mon, 13 May 2024 22:04:39 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id LXRdz6foc9SV; Mon, 13 May 2024 22:04:37 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 75B4C416E8 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 75B4C416E8; Mon, 13 May 2024 22:04:36 +0000 (UTC) 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 053BB1BF2C0 for ; Mon, 13 May 2024 22:04:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E561940546 for ; Mon, 13 May 2024 22:04:18 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id 9cZlbQ-LDI-u for ; Mon, 13 May 2024 22:04:17 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::22e; helo=mail-lj1-x22e.google.com; envelope-from=roykollensvendsen@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp4.osuosl.org 661E44053C DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 661E44053C Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) by smtp4.osuosl.org (Postfix) with ESMTPS id 661E44053C for ; Mon, 13 May 2024 22:04:17 +0000 (UTC) Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2e564cad1f1so39389261fa.0 for ; Mon, 13 May 2024 15:04:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715637855; x=1716242655; 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=KYFA+bjHuzBXW0DpUk6nrcBsJu624+RAfEvvcRr2QJs=; b=kcY17K6TAW/RsL70oI7wKjiH4KED9mmNGGgvs3MNSYfesgVNJy1HAjqtxhTC2ojd7O 833EA9isK74601rfwlvSXUgmVJXouy9UOAV/vpv4Sh5aHAItnDYmxOrME4aP+7WkDZnA vVY6lpzbEyG6ZdyZl+zUBIE21Gm83cRURTDBm9evqC/1thhoI5BidzdFw8IVUXwbnDB7 OgK9sSyvCCHfhn8AmWW7i1y0DUWFymw74mb+NMWRRx1k/7PYPikgd8mp5p8/0sFUzlCo Y5INOHshqY7G3yWX0TId86Vxsazt1lK27NadnFR2dj7FvsKV6GXGE5H0r83gIwzRxUWv JFhQ== X-Gm-Message-State: AOJu0YxtAEBkA0Py9FGlFS5KalAXqSXaoggQzQuSbplPOEPZneisNddT XKiTDJaK75c1mr0ZxkSPA5PouwApbW3YLVZ1Rb7fl4LOSwLEQ8p1rTYvvtwl X-Google-Smtp-Source: AGHT+IEtYesFUsSAUswpj12Qs7+qzgF/U63Y1MtOI7i6EZI9gYX8CC/UUhhNluZDNtBLyD9v+c63iA== X-Received: by 2002:a05:651c:19a6:b0:2d9:f00c:d2d5 with SMTP id 38308e7fff4ca-2e52039e2d3mr75023841fa.46.1715637855047; Mon, 13 May 2024 15:04:15 -0700 (PDT) Received: from precision7530-arch-roy.lan ([2a01:799:1a22:4401:9825:b52b:4cba:665e]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e4d0ce3488sm15548401fa.52.2024.05.13.15.04.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 15:04:14 -0700 (PDT) From: Roy Kollen Svendsen To: buildroot@buildroot.org Date: Tue, 14 May 2024 00:03:18 +0200 Message-ID: <20240513220328.1085629-13-roykollensvendsen@gmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240513220328.1085629-1-roykollensvendsen@gmail.com> References: <1934329> <20240513220328.1085629-1-roykollensvendsen@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715637855; x=1716242655; darn=buildroot.org; 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=KYFA+bjHuzBXW0DpUk6nrcBsJu624+RAfEvvcRr2QJs=; b=H3Yscyag9zf7Z4dBk6Oyqcf6hRy1O/mCDlY9bWnIdOhJ6jWRLfE1d+TOdLxQyC15+n Jzt0eN5M3lU03H3CLhSlcaIsx75dD90ICZvnqAHUjFMpv4OXFZCzILBgL1cDL6zU8YHi fCJZIqXMMKwwTmvRfZgRy0HJ2UoNDBxcDmX3T08oKrlBr0eyigJU1dEEGb9P5mphJN/U vsbnxEu+FCeSe+tjynmwtYEWZ5+NEbD0DaUfyob5iOWwARZN45GBpuccJmDjxUsfUThR ovjipgJ+fzcPLNEu5AMR4w8FXNPHlkhKAgYuXcqfrhMJrVhAesQRJB8/cyD82bdjacuA 9dhg== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=H3Yscyag Subject: [Buildroot] [PATCH v4 13/14] package/qt6/qt6virtualkeyboard: new package 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: Roy Kollen Svendsen , Samuel Martin , Roy Kollen Svendsen , Thomas Petazzoni , Zoltan Gyarmati , Jesse Van Gavere Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Roy Kollen Svendsen Signed-off-by: Roy Kollen Svendsen --- package/qt6/Config.in | 1 + package/qt6/qt6virtualkeyboard/Config.in | 9 ++++ .../qt6virtualkeyboard.hash | 12 +++++ .../qt6virtualkeyboard/qt6virtualkeyboard.mk | 49 +++++++++++++++++++ 4 files changed, 71 insertions(+) create mode 100644 package/qt6/qt6virtualkeyboard/Config.in create mode 100644 package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash create mode 100644 package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 48366f5fd1..9dbc4b804a 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -52,6 +52,7 @@ source "package/qt6/qt6serialport/Config.in" source "package/qt6/qt6shadertools/Config.in" source "package/qt6/qt6svg/Config.in" source "package/qt6/qt6tools/Config.in" +source "package/qt6/qt6virtualkeyboard/Config.in" source "package/qt6/qt6wayland/Config.in" source "package/qt6/qt6websockets/Config.in" diff --git a/package/qt6/qt6virtualkeyboard/Config.in b/package/qt6/qt6virtualkeyboard/Config.in new file mode 100644 index 0000000000..59e9dc3595 --- /dev/null +++ b/package/qt6/qt6virtualkeyboard/Config.in @@ -0,0 +1,9 @@ +config BR2_PACKAGE_QT6VIRTUALKEYBOARD + bool "qt6virtualkeyboard" + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6virtualkeyboard module. + + https://doc.qt.io/qt-6/qtvirtualkeyboard-index.html diff --git a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash new file mode 100644 index 0000000000..dc9a0f23ab --- /dev/null +++ b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.hash @@ -0,0 +1,12 @@ +# Hash from: https://download.qt.io/official_releases/qt/6.7/6.7.0/submodules/qtvirtualkeyboard-everywhere-src-6.7.0.tar.xz.sha256 +sha256 d61bb2a18b1b06f64c956b2bde740c90a4bb46c47a99b31462e6e8d278a0cb6a qtvirtualkeyboard-everywhere-src-6.7.0.tar.xz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt +sha256 05cc719deafd0ab083b03296bb2911de10d116953b626a7629b9ca59938038b1 src/plugins/openwnn/3rdparty/openwnn/NOTICE +sha256 b5830d96fb5a7e7e7ebcc295f352846b4b998e78fdc8f9aa68e134d2e4b39986 src/plugins/pinyin/3rdparty/pinyin/NOTICE +sha256 9400a6128693d2f25653698e695f554660c71efccc8c21af28bf143e35199db6 src/plugins/tcime/3rdparty/tcime/COPYING diff --git a/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk new file mode 100644 index 0000000000..e49643149e --- /dev/null +++ b/package/qt6/qt6virtualkeyboard/qt6virtualkeyboard.mk @@ -0,0 +1,49 @@ +################################################################################ +# +# qt6virtualkeyboard +# +################################################################################ + +QT6VIRTUALKEYBOARD_VERSION = $(QT6_VERSION) +QT6VIRTUALKEYBOARD_SITE = $(QT6_SITE) +QT6VIRTUALKEYBOARD_SOURCE = qtvirtualkeyboard-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6VIRTUALKEYBOARD_VERSION).tar.xz +QT6VIRTUALKEYBOARD_INSTALL_STAGING = YES + +QT6VIRTUALKEYBOARD_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6VIRTUALKEYBOARD_CMAKE_BACKEND = ninja + +QT6VIRTUALKEYBOARD_LICENSE = \ + GPL-3.0-only, GFDL-1.3 no invariants (docs), \ + BSD-3-Clause + +QT6VIRTUALKEYBOARD_LICENSE_FILES = \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LicenseRef-Qt-Commercial.txt \ + LICENSES/Qt-GPL-exception-1.0.txt \ + src/plugins/openwnn/3rdparty/openwnn/NOTICE \ + src/plugins/pinyin/3rdparty/pinyin/NOTICE \ + src/plugins/tcime/3rdparty/tcime/COPYING + +QT6VIRTUALKEYBOARD_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +HOST_QT6VIRTUALKEYBOARD_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6VIRTUALKEYBOARD_DEPENDENCIES = \ + qt6base \ + qt6declarative \ + qt6svg \ + host-qt6declarative + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) From patchwork Mon May 13 22:03:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roy Kollen Svendsen X-Patchwork-Id: 1934829 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=patchwork.ozlabs.org) 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 (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VdYSJ54gMz20KD for ; Tue, 14 May 2024 08:04:48 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 1519B416ED; Mon, 13 May 2024 22:04:47 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id s8WUx1iR5Kim; Mon, 13 May 2024 22:04:45 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 39ACC416E6 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 39ACC416E6; Mon, 13 May 2024 22:04:45 +0000 (UTC) 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 0D8001BF395 for ; Mon, 13 May 2024 22:04:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id CE5AA41694 for ; Mon, 13 May 2024 22:04:20 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id hVdgOfzK7BhJ for ; Mon, 13 May 2024 22:04:19 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a00:1450:4864:20::230; helo=mail-lj1-x230.google.com; envelope-from=roykollensvendsen@gmail.com; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp2.osuosl.org 28DDE416BD DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 28DDE416BD Received: from mail-lj1-x230.google.com (mail-lj1-x230.google.com [IPv6:2a00:1450:4864:20::230]) by smtp2.osuosl.org (Postfix) with ESMTPS id 28DDE416BD for ; Mon, 13 May 2024 22:04:19 +0000 (UTC) Received: by mail-lj1-x230.google.com with SMTP id 38308e7fff4ca-2e4b90b03a9so55423461fa.1 for ; Mon, 13 May 2024 15:04:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715637857; x=1716242657; 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=qx8BaWQW+AsXtvWJthWE7QJLAj/t1cBdBTRJ0Pw4cjM=; b=hcHxyUtXJWkIK+Z6jNY6EQVksBI1739RXqlNoP7/i4EUiDBcTA96kb+MxGhiwtki+8 0Xbdqdp2XcMyLhJdMN32d7Bk8tphud534AZ8WXaR75MoZ06pWRFIStMvLEuDPEWn0oVM 8BSFMXfItt6rLMFeKB/6izkhG7syAaVT2/lLywV2SeOez9IpPb43NzdLtDv5XlG3Y2L7 mUjrRnv9/9CbGV+qCQ+gsM2gN9ZrRFowupZlgZfqEb+GJcs423W7skjFJ9YQh7VKREyS uVPNzEOAGHwuvmKykXYmEOave7/HbXGaMWaP8tNF9qsvIFshkZ0VO/cp0zDOVDzGFk1D mf+A== X-Gm-Message-State: AOJu0Yy/canN5lMX3PAfKc01Ngus5scnStIQ4WtZUWmesfjyR+GlYsmE dbsha8S6epB7L4pK02CA2iKr1SydGf+5/+bkeawq8LNJPgiqkBw74luxqq3W X-Google-Smtp-Source: AGHT+IEx+4djzIL911fnRzpv5fF6uMp7g6Cmd0R2ROcq2kZWM35vNu4SwGdi2PIFHKcOdnKXC2Dm3Q== X-Received: by 2002:a2e:2205:0:b0:2df:9c94:150e with SMTP id 38308e7fff4ca-2e51ff5e6a3mr68682821fa.25.1715637856845; Mon, 13 May 2024 15:04:16 -0700 (PDT) Received: from precision7530-arch-roy.lan ([2a01:799:1a22:4401:9825:b52b:4cba:665e]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2e4d0ce3488sm15548401fa.52.2024.05.13.15.04.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 May 2024 15:04:16 -0700 (PDT) From: Roy Kollen Svendsen To: buildroot@buildroot.org Date: Tue, 14 May 2024 00:03:19 +0200 Message-ID: <20240513220328.1085629-14-roykollensvendsen@gmail.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240513220328.1085629-1-roykollensvendsen@gmail.com> References: <1934329> <20240513220328.1085629-1-roykollensvendsen@gmail.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715637857; x=1716242657; darn=buildroot.org; 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=qx8BaWQW+AsXtvWJthWE7QJLAj/t1cBdBTRJ0Pw4cjM=; b=g7Rlht4icG7F+DJ/cFkU0vNwPA7u9E+NNksAtavtg3LA9WBTTLnY7DLBgBHG6C+Nam 4AQ+EbPgDpSllCRfjTePVggw5xRc701OAhVXH15ckN/imQ+XStPfS0PWvUu2XlPX5p7f veGQoZekG0pm3l1lAGA74RxvjRbrH68BEZQiSkralVSqv8XPYPMmnUFw5H94uDWqZVjI zwSVW50UCmECMp3a4YDEr6dhYFooSt2RmQ14ykiZY9zsDiM5BoV/vUardidx820W6B+E w5ssk61hbbZUCWkevY2R6q55DB5AJRZqen1kVoWLE+9VClopLYnzOfY5IVVKCdi3PhwV N6rw== X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dmarc=pass (p=none dis=none) header.from=gmail.com X-Mailman-Original-Authentication-Results: smtp2.osuosl.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=g7Rlht4i Subject: [Buildroot] [PATCH v4 14/14] package/qt6/qt6mqtt: new package 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: Roy Kollen Svendsen , Samuel Martin , Roy Kollen Svendsen , Thomas Petazzoni , Zoltan Gyarmati , Jesse Van Gavere Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" From: Roy Kollen Svendsen Signed-off-by: Roy Kollen Svendsen --- package/qt6/Config.in | 1 + package/qt6/qt6.mk | 2 ++ package/qt6/qt6mqtt/Config.in | 10 +++++++++ package/qt6/qt6mqtt/qt6mqtt.hash | 8 ++++++++ package/qt6/qt6mqtt/qt6mqtt.mk | 35 ++++++++++++++++++++++++++++++++ 5 files changed, 56 insertions(+) create mode 100644 package/qt6/qt6mqtt/Config.in create mode 100644 package/qt6/qt6mqtt/qt6mqtt.hash create mode 100644 package/qt6/qt6mqtt/qt6mqtt.mk diff --git a/package/qt6/Config.in b/package/qt6/Config.in index 9dbc4b804a..e84806d5e4 100644 --- a/package/qt6/Config.in +++ b/package/qt6/Config.in @@ -47,6 +47,7 @@ source "package/qt6/qt6base/Config.in" source "package/qt6/qt6core5compat/Config.in" source "package/qt6/qt6declarative/Config.in" source "package/qt6/qt6languageserver/Config.in" +source "package/qt6/qt6mqtt/Config.in" source "package/qt6/qt6serialbus/Config.in" source "package/qt6/qt6serialport/Config.in" source "package/qt6/qt6shadertools/Config.in" diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk index b87cb6748d..42984f89ee 100644 --- a/package/qt6/qt6.mk +++ b/package/qt6/qt6.mk @@ -9,4 +9,6 @@ QT6_VERSION = $(QT6_VERSION_MAJOR).0 QT6_SOURCE_TARBALL_PREFIX = everywhere-src QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION)/submodules +QT6_GIT = git://code.qt.io + include $(sort $(wildcard package/qt6/*/*.mk)) diff --git a/package/qt6/qt6mqtt/Config.in b/package/qt6/qt6mqtt/Config.in new file mode 100644 index 0000000000..2cda7e53c0 --- /dev/null +++ b/package/qt6/qt6mqtt/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_QT6MQTT + bool "qt6mqtt" + select BR2_PACKAGE_QT6BASE_NETWORK + help + Qt is a cross-platform application and UI framework for + developers using C++. + + This package corresponds to the qt6mqtt module. + + https://doc.qt.io/qt-6/qtmqtt-index.html diff --git a/package/qt6/qt6mqtt/qt6mqtt.hash b/package/qt6/qt6mqtt/qt6mqtt.hash new file mode 100644 index 0000000000..0fad4fe06f --- /dev/null +++ b/package/qt6/qt6mqtt/qt6mqtt.hash @@ -0,0 +1,8 @@ +sha256 94024e3dd6c77feddfbd35520cc1f474d669aad7402f087827221890e07a64d5 qt6mqtt-6.7.0-git4.tar.gz + +# Hashes for license files: +sha256 9f0490f18656c6f2435bd14f603ef0c96434d1825615363dce43abb42ed1dcce LICENSES/BSD-3-Clause.txt +sha256 110535522396708cea37c72a802c5e7e81391139f5f7985631c93ef242b206a4 LICENSES/GFDL-1.3-no-invariants-only.txt +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSES/GPL-3.0-only.txt +sha256 9b1f50aae6267f9d5e0ceb6775ee86450262c25ec7c0573e151fe5d3f18a4700 LICENSES/LicenseRef-Qt-Commercial.txt +sha256 40678d338ce53cd93f8b22b281a2ecbcaa3ee65ce60b25ffb0c462b0530846b2 LICENSES/Qt-GPL-exception-1.0.txt diff --git a/package/qt6/qt6mqtt/qt6mqtt.mk b/package/qt6/qt6mqtt/qt6mqtt.mk new file mode 100644 index 0000000000..0405311065 --- /dev/null +++ b/package/qt6/qt6mqtt/qt6mqtt.mk @@ -0,0 +1,35 @@ +################################################################################ +# +# qt6mqtt +# +################################################################################ + +QT6MQTT_VERSION = $(QT6_VERSION) +QT6MQTT_SITE = $(QT6_GIT)/qt/qtmqtt.git + +QT6MQTT_INSTALL_STAGING = YES + +QT6MQTT_SUPPORTS_IN_SOURCE_BUILD = NO + +QT6MQTT_CMAKE_BACKEND = ninja + +QT6MQTT_LICENSE = \ + BSD-3-Clause, GPL-3.0-only, \ + GFDL-1.3-invariants-only (docs) + +QT6MQTT_LICENSE_FILES = \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/Qt-GPL-exception-1.0.txt + +QT6MQTT_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DBUILD_WITH_PCH=OFF \ + -DQT_BUILD_EXAMPLES=OFF \ + -DQT_BUILD_TESTS=OFF + +QT6MQTT_DEPENDENCIES = \ + qt6base + +$(eval $(cmake-package))