Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-quick3d for openSUSE:Factory checked in at 2026-02-03 21:27:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-quick3d (Old) and /work/SRC/openSUSE:Factory/.qt6-quick3d.new.1995 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-quick3d" Tue Feb 3 21:27:16 2026 rev:36 rq:1330593 version:6.10.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-quick3d/qt6-quick3d.changes 2025-11-25 15:49:06.641022764 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-quick3d.new.1995/qt6-quick3d.changes 2026-02-03 21:27:51.615467036 +0100 @@ -1,0 +2,8 @@ +Sat Jan 31 08:10:39 UTC 2026 - Christophe Marin <[email protected]> + +- Update to 6.10.2: + * https://www.qt.io/blog/qt-6.10.2-released +- Add upstream change: + * 0001-XR-fix-build-error-for-using-EGL-without-GL-ES.patch + +------------------------------------------------------------------- Old: ---- qtquick3d-everywhere-src-6.10.1.tar.xz New: ---- 0001-XR-fix-build-error-for-using-EGL-without-GL-ES.patch qtquick3d-everywhere-src-6.10.2.tar.xz ----------(New B)---------- New:- Add upstream change: * 0001-XR-fix-build-error-for-using-EGL-without-GL-ES.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-quick3d.spec ++++++ --- /var/tmp/diff_new_pack.HqhzRP/_old 2026-02-03 21:27:53.583549637 +0100 +++ /var/tmp/diff_new_pack.HqhzRP/_new 2026-02-03 21:27:53.583549637 +0100 @@ -16,7 +16,7 @@ # -%define real_version 6.10.1 +%define real_version 6.10.2 %define short_version 6.10 %define tar_name qtquick3d-everywhere-src %define tar_suffix %{nil} @@ -30,13 +30,15 @@ %global __requires_exclude qt6qmlimport\\((LightmapFile|Quick3DAssets|VirtualAssistant\\.Constants|robotassistant|.*Example|xr_shared).* # Name: qt6-quick3d%{?pkg_suffix} -Version: 6.10.1 +Version: 6.10.2 Release: 0 Summary: API for creating 3D content and 3D user interfaces based on Qt Quick License: GPL-3.0-only URL: https://www.qt.io Source0: https://download.qt.io/official_releases/qt/%{short_version}/%{real_version}%{tar_suffix}/submodules/%{tar_name}-%{real_version}%{tar_suffix}.tar.xz Source99: qt6-quick3d-rpmlintrc +# PATCH-FIX-UPSTREAM +Patch0: 0001-XR-fix-build-error-for-using-EGL-without-GL-ES.patch BuildRequires: fdupes BuildRequires: pkgconfig BuildRequires: cmake(Qt6Concurrent) = %{real_version} ++++++ 0001-XR-fix-build-error-for-using-EGL-without-GL-ES.patch ++++++ >From 9a31fd29f47d1cb2868a778885bfd26adeec770f Mon Sep 17 00:00:00 2001 From: Inho Lee <[email protected]> Date: Mon, 19 Jan 2026 11:35:25 +0100 Subject: [PATCH] XR: fix build error for using EGL without GL(ES) Amends a9184325f9c07996639ab2f0ac19e4b449c34ba5 XR_USE_PLATFORM_EGL will only be used for linux opengl/opengles. For the 3rd party dependncy, EGL related types should be defined before including openxr_platform.h for XR_USE_PLATFORM_EGL Done-by: Peng Zhang Fixes: QTBUG-143480 Pick-to: 6.8 Change-Id: Iff8238965849604817f282ae7a3b2efaf5444fdd Reviewed-by: Paul Olav Tvete <[email protected]> Reviewed-by: Stanislav Aleksandrov <[email protected]> (cherry picked from commit e2facad90c1bd65d3f6e0008c4e497a9397fe93a) Reviewed-by: Qt Cherry-pick Bot <[email protected]> (cherry picked from commit ad1ffd558abfe629a5a39b6ffea3ff6e5802de50) --- src/xr/quick3dxr/openxr/CMakeLists.txt | 2 +- src/xr/quick3dxr/openxr/qopenxrgraphics_opengl.cpp | 4 ---- src/xr/quick3dxr/openxr/qopenxrplatform_p.h | 12 +++++------- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/xr/quick3dxr/openxr/CMakeLists.txt b/src/xr/quick3dxr/openxr/CMakeLists.txt index 56cca56ee..fc23587e8 100644 --- a/src/xr/quick3dxr/openxr/CMakeLists.txt +++ b/src/xr/quick3dxr/openxr/CMakeLists.txt @@ -41,7 +41,7 @@ qt_internal_extend_target(Quick3DXr CONDITION LINUX AND QT_FEATURE_wayland ) # Linux / egl -qt_internal_extend_target(Quick3DXr CONDITION LINUX AND QT_FEATURE_egl +qt_internal_extend_target(Quick3DXr CONDITION LINUX AND QT_FEATURE_egl AND (QT_FEATURE_opengles2 OR QT_FEATURE_opengl) DEFINES XR_USE_PLATFORM_EGL LIBRARIES diff --git a/src/xr/quick3dxr/openxr/qopenxrgraphics_opengl.cpp b/src/xr/quick3dxr/openxr/qopenxrgraphics_opengl.cpp index 706685c28..669da3429 100644 --- a/src/xr/quick3dxr/openxr/qopenxrgraphics_opengl.cpp +++ b/src/xr/quick3dxr/openxr/qopenxrgraphics_opengl.cpp @@ -10,10 +10,6 @@ #include <rhi/qrhi.h> -#ifdef XR_USE_PLATFORM_EGL -#include <EGL/egl.h> -#endif - #if defined(XR_USE_PLATFORM_XLIB) || defined(XR_USE_PLATFORM_XCB) #include <GL/glx.h> #endif diff --git a/src/xr/quick3dxr/openxr/qopenxrplatform_p.h b/src/xr/quick3dxr/openxr/qopenxrplatform_p.h index 4e910e619..9bfab3229 100644 --- a/src/xr/quick3dxr/openxr/qopenxrplatform_p.h +++ b/src/xr/quick3dxr/openxr/qopenxrplatform_p.h @@ -29,16 +29,10 @@ # include <d3d12.h> #endif -#ifdef XR_USE_GRAPHICS_API_OPENGL +#if defined(XR_USE_GRAPHICS_API_OPENGL) || defined(XR_USE_GRAPHICS_API_OPENGL_ES) # include <QtGui/QOpenGLContext> #endif - -#ifdef XR_USE_GRAPHICS_API_OPENGL_ES -# include <QtGui/QOpenGLContext> -# include <EGL/egl.h> -#endif - #ifdef XR_USE_PLATFORM_ANDROID # include <QtCore/qnativeinterface.h> # include <QtCore/QJniEnvironment> @@ -49,6 +43,10 @@ # include <xcb/glx.h> #endif +#if defined(XR_USE_PLATFORM_EGL) || defined(XR_USE_GRAPHICS_API_OPENGL_ES) +# include <EGL/egl.h> +#endif + #ifdef XR_USE_PLATFORM_XLIB typedef struct __GLXFBConfigRec *GLXFBConfig; typedef unsigned long GLXDrawable; -- 2.52.0 ++++++ qtquick3d-everywhere-src-6.10.1.tar.xz -> qtquick3d-everywhere-src-6.10.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/qt6-quick3d/qtquick3d-everywhere-src-6.10.1.tar.xz /work/SRC/openSUSE:Factory/.qt6-quick3d.new.1995/qtquick3d-everywhere-src-6.10.2.tar.xz differ: char 27, line 1
