Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package shaderc for openSUSE:Factory checked in at 2024-04-15 20:14:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shaderc (Old) and /work/SRC/openSUSE:Factory/.shaderc.new.26366 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shaderc" Mon Apr 15 20:14:11 2024 rev:28 rq:1167487 version:2024.0 Changes: -------- --- /work/SRC/openSUSE:Factory/shaderc/shaderc.changes 2024-01-24 19:05:02.782876751 +0100 +++ /work/SRC/openSUSE:Factory/.shaderc.new.26366/shaderc.changes 2024-04-15 20:19:31.122922528 +0200 @@ -1,0 +2,6 @@ +Fri Apr 12 17:08:42 UTC 2024 - Jan Engelhardt <[email protected]> + +- Update to release 2024.0 + * Explicitly use python3 in shebangs/scripts + +------------------------------------------------------------------- Old: ---- v2023.8.tar.gz New: ---- v2024.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shaderc.spec ++++++ --- /var/tmp/diff_new_pack.710yoG/_old 2024-04-15 20:19:31.562938860 +0200 +++ /var/tmp/diff_new_pack.710yoG/_new 2024-04-15 20:19:31.566939009 +0200 @@ -19,7 +19,7 @@ # Remember to bump in baselibs.conf %define lname libshaderc_shared1 Name: shaderc -Version: 2023.8 +Version: 2024.0 Release: 0 Summary: A collection of tools, libraries and tests for shader compilation License: Apache-2.0 @@ -31,11 +31,11 @@ Patch1: 0001-Use-system-third-party-libs.patch BuildRequires: c++_compiler BuildRequires: cmake >= 2.8.12 -BuildRequires: glslang-devel >= 14 +BuildRequires: glslang-devel >= 14.1.0 BuildRequires: glslang-nonstd-devel BuildRequires: python3-base -BuildRequires: spirv-headers >= 1.6.1~sdk275 -BuildRequires: spirv-tools-devel >= 2023.6~rc1 +BuildRequires: spirv-headers >= 1.6.1~sdk280 +BuildRequires: spirv-tools-devel >= 2024.1~rc1 %description A collection of tools, libraries and tests for shader compilation. @@ -82,8 +82,7 @@ rm %buildroot/%_libdir/*.a rm %buildroot/%_libdir/pkgconfig/shaderc_{static,combined}.pc -%post -n %lname -p /sbin/ldconfig -%postun -n %lname -p /sbin/ldconfig +%ldconfig_scriptlets -n %lname %files %license LICENSE ++++++ 0001-Use-system-third-party-libs.patch ++++++ --- /var/tmp/diff_new_pack.710yoG/_old 2024-04-15 20:19:31.582939603 +0200 +++ /var/tmp/diff_new_pack.710yoG/_new 2024-04-15 20:19:31.586939751 +0200 @@ -4,11 +4,11 @@ utils/update_build_version.sh | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) -Index: shaderc-2023.8/CMakeLists.txt +Index: shaderc-2024.0/CMakeLists.txt =================================================================== ---- shaderc-2023.8.orig/CMakeLists.txt -+++ shaderc-2023.8/CMakeLists.txt -@@ -124,7 +124,6 @@ endif(MSVC) +--- shaderc-2024.0.orig/CMakeLists.txt ++++ shaderc-2024.0/CMakeLists.txt +@@ -120,7 +120,6 @@ endif(MSVC) # Configure subdirectories. # We depend on these for later projects, so they should come first. @@ -16,19 +16,19 @@ add_subdirectory(libshaderc_util) add_subdirectory(libshaderc) -@@ -135,7 +134,7 @@ endif() +@@ -131,7 +130,7 @@ endif() add_custom_target(build-version - ${PYTHON_EXECUTABLE} + ${Python_EXECUTABLE} - ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py + ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.sh ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).") -Index: shaderc-2023.8/libshaderc/CMakeLists.txt +Index: shaderc-2024.0/libshaderc/CMakeLists.txt =================================================================== ---- shaderc-2023.8.orig/libshaderc/CMakeLists.txt -+++ shaderc-2023.8/libshaderc/CMakeLists.txt +--- shaderc-2024.0.orig/libshaderc/CMakeLists.txt ++++ shaderc-2024.0/libshaderc/CMakeLists.txt @@ -67,6 +67,8 @@ set(SHADERC_LIBS shaderc_util SPIRV # from glslang @@ -38,10 +38,10 @@ ) target_link_libraries(shaderc PRIVATE ${SHADERC_LIBS}) -Index: shaderc-2023.8/utils/update_build_version.sh +Index: shaderc-2024.0/utils/update_build_version.sh =================================================================== --- /dev/null -+++ shaderc-2023.8/utils/update_build_version.sh ++++ shaderc-2024.0/utils/update_build_version.sh @@ -0,0 +1 @@ +#!/bin/true ++++++ v2023.8.tar.gz -> v2024.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.8/CHANGES new/shaderc-2024.0/CHANGES --- old/shaderc-2023.8/CHANGES 2024-01-03 18:45:00.000000000 +0100 +++ new/shaderc-2024.0/CHANGES 2024-03-08 19:52:40.000000000 +0100 @@ -1,5 +1,10 @@ Revision history for Shaderc +v2024.0 + - Update dependencies + - Utilities: + - Use Python3 explicitly in utility scripts + v2023.8 2024-01-03 - API: Expose rlaxed Vulkan rules from glslang - Update to Glslang 14.0.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.8/CMakeLists.txt new/shaderc-2024.0/CMakeLists.txt --- old/shaderc-2023.8/CMakeLists.txt 2024-01-03 18:45:00.000000000 +0100 +++ new/shaderc-2024.0/CMakeLists.txt 2024-03-08 19:52:40.000000000 +0100 @@ -91,22 +91,18 @@ add_compile_options("-Wextra-semi") endif() -if(${CMAKE_VERSION} VERSION_LESS_EQUAL "3.12") - find_package(PythonInterp 3 REQUIRED) -else () - find_package(Python COMPONENTS Interpreter REQUIRED) -endif () +find_package(Python COMPONENTS Interpreter REQUIRED) if (SHADERC_ENABLE_COPYRIGHT_CHECK) add_custom_target(check-copyright ALL - ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/add_copyright.py + ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/add_copyright.py --check WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "Check copyright") endif() add_custom_target(add-copyright - ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/add_copyright.py + ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/add_copyright.py WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "Add copyright") @@ -134,7 +130,7 @@ endif() add_custom_target(build-version - ${PYTHON_EXECUTABLE} + ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.8/DEPS new/shaderc-2024.0/DEPS --- old/shaderc-2023.8/DEPS 2024-01-03 18:45:00.000000000 +0100 +++ new/shaderc-2024.0/DEPS 2024-03-08 19:52:40.000000000 +0100 @@ -7,11 +7,11 @@ 'abseil_revision': '5be22f98733c674d532598454ae729253bc53e82', 'effcee_revision' : '19b4aa87af25cb4ee779a071409732f34bfc305c', - 'glslang_revision': 'a91631b260cba3f22858d6c6827511e636c2458a', + 'glslang_revision': 'd73712b8f6c9047b09e99614e20d456d5ada2390', 'googletest_revision': 'e47544ad31cb3ceecd04cc13e8fe556f8df9fe0b', 're2_revision': 'c9cba76063cf4235c1a15dd14a24a4ef8d623761', - 'spirv_headers_revision': '1c6bb2743599e6eb6f37b2969acc0aef812e32e3', - 'spirv_tools_revision': 'f0cc85efdbbe3a46eae90e0f915dc1509836d0fc', + 'spirv_headers_revision': '8b246ff75c6615ba4532fe4fde20f1be090c3764', + 'spirv_tools_revision': '04896c462d9f3f504c99a4698605b6524af813c1', } deps = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.8/cmake/setup_build.cmake new/shaderc-2024.0/cmake/setup_build.cmake --- old/shaderc-2023.8/cmake/setup_build.cmake 2024-01-03 18:45:00.000000000 +0100 +++ new/shaderc-2024.0/cmake/setup_build.cmake 2024-03-08 19:52:40.000000000 +0100 @@ -49,11 +49,7 @@ find_host_package(PythonInterp 3 REQUIRED) find_host_package(BISON) else() - if(${CMAKE_VERSION} VERSION_LESS_EQUAL "3.12") - find_package(PythonInterp 3 REQUIRED) - else () - find_package(Python COMPONENTS Interpreter REQUIRED) - endif () + find_package(Python COMPONENTS Interpreter REQUIRED) endif() option(DISABLE_RTTI "Disable RTTI in builds") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.8/glslc/test/CMakeLists.txt new/shaderc-2024.0/glslc/test/CMakeLists.txt --- old/shaderc-2023.8/glslc/test/CMakeLists.txt 2024-01-03 18:45:00.000000000 +0100 +++ new/shaderc-2024.0/glslc/test/CMakeLists.txt 2024-03-08 19:52:40.000000000 +0100 @@ -13,15 +13,15 @@ # limitations under the License. add_test(NAME shaderc_expect_unittests - COMMAND ${PYTHON_EXECUTABLE} -m unittest expect_unittest.py + COMMAND ${Python_EXECUTABLE} -m unittest expect_unittest.py WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) add_test(NAME shaderc_glslc_test_framework_unittests - COMMAND ${PYTHON_EXECUTABLE} -m unittest glslc_test_framework_unittest.py + COMMAND ${Python_EXECUTABLE} -m unittest glslc_test_framework_unittest.py WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) if(${SHADERC_ENABLE_TESTS}) add_test(NAME glslc_tests - COMMAND ${PYTHON_EXECUTABLE} + COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glslc_test_framework.py $<TARGET_FILE:glslc_exe> $<TARGET_FILE:spirv-dis> --test-dir ${CMAKE_CURRENT_SOURCE_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.8/glslc/test/option_dash_cap_O.py new/shaderc-2024.0/glslc/test/option_dash_cap_O.py --- old/shaderc-2023.8/glslc/test/option_dash_cap_O.py 2024-01-03 18:45:00.000000000 +0100 +++ new/shaderc-2024.0/glslc/test/option_dash_cap_O.py 2024-03-08 19:52:40.000000000 +0100 @@ -21,71 +21,94 @@ EMPTY_SHADER_IN_CWD = Directory('.', [File('shader.vert', MINIMAL_SHADER)]) ASSEMBLY_WITH_DEBUG_SOURCE = [ - '; SPIR-V\n', - '; Version: 1.0\n', - '; Generator: Google Shaderc over Glslang; 11\n', - '; Bound: 7\n', - '; Schema: 0\n', - ' OpCapability Shader\n', - ' %2 = OpExtInstImport "GLSL.std.450"\n', - ' OpMemoryModel Logical GLSL450\n', - ' OpEntryPoint Vertex %main "main"\n', - ' %1 = OpString "shader.vert"\n', - ' OpSource ESSL 310 %1 "// OpModuleProcessed entry-point main\n', - '// OpModuleProcessed client vulkan100\n', - '// OpModuleProcessed target-env vulkan1.0\n', - '// OpModuleProcessed entry-point main\n', - '#line 1\n', - '#version 310 es\n', - 'void main() {}"\n', - ' OpSourceExtension "GL_GOOGLE_cpp_style_line_directive"\n', - ' OpSourceExtension "GL_GOOGLE_include_directive"\n', - ' OpName %main "main"\n', - ' %void = OpTypeVoid\n', - ' %4 = OpTypeFunction %void\n', - ' OpLine %1 2 11\n', - ' %main = OpFunction %void None %4\n', - ' %6 = OpLabel\n', - ' OpReturn\n', - ' OpFunctionEnd\n'] - -ASSEMBLY_WITH_DEBUG = [ - '; SPIR-V\n', - '; Version: 1.0\n', - '; Generator: Google Shaderc over Glslang; 11\n', - '; Bound: 6\n', - '; Schema: 0\n', - ' OpCapability Shader\n', - ' %1 = OpExtInstImport "GLSL.std.450"\n', - ' OpMemoryModel Logical GLSL450\n', - ' OpEntryPoint Vertex %main "main"\n', - ' OpSource ESSL 310\n', - ' OpSourceExtension "GL_GOOGLE_cpp_style_line_directive"\n', - ' OpSourceExtension "GL_GOOGLE_include_directive"\n', - ' OpName %main "main"\n', - ' %void = OpTypeVoid\n', - ' %3 = OpTypeFunction %void\n', - ' %main = OpFunction %void None %3\n', - ' %5 = OpLabel\n', - ' OpReturn\n', - ' OpFunctionEnd\n'] - -ASSEMBLY_WITHOUT_DEBUG = [ - '; SPIR-V\n', - '; Version: 1.0\n', - '; Generator: Google Shaderc over Glslang; 11\n', - '; Bound: 6\n', - '; Schema: 0\n', - ' OpCapability Shader\n', - ' %1 = OpExtInstImport "GLSL.std.450"\n', - ' OpMemoryModel Logical GLSL450\n', - ' OpEntryPoint Vertex %4 "main"\n', - ' %void = OpTypeVoid\n', - ' %3 = OpTypeFunction %void\n', - ' %4 = OpFunction %void None %3\n', # %4 vs. %main - ' %5 = OpLabel\n', - ' OpReturn\n', - ' OpFunctionEnd\n'] + """; SPIR-V +; Version: 1.0 +; Generator: Google Shaderc over Glslang; 11 +; Bound: 7 +; Schema: 0 + OpCapability Shader + %2 = OpExtInstImport "GLSL.std.450" + OpMemoryModel Logical GLSL450 + OpEntryPoint Vertex %main "main" + %1 = OpString "shader.vert" + OpSource ESSL 310 %1 "// OpModuleProcessed entry-point main +// OpModuleProcessed client vulkan100 +// OpModuleProcessed target-env vulkan1.0 +// OpModuleProcessed entry-point main +#line 1 +#version 310 es +void main() {}" + OpSourceExtension "GL_GOOGLE_cpp_style_line_directive" + OpSourceExtension "GL_GOOGLE_include_directive" + OpName %main "main" + %void = OpTypeVoid + %4 = OpTypeFunction %void + OpLine %1 2 11 + %main = OpFunction %void None %4 + %6 = OpLabel + OpLine %1 2 0 + OpReturn + OpFunctionEnd +""" +] + +ASSEMBLY_O0 = [ + """; SPIR-V +; Version: 1.0 +; Generator: Google Shaderc over Glslang; 11 +; Bound: 6 +; Schema: 0 + OpCapability Shader + %1 = OpExtInstImport "GLSL.std.450" + OpMemoryModel Logical GLSL450 + OpEntryPoint Vertex %main "main" + OpSource ESSL 310 + OpSourceExtension "GL_GOOGLE_cpp_style_line_directive" + OpSourceExtension "GL_GOOGLE_include_directive" + OpName %main "main" + %void = OpTypeVoid + %3 = OpTypeFunction %void + %main = OpFunction %void None %3 + %5 = OpLabel + OpReturn + OpFunctionEnd +"""] + +ASSEMBLY_O = [ + """; SPIR-V +; Version: 1.0 +; Generator: Google Shaderc over Glslang; 11 +; Bound: 6 +; Schema: 0 + OpCapability Shader + %1 = OpExtInstImport "GLSL.std.450" + OpMemoryModel Logical GLSL450 + OpEntryPoint Vertex %4 "main" + %void = OpTypeVoid + %3 = OpTypeFunction %void + %4 = OpFunction %void None %3 + %5 = OpLabel + OpReturn + OpFunctionEnd +"""] + +ASSEMBLY_Os = [ + """; SPIR-V +; Version: 1.0 +; Generator: Google Shaderc over Glslang; 11 +; Bound: 6 +; Schema: 0 + OpCapability Shader + %1 = OpExtInstImport "GLSL.std.450" + OpMemoryModel Logical GLSL450 + OpEntryPoint Vertex %4 "main" + %void = OpTypeVoid + %3 = OpTypeFunction %void + %4 = OpFunction %void None %3 + %5 = OpLabel + OpReturn + OpFunctionEnd +"""] @inside_glslc_testsuite('OptionDashCapO') @@ -95,7 +118,8 @@ environment = EMPTY_SHADER_IN_CWD glslc_args = ['-S', '-O0', 'shader.vert'] target_filename = 'shader.vert.spvasm' - expected_file_contents = ASSEMBLY_WITH_DEBUG + expected_file_contents = ASSEMBLY_O0 + @inside_glslc_testsuite('OptionDashCapO') class TestDashCapOPerformance(expect.ValidFileContents): @@ -104,7 +128,8 @@ environment = EMPTY_SHADER_IN_CWD glslc_args = ['-S', '-O', 'shader.vert'] target_filename = 'shader.vert.spvasm' - expected_file_contents = ASSEMBLY_WITHOUT_DEBUG + expected_file_contents = ASSEMBLY_O + @inside_glslc_testsuite('OptionDashCapO') class TestDashCapOs(expect.ValidFileContents): @@ -113,7 +138,7 @@ environment = EMPTY_SHADER_IN_CWD glslc_args = ['-S', '-Os', 'shader.vert'] target_filename = 'shader.vert.spvasm' - expected_file_contents = ASSEMBLY_WITHOUT_DEBUG + expected_file_contents = ASSEMBLY_Os @inside_glslc_testsuite('OptionDashCapO') @@ -123,7 +148,7 @@ environment = EMPTY_SHADER_IN_CWD glslc_args = ['-S', '-Os', '-O0', '-Os', '-O0', 'shader.vert'] target_filename = 'shader.vert.spvasm' - expected_file_contents = ASSEMBLY_WITH_DEBUG + expected_file_contents = ASSEMBLY_O0 @inside_glslc_testsuite('OptionDashCapO') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.8/utils/add_copyright.py new/shaderc-2024.0/utils/add_copyright.py --- old/shaderc-2023.8/utils/add_copyright.py 2024-01-03 18:45:00.000000000 +0100 +++ new/shaderc-2024.0/utils/add_copyright.py 2024-03-08 19:52:40.000000000 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2015 The Shaderc Authors. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.8/utils/remove-file-by-suffix.py new/shaderc-2024.0/utils/remove-file-by-suffix.py --- old/shaderc-2023.8/utils/remove-file-by-suffix.py 2024-01-03 18:45:00.000000000 +0100 +++ new/shaderc-2024.0/utils/remove-file-by-suffix.py 2024-03-08 19:52:40.000000000 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2015 The Shaderc Authors. All rights reserved. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.8/utils/update_build_version.py new/shaderc-2024.0/utils/update_build_version.py --- old/shaderc-2023.8/utils/update_build_version.py 2024-01-03 18:45:00.000000000 +0100 +++ new/shaderc-2024.0/utils/update_build_version.py 2024-03-08 19:52:40.000000000 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright 2016 The Shaderc Authors. All rights reserved. #
