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-10-13 17:23:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qt6-shadertools (Old)
and /work/SRC/openSUSE:Factory/.qt6-shadertools.new.18484 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-shadertools"
Mon Oct 13 17:23:50 2025 rev:41 rq:1310366 version:6.10.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qt6-shadertools/qt6-shadertools.changes
2025-08-29 18:35:54.311856612 +0200
+++
/work/SRC/openSUSE:Factory/.qt6-shadertools.new.18484/qt6-shadertools.changes
2025-10-13 17:27:05.786693714 +0200
@@ -1,0 +2,6 @@
+Tue Oct 7 08:53:29 UTC 2025 - Christophe Marin <[email protected]>
+
+- Update to 6.10.0
+ * https://www.qt.io/blog/qt-6.10-released
+
+-------------------------------------------------------------------
Old:
----
qtshadertools-everywhere-src-6.9.2.tar.xz
New:
----
qtshadertools-everywhere-src-6.10.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt6-shadertools.spec ++++++
--- /var/tmp/diff_new_pack.JK4uZ1/_old 2025-10-13 17:27:06.714732521 +0200
+++ /var/tmp/diff_new_pack.JK4uZ1/_new 2025-10-13 17:27:06.718732688 +0200
@@ -16,8 +16,8 @@
#
-%define real_version 6.9.2
-%define short_version 6.9
+%define real_version 6.10.0
+%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.9.2
+Version: 6.10.0
Release: 0
Summary: Qt 6 ShaderTools library
License: GPL-3.0-only
@@ -110,7 +110,7 @@
%{_qt6_includedir}/QtShaderTools/
%{_qt6_libdir}/libQt6ShaderTools.prl
%{_qt6_libdir}/libQt6ShaderTools.so
-%{_qt6_metatypesdir}/qt6shadertools_*_metatypes.json
+%{_qt6_metatypesdir}/qt6shadertools_metatypes.json
%{_qt6_mkspecsdir}/modules/qt_lib_shadertools.pri
%{_qt6_pkgconfigdir}/Qt6ShaderTools.pc
%exclude %{_qt6_includedir}/QtShaderTools/%{real_version}/
++++++ qtshadertools-everywhere-src-6.9.2.tar.xz ->
qtshadertools-everywhere-src-6.10.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtshadertools-everywhere-src-6.9.2/.cmake.conf
new/qtshadertools-everywhere-src-6.10.0/.cmake.conf
--- old/qtshadertools-everywhere-src-6.9.2/.cmake.conf 2025-08-17
21:32:16.000000000 +0200
+++ new/qtshadertools-everywhere-src-6.10.0/.cmake.conf 2025-10-01
20:34:39.000000000 +0200
@@ -1,4 +1,4 @@
-set(QT_REPO_MODULE_VERSION "6.9.2")
+set(QT_REPO_MODULE_VERSION "6.10.0")
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.2/.tag
new/qtshadertools-everywhere-src-6.10.0/.tag
--- old/qtshadertools-everywhere-src-6.9.2/.tag 2025-08-17 21:32:16.000000000
+0200
+++ new/qtshadertools-everywhere-src-6.10.0/.tag 2025-10-01
20:34:39.000000000 +0200
@@ -1 +1 @@
-e8d800aa5ac2234f493d038591a69b99f2a55ebc
+7b064b6e4fb2e57a6f78666532382bbb5e38be91
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtshadertools-everywhere-src-6.9.2/CMakeLists.txt
new/qtshadertools-everywhere-src-6.10.0/CMakeLists.txt
--- old/qtshadertools-everywhere-src-6.9.2/CMakeLists.txt 2025-08-17
21:32:16.000000000 +0200
+++ new/qtshadertools-everywhere-src-6.10.0/CMakeLists.txt 2025-10-01
20:34:39.000000000 +0200
@@ -12,11 +12,13 @@
HOMEPAGE_URL "https://qt.io/";
LANGUAGES CXX C
)
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals)
# special case
-find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS BuildInternals
Core)
-find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui)
qt_internal_project_setup()
+find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED Core)
+find_package(Qt6 ${PROJECT_VERSION} QUIET CONFIG OPTIONAL_COMPONENTS Gui)
+
if(INTEGRITY)
add_compile_definitions(__inline=inline)
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qtshadertools-everywhere-src-6.9.2/dependencies.yaml
new/qtshadertools-everywhere-src-6.10.0/dependencies.yaml
--- old/qtshadertools-everywhere-src-6.9.2/dependencies.yaml 2025-08-17
21:32:16.000000000 +0200
+++ new/qtshadertools-everywhere-src-6.10.0/dependencies.yaml 2025-10-01
20:34:39.000000000 +0200
@@ -1,4 +1,4 @@
dependencies:
../qtbase:
- ref: 6f0d27d2e4ba5fa6562f738aaaf8eaf98ebf51e7
+ ref: 5a8637e4516bc48a0b3f4b5ec3b18618b92e7222
required: true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.9.2/src/shadertools/doc/src/qtshadertools-index.qdoc
new/qtshadertools-everywhere-src-6.10.0/src/shadertools/doc/src/qtshadertools-index.qdoc
---
old/qtshadertools-everywhere-src-6.9.2/src/shadertools/doc/src/qtshadertools-index.qdoc
2025-08-17 21:32:16.000000000 +0200
+++
new/qtshadertools-everywhere-src-6.10.0/src/shadertools/doc/src/qtshadertools-index.qdoc
2025-10-01 20:34:39.000000000 +0200
@@ -56,5 +56,5 @@
Furthermore, Qt Shader Tools in \QtVersion may contain third party
modules under following permissive licenses:
-\generatelist{groupsbymodule attributions-qtshadertools}
+\annotatedlist attributions-qtshadertools
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.9.2/src/shadertools/qspirvshader.cpp
new/qtshadertools-everywhere-src-6.10.0/src/shadertools/qspirvshader.cpp
--- old/qtshadertools-everywhere-src-6.9.2/src/shadertools/qspirvshader.cpp
2025-08-17 21:32:16.000000000 +0200
+++ new/qtshadertools-everywhere-src-6.10.0/src/shadertools/qspirvshader.cpp
2025-10-01 20:34:39.000000000 +0200
@@ -830,7 +830,9 @@
regBinding += 1;
}
- regBinding = 0; // UAVs
+ // UAV registers live in the same name space as outputs, so they must be
bound
+ // to at least outputVariables.size().
+ regBinding = d->shaderDescription.outputVariables().size();
for (const QShaderDescription::StorageBlock &blk :
d->shaderDescription.storageBlocks()) {
// readonly is also mapped to UAV due to FORCE_STORAGE_BUFFER_AS_UAV.
(would be an SRV by default)
spvc_hlsl_resource_binding bindingMapping;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qtshadertools-everywhere-src-6.9.2/tools/qsb/Qt6ShaderToolsMacros.cmake
new/qtshadertools-everywhere-src-6.10.0/tools/qsb/Qt6ShaderToolsMacros.cmake
--- old/qtshadertools-everywhere-src-6.9.2/tools/qsb/Qt6ShaderToolsMacros.cmake
2025-08-17 21:32:16.000000000 +0200
+++
new/qtshadertools-everywhere-src-6.10.0/tools/qsb/Qt6ShaderToolsMacros.cmake
2025-10-01 20:34:39.000000000 +0200
@@ -119,9 +119,15 @@
set(qsb_args "")
+ # GL_OVR_multiview works best starting with these GLSL versions
+ set(multiview_glsl "330,300es")
+
if (NOT arg_NOGLSL)
if (arg_GLSL)
set(glsl_versions "${arg_GLSL}")
+ if (glsl_versions MATCHES "4[0-9]0|3[12]0")
+ set(multiview_glsl ${arg_GLSL})
+ endif()
else()
set(glsl_versions "100es,120,150") # both 'es' and ' es' are
accepted by qsb
endif()
@@ -267,9 +273,8 @@
# Add a pre-defined suffix to the output filename.
set(qsb_multiview2_result
"${CMAKE_CURRENT_BINARY_DIR}/.qsb/${output_file}.mv2qsb")
set(qsb_multiview2_args "")
- # GL_OVR_multiview works best starting with these GLSL versions
list(APPEND qsb_multiview2_args "--glsl")
- list(APPEND qsb_multiview2_args "330,300es")
+ list(APPEND qsb_multiview2_args "${multiview_glsl}")
# view instancing needs Shader Model 6.1
list(APPEND qsb_multiview2_args "--hlsl")
list(APPEND qsb_multiview2_args "61")
