From patchwork Wed Aug 13 19:26:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4238 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id B7EDE40D37 for ; Wed, 13 Aug 2025 21:26:25 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-6188b5b11f4sf111892a12.0 for ; Wed, 13 Aug 2025 12:26:25 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1755113185; cv=pass; d=google.com; s=arc-20240605; b=OIrjRmYEAcVHFBOtqxjD9y4G8kUCtxPjtHKcNeuL2FpytDVo/JyJjpioBKD0RwinqQ sJONsbaaqMc48seGlnV7BObBpQx/u8DV3h+E1iYJlspW6o1LsxURRq4kFfNUspFkcnMX fBUmT4Xnu5+STj8FoHe0XPoviK4hc6sIhs2Hp60Nl18YMyzz2SM0OB9LYXUM05CLsX4J p9s2jzLfJxv9aUNqtJG9WLAVeCTyzw4y5l6aue+bz9XGiMHkkYqMEkZw1JNeEEFtIer1 7rmW7XOOJBoJXYZC9x7dIX6XW0Wyo/ldWxE47kyny5P/MJP0tZMXvV6AIxFIwgP8p9AR Ecqg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=tsvB6cdukaj1OtWNAEfayNSPe1qUHKK+3KJ4Ms3Jyf8=; fh=MSEpDMBpvB9OTknNfFs0teF/hyJHbquR8qUNhNdlutc=; b=FPTl9ZcUFOwOkivCdpg2y3Fx37uwrI1kP2Jf7jBTFk2dYU4jQlX3ksPHWbKKJtGRsB f0mZ44w1UpKpaSLsL2K/qJfSMrKCY7rEWrEvxNlEGumCwCJA11hpd5PtKlS+M4cGFBHt S/nE12ZLx4cNbXF0isVJlB22Z5riXZaPpRnfN5RnPus82fbiyzsxOe2A88jD8CXAX8HV CJxtMIyOcDQwMa5aFcQ54qY4IHbxHHoq9mj1U9HWgEJWHoM3v7dHHVCFK3KPmeRSmhjI CmMoZ4pIEDNKXeWyxaOz8p3gYUgXNjXC/bgl/w+tUzhfhM2/X68Nkd1IUFuDj2/q4oUr jnhg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=T5ePwuBa; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1755113185; x=1755717985; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=tsvB6cdukaj1OtWNAEfayNSPe1qUHKK+3KJ4Ms3Jyf8=; b=SQA7+NrYD+XsKSG6PjnTJPeRY1sMwPaLziI7ZtYBc18cOl4QWQrjglP4WBtyHw5Oc7 +W2jhLvGAt6MvnbEAbHij7A0enDN7u/RtRWV3FvfP0wdrH1fhb/gGVztOo67DSlf5ruU ILI/D7Q3Jq1F2ypEg0qrfjME3PTrdGx6nALPg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755113185; x=1755717985; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tsvB6cdukaj1OtWNAEfayNSPe1qUHKK+3KJ4Ms3Jyf8=; b=ejVY6HyqUIzh6po2EMm9UoFvXwCxfc6ecmTb/E22+0xXajSto1h+l8wZDTCpwvQHTs 84IQ6NJ+RmTDUOnOrn2VCIsaF9/xdBqJmkbB47VnHMso4hruVjjx/tL+aREaXhdums8S rRkKKj6ewwqfkhVZy7CmIvNguQ0VkhbwYjPuNM24b1hHMgOEoMfNZPTvR7Qsx0BfitRU FkY0iDgy+A/hF+nxAMIeunnII7goZKI5BzDVX/1h26RA8Do/GfwObsafCfkT0dRGmBZw VRwaXxlta9ZHbGRP/B02E+XO3SyOKn83M+IqmsEQ6jBkD7/MH7nxVy1DMmD9DnYRwdml 84TQ== X-Forwarded-Encrypted: i=2; AJvYcCWO2X/XRa+DNIPjYQ+Uvuh4DkyAtlJZQWYOlJgNdp+VzCrZJU2c6YmsEw+5+JbVPrIQ53jMPf5wstZNZipV@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YwhRLA6HTLJxX04u/0oXoJ9JsU6i6IWNyUZUMjXPUzYXtbycutq u+9L+w93yNih57/1K9UV+sttA4irOj/nsHUxNXSKeiOFi4eYMLSwvAI9P3xhjwRsnOF4ug== X-Google-Smtp-Source: AGHT+IHaHNDIPi2OogUPSwMFx9owC3QI2q1/9o6f9cwx/uWkg/TDliUrQBwXItvDunVV/kZIoOV+tg== X-Received: by 2002:a05:6402:26c1:b0:617:eb72:b207 with SMTP id 4fb4d7f45d1cf-6188b9a43femr282672a12.11.1755113184903; Wed, 13 Aug 2025 12:26:24 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZc0LsDVn/a7Wx5N0j43toyL5j0T3Gp5MKjm3gGK3FXxGA== Received: by 2002:a05:6402:438c:b0:607:2358:a312 with SMTP id 4fb4d7f45d1cf-6188a3267d6ls142404a12.2.-pod-prod-08-eu; Wed, 13 Aug 2025 12:26:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW6qmHOTqNHP5/eiYcO1+lvKgB+FlnkPA4iK2tmak9JEpHE8CJyepVgEbbeV/xs7WOYiR7S492QgCiiln2Q@amarulasolutions.com X-Received: by 2002:a17:906:7954:b0:af9:79a5:d635 with SMTP id a640c23a62f3a-afcb98ccfcemr32159166b.37.1755113182300; Wed, 13 Aug 2025 12:26:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1755113182; cv=none; d=google.com; s=arc-20240605; b=ILD0Fb+o/KVKMzp4QYr766pqifEX0/j9Ba4zyNF5x3o5cIzvkKhvkndP2sFXr6ZVH6 UFdj8YK086PuCzPJ1Jlly2+qzB7mCd2OFbZOrO5Mp8qLC3oWilm067kdSIQfEP9XvOQ/ b+ybic/uU9rC69uYmUANkuC0UVBqLqDXXNwOsytePEkFhoAuhXFxZZdnpeo6D86s7EWa 1JGME6gqwcINtrUI4xmWuY3WOVoxp/7ZqQCtpK8SbOB9nru0m9VKJqcIeZgezeuNClZY 38cWpA4s6FoW4CSCkEPEFFUXJymVAZtEgghpac1yKOlV7ockLnAIKDc9ylsUzQWK4hh6 dxew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=+b2hJ56nPvzx5M9Nzi+iFjRs3y5iIVOM5ZIDRuoLC/c=; fh=lDZR3dEkrflRaZoF/tsEu53xLADJRn9jbNmpJaZ6MRk=; b=gMkTlpFhz33d02t2vOVOV87qWJkaKJSz82oT0BPhWMPn6cmJVz7kP9F63N787tI4dl Pi5bi1L/aXbvguYrLLhwygHf/sd/a8q2kVJyBt933iOQ0lOIJXFJW8LUuaCVCLqme1OF 7AjJafDLpXsL4TmPbSaJUQimMxHDoU5EofJn2CE18JzBfNvyVHH5fdIfPWKcfeILB4zy gJ7V2hWiWABNDYMuT85lbauChWDdfKTZjyvThZDRSByCl9dkA4KWPIAqATpGq+xI18Cm aBKB+32Yudstt3bKZDgdW746G57RTyhsGIJk8hvkkNP2p9hJzkfiOhuHu/CuqJ1Vn2yO fK6g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=T5ePwuBa; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id a640c23a62f3a-af992721374sor883153066b.11.2025.08.13.12.26.22 for (Google Transport Security); Wed, 13 Aug 2025 12:26:22 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCUI0n9PzgXtFsjWy+CPKn+HO0lESpYe0Htj1eAowOdChrE2GXw5DWyrv/AQtXwOD3K/HyNBcgIEo/XadcUn@amarulasolutions.com X-Gm-Gg: ASbGncuSXptMAbR0UFd7obOiOS7b8Ckm2mLRtrYgrDz2u5DrNtZ8UZg0bbDhr2/xMk2 wJLS7yymafrrpQFXHbJoms4/qENtHFiADtT+34oz0DrRnrn8o4WVfIJYSlcDKtEyGLVa7aFBKmg CImrDP9VIDS43cH6Q+o7Aevu2XXkLn18oYXVs0YeFdreSkt0X3NYaEm1kQeImyvp2Hmfts3shDi 1B19jR9IhHVafp1OZZeLPCqij7RySgib+9ddVdilwQQsQgGjkOu62Cz/LNlFVDS5DlM43czWHN1 p/psGNJk+LlP3Yxcjfm/5WakKfIiUrsquMEonpET7xnq+BsWsCYgy5Z4qxccqR2+OXitLTUpU+A JHQpWcoY6QemjAl+2c40FZ6guodmE2JbpF00QIpSTbXLAs9PSNZiAtEqeA0K8IfnwQvQbh9FnNt eZeA== X-Received: by 2002:a17:907:da7:b0:ade:44f8:569 with SMTP id a640c23a62f3a-afcb98f8816mr31854066b.42.1755113181630; Wed, 13 Aug 2025 12:26:21 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.fritz.box ([2001:871:248:acda:3fd1:eaf1:73ac:376f]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-af91a0df10asm2453396166b.59.2025.08.13.12.26.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Aug 2025 12:26:21 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andreas Naumann , Angelo Compagnucci , Jesse Van Gavere , Roy Kollen Svendsen , Thomas Petazzoni , linux-amarula@amarulasolutions.com, Andrea Ricchi , Angelo Compagnucci , Dario Binacchi Subject: [RFC v2 1/5] package/qt6: Add qmake functionality Date: Wed, 13 Aug 2025 21:26:01 +0200 Message-ID: <20250813192605.1540321-2-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250813192605.1540321-1-dario.binacchi@amarulasolutions.com> References: <20250813192605.1540321-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=T5ePwuBa; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Jesse Van Gavere The qmake functionality had been missing due to the new host/target build requirement, to get it working the main parts of the qt5 qmake has been kept, we're still making our own device spec which we use to run qmake with along with passing some additional device options for our flags/cross-compiler the biggest difference is that where previously qt.conf was used to fixup per-paths builds, this is now always created with changed contents so qmake looks at the correct target directories. A big thanks to Angelo Compagnucci for the encouragement and testing. Signed-off-by: Jesse Van Gavere Tested-by: Angelo Compagnucci [dario: fix HostData in qt.conf.in] Signed-off-by: Dario Binacchi --- (no changes since v1) package/qt6/qt6.mk | 18 ++ package/qt6/qt6base/qmake.conf.in | 36 +++ package/qt6/qt6base/qplatformdefs.h | 1 + package/qt6/qt6base/qt.conf.in | 7 + package/qt6/qt6base/qt6base.mk | 18 ++ package/qt6/qt6base/qt6base.mk.save | 455 ++++++++++++++++++++++++++++ 6 files changed, 535 insertions(+) create mode 100644 package/qt6/qt6base/qmake.conf.in create mode 100644 package/qt6/qt6base/qplatformdefs.h create mode 100644 package/qt6/qt6base/qt.conf.in create mode 100644 package/qt6/qt6base/qt6base.mk.save diff --git a/package/qt6/qt6.mk b/package/qt6/qt6.mk index 33cbf7551f23..2d51c69269ac 100644 --- a/package/qt6/qt6.mk +++ b/package/qt6/qt6.mk @@ -12,3 +12,21 @@ QT6_SITE = https://download.qt.io/archive/qt/$(QT6_VERSION_MAJOR)/$(QT6_VERSION) QT6_GIT = git://code.qt.io include $(sort $(wildcard package/qt6/*/*.mk)) + +# The file "qt.conf" can be used to override the hard-coded paths that are +# compiled into the Qt library. We need it to make "qmake" relocatable and +# tweak the per-package install paths +define QT6_INSTALL_QT_CONF + rm -f $(HOST_DIR)/bin/qt.conf + sed -e "s|@@HOST_DIR@@|$(HOST_DIR)|" -e "s|@@STAGING_DIR@@|$(STAGING_DIR)|" \ + $(QT6BASE_PKGDIR)/qt.conf.in > $(HOST_DIR)/bin/qt.conf +endef + +ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y) +define QT6_QT_CONF_FIXUP + $(QT6_INSTALL_QT_CONF) +endef +endif + +# Variable for other Qt applications to use +QT6_QMAKE = $(HOST_DIR)/bin/qmake -spec devices/linux-buildroot-g++ diff --git a/package/qt6/qt6base/qmake.conf.in b/package/qt6/qt6base/qmake.conf.in new file mode 100644 index 000000000000..ebb8497d2df5 --- /dev/null +++ b/package/qt6/qt6base/qmake.conf.in @@ -0,0 +1,36 @@ +# Qt6 has a mechanism to support "device" profiles, so that people can +# specify the compiler, compiler flags and so on for a specific device. + +# We leverage this mechanism in the Buildroot packaging of qt6 to +# simplify cross-compilation: we have our own "device" definition, which +# allows us to easily pass the cross-compiler paths and flags from our +# qt6.mk. + +include(../common/linux_device_pre.conf) + +# modifications to g++-unix.conf +QMAKE_CC = $${CROSS_COMPILE}gcc +QMAKE_CXX = $${CROSS_COMPILE}g++ +QMAKE_LINK = $${CROSS_COMPILE}g++ + +# modifications to gcc-base.conf +QMAKE_CFLAGS += $${BR_COMPILER_CFLAGS} +QMAKE_CXXFLAGS += $${BR_COMPILER_CXXFLAGS} +# Remove all optimisation flags, we really only want our own. +QMAKE_CFLAGS_OPTIMIZE = +QMAKE_CFLAGS_OPTIMIZE_DEBUG = +QMAKE_CFLAGS_OPTIMIZE_FULL = +QMAKE_CFLAGS_OPTIMIZE_SIZE = +QMAKE_CFLAGS_DEBUG = +QMAKE_CXXFLAGS_DEBUG = +QMAKE_CFLAGS_RELEASE = +QMAKE_CXXFLAGS_RELEASE = +CONFIG += nostrip + +QMAKE_LIBS += -lrt -lpthread -ldl +QMAKE_CFLAGS_ISYSTEM = + +@EGLFS_DEVICE@ + +include(../common/linux_device_post.conf) +load(qt_config) diff --git a/package/qt6/qt6base/qplatformdefs.h b/package/qt6/qt6base/qplatformdefs.h new file mode 100644 index 000000000000..99e9a2792329 --- /dev/null +++ b/package/qt6/qt6base/qplatformdefs.h @@ -0,0 +1 @@ +#include "../../linux-g++/qplatformdefs.h" diff --git a/package/qt6/qt6base/qt.conf.in b/package/qt6/qt6base/qt.conf.in new file mode 100644 index 000000000000..fee209f38c00 --- /dev/null +++ b/package/qt6/qt6base/qt.conf.in @@ -0,0 +1,7 @@ +[Paths] +Prefix=/usr +HostPrefix=@@HOST_DIR@@ +HostData=@@STAGING_DIR@@/usr +Sysroot=@@STAGING_DIR@@ +SysrootifyPrefix=true +TargetSpec=devices/linux-buildroot-g++ diff --git a/package/qt6/qt6base/qt6base.mk b/package/qt6/qt6base/qt6base.mk index 51a4f1b5be7f..697d1a96a920 100644 --- a/package/qt6/qt6base/qt6base.mk +++ b/package/qt6/qt6base/qt6base.mk @@ -55,6 +55,9 @@ QT6BASE_CONF_OPTS = \ -DFEATURE_system_zlib=ON \ -DFEATURE_system_libb2=ON +QT6BASE_CFLAGS = $(TARGET_CFLAGS) +QT6BASE_CXXFLAGS = $(TARGET_CXXFLAGS) + # x86 optimization options. While we have a BR2_X86_CPU_HAS_AVX512, it # is not clear yet how it maps to all the avx512* options of Qt, so we # for now keeps them disabled. @@ -431,5 +434,20 @@ define QT6BASE_RM_USR_MKSPECS endef QT6BASE_TARGET_FINALIZE_HOOKS += QT6BASE_RM_USR_MKSPECS +define QT6BASE_MAKE_BR_SPEC + mkdir -p $(@D)/mkspecs/devices/linux-buildroot-g++/ + sed 's/@EGLFS_DEVICE@/$(QT6BASE_EGLFS_DEVICE)/g' \ + $(QT6BASE_PKGDIR)/qmake.conf.in > \ + $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf + $(INSTALL) -m 0644 -D $(QT6BASE_PKGDIR)/qplatformdefs.h \ + $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h +endef + +QT6BASE_CONF_OPTS += -DQT_QMAKE_DEVICE_OPTIONS=CROSS_COMPILE="$(TARGET_CROSS)";BR_COMPILER_CFLAGS="$(QT6BASE_CFLAGS)";BR_COMPILER_CXXFLAGS="$(QT6BASE_CXX_FLAGS)" + +QT6BASE_PRE_CONFIGURE_HOOKS += QT6BASE_MAKE_BR_SPEC + +QT6BASE_POST_INSTALL_STAGING_HOOKS += QT6_INSTALL_QT_CONF + $(eval $(cmake-package)) $(eval $(host-cmake-package)) diff --git a/package/qt6/qt6base/qt6base.mk.save b/package/qt6/qt6base/qt6base.mk.save new file mode 100644 index 000000000000..7c5acfbd9805 --- /dev/null +++ b/package/qt6/qt6base/qt6base.mk.save @@ -0,0 +1,455 @@ +################################################################################ +# +# qt6base +# +################################################################################ + +QT6BASE_VERSION = $(QT6_VERSION) +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_CMAKE_BACKEND = ninja + +QT6BASE_LICENSE = \ + GPL-2.0+ or LGPL-3.0, \ + GPL-3.0 with exception (tools), \ + GFDL-1.3 (docs), \ + Apache-2.0, \ + BSD-3-Clause, \ + BSL-1.0, \ + MIT + +QT6BASE_LICENSE_FILES = \ + LICENSES/Apache-2.0.txt \ + LICENSES/BSD-3-Clause.txt \ + LICENSES/BSL-1.0.txt \ + LICENSES/GFDL-1.3-no-invariants-only.txt \ + LICENSES/GPL-2.0-only.txt \ + LICENSES/GPL-3.0-only.txt \ + LICENSES/LGPL-3.0-only.txt \ + LICENSES/MIT.txt \ + LICENSES/Qt-GPL-exception-1.0.txt + +QT6BASE_DEPENDENCIES = \ + host-qt6base \ + double-conversion \ + libb2 \ + pcre2 \ + zlib +QT6BASE_INSTALL_STAGING = YES + +QT6BASE_CONF_OPTS = \ + -DQT_HOST_PATH=$(HOST_DIR) \ + -DINSTALL_ARCHDATADIR=lib/qt6 \ + -DFEATURE_xml=OFF \ + -DFEATURE_sql=OFF \ + -DFEATURE_testlib=OFF \ + -DFEATURE_network=OFF \ + -DFEATURE_dbus=OFF \ + -DFEATURE_icu=OFF \ + -DFEATURE_glib=OFF \ + -DFEATURE_system_doubleconversion=ON \ + -DFEATURE_system_pcre2=ON \ + -DFEATURE_system_zlib=ON \ + -DFEATURE_system_libb2=ON + +QT6BASE_CFLAGS = $(TARGET_CFLAGS) +QT6BASE_CXXFLAGS = $(TARGET_CXXFLAGS) + +# x86 optimization options. While we have a BR2_X86_CPU_HAS_AVX512, it +# is not clear yet how it maps to all the avx512* options of Qt, so we +# for now keeps them disabled. +QT6BASE_CONF_OPTS += \ + -DFEATURE_sse2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF) \ + -DFEATURE_sse3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF) \ + -DFEATURE_sse4_1=$(if $(BR2_X86_CPU_HAS_SSE4),ON,OFF) \ + -DFEATURE_sse4_2=$(if $(BR2_X86_CPU_HAS_SSE42),ON,OFF) \ + -DFEATURE_ssse3=$(if $(BR2_X86_CPU_HAS_SSSE3),ON,OFF) \ + -DFEATURE_avx=$(if $(BR2_X86_CPU_HAS_AVX),ON,OFF) \ + -DFEATURE_avx2=$(if $(BR2_X86_CPU_HAS_AVX2),ON,OFF) \ + -DFEATURE_avx512bw=OFF \ + -DFEATURE_avx512cd=OFF \ + -DFEATURE_avx512dq=OFF \ + -DFEATURE_avx512er=OFF \ + -DFEATURE_avx512f=OFF \ + -DFEATURE_avx512ifma=OFF \ + -DFEATURE_avx512pf=OFF \ + -DFEATURE_avx512vbmi=OFF \ + -DFEATURE_avx512vbmi2=OFF \ + -DFEATURE_avx512vl=OFF \ + -DFEATURE_vaes=OFF + +HOST_QT6BASE_DEPENDENCIES = \ + host-double-conversion \ + host-libb2 \ + host-pcre2 \ + host-zlib + +HOST_QT6BASE_CONF_OPTS = \ + -DFEATURE_xml=ON \ + -DFEATURE_dbus=OFF \ + -DFEATURE_icu=OFF \ + -DFEATURE_glib=OFF \ + -DFEATURE_sql=OFF \ + -DFEATURE_system_doubleconversion=ON \ + -DFEATURE_system_libb2=ON \ + -DFEATURE_system_pcre2=ON \ + -DFEATURE_system_zlib=ON + +ifeq ($(BR2_PACKAGE_HOST_QT6BASE_CONCURRENT),y) +HOST_QT6BASE_CONF_OPTS += -DFEATURE_concurrent=ON +else +HOST_QT6BASE_CONF_OPTS += -DFEATURE_concurrent=OFF +endif + +# We need host-qt6base with Gui support when building host-qt6shadertools, +# otherwise the build is skipped and no qsb host tool is generated. +# qt6shadertools fail to build if qsb is not available. +ifeq ($(BR2_PACKAGE_HOST_QT6BASE_GUI),y) +HOST_QT6BASE_CONF_OPTS += \ + -DFEATURE_gui=ON \ + -DFEATURE_freetype=OFF \ + -DFEATURE_vulkan=OFF \ + -DFEATURE_linuxfb=ON \ + -DFEATURE_xcb=OFF \ + -DFEATURE_opengl=OFF -DINPUT_opengl=no \ + -DFEATURE_harfbuzz=OFF \ + -DFEATURE_png=OFF \ + -DFEATURE_gif=OFF \ + -DFEATURE_jpeg=OFF \ + -DFEATURE_printsupport=OFF \ + -DFEATURE_kms=OFF \ + -DFEATURE_fontconfig=OFF \ + -DFEATURE_libinput=OFF \ + -DFEATURE_tslib=OFF \ + -DFEATURE_eglfs=OFF + +ifeq ($(BR2_PACKAGE_HOST_QT6BASE_WIDGETS),y) +HOST_QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON +else +HOST_QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF +endif + +else +HOST_QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF +endif + +# The Network module is explicitly required by qt6tools. +ifeq ($(BR2_PACKAGE_HOST_QT6BASE_NETWORK),y) +HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=ON +else +HOST_QT6BASE_CONF_OPTS += -DFEATURE_network=OFF +endif + +# We need host-qt6base with Testlib support when building host-qt6declarative +# with QuickTest support. QuickTest support is further required for building the +# qmltestrunner host tool. qt6declarative will fail to build if qmltestrunner is +# not available. +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. + +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +QT6BASE_CONF_OPTS += -DFEATURE_libudev=ON +QT6BASE_DEPENDENCIES += udev +else +QT6BASE_CONF_OPTS += -DFEATURE_libudev=OFF +endif + +ifeq ($(BR2_PACKAGE_ICU),y) +QT6BASE_CONF_OPTS += -DFEATURE_icu=ON +QT6BASE_DEPENDENCIES += icu +else +QT6BASE_CONF_OPTS += -DFEATURE_icu=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBGLIB2),y) +QT6BASE_CONF_OPTS += -DFEATURE_glib=ON +QT6BASE_DEPENDENCIES += libglib2 +else +QT6BASE_CONF_OPTS += -DFEATURE_glib=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_GUI),y) +QT6BASE_CONF_OPTS += \ + -DFEATURE_gui=ON \ + -DFEATURE_freetype=ON \ + -DFEATURE_vulkan=OFF +QT6BASE_DEPENDENCIES += freetype + +ifeq ($(BR2_PACKAGE_QT6BASE_VULKAN),y) +QT6BASE_DEPENDENCIES += vulkan-headers vulkan-loader +QT6BASE_CONFIGURE_OPTS += -DFEATURE_vulkan=ON +else +QT6BASE_CONFIGURE_OPTS += -DFEATURE_vulkan=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_LINUXFB),y) +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_linuxfb=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_XCB),y) +QT6BASE_CONF_OPTS += \ + -DFEATURE_xcb=ON \ + -DFEATURE_xcb_xlib=ON \ + -DFEATURE_xkbcommon=ON \ + -DFEATURE_xkbcommon_x11=ON +QT6BASE_DEPENDENCIES += \ + libxcb \ + libxkbcommon \ + xcb-util-cursor \ + xcb-util-wm \ + xcb-util-image \ + xcb-util-keysyms \ + xcb-util-renderutil \ + xlib_libX11 +else +QT6BASE_CONF_OPTS += -DFEATURE_xcb=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_HARFBUZZ),y) +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=ON +ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4),y) +# system harfbuzz in case __sync for 4 bytes is supported +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=OFF +QT6BASE_DEPENDENCIES += harfbuzz +else #BR2_TOOLCHAIN_HAS_SYNC_4 +# qt harfbuzz otherwise (using QAtomic instead) +QT6BASE_CONF_OPTS += -DQT_USE_BUNDLED_BundledHarfbuzz=ON +QT6BASE_LICENSE += , MIT (harfbuzz) +QT6BASE_LICENSE_FILES += src/3rdparty/harfbuzz-ng/COPYING +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_harfbuzz=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_PNG),y) +QT6BASE_CONF_OPTS += -DFEATURE_png=ON -DFEATURE_system_png=ON +QT6BASE_DEPENDENCIES += libpng +else +QT6BASE_CONF_OPTS += -DFEATURE_png=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_GIF),y) +QT6BASE_CONF_OPTS += -DFEATURE_gif=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_gif=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_JPEG),y) +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=ON +QT6BASE_DEPENDENCIES += jpeg +else +QT6BASE_CONF_OPTS += -DFEATURE_jpeg=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_PRINTSUPPORT),y) +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=ON +ifeq ($(BR2_PACKAGE_CUPS),y) +QT6BASE_CONF_OPTS += -DFEATURE_cups=ON +QT6BASE_DEPENDENCIES += cups +else +QT6BASE_CONF_OPTS += -DFEATURE_cups=OFF +endif +else +QT6BASE_CONF_OPTS += -DFEATURE_printsupport=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBDRM),y) +QT6BASE_CONF_OPTS += -DFEATURE_kms=ON +QT6BASE_DEPENDENCIES += libdrm +else +QT6BASE_CONF_OPTS += -DFEATURE_kms=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_FONTCONFIG),y) +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=ON +QT6BASE_DEPENDENCIES += fontconfig +else +QT6BASE_CONF_OPTS += -DFEATURE_fontconfig=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_WIDGETS),y) +QT6BASE_CONF_OPTS += -DFEATURE_widgets=ON + +# only enable gtk support if libgtk3 X11 backend is enabled +ifeq ($(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_LIBGTK3_X11),yy) +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=ON +QT6BASE_DEPENDENCIES += libgtk3 +else +QT6BASE_CONF_OPTS += -DFEATURE_gtk3=OFF +endif + +else +QT6BASE_CONF_OPTS += -DFEATURE_widgets=OFF +endif + +ifeq ($(BR2_PACKAGE_LIBINPUT),y) +QT6BASE_CONF_OPTS += -DFEATURE_libinput=ON +QT6BASE_DEPENDENCIES += libinput +else +QT6BASE_CONF_OPTS += -DFEATURE_libinput=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_TSLIB),y) +QT6BASE_CONF_OPTS += -DFEATURE_tslib=ON +QT6BASE_DEPENDENCIES += tslib +else +QT6BASE_CONF_OPTS += -DFEATURE_tslib=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_EGLFS),y) +QT6BASE_CONF_OPTS += -DFEATURE_egl=ON -DFEATURE_eglfs=ON +QT6BASE_DEPENDENCIES += libegl libgbm +else +QT6BASE_CONF_OPTS += -DFEATURE_eglfs=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_DESKTOP),y) +QT6BASE_CONF_OPTS += \ + -DFEATURE_opengl=ON \ + -DFEATURE_opengl_desktop=ON +QT6BASE_DEPENDENCIES += libgl +else ifeq ($(BR2_PACKAGE_QT6BASE_OPENGL_ES2),y) +QT6BASE_CONF_OPTS += \ + -DFEATURE_opengl=ON \ + -DFEATURE_opengles2=ON \ + -DFEATURE_opengl_desktop=OFF +QT6BASE_DEPENDENCIES += libgles +else +QT6BASE_CONF_OPTS += -DFEATURE_opengl=OFF -DINPUT_opengl=no +endif + +else +QT6BASE_CONF_OPTS += -DFEATURE_gui=OFF +endif + +QT6BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT6BASE_DEFAULT_QPA)) +QT6BASE_CONF_OPTS += $(if $(QT6BASE_DEFAULT_QPA),-DQT_QPA_DEFAULT_PLATFORM=$(QT6BASE_DEFAULT_QPA)) + +ifeq ($(BR2_PACKAGE_OPENSSL),y) +QT6BASE_CONF_OPTS += -DINPUT_openssl=yes +QT6BASE_DEPENDENCIES += openssl +else +QT6BASE_CONF_OPTS += -DINPUT_openssl=no +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_CONCURRENT),y) +QT6BASE_CONF_OPTS += -DFEATURE_concurrent=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_concurrent=OFF +endif + +# We need host-qt6base with D-Bus support, otherwise: "the tool +# "Qt6::qdbuscpp2xml" was not found in the Qt6DBusTools package." +ifeq ($(BR2_PACKAGE_QT6BASE_DBUS),y) +QT6BASE_CONF_OPTS += -DFEATURE_dbus=ON -DINPUT_dbus=linked +QT6BASE_DEPENDENCIES += dbus +HOST_QT6BASE_CONF_OPTS += -DFEATURE_dbus=ON +HOST_QT6BASE_DEPENDENCIES += host-dbus +else +QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF +HOST_QT6BASE_CONF_OPTS += -DFEATURE_dbus=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_NETWORK),y) +QT6BASE_CONF_OPTS += -DFEATURE_network=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_network=OFF +endif + +# Qt6 SQL Plugins +ifeq ($(BR2_PACKAGE_QT6BASE_SQL),y) +QT6BASE_CONF_OPTS += -DFEATURE_sql=ON +QT6BASE_CONF_OPTS += -DFEATURE_sql_db2=OFF -DFEATURE_sql_ibase=OFF -DFEATURE_sql_oci=OFF -DFEATURE_sql_odbc=OFF + +ifeq ($(BR2_PACKAGE_QT6BASE_MYSQL),y) +QT6BASE_CONF_OPTS += -DFEATURE_sql_mysql=ON +QT6BASE_DEPENDENCIES += mariadb +else +QT6BASE_CONF_OPTS += -DFEATURE_sql_mysql=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_PSQL),y) +QT6BASE_CONF_OPTS += -DFEATURE_sql_psql=ON +QT6BASE_DEPENDENCIES += postgresql +else +QT6BASE_CONF_OPTS += -DFEATURE_sql_psql=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_SQLITE),y) +QT6BASE_CONF_OPTS += -DFEATURE_sql_sqlite=ON -DFEATURE_system_sqlite=ON +QT6BASE_DEPENDENCIES += sqlite +else +QT6BASE_CONF_OPTS += -DFEATURE_sql_sqlite=OFF +endif + +else +QT6BASE_CONF_OPTS += -DFEATURE_sql=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_SYSLOG),y) +QT6BASE_CONF_OPTS += -DFEATURE_syslog=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_syslog=OFF +endif + +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +QT6BASE_CONF_OPTS += -DFEATURE_journald=ON +QT6BASE_DEPENDENCIES += systemd +else +QT6BASE_CONF_OPTS += -DFEATURE_journald=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_TEST),y) +QT6BASE_CONF_OPTS += -DFEATURE_testlib=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_testlib=OFF +endif + +ifeq ($(BR2_PACKAGE_QT6BASE_XML),y) +QT6BASE_CONF_OPTS += -DFEATURE_xml=ON +else +QT6BASE_CONF_OPTS += -DFEATURE_xml=OFF +endif + +ifeq ($(BR2_PACKAGE_ZSTD),y) +QT6BASE_CONF_OPTS += -DFEATURE_zstd=ON +QT6BASE_DEPENDENCIES += zstd +else +QT6BASE_CONF_OPTS += -DFEATURE_zstd=OFF +endif + +define QT6BASE_RM_USR_MKSPECS + $(Q)rm -rf $(TARGET_DIR)/usr/mkspecs +endef +QT6BASE_TARGET_FINALIZE_HOOKS += QT6BASE_RM_USR_MKSPECS + +define QT6BASE_MAKE_BR_SPEC + mkdir -p $(@D)/mkspecs/devices/linux-buildroot-g++/ + sed 's/@EGLFS_DEVICE@/$(QT6BASE_EGLFS_DEVICE)/g' \ + $(QT6BASE_PKGDIR)/qmake.conf.in > \ + $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf + $(INSTALL) -m 0644 -D $(QT6BASE_PKGDIR)/qplatformdefs.h \ + $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h +endef + +QT6BASE_CONF_OPTS += -DQT_QMAKE_DEVICE_OPTIONS=CROSS_COMPILE="$(TARGET_CROSS)";BR_COMPILER_CFLAGS="$(QT6BASE_CFLAGS)";BR_COMPILER_CXXFLAGS="$(QT6BASE_CXX_FLAGS)" + +HOST_QT6BASE_PRE_CONFIGURE_HOOKS += QT6BASE_MAKE_BR_SPEC + +QT6BASE_PRE_CONFIGURE_HOOKS += QT6BASE_MAKE_BR_SPEC + +QT6BASE_POST_INSTALL_STAGING_HOOKS += QT6_INSTALL_QT_CONF + +$(eval $(cmake-package)) +$(eval $(host-cmake-package)) From patchwork Wed Aug 13 19:26:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4241 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 4BEC240D3E for ; Wed, 13 Aug 2025 21:26:26 +0200 (CEST) Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-afcb7348249sf16295666b.0 for ; Wed, 13 Aug 2025 12:26:26 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1755113186; cv=pass; d=google.com; s=arc-20240605; b=GzV0XIiYgcDUpkhL24s5O8VtsJQDzUIeNyGejrVIqTwitdMX6dQKRJ7Trcd1PYGUco rg8bfdzjl2HPUrzEsrhgh7HfJFxQdtqbND6MbQ6WnY+9MPvU6fxr9eRbRstJ95KwaL2k x6qcW9uZG1y/amW+VQVFM1IDF6pcgAbIUmyMmU1M490HZRLVgBBMKYzFEhOMex8ebxwf Kg/AKmAUwa9wJ/MryT6oUhny125Jcl4Bj9AFlnJXsHe4LXDd3s1YiOeSpPMM0k1HZ87t yfjdtuIURgS4x+RhCVszKxmDRX3gEDrTWmmejfA26pIf80BP7MuTIOju7MY42rYB8Ay6 XDiA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=gmNy/ku+9maRWDTxXrX9OFvw4O9Rxzf36/eCP7NvM/g=; fh=jQ7nFWDBmvsMTwkEF2HO8hns3Rt1L2T9vyqtw5/mnNE=; b=UmgpNJZ2bGrO3HCChcoeMCpiJD50AEajnpqEbhTqvnqkklNV3u0FKpRCHdw6IJm+jL WQR7gVErfvH/S5f6s7yxuY6wgEiE82kg2scTWHcO7BWnLekKEollp3ZoM9tEjLtRZ56q fKpNAhNv2RijKufOql7OF65rmSE0oK6Jrs4OtTkK5C96Zd4BfXywFnywqFcj6ov++wx/ mRnNRXWObHh4WjgTTnsiXMNJF97GCAw0CwhHJwnBCrp94+2joiH7az+8HwUeqnh/AhFe kpJR+i4s8HMIO93ZAYadh5//nLrCWqkhnXo7EqtVFEB9XcXdbNWj01DH4PHeT3SlYQnQ mB2w==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=f9juSFpN; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1755113186; x=1755717986; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=gmNy/ku+9maRWDTxXrX9OFvw4O9Rxzf36/eCP7NvM/g=; b=VIuLtWg6oQI3p/IGdp8XIJ3agdKTh0Vl7hnZtTQtXXdrw6rUYNC6qNzTrEe6IeRuQN yX3N0fCbPuaOtEfp6NYZ3eWH/0nSxJttzn2cAVIHaH2WtNU4AXdPXLlPtQGU3xupSXSq hn8ihPWxT9B0RT4Zwsc+SqmxVZiIiAYd15p3o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755113186; x=1755717986; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=gmNy/ku+9maRWDTxXrX9OFvw4O9Rxzf36/eCP7NvM/g=; b=p2oWTB3aHi1l5MrNFW09BXOypjAVBEfY4vT29+xrnpl4VA7zL0OCx7hHxXCl3qiitx WrSm501oL6AZul61xoZw2INyHCJs381Uc4LmuSaqqIJ0SKTf71AWDqFMkozwKuc++4yK aOqkcMAEAMS8A/wjAsuOay5EAMw6pHwbWg6c9a7pDxbqyOw2jLlyi6N07RfF8PQhf0pZ CTl9yzIDC+0rsOu6ihs3ZjHWVsRbOXgXZ9xTwEtVCIs22/fQpQEJcxCOnxDmniU1PAv4 6pkwG3sjvh+TaFrXBe71TNNSFTJpecSk3B/bqPxgM2W1QRn8O4huAIXEtkv6WQeKb4bo uneQ== X-Forwarded-Encrypted: i=2; AJvYcCUMc1CAKSc4oiRsIo40ddVE3q5vhpVCuhidEOBXIe2vEe46qHB9Xf66KdhsJRdK32xaVjIdItqmHGdniUtF@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YzZ1ulL8555gxw+xf1uOXxTuAHJ1ndkyam9QBe+KcL2xNqHfa/F 4++2U/snlXJTd5b+lwH2Jx2ZI7dOfIb2PLHWTfeA7GQSEM6542dBCb3mdmAme6VjqOPRThRGRMY lgQ== X-Google-Smtp-Source: AGHT+IF1l7GanJx1NyJXuSwkpiISEXQXlm5ThzAgWot8G/3hEpOTNz18mf6k1PVHdCnPiYMCZoufpA== X-Received: by 2002:a17:907:c0f:b0:af9:a38f:d83a with SMTP id a640c23a62f3a-afcb98fca6bmr29190266b.42.1755113185830; Wed, 13 Aug 2025 12:26:25 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZeJ+Fc2vAyhw/WdIUViwj9vlGSwh7MXJxymJybO7hjoCw== Received: by 2002:a05:6402:46d6:b0:615:9353:4c58 with SMTP id 4fb4d7f45d1cf-6188a071d32ls150594a12.0.-pod-prod-04-eu; Wed, 13 Aug 2025 12:26:23 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWOKFa51yV+il0i14zxUC0DHQP1J+PrYN/YUbok0cGi3lk7nfWemLO5WNs9PF1NEsu705LtTSO1Eg/PXE8U@amarulasolutions.com X-Received: by 2002:a17:907:3e1c:b0:ad5:4a43:5ae8 with SMTP id a640c23a62f3a-afcb939815fmr37666666b.12.1755113183302; Wed, 13 Aug 2025 12:26:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1755113183; cv=none; d=google.com; s=arc-20240605; b=U+MofsvZHdI/voOcFO+kv2v+QOTk3Id3H+kYHok3aBsvUyU3jE9cFzQy04iXD2eWlg p80tGgFI0NBTw8JoYXNJ+dwen0/euJrOds9fVX4LbVhne3uAq0j5fz+5mGC7tGdXxcxD ZchE4jsM1k/ajyMEgaFqgeykxsv5b4nZ4cecX2/dYXUPU1oLJCmPZkwnZfMtNpTO0bTc U8c5n6HQV4YWQAFoU4nng+n0qGDSKenzrtOlxkUUMSbUExiJ26y9L0YXonQleRSTlNa8 GvL/ERgZWer7oEun0icqIKCU6m29TwRxsw+CqSgwnAc77+Evg9mY5RiM7x+5vJMPjsMJ tiEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=JT8MvWsy5P59IqKvZtPcHmV5Q2HyVsjBIgeB0M1+FgE=; fh=H1UXBXWGE1d6F7bWKLLl8N47Z78QlQa0VX0vpCZsCVA=; b=ILnsPGQfvkvQNJW3gLWIqrfKCSwf9M7ydAWFnTupdXJhcQECycMJHKEaIWp6xsRCq8 3S1Fgozf9nCysnarHqNGS0SihAgAYqliNNgKsr77LCVY/jWQVH2bj+XkOdHQ00rBssPV G1gri51J/BO4ZLJKvkIi5AaVE83X4xt2OBWK7Y4THFTM7xt72ffS+DH6O6/4tRooLB7o utGn0eWdWADQ4w89zNrNd42Q2yXqCe3lAUK0EyKN8yBAy5GdsDYDY1/d3kW2eGtETLcF 7eu2rPWtMK2XvEeNlZGEAhjoJcpqBXLzdXGNVhm+drV/5iH5ulMEq2Tf5lL1FbC3qxou hELg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=f9juSFpN; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id a640c23a62f3a-af919e8cccdsor1745626966b.0.2025.08.13.12.26.23 for (Google Transport Security); Wed, 13 Aug 2025 12:26:23 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCXW2UswYqnPGbPTUf0o/v63iv0vfsLYAoepnYhRA4ej8P39M/XifUqKFcd1snoP/uEhSK+qQkyzeHSm9OEe@amarulasolutions.com X-Gm-Gg: ASbGncuAB2BVrPAwEqg7vO98WRasuiBzRkk/v9DRKwHiQ5u0w3KVM4nYm00da16aj75 5ll6oviRSLZfFPkHk3kNxyd4rpyrFj6sNDVGr9Buuvp9W913ZMIPdz92p8TBkhi4YN9ZmPqpZGa nxKkLzJFiKcppMniPhf26m827V+CvXWcSbhslapuCKWahl4/i1nq4ET2aKmp1lR34COFSOdv3iU oNNigK9ApAb5eNsupStmAFI69/Wi8MkhNLCm0WE8r8dJiJTizl+viWYW3oy1eJcUqDQoorImso6 a/gvRSteaeZIbLQ5uuoVlNhO4LjFMbPO4UvFFAv69HrFOO5RFP72pw0WFUZHgpUBz0w4s0z7GjL badCMOlS0q/NE5fw6q6XElhcskQOgVg1fYv2dmkrf5Tc/pgehNtv/mivCBY4tD8nkuKn/e/Gyui ZCe8FCRNVtgowM X-Received: by 2002:a17:906:c152:b0:af9:610e:343e with SMTP id a640c23a62f3a-afcb93988f4mr30860866b.11.1755113182790; Wed, 13 Aug 2025 12:26:22 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.fritz.box ([2001:871:248:acda:3fd1:eaf1:73ac:376f]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-af91a0df10asm2453396166b.59.2025.08.13.12.26.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Aug 2025 12:26:22 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andreas Naumann , Angelo Compagnucci , Jesse Van Gavere , Roy Kollen Svendsen , Thomas Petazzoni , linux-amarula@amarulasolutions.com, Andrea Ricchi , Dario Binacchi Subject: [RFC v2 2/5] package/qwt: bump to version 6.3.0 Date: Wed, 13 Aug 2025 21:26:02 +0200 Message-ID: <20250813192605.1540321-3-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250813192605.1540321-1-dario.binacchi@amarulasolutions.com> References: <20250813192605.1540321-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=f9juSFpN; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Release notes: https://sourceforge.net/p/qwt/git/ci/qwt-6.2/tree/CHANGES-6.2 https://sourceforge.net/p/qwt/git/ci/develop/tree/CHANGES-6.3 Signed-off-by: Dario Binacchi --- (no changes since v1) package/qwt/qwt.hash | 8 ++++---- package/qwt/qwt.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/qwt/qwt.hash b/package/qwt/qwt.hash index d4fd210cbd69..e20c9ebadab9 100644 --- a/package/qwt/qwt.hash +++ b/package/qwt/qwt.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/qwt/files/qwt/6.1.6 -md5 cc71be5d6c33c2fc19ae8082ccdd3e83 qwt-6.1.6.tar.bz2 -sha1 b1f17a86c9b1b0790a0c0067ef69fb6277efac79 qwt-6.1.6.tar.bz2 +# From https://sourceforge.net/projects/qwt/files/qwt/6.3.0 +md5 06a8f8eb1bc07bedfb1df601804439cb qwt-6.3.0.tar.bz2 +sha1 9180f33f75ff8817f27019c94d10f92de840a5e4 qwt-6.3.0.tar.bz2 # Locally computed -sha256 99460d31c115ee4117b0175d885f47c2c590d784206f09815dc058fbe5ede1f6 qwt-6.1.6.tar.bz2 +sha256 dcb085896c28aaec5518cbc08c0ee2b4e60ada7ac929d82639f6189851a6129a qwt-6.3.0.tar.bz2 sha256 d8737db330e1eeb439962e11654ab7f1aece3561d9415454a8c538643824ede6 COPYING diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk index 9f0b78655f6f..67292ee025be 100644 --- a/package/qwt/qwt.mk +++ b/package/qwt/qwt.mk @@ -4,7 +4,7 @@ # ################################################################################ -QWT_VERSION = 6.1.6 +QWT_VERSION = 6.3.0 QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2 QWT_SITE = http://downloads.sourceforge.net/project/qwt/qwt/$(QWT_VERSION) QWT_INSTALL_STAGING = YES From patchwork Wed Aug 13 19:26:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4240 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 8A04D40D4A for ; Wed, 13 Aug 2025 21:26:27 +0200 (CEST) Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-afcb72b0baesf2878766b.0 for ; Wed, 13 Aug 2025 12:26:27 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1755113187; cv=pass; d=google.com; s=arc-20240605; b=jNe8fXxoSZ8DfStsK0XeqXc3apLEG0ReBEF3n450hdINlmOSmyZv4EZoZ8qW4GUhTm +e5b8Zq0YfvwmxLZWYEl/gPlKHulO0Bi3t7UFXjgtQ6VkZjM487AF+Pk2jc04+A9O6Yj A23WQbFQDVGot2Bh8nwS2IlCkODulrVOH1UZeQ9eZ1fTchb6nhtCi0K8qwLQfJTJ8naJ bzj5bRY+Is3NTGG4uUUWKdKTi8nm1oA6k8ZMXN3fP5Ol7ww994JPkJ3ZswNa+mo3fyoQ F3z074nWc+stwhh/W7c2/aj2g21+j4gdsokudguODa1IXYMQm05aBch24XeyAjQK4gTA KI5A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=oG92LOUBq2w8zGrUWMssFVqeLln27tVLCgnErHvHC6U=; fh=lHxnlsYGjDdRQSPOndrbg93B39qNmlQ6m3B18tiZGv0=; b=fLFqclntgNVN9CvSzsH54AR1BWITaY5ll4MKQOhnTjAGBL33ECjZpUeOsby9lxgyue i/1mctjuDLZ/eFVTk9A3wwxnnWdLWNdwa5v9/dQVDXOW6mjJnnr8YBHyFh8p6N0LZ6Bi nrXykrYo0MhcVbjfyUARoEc9QoVroqxnSeXqmcHx9/7JfCfQ5GF6pKNnnTvcxtal2UlE 4no0lKwM5SgarRroejko85798ApKHh53wt14Fvuzdb0sG2VkQi87bnR92nAmpOVhfZ3l G/6GuHJpQn/ZBm7MVo5o4u4ErXVs9x82PDs7V0bHeOm3k8xZMhZeJeFc2jq/n2Wa8ftz 2Acw==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=LhPkwlgb; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1755113187; x=1755717987; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=oG92LOUBq2w8zGrUWMssFVqeLln27tVLCgnErHvHC6U=; b=lxu0NMwyK0snLBv/sEdIC8AHqWHh/4o2hZAARehWdu8vvo3q01GLdr4wGuCNYx78dS OjeoWfIAayJ+juIBWji27nzTRfOR5P5K8Z8uUQoNjPFKf7B6wz5uIq1xgb7/bJUy4Y9v EUdrxbfW1TpT+whkh+1LTopfqtoiQn8cJfb0g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755113187; x=1755717987; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oG92LOUBq2w8zGrUWMssFVqeLln27tVLCgnErHvHC6U=; b=HoK3U8G18izUjJNQ4OoCIeM+jtzNUH0rMqnKa6ivyLiTjCUpe2c9kF7VCWiVjmiT2v AibL8348Rzd2ODIxyetkkN0laPCwE7Yd+Ptjwf8kjh4QEQ4q5MMqvrw5fl3Xi1ktrSF0 SOdD6HJ8+KfHRDCEXtOXkmovJ/RgLJm3Uc8r4/eJWXUJ0w8DCt0KLMRnBoJ7pHCRVCyn vI5oNlfRCbEXJuzEZzS7GyPFMxv4VMG4TbGghzlB5iOfmAEMCOl+qsXy50VzsZGXqlD6 h3Fng+fA/xtkWoQfvHN6GvgSxOBO3bWNo6e6nEWOsSSIU/ShObfRvCok1wfejet4veJp 5sjw== X-Forwarded-Encrypted: i=2; AJvYcCVZi+tZ/WhsYG7IUNfHMd898IRXfHLF+U78JnTOImgwgeb2Ik/Vy+WHKRWSzip/61zP2wtrClm9z+Ot0kiJ@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0Ywd6hpSVCqmOGXH9OgppobmZLcme9lJG7sLVz3jWbShzSlW+n7V iCcbJE6Q+RYME1YJv1xXZuZIsk7Mrl3ZP2CgMXiSTz9b+awhLnZVeL4WR1i4NrbHHXVwFA== X-Google-Smtp-Source: AGHT+IGzPA/fjFv1ZtM19976u1P9a6vmISG6FyNGJ0sa+7PXG3cMzGvyBtD1M80o6UTG+nLTOIbezg== X-Received: by 2002:a05:6402:1ed0:b0:615:a508:1d04 with SMTP id 4fb4d7f45d1cf-6188b9e4a3amr133472a12.3.1755113186923; Wed, 13 Aug 2025 12:26:26 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZfK0Ogwytozt+uAmbrvXBvQG/zXQDskmTuC6ab8/SPFEQ== Received: by 2002:a50:d686:0:b0:604:f62b:4112 with SMTP id 4fb4d7f45d1cf-6188a394f8als138699a12.2.-pod-prod-06-eu; Wed, 13 Aug 2025 12:26:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWRXVAe/Ldxc8bGNWdJGjTrOFMtOBB1T2QJFOtGUzNW8mZEGcifxuNTKbsgjGQs10hKk96ujQdyPy46VU2z@amarulasolutions.com X-Received: by 2002:a17:906:9f92:b0:af9:a8a6:d5eb with SMTP id a640c23a62f3a-afcb91e8b49mr34750766b.0.1755113184363; Wed, 13 Aug 2025 12:26:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1755113184; cv=none; d=google.com; s=arc-20240605; b=IidyIliu+7OX3sRjVC8EfibUnIl3rmJqZTuuYpy+PpxtOZY9YMZmazFAmcDLRB3P3U FD9jKngPcpXR0X38vN+QQwFIUGekq44zifufIqjmpFvJSHICsAEbXHUpnm0/HkSjvGZP 3SrDDBrchR+5By4lyMy1ocxBG8u1YdhGDzhW43uZL5Q1OLlNLgB2pcyjvPOZuVOCngNy syRcGPB8Eyd5V2IrIL4ngJO5du83nAG0Zoz8zuwnB/C2Xk3ELCI1Gf9NyUuFsVEUfNrw o7nCwJsL/c4ixWJ/awGgy+lL6/0WgJ5r6Clz0uAP7v0cJkE5vh1FZC/5A+fG8BLeLwpr MSRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=8SSie2DvEC8aGt7yKTAVRQPP/EjwDwwbFMlKAoB2DOk=; fh=1mKE/SdvLaa8uir3ubMsB9e0OznmluXvBrEBvvD4pgw=; b=eM9v8mIneQibkwttnzmDmWyFmDvISltqKOBwYEs0OaNNj6TScuEjb9GnPNVDoU4brK Wu+V0MYGweadAkzLZTLIGp51Jky3hAD0KiDDFezq2VDYDSyAGd0iRRDb/O7IY+ckOxJh q+ZNuSGFf5JnLicMHywk9A+tEeOFpNvO5jPJdhT2FfHE6+Ikg739PZOxMwyWh4nxBYJB ACAxQV0k2tupzP/oX/GqeIw31WvImAog7tm57p2ICB1GyHEfNvogQCziDDp1VB9NGbWb 8yrzA4tLnhd/zWds2f9UdrHOSRupsLt+GVWSNfNJNpQx1sa5DyYIBvfDAOOfL09NjIsi aaWQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=LhPkwlgb; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id a640c23a62f3a-af98c158e91sor945741666b.15.2025.08.13.12.26.24 for (Google Transport Security); Wed, 13 Aug 2025 12:26:24 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCWEIEZAz2mvneiUxKkH4/XyLFOKC3FIVFscWPDIE0225M3EWcJdVlsPhQRZtFW/qMh57o/gI05Vb3ir1gxn@amarulasolutions.com X-Gm-Gg: ASbGnctMD0pzf8QbFpRA2QGlFGhjq0GZy7yHEMAZyQX7s4ytOAHlaWAg6Z1vSCTAgNn NuQWJ5cU5gvXFfcyVvuGcfwIsLihyYcQokqOVTHwMYNq63nuoGB8WvVPYpQ4Od5sCnKpiT3wPvq afr5iJIb27E8B3l406iFixfRUoJGw/A1tF97TtScHY/525Yuqwr2xJlBehQ5w4akkYwELVyByCL 476GxGcDagLmzJHmhyKH0xmeu1I7IDIbJue41T6tXZucCWi4rrYCQEdg8ajFokQwagDf3C/hfB5 cCYwcXLjJHzaT1NEJUN/GSeiePqxl/lWa64eKxBZZhFt8CBHkr+10flBn4yXu2pt+wJF535aU2O ZYjO2Nzx9AqkL5WaDY9EvpeYzW4j/QcC2NAHC+0ib3vu2SUSFskcmaUmIZM8vn/KY0/qgzeniy6 tMFw== X-Received: by 2002:a17:907:dac:b0:afc:b61a:df8 with SMTP id a640c23a62f3a-afcb98e1861mr29363666b.34.1755113183939; Wed, 13 Aug 2025 12:26:23 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.fritz.box ([2001:871:248:acda:3fd1:eaf1:73ac:376f]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-af91a0df10asm2453396166b.59.2025.08.13.12.26.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Aug 2025 12:26:23 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andreas Naumann , Angelo Compagnucci , Jesse Van Gavere , Roy Kollen Svendsen , Thomas Petazzoni , linux-amarula@amarulasolutions.com, Andrea Ricchi , Dario Binacchi Subject: [RFC v2 3/5] package/pkg-qmake: support Qt6 Date: Wed, 13 Aug 2025 21:26:03 +0200 Message-ID: <20250813192605.1540321-4-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250813192605.1540321-1-dario.binacchi@amarulasolutions.com> References: <20250813192605.1540321-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=LhPkwlgb; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Extend build support to Qt6. Signed-off-by: Dario Binacchi --- (no changes since v1) package/pkg-qmake.mk | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/package/pkg-qmake.mk b/package/pkg-qmake.mk index ccf78692e885..1449690ca114 100644 --- a/package/pkg-qmake.mk +++ b/package/pkg-qmake.mk @@ -20,11 +20,22 @@ # ################################################################################ + +ifeq ($(BR2_PACKAGE_QT5),y) +QT_VERSION = 5.15 +else +QT_VERSION = 6.8 +endif + +QT_VERSION_MAJOR = $(word 1,$(subst ., ,$(QT_VERSION))) +QT_VERSION_MINOR = $(word 2,$(subst ., ,$(QT_VERSION))) +QT_BASE = qt$(QT_VERSION_MAJOR)base + # # Hook to sync Qt headers # define QT_HEADERS_SYNC_HOOK - sed -e '/^MODULE_VERSION/s/5\.15\.[3456789]/$(QT5_VERSION)/' -i \ + sed -e '/^MODULE_VERSION/s/$(QT_VERSION_MAJOR)\.$(QT_VERSION_MINOR)\.[3456789]/$(QT_VERSION)/' -i \ $($(PKG)_BUILDDIR)/.qmake.conf touch $($(PKG)_BUILDDIR)/.git endef @@ -45,15 +56,15 @@ define inner-qmake-package $(2)_INSTALL_STAGING_OPTS ?= install $(2)_INSTALL_TARGET_OPTS ?= $$($(2)_INSTALL_STAGING_OPTS) -ifneq ($(1),qt5base) -$(2)_DEPENDENCIES += qt5base +ifneq ($(1),$(QT_BASE)) +$(2)_DEPENDENCIES += $(QT_BASE) endif ifeq ($$($(2)_SYNC_QT_HEADERS),YES) $(2)_PRE_CONFIGURE_HOOKS += QT_HEADERS_SYNC_HOOK endif -$(2)_POST_PREPARE_HOOKS += QT5_QT_CONF_FIXUP +$(2)_POST_PREPARE_HOOKS += QT$(QT_VERSION_MAJOR)_QT_CONF_FIXUP # # Configure step. Only define it if not already defined by the package @@ -62,7 +73,7 @@ $(2)_POST_PREPARE_HOOKS += QT5_QT_CONF_FIXUP ifndef $(2)_CONFIGURE_CMDS define $(2)_CONFIGURE_CMDS cd $$($(2)_BUILDDIR) && \ - $$(TARGET_MAKE_ENV) $$($(2)_CONF_ENV) $$(QT5_QMAKE) $$($(2)_CONF_OPTS) + $$(TARGET_MAKE_ENV) $$($(2)_CONF_ENV) $$(QT$(QT_VERSION_MAJOR)_QMAKE) $$($(2)_CONF_OPTS) endef endif From patchwork Wed Aug 13 19:26:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4242 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 7AB6040D6F for ; Wed, 13 Aug 2025 21:26:28 +0200 (CEST) Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-afcb790fcfdsf11876966b.1 for ; Wed, 13 Aug 2025 12:26:28 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1755113188; cv=pass; d=google.com; s=arc-20240605; b=lQZ71Xs0v467GdFdnEFiFUx0b4fobcStu8o4mi4y/cfQt3Rw6kH2B0Q9hDuyjSZtea S0Gz0mILmKAsl4Cfk6y/1eL68DhmWSugLJjhxkfQDoGjaFVzkV0cdtAZo75sr+k+BqYY qFbvGxhYHuZE6/mBMOnQyXFrl4bXWcaY4GN2g/sFG37mqnNm1OCf+cu+nGcJcXP6BqdZ q9EtNv3E9DBQBm+BxJha6mE3uJTPhUDIR7joFeF1mYpmz4EdO6hHo2gj0dL9HDyckk7K nQMWIck3F93k5uoPlQ5r7B3Wk8f+tkW/L74TeEhN9V/1cemcsQu2Zk0xl28XtTaDOhY4 jBgg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=vf+a9u2L+FoM7qtCxVtSl7HARjVTkt0vRcQd6E9d2TQ=; fh=rGvuQl8E8faL5/lCzf39cDRu6zxiLEdjN9OkpCfrJMM=; b=DEgDspwBgdbGJyK8vpUojJtVyHCwhg82QnE3x9la//23MBwBPwf6f5h/9gd6ugzJYo rVDtwd6mpjf0HUiEd364EM3aMw6W4rxh9qsNX4ZFO/xB7QkVFM5zH6yiSe4/xXSPwO9r xPUsmq+LyuSVBDtJnKkC/YfB5HWfitHcDwsTuxMxQXTjGjmFFZwX6kg+/+ciLHUniUzj OOwtckO7JOfQYKxWbiMWuBeBjheG6XJqiG6GXkAAHovcu4jiv1ZmoOFM7CoVCIQLUKS/ 5BujGEIV9NIiHOvqw8IFhCY7r8sNsPDbqnTNAAG1oDQ0PNRWuEsBDgjz/rYyO4bs/KJ7 D6Lw==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=KYyBaigH; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1755113188; x=1755717988; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=vf+a9u2L+FoM7qtCxVtSl7HARjVTkt0vRcQd6E9d2TQ=; b=Bjcrs+aieZrdDKjRFkWL4zPaLF2A2f8zivOVAHlJWTaJ/aXlGssboSwXU9YSMMHESj NpwRWEjNSluvsLaYV6Ac/7Py+Iad1lKJFlQrHbuU+Kmhw+aQNdaiWS5O9EwJF1Dj5KoX idtglzGa400yKifxDtpx2Se3TmHa82eJ2Lv5g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755113188; x=1755717988; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vf+a9u2L+FoM7qtCxVtSl7HARjVTkt0vRcQd6E9d2TQ=; b=MDVoIzzPjgBxQM8b8SKGwGROeCma7bTiay5fuYg5pjT1v1WD0XefUz7GAJJwt9Pm63 WMAHVcWH8entA/CmVQ90C+Ef67UcoVKhpXzjRVeWv16mj1dHmgRhG7afamLgHTauRf4s u50IaHPNMvNExfwUa+kCKF4ldP3iURpHetgbV5DrPUh506hxPzcWKN0lQ14i6bU8LW0J eUmx2GwbUR0KDmtCvSlYWr5QIj4mRmmi7FbBou3NKkG5B43AaeWGjRkIqcuiAbBmlBj2 TjxGhekeMZpnSVFHr9DKYcj73tD1p5DCPdQ5wn8JVRP044NNBjX+pwDxC8jgefGccKKu yA0A== X-Forwarded-Encrypted: i=2; AJvYcCXZc/nySLtM+nfSxAmvlzc6Ij9ux63BvXk5kswC581XyuhxRnD/KtsKgZ4A2eVutnY7JbnOpeVJxyduQnz2@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0Yz0mI1iyIm7hHVaGiPEFkNj0ONnXH/jpYJCEiaSqPaza37MBfcQ ToptWTudxYGIo8oJbdkBY17Us4OKJ5n3kRIHWNEDuTD/2v5B1bgyKJIyrG3vpV65NhECrg== X-Google-Smtp-Source: AGHT+IFIOrz/9stSEj80Kuzj1TkRwAwHDvF+9I6ftrNRDYM59+nN95x1YWRkZSoORy1laJJDAbU44w== X-Received: by 2002:a17:907:6d16:b0:af9:e1f0:cd30 with SMTP id a640c23a62f3a-afcb99dd8cemr32474266b.60.1755113188048; Wed, 13 Aug 2025 12:26:28 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZc1HzRwOsjjnST27S6RKOJMr3UPbaUlP9L/bW+veRoOBg== Received: by 2002:a05:6402:4389:b0:618:10c3:d7ca with SMTP id 4fb4d7f45d1cf-618899fece4ls118339a12.0.-pod-prod-05-eu; Wed, 13 Aug 2025 12:26:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXgkVoewfux5P3Ilalhz85odqDkdBIgVtYJsy7XLAEQqYYQUk4n4KG3aYuqMOeXJ2t4MFg8PePSkZecYk6C@amarulasolutions.com X-Received: by 2002:a17:906:f58c:b0:adf:7740:9284 with SMTP id a640c23a62f3a-afcb99a1663mr33427466b.57.1755113185604; Wed, 13 Aug 2025 12:26:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1755113185; cv=none; d=google.com; s=arc-20240605; b=CgP3DUj00c6m0uGFtOs0AbTGLQuK4k8MUWiMiNOLNbFnLqGLUbEHQ8qC0V3O/Kadpy Vs6wKuUebdaAPI1TGGskbIQLjNt5T2u1O9+KWIrFU/giDGWyyzKEsJ46Fccvd9uzhla8 ZrhcAbB0nFEwJoprbB/xG4Co+7VsyItCJmOTCKn3SceGMBuG4ex8Os0OSj6hdGFXOvp+ UpuroT01QTJkPunXZkPmM2eNB1VgRM0MvgzLKmiFioAH3bJT/9HeMdzSCDvv1oc+YDT+ wkEAAFirv4iEMTwaLIJJBHoQEHqzu/cCUriMUCqyg9N1Qeg/mxYCB4aYGMdis2AKzbPc 9o3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=D81YniUm0d5I2fh0KwtxE7j/KmEcZkOvoWFi71EYJBU=; fh=Z/nTetMZqW/n6FrDl72W00WUVCgxu6gUaI48P6tBysk=; b=lwjQKPDOruF+mVdEBaxgmaPpWPSjHuq2UscSH69l+VTfZmKiag0sx1Wg/36N5cGmI7 eXNKyiZfEqB1v7syP6UdzvdWJM1s2gQtW0PJgVP+sT8SqIoz2BxWOJYK0x63T4yHQi4t i81Fx4aVGCm8+8M5M/2hA0XEWJiwL7dtCw6/2iihb/yl/J5oyH+E/mcaKT5RuFCOb299 iEQsPmlow3atHeb+xGDGo4TQAViD1FluZQ3kscMdnUMy5UuYABbWWNOrHwClRSo/A6AB nGJ3rIjXXtVEgD/U6/foL4sNmPPLhaHQ/0qbhOzKblqW5HjQtfsbRQHCgAu+q80bPWtX piiQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=KYyBaigH; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id a640c23a62f3a-af994171aaasor696152766b.1.2025.08.13.12.26.25 for (Google Transport Security); Wed, 13 Aug 2025 12:26:25 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCVao59kX56OhN7n1ZyuWIbpy+1dYjH0PsI6PlxivJjiMXLsA8W02xRv8qFUFFyjrCTcgnOHYk/aL3y8nI5O@amarulasolutions.com X-Gm-Gg: ASbGncsOgL5abtMxWGWGt4XvpN4jONn4ydI3ae7tHNrnmEd3BtK3eOPx/JveDET42cv irGSv1Gmp1s6Qws40vlmLcTzHd/yzn4Qe5SuDBDlxvBwz0ddHvOOsj0lgBjG5nc12gl0acsgGL7 LVNaQ4r+Exypxwt5bq7A9IF8HInvxrVNuEQ9eGXCmL4dQ/osVokkqouxRHgNug/0ZT/jbUvVXUH aivkppw+OiaIMpeVU962vO0HDsEecH1ZKMCXXSdHwAB0pLP2P+qUpoCFu3vd7ERa4USe9Aixxbf 02/9y7ZqxGLWsTOviUbYdiv3yQKOpTfKpyWBAgcEfid56U4S6HEvjqm8nmXjfUwmcCQUyj28D/1 JxGURzh6EVkF/cTqhigY3/6g6Kzjcp3LVqru02ru2CcDPPzShdJH4yIHHEncha66/6eZMPAtm6Z FOYLHKI8zciN+g X-Received: by 2002:a17:907:6e91:b0:af9:b4e9:8677 with SMTP id a640c23a62f3a-afcb99238c0mr31670566b.40.1755113185047; Wed, 13 Aug 2025 12:26:25 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.fritz.box ([2001:871:248:acda:3fd1:eaf1:73ac:376f]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-af91a0df10asm2453396166b.59.2025.08.13.12.26.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Aug 2025 12:26:24 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andreas Naumann , Angelo Compagnucci , Jesse Van Gavere , Roy Kollen Svendsen , Thomas Petazzoni , linux-amarula@amarulasolutions.com, Andrea Ricchi , Dario Binacchi Subject: [RFC v2 4/5] package/qwt: enable build with Qt6 Date: Wed, 13 Aug 2025 21:26:04 +0200 Message-ID: <20250813192605.1540321-5-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250813192605.1540321-1-dario.binacchi@amarulasolutions.com> References: <20250813192605.1540321-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=KYyBaigH; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Version 6.3.0 added support for Qt6, so enable building Qwt with Qt6 as well. Signed-off-by: Dario Binacchi --- (no changes since v1) package/qwt/Config.in | 22 ++++++++++++++-------- package/qwt/qwt.mk | 4 ++++ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/package/qwt/Config.in b/package/qwt/Config.in index 736ccc2a5ea5..c816b48a0851 100644 --- a/package/qwt/Config.in +++ b/package/qwt/Config.in @@ -1,9 +1,13 @@ config BR2_PACKAGE_QWT bool "qwt" - depends on BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5BASE_GUI - select BR2_PACKAGE_QT5BASE_WIDGETS # printsupport - select BR2_PACKAGE_QT5BASE_CONCURRENT + depends on BR2_PACKAGE_QT5 || BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 # printsupport + select BR2_PACKAGE_QT5BASE_CONCURRENT if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT6BASE_GUI if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6BASE_WIDGETS if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6BASE_PRINTSUPPORT if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6BASE_CONCURRENT if BR2_PACKAGE_QT6 help Qwt is a graphics extension to the Qt GUI application framework. It provides a 2D plotting widget and more. @@ -14,15 +18,17 @@ if BR2_PACKAGE_QWT config BR2_PACKAGE_QWT_SVG bool "SVG support" - select BR2_PACKAGE_QT5SVG + select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT6SVG if BR2_PACKAGE_QT6 config BR2_PACKAGE_QWT_MATHML bool "MathML support" config BR2_PACKAGE_QWT_OPENGL bool "OpenGL support" - depends on BR2_PACKAGE_QT5_GL_AVAILABLE - select BR2_PACKAGE_QT5BASE_OPENGL - select BR2_PACKAGE_QT5BASE_OPENGL_LIB + depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT6BASE_OPENGL if BR2_PACKAGE_QT6 endif diff --git a/package/qwt/qwt.mk b/package/qwt/qwt.mk index 67292ee025be..0e835c700e16 100644 --- a/package/qwt/qwt.mk +++ b/package/qwt/qwt.mk @@ -18,8 +18,12 @@ QWT_CONFIG += -e 's%/features%/mkspecs/features%' ifeq ($(BR2_PACKAGE_QWT_SVG),y) QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/QWT_CONFIG += QwtSvg/' +ifeq ($(BR2_PACKAGE_QT5),y) QWT_DEPENDENCIES += qt5svg else +QWT_DEPENDENCIES += qt6svg +endif +else QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/\# QWT_CONFIG += QwtSvg/' endif From patchwork Wed Aug 13 19:26:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4243 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 9F55240D1C for ; Wed, 13 Aug 2025 21:26:29 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-6188b5be02csf123696a12.0 for ; Wed, 13 Aug 2025 12:26:29 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1755113189; cv=pass; d=google.com; s=arc-20240605; b=N5N5S9l0P5t3nf0UNOtL8+by7Xs8XiA83UqGugCdHHkU53Z10goG1kmyOIYPmEEPKC cAp1yjvMu7aPmygWa9W10XNtYnhK804op0J3RtJ28HfuGqlvfnxT1evj9ZhNymIshiW4 okqi77SaJQ2h8Oml93hRuRDmKsbtXzT5kfbLL1Y7llKtSHzQvAfFW/iHTUJ6BRB0NQw2 sXEUbp89P5lvu8py+qAAQVgZCV6jVdgWjhaJ85fiIF0zmuKDWhIzdqMKaTnLeD9e0AZO R5RknguWhR1yfv+re+2eXAt1MbPq6x7EmEjjLZKsK05fLwblk3bHW8JAhoWoQqPlmIhW tv2g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=FAn18cWZq2MnC/8RUi8Z1alXLMnZ+FoNEeDLE87lFRg=; fh=D+vufEyWF6FFV8FB/xxXP8B2tO2ah+9C9DEAz1hIV8U=; b=OHh5uqWV2fS0PUkyf+Klc/EUOUPUXVhmUr0TG2a4WDCEDQooYnRBg3xfv+u+88wV5Q c+Da1PJmzKB47QwCD2y+djibHNjHEzqfhQkcvt5LoGpPEocEx9br6S6r0s2p4XntITlz 9ryEQLKgEBOMBgQA8DJFgb8aI8oTW2LJB7iS+tTTcIeV192BZhNg4z0tAOKeqXTHJkAU /+Ze51sDfoOl7KGUrNxPA1QGgfD5JZ9tQxJp0qnyNGwG3BdTeBoW90QFGxRVBHMPUXj3 WxqIRHWWIiT2IMrnRK4qFOjNFgJsu/l0fA3Xuz/PlJdtZSbbBZCA+zsSMmoCh5CCAeNG rqcw==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=MOSyaph4; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1755113189; x=1755717989; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=FAn18cWZq2MnC/8RUi8Z1alXLMnZ+FoNEeDLE87lFRg=; b=p8nqYQfqgFkLohsXPIw7zMD7f+9+U4S+ELuSmW8Em9YYslsjUsHXJf5JOabI+tQmZF xFEMxTDjSJv2+Mcoa56VyNCRn+B2yljkuLT+drX3ZnBmw86v0lGfMG+dM+9joMkdrnHt DqFtaOLTYM3Pud6DmHUaZcOXpwrpSZBzH8yZc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755113189; x=1755717989; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=FAn18cWZq2MnC/8RUi8Z1alXLMnZ+FoNEeDLE87lFRg=; b=uEYs897N8WDGo/wbvrVDobMAz8YJszYm2ZlDvEmeY5xAaNp7V3mLluqZe5vV4mwkRD fW2WG0EqRoffhfGFSCInLFQd06xzmBS4NuMSws8Gt1aTm9ks/1zmnUUU74yo4sIzzE0I XpazKy3FKatXZ2BZVjiccOFtktE4JVR3S5IIf/aj7nFuPaBMWRYCH09zgZEuuSzTZPlm b4UU7amurl5/9Sm9Vl+or2pp2+XTacq9W6EHvyZ6+OGKxcgdLunhZJqyK2/QkZ9fCz5L cmTQN7erttkq6Km8ieoN14xXfpOdmQqI1QpHy1gI9SrYJffg0Ojkpvl+GvFZprZR8IJc TxxQ== X-Forwarded-Encrypted: i=2; AJvYcCUclV85W+z5jHqJYYtAow8g2I+OrxxUTBBZMm7cz3xjsFRrY8PsTju2Tj+yODL2WOcQOx3uLWkN/beSSpSI@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0Yw+qTQWVZZblqr/+Aps/iiOHBpKLvr9buZcnW4QyXhbaejrlnDY +tqScMzO1lFdBRVoDfqKiNWimzwCbXUiUygxXgDSp0vIwJ9Rx4iyGSn9GIx5mXNlK3J8BQ== X-Google-Smtp-Source: AGHT+IHAD9X5cfxdvXBn3lXdrBWr2Ma5G12Wg+mVhQddsA8YtRleC4KgwVq0r8GNKrSzb9BJEPcVbA== X-Received: by 2002:a05:6402:4017:b0:618:4a41:80b2 with SMTP id 4fb4d7f45d1cf-6188c1f42cdmr272443a12.33.1755113189224; Wed, 13 Aug 2025 12:26:29 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZfwS5UVtwNDayQPPnHu6QuUV1VkJOiCvuGRqOs/nhLnoQ== Received: by 2002:a05:6402:46c9:b0:618:8825:4bd with SMTP id 4fb4d7f45d1cf-6188a1f9741ls144736a12.2.-pod-prod-02-eu; Wed, 13 Aug 2025 12:26:27 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWXA/lLTqQ9dYvC39pARA8rYK86CPdaGj1sx/plax9gtURHxxY8eHWeeVTLR1sJ4Mtf9k93xW+1w8tXT/LT@amarulasolutions.com X-Received: by 2002:a17:907:3c8a:b0:afa:1d17:b5c5 with SMTP id a640c23a62f3a-afcb97c34f3mr37102266b.19.1755113186790; Wed, 13 Aug 2025 12:26:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1755113186; cv=none; d=google.com; s=arc-20240605; b=dENQ8TO4u1kW3VbAVkmaAwbSXigT13hprbacjUx3mKDwZs98KZiUjOUwEBD8rptqGq 9fv3I7bihUshHzY8MEXUVuWdQ1IcdbulRqK1T6tmcoAcrJg80TsBAmsYAFcrCtQxcVtm qShIPyIHbB7234s0qGZHWe3I5oGZ7Kt9yBpMlFxnlZgxVhhrtdCRrMn2jPx8+dPNWNV8 gV7JyLmoPsadoDBGcebr0KHaZB9Eo6Rv9G2M7YaoFIduzQM/S/cWQkoeNExqZ/pzkyTu 34ZnC3BXh4R6pcY31fSFOZDicnuT7A5kCIvpvmjjbSg1R2NrxP8HAwh4bx4bHxc7Yo4k itHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=Blxy4HyevyRRHVgsLhuZ0FiHsljJxSdYpyi/FHRDL2k=; fh=AqbW8vWQzP0Hp9BKDkQRB0Alrfdc/u/D+EoxeeZrCOY=; b=jpfxgiqBwkP2lUpxtunDVCneaZ4qh264tMxJgXcPnZBx9Tmlokd0G94MJT8wiEb9Qj nxGClwBkF0fXNI6tEJcBlKFrBEFn0W5proVUfg2oQTMfqe9g1sK0rK1LQaxMurleCBND eKV/65+qZnszoYFNeQRUvdMQinn7LgrqfrqRypyt/q/yuvKM0t34lfetu+j8A/vutUr+ jBWmmW2A4QKp/brNgZM1mCLykYbqJS9Ie5tLgwWeFIn0+izxJn8hOPxHn6/wWA98adwm TlYtGjSRHIPl0uDKrPkPQ+mI0pDB0K54T7kp/TR4GC9pOdjwHIv1A+aLa6DmHuAOESMv HAPQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=MOSyaph4; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id a640c23a62f3a-af91a08aa75sor1562336466b.2.2025.08.13.12.26.26 for (Google Transport Security); Wed, 13 Aug 2025 12:26:26 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCUBfIEoUYAJElWnb/be2U3mYClS1ybn7ohv6VUXQPPEwr7Rc1SgmpRnTCgjPmiwo1fnUaxUdfHBA/MiYZHT@amarulasolutions.com X-Gm-Gg: ASbGncu0CwESvf7pE8TqtH0utBqne9HcNdAcs2Yk/vK2wiQb3JchYq7PmpTWtxts8/w BMTMNoM7SH0D9kW7tYffNiLbCrWiEVMb53ua44om4azy419+eUq1udKOVNnfy8rgP382IcnRaLi NmMY7Z3yHk41BGsMIAefM+7uy4ohlnjOkrWU8k7gGhzMdtHHGc7WHGR1Eawn0O7JrwCsJ4wgyAm VIk9AOjAlJVbgFSlNthxN4Kqr2a0hORFq4R3fxI2DU62CrtEN8sZPJ8vGPmTS5NlVLMKaUMK8PY xDQO/tb5ri1inwM+pXvcBGbZ/ZUZniQHcI2oOO1of3Us8E9BGww1lroBe274oefrI7/dPOhMn7A 5tx4e11EoLe6Q1Hk3QfUZDPKg9Kh6YzZkpiT/X2hXhNIU3hwEiSGqb8yvSc6fBf1xcExXNqKRTc Gn4A== X-Received: by 2002:a17:907:94c1:b0:af9:116c:61cf with SMTP id a640c23a62f3a-afcb98e90a0mr33197466b.43.1755113186306; Wed, 13 Aug 2025 12:26:26 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.fritz.box ([2001:871:248:acda:3fd1:eaf1:73ac:376f]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-af91a0df10asm2453396166b.59.2025.08.13.12.26.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Aug 2025 12:26:25 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andreas Naumann , Angelo Compagnucci , Jesse Van Gavere , Roy Kollen Svendsen , Thomas Petazzoni , linux-amarula@amarulasolutions.com, Andrea Ricchi , Dario Binacchi Subject: [RFC v2 5/5] package/cutekeyboard: enable build with Qt6 Date: Wed, 13 Aug 2025 21:26:05 +0200 Message-ID: <20250813192605.1540321-6-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250813192605.1540321-1-dario.binacchi@amarulasolutions.com> References: <20250813192605.1540321-1-dario.binacchi@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=MOSyaph4; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Enable building of cutekeyboard with Qt6. With the merge of QuickControls2 into qtdeclarative, the corresponding Kconfig option has also disappeared in Buildroot. Signed-off-by: Dario Binacchi --- Added in v2 package/cutekeyboard/Config.in | 13 ++++++++----- package/cutekeyboard/cutekeyboard.mk | 6 +++++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/package/cutekeyboard/Config.in b/package/cutekeyboard/Config.in index bd661b0cd42e..4f83316644a2 100644 --- a/package/cutekeyboard/Config.in +++ b/package/cutekeyboard/Config.in @@ -1,10 +1,13 @@ config BR2_PACKAGE_CUTEKEYBOARD bool "cutekeyboard" - depends on BR2_PACKAGE_QT5 - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative - select BR2_PACKAGE_QT5DECLARATIVE - select BR2_PACKAGE_QT5DECLARATIVE_QUICK - select BR2_PACKAGE_QT5QUICKCONTROLS2 + depends on BR2_PACKAGE_QT5 || BR2_PACKAGE_QT6 + depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE || BR2_PACKAGE_QT6 # qt5declarative + select BR2_PACKAGE_QT5DECLARATIVE if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5DECLARATIVE_QUICK if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT5QUICKCONTROLS2 if BR2_PACKAGE_QT5 + select BR2_PACKAGE_QT6BASE_GUI if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6DECLARATIVE if BR2_PACKAGE_QT6 + select BR2_PACKAGE_QT6DECLARATIVE_QUICK if BR2_PACKAGE_QT6 help CuteKeyboard is a Qt virtual keyboard plugin for embedded applications. diff --git a/package/cutekeyboard/cutekeyboard.mk b/package/cutekeyboard/cutekeyboard.mk index 775bed0fe995..8181950aac50 100644 --- a/package/cutekeyboard/cutekeyboard.mk +++ b/package/cutekeyboard/cutekeyboard.mk @@ -6,7 +6,11 @@ CUTEKEYBOARD_VERSION = v1.3.0 CUTEKEYBOARD_SITE = $(call github,amarula,cutekeyboard,$(CUTEKEYBOARD_VERSION)) -CUTEKEYBOARD_DEPENDENCIES = qt5declarative qt5quickcontrols2 +ifeq ($(BR2_PACKAGE_QT5),y) +CUTEKEYBOARD_DEPENDENCIES += qt5declarative qt5quickcontrols2 +else +CUTEKEYBOARD_DEPENDENCIES += qt6declarative +endif CUTEKEYBOARD_INSTALL_STAGING = YES CUTEKEYBOARD_LICENSE = MIT CUTEKEYBOARD_LICENSE_FILES = LICENSE