diff --git a/classes/qt6-base.yaml b/classes/qt6-base.yaml index ce409711..18d51d72 100644 --- a/classes/qt6-base.yaml +++ b/classes/qt6-base.yaml @@ -1,8 +1,8 @@ inherit: [cmake] privateEnvironment: - QT6_VERSION: "6.8.1" - QT6_MIRROR: "https://download.qt.io/archive/qt/6.8/6.8.1/submodules" + QT6_VERSION: "6.11.2" + QT6_MIRROR: "https://download.qt.io/archive/qt/6.11/6.11.2/submodules" buildSetup: | # Build the actual target qt6 package diff --git a/recipes/graphics/wayland/wayland-protocols.yaml b/recipes/graphics/wayland/wayland-protocols.yaml index 6b93c7b6..14edd149 100644 --- a/recipes/graphics/wayland/wayland-protocols.yaml +++ b/recipes/graphics/wayland/wayland-protocols.yaml @@ -1,14 +1,14 @@ inherit: [meson, wayland-scanner] metaEnvironment: - PKG_VERSION: "1.47" + PKG_VERSION: "1.49" PKG_LICENSE: "MIT" checkoutSCM: scm: url url: "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/\ ${PKG_VERSION}/downloads/wayland-protocols-${PKG_VERSION}.tar.xz" - digestSHA1: cc3915eb646e607abc82242e84652e4a548832d0 + digestSHA1: fb934fc767ec68d2335030a41e5f132c03179438 stripComponents: 1 buildScript: | diff --git a/recipes/graphics/wayland/wayland.yaml b/recipes/graphics/wayland/wayland.yaml index 23180331..f45152f8 100644 --- a/recipes/graphics/wayland/wayland.yaml +++ b/recipes/graphics/wayland/wayland.yaml @@ -1,7 +1,7 @@ inherit: [meson] metaEnvironment: - PKG_VERSION: "1.24.0" + PKG_VERSION: "1.26.0" PKG_LICENSE: "MIT" depends: @@ -18,7 +18,7 @@ depends: checkoutSCM: scm: url url: https://gitlab.freedesktop.org/wayland/wayland/-/archive/${PKG_VERSION}/wayland-${PKG_VERSION}.tar.bz2 - digestSHA1: b2e4f077a60c07bfaa7b241bcdeecea6bfa85c78 + digestSHA1: 1be4f6a8dc79a8371d6daa4690f420bd53804199 stripComponents: 1 multiPackage: diff --git a/recipes/graphics/wayland/weston.yaml b/recipes/graphics/wayland/weston.yaml index a5966803..acd489de 100644 --- a/recipes/graphics/wayland/weston.yaml +++ b/recipes/graphics/wayland/weston.yaml @@ -1,7 +1,7 @@ inherit: [meson, wayland-scanner, init] metaEnvironment: - PKG_VERSION: "15.0.0" + PKG_VERSION: "16.0.0" PKG_LICENSE: "MIT" depends: @@ -40,14 +40,13 @@ depends: checkoutSCM: scm: url url: https://gitlab.freedesktop.org/wayland/weston/-/releases/${PKG_VERSION}/downloads/weston-${PKG_VERSION}.tar.xz - digestSHA1: 0ddaae77c58d13afbfb22380a1ded691127fb7c4 + digestSHA1: 0f8e5f770e78b5b968e5beed3322d2ac26b8687c stripComponents: 1 buildScript: | mesonBuild $1 \ -Ddoc=false \ -Dtest-junit-xml=false \ - -Dremoting=false \ -Dbackend-x11=false \ -Dbackend-vnc=false \ -Dbackend-rdp=false \ @@ -55,9 +54,7 @@ buildScript: | -Dbackend-headless=false \ -Dxwayland=false \ -Dsystemd=false \ - -Dpipewire=false \ -Dimage-webp=false \ - -Dwcap-decode=false \ -Dcolor-management-lcms=false \ -Dtools=calibrator,debug,info,terminal,touch-calibrator \ -Dsimple-clients=all \ @@ -91,8 +88,8 @@ multiPackage: packageScript: | mesonPackageDev "$1" \ "/usr/" "/usr/share/" \ - "/usr/share/libweston-14/" \ - "/usr/share/libweston-14/protocols/" + "/usr/share/libweston-16/" \ + "/usr/share/libweston-16/protocols/***" provideDeps: [ "*-dev" ] tgt: diff --git a/recipes/libs/qt6-base.yaml b/recipes/libs/qt6-base.yaml index 1665b2d6..2f709d3f 100644 --- a/recipes/libs/qt6-base.yaml +++ b/recipes/libs/qt6-base.yaml @@ -1,4 +1,4 @@ -inherit: [qt6-base] +inherit: [qt6-base, wayland-scanner] metaEnvironment: PKG_VERSION: "${QT6_VERSION}" @@ -39,6 +39,7 @@ privateEnvironment: -DFEATURE_dbus=OFF -DFEATURE_icu=OFF -DFEATURE_glib=OFF + -DFEATURE_wayland=OFF -DFEATURE_force_bundled_libs=ON DEFAULT_CONF: >- -DFEATURE_opengl=ON @@ -47,6 +48,7 @@ privateEnvironment: -DFEATURE_gui=ON -DFEATURE_kms=ON -DFEATURE_libinput=ON + -DFEATURE_wayland=ON -DFEATURE_freetype=ON -DFEATURE_xml=ON -DFEATURE_network=ON @@ -59,12 +61,14 @@ privateEnvironment: -DFEATURE_dbus=OFF -DFEATURE_icu=OFF -DFEATURE_force_system_libs=ON + -DFEATURE_system_pcre2=OFF + -DFEATURE_system_textmarkdownreader=OFF -DQT_QPA_DEFAULT_PLATFORM=eglfs checkoutSCM: scm: url url: ${QT6_MIRROR}/qtbase-everywhere-src-${PKG_VERSION}.tar.xz - digestSHA1: ac3cfaee831310f03288ab32adc7ccc60b501205 + digestSHA1: efd440c60bb38beaaf29d1fc08a5cca94edb2329 stripComponents: 1 multiPackage: @@ -74,7 +78,6 @@ multiPackage: !"${QT6_BASE_HOST_BUILD}" depends: - libs::zlib-dev - - libs::libpcre2-dev - libs::libb2-dev - libs::glib-dev - libs::libinput-dev @@ -88,13 +91,13 @@ multiPackage: - virtual::libs::libdrm-dev - virtual::libs::libegl-dev - virtual::libs::libgles-dev + - graphics::wayland::wayland-dev - use: [] depends: - libs::libc-openmp-tgt - libs::libc-stdc++-tgt - libs::zlib-tgt - - libs::libpcre2-tgt - libs::libb2-tgt - libs::glib-tgt - libs::libinput-tgt @@ -108,6 +111,7 @@ multiPackage: - virtual::libs::libdrm-tgt - virtual::libs::libegl-tgt - virtual::libs::libgles-tgt + - graphics::wayland::wayland-tgt # depend on our self for the host tools build - name: libs::qt6-base-tools diff --git a/recipes/libs/qt6-declarative.yaml b/recipes/libs/qt6-declarative.yaml index aae29e43..90a69b18 100644 --- a/recipes/libs/qt6-declarative.yaml +++ b/recipes/libs/qt6-declarative.yaml @@ -9,7 +9,7 @@ metaEnvironment: checkoutSCM: scm: url url: ${QT6_MIRROR}/qtdeclarative-everywhere-src-${PKG_VERSION}.tar.xz - digestSHA1: 672e5532e616fea73ae7368174fe1536299b450e + digestSHA1: 5059986384515b7388d6182355e02cffbc8ce526 stripComponents: 1 checkoutDeterministic: True diff --git a/recipes/libs/qt6-declarative/0001-always-build-tools.patch b/recipes/libs/qt6-declarative/0001-always-build-tools.patch index d4b23b18..825538ec 100644 --- a/recipes/libs/qt6-declarative/0001-always-build-tools.patch +++ b/recipes/libs/qt6-declarative/0001-always-build-tools.patch @@ -1,17 +1,17 @@ ---- a/tools/CMakeLists.txt 2025-01-06 15:32:20.018504753 +0100 -+++ b/tools/CMakeLists.txt 2025-01-06 15:32:48.409717127 +0100 -@@ -34,12 +34,11 @@ - if(QT_FEATURE_qml_preview) - add_subdirectory(qmlpreview) - endif() -- if(QT_BUILD_SHARED_LIBS AND TARGET Qt::Quick) -+ if(TARGET Qt::Quick) - add_subdirectory(qmlscene) - add_subdirectory(qmltime) - endif() -- if(QT_BUILD_SHARED_LIBS -- AND QT_FEATURE_process -+ if(QT_FEATURE_process - AND QT_FEATURE_regularexpression - AND TARGET Qt::Quick) - add_subdirectory(qmlplugindump) +--- a/tools/CMakeLists.txt 2026-09-29 20:39:38.147600772 +0200 ++++ b/tools/CMakeLists.txt 2026-09-29 20:39:38.151600653 +0200 +@@ -36,12 +36,11 @@ + if(QT_FEATURE_qml_preview) + add_subdirectory(qmlpreview) + endif() +- if(QT_BUILD_SHARED_LIBS AND TARGET Qt::Quick) ++ if(TARGET Qt::Quick) + add_subdirectory(qmlscene) + add_subdirectory(qmltime) + endif() +- if(QT_BUILD_SHARED_LIBS +- AND QT_FEATURE_process ++ if(QT_FEATURE_process + AND QT_FEATURE_regularexpression + AND TARGET Qt::Quick) + add_subdirectory(qmlplugindump) diff --git a/recipes/libs/qt6-remoteobjects.yaml b/recipes/libs/qt6-remoteobjects.yaml index 5af8f89e..244488b8 100644 --- a/recipes/libs/qt6-remoteobjects.yaml +++ b/recipes/libs/qt6-remoteobjects.yaml @@ -7,7 +7,7 @@ metaEnvironment: checkoutSCM: scm: url url: ${QT6_MIRROR}/qtremoteobjects-everywhere-src-${PKG_VERSION}.tar.xz - digestSHA1: ef4c9b112b023e4b7dd968871dd53853dd7b526c + digestSHA1: cea22c06555a504084a593bde8cf24061db8ce2f stripComponents: 1 multiPackage: diff --git a/recipes/libs/qt6-shadertools.yaml b/recipes/libs/qt6-shadertools.yaml index 5ec69004..3c797810 100644 --- a/recipes/libs/qt6-shadertools.yaml +++ b/recipes/libs/qt6-shadertools.yaml @@ -7,7 +7,7 @@ metaEnvironment: checkoutSCM: scm: url url: ${QT6_MIRROR}/qtshadertools-everywhere-src-${PKG_VERSION}.tar.xz - digestSHA1: 9cae6c63fa71cd02444bacba3ea5378083e7705d + digestSHA1: da78118acad77072a7e6002b602274801bdcb247 stripComponents: 1 multiPackage: diff --git a/recipes/libs/qt6-svg.yaml b/recipes/libs/qt6-svg.yaml index d58964d9..265d6b48 100644 --- a/recipes/libs/qt6-svg.yaml +++ b/recipes/libs/qt6-svg.yaml @@ -9,7 +9,7 @@ metaEnvironment: checkoutSCM: scm: url url: ${QT6_MIRROR}/qtsvg-everywhere-src-${PKG_VERSION}.tar.xz - digestSHA1: 82c4a06321d3e2f9e221892cd0c241de99ed9d27 + digestSHA1: 756a5aafc445fef7fe75a3254ee021eee07ad0c8 stripComponents: 1 buildScript: | diff --git a/recipes/libs/qt6-wayland.yaml b/recipes/libs/qt6-wayland.yaml index 95e364e7..4cab00f6 100644 --- a/recipes/libs/qt6-wayland.yaml +++ b/recipes/libs/qt6-wayland.yaml @@ -1,3 +1,5 @@ +inherit: [qt6, wayland-scanner] + metaEnvironment: PKG_VERSION: "${QT6_VERSION}" PKG_LICENSE: >- @@ -7,48 +9,24 @@ metaEnvironment: checkoutSCM: scm: url url: ${QT6_MIRROR}/qtwayland-everywhere-src-${PKG_VERSION}.tar.xz - digestSHA1: 9186473950103916a57499784376baf88db297aa + digestSHA1: 058a12a72d9cdf13967c38f7fbab08e99d3c2425 stripComponents: 1 -multiPackage: - "": - inherit: [qt6, wayland-scanner] - depends: - - graphics::wayland::wayland-dev - - - use: [] - depends: - - graphics::wayland::wayland-tgt - - # depend on our self for the host tools build - - name: libs::qt6-wayland-tools - tools: - target-toolchain: host-native-toolchain - use: [tools] +depends: + - graphics::wayland::wayland-dev - buildTools: [qt6-wayland-tools] - buildScript: | - qt6Build $1 + - use: [] + depends: + - graphics::wayland::wayland-tgt - multiPackage: - dev: - packageScript: qt6PackageDev - provideDeps: [ "*-dev" ] +buildScript: | + qt6Build $1 - tgt: - packageScript: qt6PackageLib - provideDeps: [ "*-tgt" ] - - tools: - inherit: [qt6-tools, wayland-scanner] - depends: - - graphics::wayland::wayland-dev - - buildScript: | - # tools only version usually used for building - qt6Build $1 \ - -DFEATURE_wayland_client=OFF \ - -DFEATURE_wayland_server=OFF +multiPackage: + dev: + packageScript: qt6PackageDev + provideDeps: [ "*-dev" ] - provideTools: - qt6-wayland-tools: "usr/libexec" + tgt: + packageScript: qt6PackageLib + provideDeps: [ "*-tgt" ] diff --git a/recipes/virtualization/qemu.yaml b/recipes/virtualization/qemu.yaml index 88ebd830..c9a33145 100644 --- a/recipes/virtualization/qemu.yaml +++ b/recipes/virtualization/qemu.yaml @@ -5,7 +5,7 @@ inherit: [meson, pkg-config, install, make, patch] # work. metaEnvironment: - PKG_VERSION: "11.1.1" + PKG_VERSION: "11.1.2" PKG_LICENSE: "GPL-2.0, LGPL-2.1, MIT, BSD-3-Clause, BSD-2-Clause, Others/BSD-1c" depends: @@ -18,7 +18,7 @@ depends: checkoutSCM: scm: url url: https://download.qemu.org/qemu-${PKG_VERSION}.tar.xz - digestSHA1: cadeadb4ff18ae6a93b01a3cf000616a75c03e91 + digestSHA1: fb04bb1f7850c81a507b5b3786efed0d134718c9 stripComponents: 1 checkoutDeterministic: True