From patchwork Wed Aug 6 11:52:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4230 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 186B53F165 for ; Wed, 6 Aug 2025 13:53:21 +0200 (CEST) Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-458b5811c78sf2752445e9.1 for ; Wed, 06 Aug 2025 04:53:21 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1754481200; cv=pass; d=google.com; s=arc-20240605; b=ly/x0OwFrdMwdeJds8rTTmUv1M++UNoB1YO+lpEYgTQMuwVRTbaxcMRju88iDT1CEG NSEW87swWIS5Gx4IbIJlCT/WkzV7XQkclfWaj6m3rGhFb1KR2/Nj3kK5mue1iQN2YrCf 2gNtzRyugxw4u4+JXiHkeAkC/z0PAjDBNeIyF/OeA9u0/EdDuNtYrI3IV++TlSdbkgbU tD/4O3Iq71EYOEdjyZJcLYPy9+/nkY/jY1bOyD1dJIk+DEd6XNGhTlGS6CXw+L5U+HR/ FEfXM4pVXCCCzsVvd55i2drRIFwDks3nq2VC9tiqdOh+75471pWG9zjkmgNIQvTapKE7 LmrQ== 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=a/hPFyPuJjgnSKa49G7GidrJQy26Du2dexaKSp4PEgA=; fh=ESx3X9rWrVedMOUW2Rkox+/aGNZ+dndgXjUhdJTCyAs=; b=Xen8aup9pgPgTQGg1kdYtttU7TLFt00FIZjNkNOgWLWE/a7sKs+hlNmrMh7FKn5yQ2 /1U0IUREfrvXOnEY7+l+XUCr3ly4+S7dsxdFH5LyLmcu/YYTqdzax2y8reCuF1TUtpzR qLzhZ92YYPDJhwygdLZxQqAMBb4xtQtLOKVPPpPFjoB6uya8w5OyqgcMVSLX21gA8Y3m nKsLlM15KUvqKiY7LWIl5ZbRoWgh/WMfHYBbFdIdVquefEO9Whv6h9/olLdKR0uzZ6Re lfzwhQhM177ZA+95YCyDAZ/WlNOMMCFeX3dFCM3dIX8m/1QvfqiHTBLiflw+aMsq4veq sXWQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=hAUy7Itv; 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=1754481200; x=1755086000; 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=a/hPFyPuJjgnSKa49G7GidrJQy26Du2dexaKSp4PEgA=; b=TGChnPN9oojxy02tjXoh5DuxkYWPugvvN/q4b3CQJTxuHuLhFfg3dAHhPWaRM0ei6W OMpTjHMwZC1nTqvrUjY+E4z3yrdUoDza8yAic75bfyOYgGSUCvP2ysxliNYrQ24ckul0 Zlan9ewRl3czYHRwQXiJdcnGDaWP/iUaMVgJE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754481200; x=1755086000; 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=a/hPFyPuJjgnSKa49G7GidrJQy26Du2dexaKSp4PEgA=; b=u6PthMM4I7MPqMfD7iQxlZafVO8+GMx7rqr5t6BKOf/2Lo975SsydaeqoVOkNBlvMQ Lr0jt9ZFmHeCvC+jvROylpGDCmKBvnSPR5Xux3BIk7nsp6gGvE38sbfVDjctgYaBMrdh Gm2nKW26BexRQlNFg1Mw2xEpciZRW0K33CcxHxx5R0DgysN09ARCmV2Kz8EBZOXTJU+D 4o2h5LWx1iKNPjg0EJh2lR0DMTGgmT8gqh1Ims+SXHbSgAN+gKxa0GaMKAS8xzZRX9lk 1b2U/a6rLaMVr6TQtiXiV7n1hb+YNM6TR5YpOHFdGU6GXeX4uBxsA+jqxaFsk6m/4DJA N+eQ== X-Forwarded-Encrypted: i=2; AJvYcCX7oGr6vn8y0Y/J8WxXGOhV5g70gWtA4G14if5DIypqOBK8R8RAOLFEaT4qkq6MwI74MuWWFO4iWe+bGUU4@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YxlyRXqPJn4QBhwtITSXVOVsu2gDxIRSF6++L7xPfmSnVuKo/Je DQ9aoTsDeet9qvao0anlNFD9wRv5P1x1KUJgpLLKlLh2bCt0sUwj6h2NW3q0uTKTpM2irA== X-Google-Smtp-Source: AGHT+IH4aBXGaBN+i8PfORBUP8haaTtNcR4PrEl55igmLsJRmJkgQm2upbTUzQfj5TVIwiwOZP02uQ== X-Received: by 2002:a05:600c:348b:b0:43b:c844:a4ba with SMTP id 5b1f17b1804b1-459e7105b64mr10382865e9.3.1754481200390; Wed, 06 Aug 2025 04:53:20 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZefUg7DOXHIX1ILvxBNQcrFad623fOT0MQGS3YFLKdcjQ== Received: by 2002:a05:600c:5246:b0:459:d904:8de9 with SMTP id 5b1f17b1804b1-459e65b6f5cls3111735e9.1.-pod-prod-00-eu; Wed, 06 Aug 2025 04:53:18 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVN2trS+8I6wmlCPSETMdXkC3zwpgf9tPKoQoCJ0WE8eLv2cgdMwg8c7UN51R7/jrqljF43G6h2gn7TqDsG@amarulasolutions.com X-Received: by 2002:a05:600c:45c6:b0:459:443e:b18a with SMTP id 5b1f17b1804b1-459e70e63c1mr26573105e9.14.1754481197867; Wed, 06 Aug 2025 04:53:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1754481197; cv=none; d=google.com; s=arc-20240605; b=do1I6+IOYm1JhUiAjdZ++R6nmYirnmVyE683fJ4iCa6Vf19Pp53T5CkeBmxSbnrTGD EzrL9WVkAsBiF/cxMDyPNcApcJpJJTxYUlB7PZBQ82g9TzjGyJ16e8xxrrP2329d7AyA Pd5hHEAiaj4RZc/T2T0uEHN0Mpj+Yx5G1q09Lcqtoj8zTh10AS/4YVN/aDxxXbQRCTy5 sVQrnbHuTVrfF4docdvgk4h7xEgfWl/da6WlVwKgLs3/y33greVaZRA92MrwWabEo3pn tQN+Ok/BiuSurqSTLG64Ag8DEADmFs/YmTRQs4/hDTwXa04wf7M2HOjy6fThGxtbpzPN ZOCw== 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=Zz+b4daQ3kcyezTHGq11ULARpf1wrO0Pm6Sv30m815Y=; fh=NGkoX4rF5pq3f3+wKWl2AU3567wJQMn780+qpc4GPIE=; b=KkUzfH0a2izrIxqR7yqCm9q7bD4SHWrqB88j5LtpMRhYjMRKUBnDY51NA4FGqyQxxZ Z5EENR8Kf8Uorz/f591XP2jMvOGfNxOwO1HJZRNY1gc13Og2Q5XJPdOE06JJfIMtbhWf U3XFi6Ucd5Yy+HYXranBZEwT7nlT/DFHg98LpyVsEeMjFU0ixKg4A5RkR14qqxJ0LChO D/e52D5/DH++pex0Sb1grtQFHmZk96GkJRQRatdTqCDGTkh/tMhwRIpnLXH6b55iixQy gv8WYhyqo/Z6xi1f621L3cQc1lc8PbKmWzfgTTVf4/8cbR7gbXJrTRrACfxR6fmPX7J0 f67w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=hAUy7Itv; 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 ffacd0b85a97d-3b79c23b9d0sor2804803f8f.3.2025.08.06.04.53.17 for (Google Transport Security); Wed, 06 Aug 2025 04:53:17 -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; AJvYcCUc21DlH154kTymAQmSCUfAIzxX4IcDJwgshyZ5D2+27afEh8T5GdzGJcRfHViPqzE8BzAaDynDWv0Pu99H@amarulasolutions.com X-Gm-Gg: ASbGncsfSgz9uUxHTwYNNvgka3tmiUJLosGo0kW3e3MdpIF65cqGV7TxB3geI9zEKp8 xjHHVYNVV7/80iyz4Ec6KGsfQlDITC83sD3NrnPPwgIwHZXkmxb2O4f+O/LJ7gxkilhNd/aib+k 6NDFZw+m7HU98n29z+aKrXNbIMmZgN0aZiUBklf5xhsUr8/KD+oSszf7kWDKN4Fc8Z4DM1cvK59 3zwWu+ZC7DoqXFl2JCfqxgUShTyV68ZhvszpzDs6McCkuAPdD6yrOlDXLq9kBBrLfdBWdtRHopE 0K9uyLiTYV+c/jC6aMm3m4hbt+NX+YG2wj4rnStftJwHGjNk59HNrxCm78xcgWnqQL0TULCWSrz ggCLTarhAfF2GzXabZ8/EbmaPWS7pdWkKgKfIj0MQMRcpkzq/MQ69Og9vhuoT2kGpTwqezWosZG sLZUHktPF5sX3KgNACXw== X-Received: by 2002:a05:6000:25c3:b0:3b7:8ed8:1c80 with SMTP id ffacd0b85a97d-3b8f430f0a7mr1886781f8f.3.1754481197244; Wed, 06 Aug 2025 04:53:17 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2001:b07:6474:ebbf:3f96:8759:f916:8982]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-459c58ed07fsm142606555e9.22.2025.08.06.04.53.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Aug 2025 04:53:16 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andreas Naumann , Jesse Van Gavere , Roy Kollen Svendsen , Thomas Petazzoni , linux-amarula@amarulasolutions.com, Angelo Compagnucci , Giuseppe D'Angelo , Angelo Compagnucci , Dario Binacchi Subject: [RFC PATCH 1/4] package/qt6: Add qmake functionality Date: Wed, 6 Aug 2025 13:52:16 +0200 Message-ID: <20250806115219.3307438-2-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250806115219.3307438-1-dario.binacchi@amarulasolutions.com> References: <20250806115219.3307438-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=hAUy7Itv; 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 --- 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 6 11:52:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4231 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 0CD5240CB4 for ; Wed, 6 Aug 2025 13:53:22 +0200 (CEST) Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-459e4b85895sf7349755e9.2 for ; Wed, 06 Aug 2025 04:53:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1754481201; cv=pass; d=google.com; s=arc-20240605; b=kC35k6HrdI3XnfKrBKIIWYZ7bz/nne5Br1kdGmBCb3slo00HC01CmGu0PSYaoGPpmU aMlBsMzV8YZIoqKhVq43OFVbzwEwT5jQfJxTAMhhWguqX/7IYGZYfGNdJwOP6SiTtUD3 vVRMVeu9Bu9BZRyE2mibNAhWrkXMORNRmqqbEb4vq8Aw90orWeLCAxYvupnDh7dpRZ2p xxs2yX4v0/FakNb80kA3t+bR3qaEP0+s20s+aKryWsYYYsX8mUhk3Y4ni16IcxMxndtK y+t4VOMvp40VdojTmT0upV1L6H8vbTNEq7GAZLHuDOm6jfsjCddVkUwilvcZKCqt9a8g DC0w== 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=0BlVHAsOSdkhf43dMZVqeJ1olM0wYeyTAc63outx9bM=; fh=eMitNDjkj+lzIj4g4HitXoEiCMXN1kIKWhg0RjYm0uI=; b=XxbDfBWfjMBaKe4+jAo/ovwFqlYVgAcCBK0swa2lyPjXJMN1RnkQj9nnN41i/aq+d1 iTMMEqADfEQFXHwG3Td6EfHGJpEESkvKUlO3TsJprS0oPWM4OfCMbQwLNYqKHAtLowQg FE4wCf7qcQI9eqFMsy3tDzh9wKIOWDJA4jMHkEbfwzxhgN4Um9tIBO7Q4GSg5KK5FQ4I DeekkSj3s85GO4hh4u75WjCCDzDCaHeMNHmuv6aLJmm6g3a95rvh/WtPeNGXM7L+i9TE yVs6N/wXEJR+noMsgJl6OVA4pU5Ch9G1NTm/hWCcupqo8Fd4H5HcIuQRN0XJJfro3leD gVLA==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=aYmpeeYV; 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=1754481201; x=1755086001; 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=0BlVHAsOSdkhf43dMZVqeJ1olM0wYeyTAc63outx9bM=; b=ZP7aaAYkVFrotCVQrn2xg4WgG166SYg394PAqtmL9QGT58cNSYlwCu8SMo9bt9Ki1V WIqDkEVIAIVAb7qJMLJIyN1KoePCqzurHwjB/JvcY4Tqk6qwYxwsOwRsGeprjVok5sGT OVh27dIjKWj+baUKtWW6hmCZMCEBUiJMSAnVs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754481201; x=1755086001; 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=0BlVHAsOSdkhf43dMZVqeJ1olM0wYeyTAc63outx9bM=; b=IHOy34OvHE8ETl9F1L/IqYAWpQIEZU53fmIosnCr/A1u0A+6QRSsomp9mlM4lHVsxz p+V5BAsrC4ajk6A+HDapKoo2MErwbuA/c3YoS1oJJkUrIX0VNAhT9Y3eIq5Zh+8cpuvo whevNAE93H486701KggNQOuugUPkSEQbMsP3beag7awoIpL/gVTnzh0O1cBEM9qMQvH9 N4UyFXj0ZBZ4tVKjd5BtGfagdDFLFtZwAE5Rw7z1iSTFi+6n29yT5ATbIMa72qFIjDnn ZwsHiS3SU6RhD/e09hMtXEpd8BkAZZ4t4U6DXwFlowtMkHGOx98w1z9iSJ/ExNeUcKja TlpQ== X-Forwarded-Encrypted: i=2; AJvYcCVsM/ydSImB+RVTuV9LYyn5JpNNQfPZQgszY/YuyAf6+d3X+aCmDwRAvvPDw/di+Rf4tsV2mVY2dv+SwITv@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0Yy1j3T/kzxoypYF+Icn0PvWKNxRfgpr8FYLp21tn2xOwlpEI/2p 9qVACb4zvZiT6dilCkWHy9ZdclKnIq/svG7K8SCWPl9ER0uVvHr0y6vMnRRz9jRaicQ7xw== X-Google-Smtp-Source: AGHT+IHNdg+3hu8nfK0N7V8xQbUJJhbhIXrOkaqaiAfyIwwJo0HR5YX7fkBOyrOfTM+bvNIP+6K3yA== X-Received: by 2002:a05:600c:4589:b0:459:e398:ed80 with SMTP id 5b1f17b1804b1-459e74b6721mr19541265e9.32.1754481201231; Wed, 06 Aug 2025 04:53:21 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZeaqVkGScPkdx8IL1qGz3mCNC7grZVnl2sVlh9jDazI5Q== Received: by 2002:a05:600c:1384:b0:456:241d:50c3 with SMTP id 5b1f17b1804b1-4589ebc361cls41398655e9.1.-pod-prod-08-eu; Wed, 06 Aug 2025 04:53:19 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUuYrRHEtazHZ7h6ypPUe9MAmfPmg/oQETVXEylhgKeYm9G5jmZ62FYCBdqceS1LijIf8q5ccacjlzJk/TA@amarulasolutions.com X-Received: by 2002:a05:600c:828f:b0:450:d30e:ff96 with SMTP id 5b1f17b1804b1-459e92c38d3mr17239635e9.0.1754481198593; Wed, 06 Aug 2025 04:53:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1754481198; cv=none; d=google.com; s=arc-20240605; b=UODP2ZrGA6NOcgN0r9VZsofxH8ulTZtof+VKrfGOjzHn4EcW67RTSqb94dZ1jw4M+7 mYNBqKRUImRxmEyRLFg+8IUk3uHg5ukjPQNDpGlveFnXQj9Pseq1UYipS86f0oAL9/US Gd5ZnRnhRqDXt09+D4C8fIiF6L1IvTmPjv8HoZj5n2R7T7IMmhBLdVyWs/70N+fx8stB 2WAqBS9tmPSem400cv3pfKlx69qnV7WHfIe4G4nxBJSXJ5zQ3WMGLw9w0OJ5ibXfiizt Lteh0Csrd7PCAMRmEbngaBV9PUCrb7iaJykWCDsRK6Zb05+zvoVe4IWSUyPm1+1mEuWA hyFg== 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=h6rNQRSxgTk0Oajsv7sHj9dqe7OdqDv5aHgMf2fOIQg=; fh=YcwHi0OwLKfZHKanov6hg64cpX77re8STprVWVUk1YI=; b=feIC6X8LyMsow5939w3fDOYpTOp2Ir0gXMfAR/LKHIFKiRpKwccO50mp9JuvfyXyut zUJh2G7bD5WmqpKH0FRZmTEcUGhv55jzGWscTZARKpVSrlrZYExKKBaK2sv67fRAKMSb xLhbVlMEf3P0vyXiYmWXOA7z4fNoSOau1JaGTFtD7VOSf8dNf25+hkM0BKuhrghqF26J NbkgxfRqhfy/AYJCb0g0ql5E8eFe2zYdM7isErhadAGADCpU0Cf8Gcic59jNvg9MN0uP p0sGgg6fbt+X3QlMtZSIgs/6NyOwPt28VQrKzJ9E7xm/ogF3/GCVYp444oTw1tBurLzC KjNw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=aYmpeeYV; 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 5b1f17b1804b1-459e72f524esor5694865e9.9.2025.08.06.04.53.18 for (Google Transport Security); Wed, 06 Aug 2025 04:53:18 -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; AJvYcCUCS+6tt7o5f3d31U/0BNxvuIx6cbBYFBDZnVITqllPlzUcmMs3ILlHJZQevQCdAoS2B49K4+W6/M2IIZAe@amarulasolutions.com X-Gm-Gg: ASbGnctcd17RzkHJt7cHNShTLKV54O9gz9zNQZw47ZgnZOEHRf6CCO/NPNW5h8jGKcb Gg+KJZOhm9VAjO/kK3RgMCgqukvvHT2EMnVJBySb+xvP3dyiuxJedq6KqVDZYALFeesO3/4Tsrk 4jj5Ef9dLWTRHqc7xcYqLTzxwPl4iJyqmQImKLQ1p/LBs+TJr4IkuYDVl1BnistHQO+mHQCPwoF tf2pn79dvPCNTzdkpwyhZ5bnbsy+3zdbdQ6sCFY9c6J6WLp8xUNBwS/R5vjZTslrTTHj8EXQ66W 7ohgdPmx+GZ4bsydT0OQpzqnhaBU84eB6+jwtfXWb+i17IZADMaRdrKjy7vB9ZpmRRgp9TXDwrL Dpk9dNqPqBTUU82iQfv+rvNxdqtb9XhCyqlmgQlrmUZgpe6ub7N7Vqsgny5MQRJD/46a/RMTRg6 gK8wflFqO7ieYsZOLDgtvLYsADFfaP X-Received: by 2002:a05:600c:4510:b0:459:dba8:bb7b with SMTP id 5b1f17b1804b1-459e7450de5mr21497965e9.13.1754481198155; Wed, 06 Aug 2025 04:53:18 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2001:b07:6474:ebbf:3f96:8759:f916:8982]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-459c58ed07fsm142606555e9.22.2025.08.06.04.53.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Aug 2025 04:53:17 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andreas Naumann , Jesse Van Gavere , Roy Kollen Svendsen , Thomas Petazzoni , linux-amarula@amarulasolutions.com, Angelo Compagnucci , Giuseppe D'Angelo , Dario Binacchi Subject: [RFC PATCH 2/4] package/qwt: bump to version 6.3.0 Date: Wed, 6 Aug 2025 13:52:17 +0200 Message-ID: <20250806115219.3307438-3-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250806115219.3307438-1-dario.binacchi@amarulasolutions.com> References: <20250806115219.3307438-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=aYmpeeYV; 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 --- 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 6 11:52:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4232 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id C335C3F14B for ; Wed, 6 Aug 2025 13:53:22 +0200 (CEST) Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3b7886bfc16sf3891253f8f.1 for ; Wed, 06 Aug 2025 04:53:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1754481202; cv=pass; d=google.com; s=arc-20240605; b=kpWua+y4FJBrqg8aOun8k+sg7XLbHQvOV/LKRzw1JlvLTegA4+GKaB0K9zQxH/bF0W OZoSFRp5Bw0cYDY1dm/aXjpt7rCnikINzNoewWds+buxxBj7nCt19a9dq3VENzv4Kucc ca9TMrjI8RFBq2nkKqr5diGHgjDEsYeccGfMEZW6DE9QRJ8tm3ZWL5kc0gR0hCpGqnPH SZ4BULSfLCD7qxnLtqkjhxyD1VtF5/0m3oH4WG+u5RSLpFk6CXCrYEge9pJcZqPM01SH E5eA0xRvFaQV0Kx/DeUwX7ItaF8KonSuhZTb8GobOWvjTpObEzgiFjHiaV8edDslxlN5 edUg== 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=Y/+DySOVlijLzWtayFvNoVtu2pt21XT3Cb7rqpTGrr8=; fh=u+LHwlVypr7m3X2cn19Y5wvOSDdNzBXhpdRpfeppO1I=; b=jp2iEWWOR5fMo8W+71ZCxgy7ImluzeZROPlSJepaZmuPNyuJG4BrmEQ7eD6JANsoJv D+tevSVxyUJlzOMHI4ElN3s7Ycf2zjby7Pa3OB9sKIbF9HsM7rl3cFxwHghvZ65SCwmk m5P+Q1wLP8xQzqYmYfpj25DgMCX22O3hKUbKuHDvAkQeil/KK+lhnidOREJrrLEQLjbY mQ9ZUojm1R0FEGaqIiC4Ke4snXRqzfUEYY3xlGoX8KuoNtD2VQNOt05EEB/Ibq840AdA LA/TnG9soJcLwe/rMMeAmamYTGQF0hd+NmQfT4pyXXMFfIFV/LtMYtL0fesYdips1mli N0uA==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=aTkVskdZ; 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=1754481202; x=1755086002; 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=Y/+DySOVlijLzWtayFvNoVtu2pt21XT3Cb7rqpTGrr8=; b=FTotSwmgz3UBGbhs/AkWl1J70qVL+2WLU652z/OcVCLeal73XrnFyH4iZeUeLzGF4k JayA2s4qmt4ggwuA9pNjJ2BE56yRc+YbuJSYCSlbR84A+6URNnbtdjYslxf52cfmlhMD mG8E4LLxCQuYAXMr+NhmIfejwv8AVbRgwYiGY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754481202; x=1755086002; 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=Y/+DySOVlijLzWtayFvNoVtu2pt21XT3Cb7rqpTGrr8=; b=W85wCqFb+fc88i/IijxF62XjLCpxlAcSrR7AJiSb28XsdpKw6LD2yVL8Bo+UFzC9iI 5bydNwphRllWuDYJLJrGcpf7ap8chGAOJgerMifoVmjTg31oqy0Y2iuQDJ0Ij/2QPs7P t5bA+UOJQgSGsjdqywgvDGKd3i893L+zsN05l8EQ2Bby4oeSF09JbKEqzXyvPSU3cNMD ZS8zdqY8FQKJT4ukZQ995heUkreqRNrtS6D5Vfg9CBOzIQWSLz0xnxh0iKjJydufqUhb +0sBVpIYGBrjNWBYSwtK7AgODMDTuNw3V3FHtosRi+8MeUVntMJZDaeZ5oN1hY0gDgkf CcDw== X-Forwarded-Encrypted: i=2; AJvYcCXJ9lXPq1NBRkE1txW+qoJo7/ypeoFRof7tGtMcx+3RnvnOKieH25QYXMYlGb9Lv6jEhG1eKZeUUhNIMkaW@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YzaxECxcgZeF6tVUvFj2UD5UpwQrxr89XUcsHoSfOfrO5BJRq68 Wn+Dxrlw7KsmIxolRlNQIs8Uje7y9qmWzEWa1TXQvLLul8fNxcrcs721ebB854aQOThuTg== X-Google-Smtp-Source: AGHT+IF4MKYuQDCT7CEljrH40FBC9gez+nVzoNZNS2219/XVCN6v9MOPki3kIYHYXUweSfRE1StUww== X-Received: by 2002:a05:6000:2313:b0:3a4:f8fa:8a3a with SMTP id ffacd0b85a97d-3b8f41620f8mr2039649f8f.18.1754481202257; Wed, 06 Aug 2025 04:53:22 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZeLXSrhPAr+rRxUfsATdVMuW/DHgZcCMuMJDIa/iN4oow== Received: by 2002:a05:6000:2c0b:b0:3b7:89fd:a279 with SMTP id ffacd0b85a97d-3b79c3561eels3027544f8f.0.-pod-prod-05-eu; Wed, 06 Aug 2025 04:53:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXRg36C+/LcQxCJJHs2lpfZP9+xsfxnAm/1jyCKjKpMveznmf5Bb7nlqstEN8whwtOIU171rG0DLmY5o6Kf@amarulasolutions.com X-Received: by 2002:a05:6000:381:b0:3a4:e68e:d33c with SMTP id ffacd0b85a97d-3b8f41ae244mr2271109f8f.47.1754481199725; Wed, 06 Aug 2025 04:53:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1754481199; cv=none; d=google.com; s=arc-20240605; b=hLr19yBLFn6qW2WP+vyfRoGQ7bJ3iggyOH0rR+CPvqxMv0MEZOSuvGq7OT1RQzuppI LccT0QjJ1whU0RWomQwlLm4kq+9MElMjCUq/EFD/xbkKknHGfcSKqXBZchftqxOY/lfV FIwG/Ddft61AxDQoa216U1dIV8xbFzBi0jfAfWzIj2q9zLwj7iH9VYYkMTyzq4aTsvhM pfS+BcArBFoG9gjZyBTYwyXy0mRnFRGlgXP0DXbPAP6kR285ejWhPCbtzseKt5/7OC7/ XZgLJGBxUGj5m6H0tuBd0ixKdNYPUgG3NHwdlHm/hUBIP5Fot5iY/H9fDBAk3ZdV1X61 ok9g== 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=V3A8T3go1kMZqLquCA73NL1gpnU9RCDFAIwiJjewnio=; fh=omxUURsQqMTimmVZH8Iyo69UqX8LNbyvTv+pL6/wy2E=; b=cbFlXbwBUYAK31AdAuMEu4S9o5NdgT0loKGs6cmx2uESjq9R8WFqG+BvHufEBYzGhk o186TKt2fNFmmAgLwj63fPVg4I/jsfj5JbqrZ3KR98Doa3i+tsC3cmQM/KrODIvmiKsP f1OcyalpE5CBYS/ad3iQkw3R9eDylcHql37HB1qEnK2eAXulyA0/FldCXVHc+505z3hK 0WKsE4Ii39eTJNPvImtsB0TsW3NjC9C55yWwRdUGk2/Oy8KctASCRoG92xHLH3IS3J6p W0Kip9dJuf8zi8+gj+itdP4x0Ev+z02QdYIU0295otrGwSD6MVDRGpIwHC03z/ypSyKw MWAg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=aTkVskdZ; 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 ffacd0b85a97d-3b8d33f2427sor6445960f8f.2.2025.08.06.04.53.19 for (Google Transport Security); Wed, 06 Aug 2025 04:53:19 -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; AJvYcCXNBnmMHjBNq6d16jUJdKsAIFi8zWoLQlcp5XrrTNLyr714aKCOtfjhanBrED2mSLln7W6gIw4XvR9eqFKY@amarulasolutions.com X-Gm-Gg: ASbGncuFjhDL4JuekgCar4vN7aC89o4bfPMNBDAqxt1qs2gt1628FIvNy2wf56c/UBP ED8CT6SpP32s2e36KkciZjGgLMHvDiCLLKHHksyVEHjt9svp8C647bP517aDx56zBwy50c2GtDe 0aHr+3Sr0iOrE0Lib7i5wOh4mU9xqbiJttG2pKF/6aEMhWN7Byl1eOx9+hViyBwscIW5xOWO/Nm X9BAfTeTKQgG+NVsbht5tIvDIoDh9Tpsm2iTzYvJ+64jha/8McdY9hRn0ZNDWJraTmoDRkoYRYr +iC/6CP25sDrWktPwM/RLspvC/QRl4gwSc3YoIpo1x8NwGJFT3lY8eP0uYFPVpMtb85lv8ytCfb RSBoSEOnmDT6O6YTgNWyCIK0SfwBMZoysPhwktTCH0zpihNAiXpU92VK+L+C/7pMXj+KfLqF/m+ +vWzrNq4DPNA139WPCuA== X-Received: by 2002:a5d:5d07:0:b0:3b8:893f:a185 with SMTP id ffacd0b85a97d-3b8f41b8ae2mr2221230f8f.53.1754481199110; Wed, 06 Aug 2025 04:53:19 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2001:b07:6474:ebbf:3f96:8759:f916:8982]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-459c58ed07fsm142606555e9.22.2025.08.06.04.53.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Aug 2025 04:53:18 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andreas Naumann , Jesse Van Gavere , Roy Kollen Svendsen , Thomas Petazzoni , linux-amarula@amarulasolutions.com, Angelo Compagnucci , Giuseppe D'Angelo , Dario Binacchi Subject: [RFC PATCH 3/4] package/pkg-qmake: support Qt6 Date: Wed, 6 Aug 2025 13:52:18 +0200 Message-ID: <20250806115219.3307438-4-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250806115219.3307438-1-dario.binacchi@amarulasolutions.com> References: <20250806115219.3307438-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=aTkVskdZ; 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 --- 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 6 11:52:19 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4233 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 7EE763F165 for ; Wed, 6 Aug 2025 13:53:23 +0200 (CEST) Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-3b782c29be3sf3872376f8f.0 for ; Wed, 06 Aug 2025 04:53:23 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1754481203; cv=pass; d=google.com; s=arc-20240605; b=D5sV5ZP29yd5/CsotLYU10OSnIeef63dRXND22ln5n+HcCbmnKlDiD+r4arh6HlTPa lDyZoT+sUVCd0bg6ozuprAm61hSsozW/7Hz9AToEF8n1dM4qawHEViIS+jQHcj/EVz/k o+gQXRimDJLtYC1kQjyn+IDiaKoW/cD6xpX+qXHtZ2ZodkGaQJPSMB95TdJZrtX4KXlK XvHBJ+TwmMiuTSPFEzr2z1KFD5bWemNzdjYv4V0o6ftxDunczMUYq8gCpZpNBlLUZ8M0 tRyoU7UCQrsDAanHGivPWV5iKKpqN2/o/zu6vKKeSc2jvax4HmktHDVqXD7GM9KY3qd4 Y5rg== 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=ty04nsLHKcBuZL10wkvGXXCupv9CJ0ObWmCiAPSMxKg=; fh=X4R6lOJsZ9CkxCqnQZwyVaMQqggMD+/63jb3LsXI49E=; b=eigNcmQv1RGbQIQq5Q06Y30pBsMPfZM0hsISetzS+rkjlvvRF9w+4AkMvyaGmf5/QD UDvgyNZk89iuOicBpenKNtTbYDMgoRX9wdigRu0xl2Td2dsCw+lJLKAyowKJ1MLwKRm5 chj+wUIfs7ov45QrNLbKYoMYWH6nO7LRS9v0SEDk6Zk04CvnC/bkHPWu3Jw6bIetZWZK 0T5cJsFrSfgjcL54jEqnpZT8I1sLPYFDZ6hJ6x3Yjio+SDeHKNcreDLvCKQnEblgjuVa D39f1Gyx+ZmVx1ymbKPspZ4Qx1LD/k55etqkwOrCiMguy7ZKoTiJVaeYpgLYGNtW1OvJ f+mg==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=HFComnKZ; 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=1754481203; x=1755086003; 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=ty04nsLHKcBuZL10wkvGXXCupv9CJ0ObWmCiAPSMxKg=; b=Yn7t8GHyP2xbxZQMzD3OCECcWjO7oD9y6ZG6nT+36Dr3RTpajCf7Vh9l7iEWsi9q0A FeRin1QI2RNOMRUTiNAcHBSQFM/UE2b2ypHGVXeGYXGmtWVX5izb2zgNy2Sn/qjqwAyK 0eQNKEv2P6rsO51YaGn6eMZdblbfWBcr8SBDQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754481203; x=1755086003; 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=ty04nsLHKcBuZL10wkvGXXCupv9CJ0ObWmCiAPSMxKg=; b=YmnJDlqS+S+3ZxqFremA3xEYe6yRNCVcoHYr9psj/mQ9JIS/RkazKt5ZMTN99sG9GD OM7tWMuSXXBpDnijK3Pf+1Vfn89Q2eFNnD0xzTkzDYLGyyvcyvog6Mc88hIXKwDr7NVi L5U5JGBCPNolhIyBc/L9IDdTHRL421uSNtWg+IjssrAeJ/09y0e+ENqfXcAz0g1uZ2O7 J0E1A+KceFm8RQfiC+8t29NiMDEwgWNJjS2JpL/SbFqen+8EoctALi7rTgF1foz7NiiQ LX8tJ5kKKeDdmeE7RAbSOKWA9Nn9gg7Hf2l4D3aWEOtUOfH/84samnl6+Ha13oXAtvkW RGHg== X-Forwarded-Encrypted: i=2; AJvYcCXtCa7QAyfj8s51XVzybRBJ5+VekFX3fJSheh//3P7PsoaLGldQmZ0I2NQjlTbTynSTYvFxLi1DrUrY7bNt@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YzsM9edCkBsKWbBYCKQvU3ems8I82Hu9BAZIuvvXJnZbecLSRSe pxQ8lgFSAh1A9fB+KeO3oEJ/W7rzIjUy4cZHw/qsUi4rtBIZn3V43WOKGbpfoK4bWibdjA== X-Google-Smtp-Source: AGHT+IF7a99XU0wRucoAVndP5cmr65PbQfd3UR56mY64Qywlt9nkv/P1XKE/f2YMvDx5KMW8XWYIHg== X-Received: by 2002:a05:6000:4020:b0:3a4:e7d3:bd9c with SMTP id ffacd0b85a97d-3b8f4161da8mr2023942f8f.17.1754481203059; Wed, 06 Aug 2025 04:53:23 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=AZMbMZfxNCuUUDXpTDe90palMEalJVJVTBbBQaW7F2ZMA3T/Cg== Received: by 2002:a05:6000:2892:b0:3a4:eed9:752c with SMTP id ffacd0b85a97d-3b79c3f99d6ls2887663f8f.2.-pod-prod-05-eu; Wed, 06 Aug 2025 04:53:20 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX7QMZ2qBPSuuTX49opXToRMspjnyFHpsqkkS3vz1Xskzxe1czIm7G1EDnKsvoNc1tw6HAJtlp2GsOb8c57@amarulasolutions.com X-Received: by 2002:a5d:64e8:0:b0:3b8:d955:5382 with SMTP id ffacd0b85a97d-3b8f419bdcemr2130791f8f.32.1754481200507; Wed, 06 Aug 2025 04:53:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1754481200; cv=none; d=google.com; s=arc-20240605; b=hQNUorcKprQZUbsaBGoMLpG+IY2Q5pQPyTjp25uOlWUqHAkgZyu5Bmu5Ov/f3oxEkA 4r6Yd3I4U4It1qIVD7aE0q6gLHX9xJ2uvAZCAmAJP4Wr1PvSeSRaOItVL5RGFJSywFZY OOn0uOji0EDo+ij6FiXkFiqdZwU8X2xqw3Y/OQJmA92e5WS69yjfzsIUVAeXLxq5kDHr Umcd/Z+7eNvQzELcGWXVDZbQwmMa3bnk+T3ZgeRtKeGpfYzxq5hItB+zgf90YJ6/hZJR 30Y+32Gm882eRSHJQsIQwRLVfNnbh4I4c2BfR6m/c7cTLLVXOVI2p9OTVtefgb1Y90mv SqMg== 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=dmWSYwXOcPmSXa8Lu26abcCknd4OLA+/OVCekEU4hHg=; fh=eernEyErBY3IM1zKSoirNITJqj8C9xIzgoV3I95wPco=; b=S4PprLTnnqj/M6L9pE9w97peWofeyLi1IlqDQsUz0VQdSf7or63v/HV/Q22P9p0u2d 1y4D0XjGhkFDYkFn7j+Oi0Ys7JTR4LiKRYbaCfaDGcjKuf+AsA9gZQFfRut7yzAySvts EI+q8BKAi9KETiLt09s7vzrzO121pQVpC4h+AaXQlwUfXf4RJLMuN8SPZV9eXWTFWxgo OsTUbc2Xzv71QwaexQ11DnCTbgMJpP33kv1vDw/0BM7g5P/jm8WIOk6tA2vBTNEdlfnw EQSimBouEnWef/eoCPrCsfb5bcvzkrPYQZlX4u0sufazyuKPYYVBLX/ElpxXwdVo9vsn WBJg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=HFComnKZ; 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 5b1f17b1804b1-458a993df19sor70880305e9.2.2025.08.06.04.53.20 for (Google Transport Security); Wed, 06 Aug 2025 04:53:20 -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; AJvYcCUnAHEXmy+m5YgcC6GZu9tS2YgSQ0FPHL0iLO2iX8ufMyK0DtVxPjG/VTigr4tc1gZ9asLm03O6+bQCVetp@amarulasolutions.com X-Gm-Gg: ASbGncsbLcGhxjBUqDcqKAT+ITDa6gcxA3rfi1V1esJ8W8lVWpgFvZtfuas7UTWTWov 8rRY+b7OPf3Xv6qIKsmeyDwx2ylt47TPvVlxpZ+QixC38i43Y/4r9tS+GLYf5rCF2vwycPDbHrs ibGD/rIvorvDbZS7IbeTJ8wlO1MRrtQp7MDfBVeUMzmIFoOjf3CfQkLOz1UIdr+MH4EusU5eIdY Z2ZwUJJU9bHX06VfvGoUVi+JPO2aSpiUhoR9sF+WilVXhd3glxZnP83arzqD2E/5L/EzYjraa+L gogAy7JEgDv9D1tJrIHLhjUClni2KDYwtcvfjofLTPPo+jHl19gZDs9SvdMC2rlPMf0qDDTW3Ac x6ordw98MG3tuBMtqwiXDgOJnEYBnrfKb7+lQzBYP9jusXFvZsNRshc/onC8sAZ90bmKmxcsYFe Yp/YMmxkBiURIH8/aSI+YyB4B47hiI X-Received: by 2002:a05:600c:a342:b0:459:e3a1:a0c4 with SMTP id 5b1f17b1804b1-459e70f63cfmr25010995e9.30.1754481200076; Wed, 06 Aug 2025 04:53:20 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2001:b07:6474:ebbf:3f96:8759:f916:8982]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-459c58ed07fsm142606555e9.22.2025.08.06.04.53.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Aug 2025 04:53:19 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Andreas Naumann , Jesse Van Gavere , Roy Kollen Svendsen , Thomas Petazzoni , linux-amarula@amarulasolutions.com, Angelo Compagnucci , Giuseppe D'Angelo , Dario Binacchi Subject: [RFC PATCH 4/4] package/qwt: enable build with Qt6 Date: Wed, 6 Aug 2025 13:52:19 +0200 Message-ID: <20250806115219.3307438-5-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250806115219.3307438-1-dario.binacchi@amarulasolutions.com> References: <20250806115219.3307438-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=HFComnKZ; 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 --- 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