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-06-05 20:32:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-shadertools (Old) and /work/SRC/openSUSE:Factory/.qt6-shadertools.new.19631 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-shadertools" Thu Jun 5 20:32:32 2025 rev:39 rq:1282580 version:6.9.1 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-shadertools/qt6-shadertools.changes 2025-04-07 17:35:41.178487514 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-shadertools.new.19631/qt6-shadertools.changes 2025-06-05 20:33:05.098164278 +0200 @@ -1,0 +2,6 @@ +Tue Jun 3 07:49:32 UTC 2025 - Christophe Marin <christo...@krop.fr> + +- Update to 6.9.1: + * https://www.qt.io/blog/qt-6.9.1-released + +------------------------------------------------------------------- Old: ---- qtshadertools-everywhere-src-6.9.0.tar.xz New: ---- qtshadertools-everywhere-src-6.9.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-shadertools.spec ++++++ --- /var/tmp/diff_new_pack.8jrMjT/_old 2025-06-05 20:33:05.694189060 +0200 +++ /var/tmp/diff_new_pack.8jrMjT/_new 2025-06-05 20:33:05.694189060 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.9.0 +%define real_version 6.9.1 %define short_version 6.9 %define tar_name qtshadertools-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-shadertools%{?pkg_suffix} -Version: 6.9.0 +Version: 6.9.1 Release: 0 Summary: Qt 6 ShaderTools library License: GPL-3.0-only ++++++ qtshadertools-everywhere-src-6.9.0.tar.xz -> qtshadertools-everywhere-src-6.9.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtshadertools-everywhere-src-6.9.0/.cmake.conf new/qtshadertools-everywhere-src-6.9.1/.cmake.conf --- old/qtshadertools-everywhere-src-6.9.0/.cmake.conf 2025-03-28 16:40:03.000000000 +0100 +++ new/qtshadertools-everywhere-src-6.9.1/.cmake.conf 2025-05-28 21:49:03.000000000 +0200 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.9.0") +set(QT_REPO_MODULE_VERSION "6.9.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.9.0/.gitreview new/qtshadertools-everywhere-src-6.9.1/.gitreview --- old/qtshadertools-everywhere-src-6.9.0/.gitreview 1970-01-01 01:00:00.000000000 +0100 +++ new/qtshadertools-everywhere-src-6.9.1/.gitreview 2025-05-28 21:49:03.000000000 +0200 @@ -0,0 +1,4 @@ +[gerrit] +host=codereview.qt-project.org +project=qt/qtshadertools +defaultbranch=dev diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtshadertools-everywhere-src-6.9.0/.tag new/qtshadertools-everywhere-src-6.9.1/.tag --- old/qtshadertools-everywhere-src-6.9.0/.tag 2025-03-28 16:40:03.000000000 +0100 +++ new/qtshadertools-everywhere-src-6.9.1/.tag 2025-05-28 21:49:03.000000000 +0200 @@ -1 +1 @@ -d6b8c38ef5b4ad382bc8bfaf8a9b81e748daba9e +661130571df1a19bd10dd7705fe689cfde835dad diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtshadertools-everywhere-src-6.9.0/REUSE.toml new/qtshadertools-everywhere-src-6.9.1/REUSE.toml --- old/qtshadertools-everywhere-src-6.9.0/REUSE.toml 2025-03-28 16:40:03.000000000 +0100 +++ new/qtshadertools-everywhere-src-6.9.1/REUSE.toml 2025-05-28 21:49:03.000000000 +0200 @@ -15,18 +15,19 @@ SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0" [[annotations]] -path = ["**.in", "**.pro", "**CMakeLists.txt", ".cmake.conf", "**.yaml", "**.json"] +path = ["**.in", "**.pro", "**CMakeLists.txt", ".cmake.conf", "**.yaml", + "**ci_config_linux.json", ".tag"] precedence = "closest" comment = "build system" SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." SPDX-License-Identifier = "BSD-3-Clause" [[annotations]] -path = [".tag", "**/.gitattributes", "**.gitignore"] +path = ["**/.gitattributes", "**.gitignore", "**/.gitreview"] precedence = "closest" -comment = "not sure at all" +comment = "infrastructure" SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." -SPDX-License-Identifier = "BSD-3-Clause" +SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause" [[annotations]] path = ["**/doc/snippets/**"] @@ -46,7 +47,7 @@ path = ["**.toml", "licenseRule.json"] precedence = "override" SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." -SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only" +SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause" [[annotations]] path = ["**/qt_attribution.json"] @@ -54,10 +55,3 @@ SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only" -[[annotations]] -path = ["**LICENSE*"] -precedence = "override" -comment = "License file." -SPDX-FileCopyrightText = "None" -SPDX-License-Identifier = "CC0-1.0" - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtshadertools-everywhere-src-6.9.0/dependencies.yaml new/qtshadertools-everywhere-src-6.9.1/dependencies.yaml --- old/qtshadertools-everywhere-src-6.9.0/dependencies.yaml 2025-03-28 16:40:03.000000000 +0100 +++ new/qtshadertools-everywhere-src-6.9.1/dependencies.yaml 2025-05-28 21:49:03.000000000 +0200 @@ -1,4 +1,4 @@ dependencies: ../qtbase: - ref: 25986746947798e1a22d0830d3bcb11a55fcd3ae + ref: 2ad23cd72d5f122f88ce95792a4323d639c27d25 required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtshadertools-everywhere-src-6.9.0/licenseRule.json new/qtshadertools-everywhere-src-6.9.1/licenseRule.json --- old/qtshadertools-everywhere-src-6.9.0/licenseRule.json 2025-03-28 16:40:03.000000000 +0100 +++ new/qtshadertools-everywhere-src-6.9.1/licenseRule.json 2025-05-28 21:49:03.000000000 +0200 @@ -1,6 +1,6 @@ [ { - "comment" : ["file_pattern_ending: strings matched against the end of a file name.", + "comment": ["file_pattern_ending: strings matched against the end of a file name.", "location keys: regular expression matched against the beginning of", "the file path (relative to the git submodule root).", "spdx: list of SPDX-License-Expression's allowed in the matching files.", @@ -9,98 +9,109 @@ "unless they are examples", "Files with other endings can also be build system files" ], - "file_pattern_ending" : ["CMakeLists.txt", ".cmake", ".pro", ".pri", ".prf", + "file_pattern_ending": ["CMakeLists.txt", ".cmake", ".pro", ".pri", ".prf", "configure", "configure.bat", "cmake.in", "plist.in", "CMakeLists.txt.in", - ".gitignore", ".gitattributes", "Makefile", ".gitreview", - ".conf", ".yml", ".cfg", ".yaml", ".tag", ".dynlist", ".qsb.d.in"], - "location" : { - "" : { - "comment" : "Default", - "file type" : "build system", - "spdx" : ["BSD-3-Clause"] - }, - "(.*)(examples/|snippets/)" : { - "comment" : "Example takes precedence", - "file type" : "examples and snippets", - "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + "Makefile", ".conf", ".yml", ".cfg", ".yaml", ".tag", ".dynlist", + ".qsb.d.in"], + "location": { + "": { + "comment": "Default", + "file type": "build system", + "spdx": ["BSD-3-Clause"] + }, + "(.*)(examples/|snippets/)": { + "comment": "Example takes precedence", + "file type": "examples and snippets", + "spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] } } }, { - "comments" : ["Files with the following endings are Tool licensed,", + "comments": ["Files with the following endings are infrastructure licensed"], + "file_pattern_ending": [".gitattributes", ".gitignore", ".gitmodules", ".gitreview", + "clang-format", "licenseRule.json", "REUSE.toml"], + "location":{ + "": { + "comment": "Default", + "file type": "infrastructure", + "spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + } + } + }, + { + "comments": ["Files with the following endings are Tool licensed,", "unless they are examples.", "Files with other endings can also be tool files."], - "file_pattern_ending" : [".sh", ".py", ".pl", ".bat", ".ps1"], - "location" :{ - "" : { - "comment" : "Default", - "file type" : "tools and utils", - "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] - }, - "(.*)(examples/|snippets/)" : { - "comment" : "Example takes precedence", - "file type" : "examples and snippets", - "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + "file_pattern_ending": [".sh", ".py", ".pl", ".bat", ".ps1"], + "location":{ + "": { + "comment": "Default", + "file type": "tools and utils", + "spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] + }, + "(.*)(examples/|snippets/)": { + "comment": "Example takes precedence", + "file type": "examples and snippets", + "spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] } } }, { - "comment" : "Files with the following endings are Documentation licensed.", - "file_pattern_ending" : [".qdoc", ".qdocinc" , ".qdocconf", ".txt", "README", "qt_attribution.json", - "REUSE.toml", "licenseRule.json"], - "location" :{ - "" : { - "comment" : "", - "file type" : "documentation", - "spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] + "comment": "Files with the following endings are Documentation licensed.", + "file_pattern_ending": [".qdoc", ".qdocinc" , ".qdocconf", ".txt", "README", "qt_attribution.json"], + "location":{ + "": { + "comment": "", + "file type": "documentation", + "spdx": ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] } } }, { - "comment" : ["All other files", + "comment": ["All other files", "The licensing is defined only by the file location in the Qt module repository.", "NO <file_pattern_ending> key for this case!", "This needs to be the last entry of the file."], - "location" : { - "" : { - "comment" : "Default", - "file type" : "module and plugin", - "spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] - }, - "dist/" : { - "comment" : "Default", - "file type" : "documentation", - "spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] - }, - "coin/" : { - "comment" : "Default", - "file type" : "build system", - "spdx" : ["BSD-3-Clause"] - }, - "src/shadertools/doc/images/" : { - "comment" : "Default", - "file type" : "documentation", - "spdx" : ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] - }, - "src/" : { - "comment" : "Default", - "file type" : "module and plugin", - "spdx" : ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] - }, - "tools/" : { - "comment" : "Default", - "file type" : "tools and utils", - "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] - }, - "tests/" : { - "comment" : "Default", - "file type" : "test", - "spdx" : ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] - }, - "(.*)(examples/|snippets/)" : { - "comment" : "Default", - "file type" : "examples and snippets", - "spdx" : ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] + "location": { + "": { + "comment": "Default", + "file type": "module and plugin", + "spdx": ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] + }, + "dist/": { + "comment": "Default", + "file type": "documentation", + "spdx": ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] + }, + "coin/": { + "comment": "Default", + "file type": "build system", + "spdx": ["BSD-3-Clause"] + }, + "src/shadertools/doc/images/": { + "comment": "Default", + "file type": "documentation", + "spdx": ["LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only"] + }, + "src/": { + "comment": "Default", + "file type": "module and plugin", + "spdx": ["LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only"] + }, + "tools/": { + "comment": "Default", + "file type": "tools and utils", + "spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0"] + }, + "tests/": { + "comment": "Default", + "file type": "test", + "spdx": ["LicenseRef-Qt-Commercial OR GPL-3.0-only"] + }, + "(.*)(examples/|snippets/)": { + "comment": "Default", + "file type": "examples and snippets", + "spdx": ["LicenseRef-Qt-Commercial OR BSD-3-Clause"] } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtshadertools-everywhere-src-6.9.0/src/shadertools/doc/src/qtshadertools-qsb.qdoc new/qtshadertools-everywhere-src-6.9.1/src/shadertools/doc/src/qtshadertools-qsb.qdoc --- old/qtshadertools-everywhere-src-6.9.0/src/shadertools/doc/src/qtshadertools-qsb.qdoc 2025-03-28 16:40:03.000000000 +0100 +++ new/qtshadertools-everywhere-src-6.9.1/src/shadertools/doc/src/qtshadertools-qsb.qdoc 2025-05-28 21:49:03.000000000 +0200 @@ -15,7 +15,7 @@ \badcode Usage: qsb [options] file -Qt Shader Baker (using QShader from Qt 6.9.0) +Qt Shader Baker (using QShader from Qt 6.10.0) Options: -?, -h, --help Displays help on commandline options. @@ -113,14 +113,15 @@ Arguments: file Vulkan GLSL source file to compile. The file extension determines the shader stage, and can be - one of .vert, .tesc, .tese, .frag, .comp. Note: - Tessellation control/evaluation is not supported - with HLSL, instead use -r to inject handcrafted - hull/domain shaders. Some targets may need - special arguments to be set, e.g. MSL + one of .vert, .tesc, .tese, .geom, .frag, .comp. + Note: Tessellation control/evaluation is not + supported with HLSL, instead use -r to inject + handcrafted hull/domain shaders. Some targets may + need special arguments to be set, e.g. MSL tessellation will likely need --msltess, --tess-vertex-count, --tess-mode, depending on - the stage. + the stage. Geometry shaders are not supported + with HLSL and MSL. \endcode \section1 Modes of Operation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtshadertools-everywhere-src-6.9.0/src/shadertools/qshaderbaker.cpp new/qtshadertools-everywhere-src-6.9.1/src/shadertools/qshaderbaker.cpp --- old/qtshadertools-everywhere-src-6.9.0/src/shadertools/qshaderbaker.cpp 2025-03-28 16:40:03.000000000 +0100 +++ new/qtshadertools-everywhere-src-6.9.1/src/shadertools/qshaderbaker.cpp 2025-05-28 21:49:03.000000000 +0200 @@ -186,6 +186,11 @@ \li \c{.geom} - geometry shader \li \c{.comp} - compute shader \endlist + + \warning \a fileName is expected to contain trusted content. Application + developers are advised to carefully consider the potential implications + before passing in user-provided source files that are not part of the + application. */ void QShaderBaker::setSourceFileName(const QString &fileName) { @@ -215,6 +220,11 @@ Sets the name of the shader source file to \a fileName. This is the file that will be read when calling bake(). The shader stage is specified by \a stage. + + \warning \a fileName is expected to contain trusted content. Application + developers are advised to carefully consider the potential implications + before passing in user-provided source files that are not part of the + application. */ void QShaderBaker::setSourceFileName(const QString &fileName, QShader::Stage stage) { @@ -226,6 +236,11 @@ Sets the source \a device. This allows using any QIODevice instead of just files. \a stage specifies the shader stage, while the optional \a fileName contains a filename that is used in the error messages. + + \warning \a device is expected to contain trusted content. Application + developers are advised to carefully consider the potential implications + before passing in user-provided data from sources that are not under the + application's control. */ void QShaderBaker::setSourceDevice(QIODevice *device, QShader::Stage stage, const QString &fileName) { @@ -236,6 +251,11 @@ Sets the input shader \a sourceString. \a stage specified the shader stage, while the optional \a fileName contains a filename that is used in the error messages. + + \warning \a sourceString is expected to contain trusted content. Application + developers are advised to carefully consider the potential implications + before passing in user-provided data from sources that are not under the + application's control. */ void QShaderBaker::setSourceString(const QByteArray &sourceString, QShader::Stage stage, const QString &fileName) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtshadertools-everywhere-src-6.9.0/tools/qsb/qsb.cpp new/qtshadertools-everywhere-src-6.9.1/tools/qsb/qsb.cpp --- old/qtshadertools-everywhere-src-6.9.0/tools/qsb/qsb.cpp 2025-03-28 16:40:03.000000000 +0100 +++ new/qtshadertools-everywhere-src-6.9.1/tools/qsb/qsb.cpp 2025-05-28 21:49:03.000000000 +0200 @@ -560,9 +560,10 @@ cmdLineParser.addVersionOption(); cmdLineParser.addPositionalArgument(QLatin1String("file"), QObject::tr("Vulkan GLSL source file to compile. The file extension determines the shader stage, and can be one of " - ".vert, .tesc, .tese, .frag, .comp. " + ".vert, .tesc, .tese, .geom, .frag, .comp. " "Note: Tessellation control/evaluation is not supported with HLSL, instead use -r to inject handcrafted hull/domain shaders. " - "Some targets may need special arguments to be set, e.g. MSL tessellation will likely need --msltess, --tess-vertex-count, --tess-mode, depending on the stage." + "Some targets may need special arguments to be set, e.g. MSL tessellation will likely need --msltess, --tess-vertex-count, --tess-mode, depending on the stage. " + "Geometry shaders are not supported with HLSL and MSL." ), QObject::tr("file")); QCommandLineOption batchableOption({ "b", "batchable" }, QObject::tr("Also generates rewritten vertex shader for Qt Quick scene graph batching."));