Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qt6-shadertools for openSUSE:Factory
checked in at 2025-11-25 15:48:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-shadertools (Old)
and /work/SRC/openSUSE:Factory/.qt6-shadertools.new.14147 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-shadertools"
Tue Nov 25 15:48:17 2025 rev:42 rq:1319504 version:6.10.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-shadertools/qt6-shadertools.changes
2025-10-13 17:27:05.786693714 +0200
+++
/work/SRC/openSUSE:Factory/.qt6-shadertools.new.14147/qt6-shadertools.changes
2025-11-25 15:49:31.018056782 +0100
@@ -1,0 +2,6 @@
+Thu Nov 20 15:15:02 UTC 2025 - Christophe Marin <[email protected]>
+
+- Update to 6.10.1
+ https://www.qt.io/blog/qt-6.10.1-released
+
+-------------------------------------------------------------------
Old:
----
qtshadertools-everywhere-src-6.10.0.tar.xz
New:
----
qtshadertools-everywhere-src-6.10.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-shadertools.spec ++++++
--- /var/tmp/diff_new_pack.dcNRh8/_old 2025-11-25 15:49:31.758088173 +0100
+++ /var/tmp/diff_new_pack.dcNRh8/_new 2025-11-25 15:49:31.758088173 +0100
@@ -16,7 +16,7 @@
#
-%define real_version 6.10.0
+%define real_version 6.10.1
%define short_version 6.10
%define tar_name qtshadertools-everywhere-src
%define tar_suffix %{nil}
@@ -27,7 +27,7 @@
%endif
#
Name: qt6-shadertools%{?pkg_suffix}
-Version: 6.10.0
+Version: 6.10.1
Release: 0
Summary: Qt 6 ShaderTools library
License: GPL-3.0-only
++++++ qtshadertools-everywhere-src-6.10.0.tar.xz ->
qtshadertools-everywhere-src-6.10.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtshadertools-everywhere-src-6.10.0/.cmake.conf
new/qtshadertools-everywhere-src-6.10.1/.cmake.conf
--- old/qtshadertools-everywhere-src-6.10.0/.cmake.conf 2025-10-01
20:34:39.000000000 +0200
+++ new/qtshadertools-everywhere-src-6.10.1/.cmake.conf 2025-11-13
17:35:28.000000000 +0100
@@ -1,4 +1,4 @@
-set(QT_REPO_MODULE_VERSION "6.10.0")
+set(QT_REPO_MODULE_VERSION "6.10.1")
set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1")
set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_LEAN_HEADERS=1")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtshadertools-everywhere-src-6.10.0/.tag
new/qtshadertools-everywhere-src-6.10.1/.tag
--- old/qtshadertools-everywhere-src-6.10.0/.tag 2025-10-01
20:34:39.000000000 +0200
+++ new/qtshadertools-everywhere-src-6.10.1/.tag 2025-11-13
17:35:28.000000000 +0100
@@ -1 +1 @@
-7b064b6e4fb2e57a6f78666532382bbb5e38be91
+86c4b079a05c2dbe5fdb6f46ad9df8ef297487a9
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.10.0/dependencies.yaml
new/qtshadertools-everywhere-src-6.10.1/dependencies.yaml
--- old/qtshadertools-everywhere-src-6.10.0/dependencies.yaml 2025-10-01
20:34:39.000000000 +0200
+++ new/qtshadertools-everywhere-src-6.10.1/dependencies.yaml 2025-11-13
17:35:28.000000000 +0100
@@ -1,4 +1,4 @@
dependencies:
../qtbase:
- ref: 5a8637e4516bc48a0b3f4b5ec3b18618b92e7222
+ ref: 90b845d15ffb97693dba527385db83510ebd121a
required: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.10.0/src/3rdparty/glslang/glslang/Public/ResourceLimits.h
new/qtshadertools-everywhere-src-6.10.1/src/3rdparty/glslang/glslang/Public/ResourceLimits.h
---
old/qtshadertools-everywhere-src-6.10.0/src/3rdparty/glslang/glslang/Public/ResourceLimits.h
2025-10-01 20:34:39.000000000 +0200
+++
new/qtshadertools-everywhere-src-6.10.1/src/3rdparty/glslang/glslang/Public/ResourceLimits.h
2025-11-13 17:35:28.000000000 +0100
@@ -40,6 +40,8 @@
#include "../Include/ResourceLimits.h"
#include "../Include/visibility.h"
+namespace QtShaderTools {
+
// Return pointer to user-writable Resource to pass through API in
// future-proof way.
GLSLANG_EXPORT extern TBuiltInResource* GetResources();
@@ -55,4 +57,6 @@
// Decodes the resource limits from |config| to |resources|.
GLSLANG_EXPORT void DecodeResourceLimits(TBuiltInResource* resources, char*
config);
+}
+
#endif // _STAND_ALONE_RESOURCE_LIMITS_INCLUDED_
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.10.0/src/3rdparty/glslang/glslang/Public/ShaderLang.h
new/qtshadertools-everywhere-src-6.10.1/src/3rdparty/glslang/glslang/Public/ShaderLang.h
---
old/qtshadertools-everywhere-src-6.10.0/src/3rdparty/glslang/glslang/Public/ShaderLang.h
2025-10-01 20:34:39.000000000 +0200
+++
new/qtshadertools-everywhere-src-6.10.1/src/3rdparty/glslang/glslang/Public/ShaderLang.h
2025-11-13 17:35:28.000000000 +0100
@@ -126,6 +126,10 @@
LAST_ELEMENT_MARKER(EShLanguageMaskCount),
} EShLanguageMask;
+#ifdef __cplusplus
+ }
+#endif
+
namespace QtShaderTools {
namespace glslang {
@@ -223,6 +227,10 @@
} // end namespace glslang
} // namespace QtShaderTools
+#ifdef __cplusplus
+ extern "C" {
+#endif
+
//
// Types of output the linker will create.
//
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.10.0/src/3rdparty/glslang/glslang/ResourceLimits/ResourceLimits.cpp
new/qtshadertools-everywhere-src-6.10.1/src/3rdparty/glslang/glslang/ResourceLimits/ResourceLimits.cpp
---
old/qtshadertools-everywhere-src-6.10.0/src/3rdparty/glslang/glslang/ResourceLimits/ResourceLimits.cpp
2025-10-01 20:34:39.000000000 +0200
+++
new/qtshadertools-everywhere-src-6.10.1/src/3rdparty/glslang/glslang/ResourceLimits/ResourceLimits.cpp
2025-11-13 17:35:28.000000000 +0100
@@ -39,6 +39,8 @@
#include "glslang/Public/ResourceLimits.h"
+namespace QtShaderTools {
+
TBuiltInResource Resources;
const TBuiltInResource DefaultTBuiltInResource = {
@@ -540,3 +542,6 @@
{
return &DefaultTBuiltInResource;
}
+
+} // namespace QtShaderTools
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.10.0/src/3rdparty/patches/glslang/0010-glslang-fix-missing-namespacing.patch
new/qtshadertools-everywhere-src-6.10.1/src/3rdparty/patches/glslang/0010-glslang-fix-missing-namespacing.patch
---
old/qtshadertools-everywhere-src-6.10.0/src/3rdparty/patches/glslang/0010-glslang-fix-missing-namespacing.patch
1970-01-01 01:00:00.000000000 +0100
+++
new/qtshadertools-everywhere-src-6.10.1/src/3rdparty/patches/glslang/0010-glslang-fix-missing-namespacing.patch
2025-11-13 17:35:28.000000000 +0100
@@ -0,0 +1,86 @@
+From ee947c59a2f5ee0e72816fe559a9755c1587c520 Mon Sep 17 00:00:00 2001
+From: Tim Blechmann <[email protected]>
+Date: Mon, 1 Sep 2025 13:37:01 +0800
+Subject: [PATCH] glslang: fix missing namespacing
+
+* functions declared inside an extern "C" block are not name mangled,
+ even if they are in namespaces. We close the extern "C" block before
+ opening the namespace
+* the resource limit files were not namespaced inside a QtShaderTools
+ block, resulting in their symbols being exported.
+
+---
+ src/3rdparty/glslang/glslang/Public/ResourceLimits.h | 4 ++++
+ src/3rdparty/glslang/glslang/Public/ShaderLang.h | 8 ++++++++
+ .../glslang/glslang/ResourceLimits/ResourceLimits.cpp | 5 +++++
+ 3 files changed, 17 insertions(+)
+
+diff --git a/src/3rdparty/glslang/glslang/Public/ResourceLimits.h
b/src/3rdparty/glslang/glslang/Public/ResourceLimits.h
+index 8245e12..3dba0cb 100644
+--- a/src/3rdparty/glslang/glslang/Public/ResourceLimits.h
++++ b/src/3rdparty/glslang/glslang/Public/ResourceLimits.h
+@@ -40,6 +40,8 @@
+ #include "../Include/ResourceLimits.h"
+ #include "../Include/visibility.h"
+
++namespace QtShaderTools {
++
+ // Return pointer to user-writable Resource to pass through API in
+ // future-proof way.
+ GLSLANG_EXPORT extern TBuiltInResource* GetResources();
+@@ -55,4 +57,6 @@ GLSLANG_EXPORT std::string
GetDefaultTBuiltInResourceString();
+ // Decodes the resource limits from |config| to |resources|.
+ GLSLANG_EXPORT void DecodeResourceLimits(TBuiltInResource* resources, char*
config);
+
++}
++
+ #endif // _STAND_ALONE_RESOURCE_LIMITS_INCLUDED_
+diff --git a/src/3rdparty/glslang/glslang/Public/ShaderLang.h
b/src/3rdparty/glslang/glslang/Public/ShaderLang.h
+index 03b9b66..81aa7c7 100755
+--- a/src/3rdparty/glslang/glslang/Public/ShaderLang.h
++++ b/src/3rdparty/glslang/glslang/Public/ShaderLang.h
+@@ -126,6 +126,10 @@ typedef enum : unsigned {
+ LAST_ELEMENT_MARKER(EShLanguageMaskCount),
+ } EShLanguageMask;
+
++#ifdef __cplusplus
++ }
++#endif
++
+ namespace QtShaderTools {
+ namespace glslang {
+
+@@ -223,6 +227,10 @@ GLSLANG_EXPORT const char* StageName(EShLanguage);
+ } // end namespace glslang
+ } // namespace QtShaderTools
+
++#ifdef __cplusplus
++ extern "C" {
++#endif
++
+ //
+ // Types of output the linker will create.
+ //
+diff --git a/src/3rdparty/glslang/glslang/ResourceLimits/ResourceLimits.cpp
b/src/3rdparty/glslang/glslang/ResourceLimits/ResourceLimits.cpp
+index 0e9d1b5..d9afaa9 100644
+--- a/src/3rdparty/glslang/glslang/ResourceLimits/ResourceLimits.cpp
++++ b/src/3rdparty/glslang/glslang/ResourceLimits/ResourceLimits.cpp
+@@ -39,6 +39,8 @@
+
+ #include "glslang/Public/ResourceLimits.h"
+
++namespace QtShaderTools {
++
+ TBuiltInResource Resources;
+
+ const TBuiltInResource DefaultTBuiltInResource = {
+@@ -540,3 +542,6 @@ const TBuiltInResource* GetDefaultResources()
+ {
+ return &DefaultTBuiltInResource;
+ }
++
++} // namespace QtShaderTools
++
+--
+2.51.0
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.10.0/src/SPIRV-Cross/CMakeLists.txt
new/qtshadertools-everywhere-src-6.10.1/src/SPIRV-Cross/CMakeLists.txt
--- old/qtshadertools-everywhere-src-6.10.0/src/SPIRV-Cross/CMakeLists.txt
2025-10-01 20:34:39.000000000 +0200
+++ new/qtshadertools-everywhere-src-6.10.1/src/SPIRV-Cross/CMakeLists.txt
2025-11-13 17:35:28.000000000 +0100
@@ -9,6 +9,7 @@
qt_internal_add_3rdparty_library(BundledSpirv_Cross
QMAKE_LIB_NAME spirv_cross
+ SKIP_AUTOMOC
STATIC
EXCEPTIONS
SOURCES
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.10.0/src/glslang/CMakeLists.txt
new/qtshadertools-everywhere-src-6.10.1/src/glslang/CMakeLists.txt
--- old/qtshadertools-everywhere-src-6.10.0/src/glslang/CMakeLists.txt
2025-10-01 20:34:39.000000000 +0200
+++ new/qtshadertools-everywhere-src-6.10.1/src/glslang/CMakeLists.txt
2025-11-13 17:35:28.000000000 +0100
@@ -10,6 +10,7 @@
qt_internal_add_3rdparty_library(BundledGlslang_Spirv
QMAKE_LIB_NAME glslang_spirv
STATIC
+ SKIP_AUTOMOC
SOURCES
../3rdparty/glslang/SPIRV/GlslangToSpv.cpp
../3rdparty/glslang/SPIRV/InReadableOrder.cpp
@@ -58,6 +59,7 @@
qt_internal_add_3rdparty_library(BundledGlslang_Osdependent
QMAKE_LIB_NAME glslang_osdependent
STATIC
+ SKIP_AUTOMOC
SOURCES
${GLSLANG_OSDEP_PATH}/ossource.cpp # special case
INCLUDE_DIRECTORIES
@@ -102,6 +104,7 @@
qt_internal_add_3rdparty_library(BundledGlslang_Glslang
QMAKE_LIB_NAME glslang_glslang
STATIC
+ SKIP_AUTOMOC
SOURCES
../3rdparty/glslang/glslang/GenericCodeGen/CodeGen.cpp
../3rdparty/glslang/glslang/GenericCodeGen/Link.cpp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.10.0/src/shadertools/doc/src/qtshadertools-build.qdoc
new/qtshadertools-everywhere-src-6.10.1/src/shadertools/doc/src/qtshadertools-build.qdoc
---
old/qtshadertools-everywhere-src-6.10.0/src/shadertools/doc/src/qtshadertools-build.qdoc
2025-10-01 20:34:39.000000000 +0200
+++
new/qtshadertools-everywhere-src-6.10.1/src/shadertools/doc/src/qtshadertools-build.qdoc
2025-11-13 17:35:28.000000000 +0100
@@ -101,6 +101,13 @@
the resulting application will now require OpenGL ES 3.0 or higher and will
not be compatible with OpenGL ES 2.0 based systems.
+ On WebAssembly \c qt6_add_shaders invokes \l{QSB Manual}{qsb} as follows:
+ \badcode
+ qsb --glsl "100 es, 300 es" <output>.qsb <input>
+ \endcode
+
+ This generates shaders compatible with WebGL 1 and WebGL 2.
+
\section2 Shader type
The type of shader is deduced from the file extension. Thus, the extension
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.10.0/src/shadertools/qspirvcompiler.cpp
new/qtshadertools-everywhere-src-6.10.1/src/shadertools/qspirvcompiler.cpp
--- old/qtshadertools-everywhere-src-6.10.0/src/shadertools/qspirvcompiler.cpp
2025-10-01 20:34:39.000000000 +0200
+++ new/qtshadertools-everywhere-src-6.10.1/src/shadertools/qspirvcompiler.cpp
2025-11-13 17:35:28.000000000 +0100
@@ -145,7 +145,7 @@
messages |= EShMsgDebugInfo;
Includer includer;
- if (!shader.parse(GetDefaultResources(), 100, false,
EShMessages(messages), includer)) {
+ if (!shader.parse(QtShaderTools::GetDefaultResources(), 100, false,
EShMessages(messages), includer)) {
qWarning("QSpirvCompiler: Failed to parse shader");
log = QString::fromUtf8(shader.getInfoLog()).trimmed();
return false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.10.0/tests/auto/qshaderbaker/tst_qshaderbaker.cpp
new/qtshadertools-everywhere-src-6.10.1/tests/auto/qshaderbaker/tst_qshaderbaker.cpp
---
old/qtshadertools-everywhere-src-6.10.0/tests/auto/qshaderbaker/tst_qshaderbaker.cpp
2025-10-01 20:34:39.000000000 +0200
+++
new/qtshadertools-everywhere-src-6.10.1/tests/auto/qshaderbaker/tst_qshaderbaker.cpp
2025-11-13 17:35:28.000000000 +0100
@@ -678,8 +678,9 @@
QCOMPARE(nativeBindingPair.second, 1); // sampler
baker.setSourceFileName(QLatin1String(":/data/manyresources.frag"));
- targets = { { QShader::SpirvShader, QShaderVersion(100) },
- { QShader::MslShader, QShaderVersion(12) } };
+ targets.clear();
+ targets.append({ QShader::SpirvShader, QShaderVersion(100) });
+ targets.append({ QShader::MslShader, QShaderVersion(12) });
baker.setGeneratedShaders(targets);
s = baker.bake();
QVERIFY(s.isValid());
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.10.0/tools/qsb/Qt6ShaderToolsMacros.cmake
new/qtshadertools-everywhere-src-6.10.1/tools/qsb/Qt6ShaderToolsMacros.cmake
---
old/qtshadertools-everywhere-src-6.10.0/tools/qsb/Qt6ShaderToolsMacros.cmake
2025-10-01 20:34:39.000000000 +0200
+++
new/qtshadertools-everywhere-src-6.10.1/tools/qsb/Qt6ShaderToolsMacros.cmake
2025-11-13 17:35:28.000000000 +0100
@@ -128,6 +128,8 @@
if (glsl_versions MATCHES "4[0-9]0|3[12]0")
set(multiview_glsl ${arg_GLSL})
endif()
+ elseif(WASM)
+ set(glsl_versions "100es,300es")
else()
set(glsl_versions "100es,120,150") # both 'es' and ' es' are
accepted by qsb
endif()
@@ -135,7 +137,7 @@
list(APPEND qsb_args "${glsl_versions}")
endif()
- if (NOT arg_NOHLSL)
+ if (NOT arg_NOHLSL AND NOT WASM)
if (arg_HLSL)
set(shader_model_versions "${arg_HLSL}")
else()
@@ -145,7 +147,7 @@
list(APPEND qsb_args "${shader_model_versions}")
endif()
- if (NOT arg_NOMSL)
+ if (NOT arg_NOMSL AND NOT WASM)
if (arg_MSL)
set(metal_lang_versions "${arg_MSL}")
else()
