From patchwork Wed Apr 17 08:05:24 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: 1924535 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VKD5G5Xqtz1yZ2 for ; Wed, 17 Apr 2024 18:06:42 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id F04F740803; Wed, 17 Apr 2024 08:06:37 +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 t35DIq1Ff5wZ; Wed, 17 Apr 2024 08:06:35 +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 smtp4.osuosl.org 0C0644079E Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 0C0644079E; Wed, 17 Apr 2024 08:06: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 AFCBF1BF341 for ; Wed, 17 Apr 2024 08:06:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 962284060C for ; Wed, 17 Apr 2024 08:06:27 +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 RCYOkkDJ0nVL for ; Wed, 17 Apr 2024 08:06:23 +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 7C08B405E6 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 7C08B405E6 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 7C08B405E6 for ; Wed, 17 Apr 2024 08:06:23 +0000 (UTC) Received: by mail-lj1-x22d.google.com with SMTP id 38308e7fff4ca-2d8b194341eso48853101fa.3 for ; Wed, 17 Apr 2024 01:06:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713341181; x=1713945981; 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=FJ9xCLS9tSCgXE9tfx3uHun0/viU8LnDXIwHpzBZQoE=; b=VzyXYsPETeF7+3vwYbgYRqgk+mnT5/iCwYi8oheB1FqQATmTfaooWH1ZpX1++sQFcl 6Fxuek6/ua8cwRHtxiomTNZz5zYoxJ2bV7Ea0C23RUAm12WgzMBmCu/7ibFO+88VYcC0 xfXeRMhMI8/sRv436RQcCqqd+2VqLn65uQ2sChuJi+7Bu4f2+YCZGY2/ALawMg4f1rC3 7iF7Fu+Tnm9EIRfFJ7GyUQd1495vn+fdOQTHsgcOkkFFnwZl4WnRlYVlY8UrQCM6/BE4 dX6ZYb8CACrrxNX/EBiw607paakvUNrn+dsqJvcwXZCx+havZm8JZSKSxzOvk+SBNwLV bbig== X-Gm-Message-State: AOJu0Yw0GLhnqHXyttRUVjZ7FFFMXt+1aFEHTxqcofvgnm0sWvgcn4gS eOgI5L2P1RAgObkJoBSZy4Osgv1Ur3hxXkeaBz+y7LTTVuiuO0OfpNIlqeNv X-Google-Smtp-Source: AGHT+IHIsE+bfQ68500ZH41v3VANGfYMxdm/CO0pTkcal1uzA5IYIVpCDx5v4zoXv5UOoaLrtk2l/w== X-Received: by 2002:a05:651c:140f:b0:2d8:8eb4:11a6 with SMTP id u15-20020a05651c140f00b002d88eb411a6mr8922861lje.12.1713341180934; Wed, 17 Apr 2024 01:06:20 -0700 (PDT) Received: from precision7530-arch-roy.lan ([79.161.254.12]) by smtp.gmail.com with ESMTPSA id d18-20020a2e8912000000b002d2191e20e1sm1830254lji.92.2024.04.17.01.06.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Apr 2024 01:06:20 -0700 (PDT) From: Roy Kollen Svendsen X-Google-Original-From: Roy Kollen Svendsen To: buildroot@buildroot.org Date: Wed, 17 Apr 2024 10:05:24 +0200 Message-ID: <20240417080538.3451923-3-roy.kollen.svendsen@akersolutions.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240417080538.3451923-1-roy.kollen.svendsen@akersolutions.com> References: <20240417080538.3451923-1-roy.kollen.svendsen@akersolutions.com> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713341181; x=1713945981; 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=FJ9xCLS9tSCgXE9tfx3uHun0/viU8LnDXIwHpzBZQoE=; b=UVWsNbESeCwG61ZoG2r6rEUohTSqcEnxn2iD2U4jTG0MW9GLqcA5metgSD/k5kquNb oOQjDN5LONJsPoWv6+eiZDR1jR176Cmyhcd3xHFb4R3kSHSw3UZYfA93JSiJA0QE+kRj zulkxPcpT+kqn7CbscwZgh7tXSXg8r/CXloj7GEidjjBKqghRBLW7xokovo7GrSRecd+ yqDj9B/nKfyju67n4q5eQb73jIW9EJWa/ZYJ3+M3ggtboG82O0Hws70dF3exEc/JUDXI lxYAe89QuDDcxo5RuHny+d4BnFzKs8yzJgikLgq0CXmwOvXpL+vhMOnJa11bkPxkWvxP EoMQ== 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=UVWsNbES Subject: [Buildroot] [PATCH v2 03/11] 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 , Zoltan Gyarmati , Jesse Van Gavere , Samuel Martin , Thomas Petazzoni Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: Roy Kollen Svendsen --- Changes v1 -> v2: - don't add unnecessary Config.in.host - add required BR2_PACKAGE_HOST_QT6BASE_GUI config element to qt6base/Config.in package/qt6/Config.in | 1 + package/qt6/qt6base/Config.in | 3 ++ package/qt6/qt6base/qt6base.mk | 7 +++- package/qt6/qt6shadertools/Config.in | 13 +++++++ .../qt6/qt6shadertools/qt6shadertools.hash | 10 +++++ package/qt6/qt6shadertools/qt6shadertools.mk | 39 +++++++++++++++++++ 6 files changed, 72 insertions(+), 1 deletion(-) 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/qt6base/Config.in b/package/qt6/qt6base/Config.in index 3b15d40c83..5b598aa938 100644 --- a/package/qt6/qt6base/Config.in +++ b/package/qt6/qt6base/Config.in @@ -1,3 +1,6 @@ +config BR2_PACKAGE_HOST_QT6BASE_GUI + bool + config BR2_PACKAGE_QT6BASE bool "qt6base" select BR2_PACKAGE_DOUBLE_CONVERSION diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 211808d2af..a7101ca043 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. 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))