Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package shaderc for openSUSE:Factory checked in at 2023-03-30 22:50:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shaderc (Old) and /work/SRC/openSUSE:Factory/.shaderc.new.31432 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shaderc" Thu Mar 30 22:50:46 2023 rev:21 rq:1075216 version:2023.2 Changes: -------- --- /work/SRC/openSUSE:Factory/shaderc/shaderc.changes 2022-12-12 17:37:22.416476062 +0100 +++ /work/SRC/openSUSE:Factory/.shaderc.new.31432/shaderc.changes 2023-03-30 22:50:50.768439650 +0200 @@ -1,0 +2,7 @@ +Tue Mar 28 23:26:28 UTC 2023 - Jan Engelhardt <[email protected]> + +- Update to release 2023.2 + * Fix C++20 compatibility: explicitly construct string_piece when + comparing to `char *` + +------------------------------------------------------------------- Old: ---- v2022.4.tar.gz New: ---- v2023.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shaderc.spec ++++++ --- /var/tmp/diff_new_pack.ow1dzN/_old 2023-03-30 22:50:51.280442390 +0200 +++ /var/tmp/diff_new_pack.ow1dzN/_new 2023-03-30 22:50:51.284442412 +0200 @@ -1,7 +1,7 @@ # # spec file for package shaderc # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ # Remember to bump in baselibs.conf %define lname libshaderc_shared1 Name: shaderc -Version: 2022.4 +Version: 2023.2 Release: 0 Summary: A collection of tools, libraries and tests for shader compilation License: Apache-2.0 @@ -31,13 +31,10 @@ Patch1: 0001-Use-system-third-party-libs.patch BuildRequires: c++_compiler BuildRequires: cmake >= 2.8.12 -# "DEPS" file recommends: glslang 11.12.0-24-g728c6895 -# DEPS file: spirv-headers sdk-1.3.231.0-14-gc214f6f -# DEPS file: spirv-tools v2022.4-28-gd9446130 -# Slightly lower should work too -BuildRequires: glslang-devel >= 11.12.0 -BuildRequires: spirv-headers >= 1.6.1~sdk231 -BuildRequires: spirv-tools-devel >= 2022.4 +BuildRequires: glslang-devel >= 12 +BuildRequires: glslang-nonstd-devel +BuildRequires: spirv-headers >= 1.6.1~sdk239 +BuildRequires: spirv-tools-devel >= 2023.1 %description A collection of tools, libraries and tests for shader compilation. @@ -69,6 +66,7 @@ %prep %autosetup -p1 +chmod a+x utils/update_build_version.sh echo "\"%version\"" >glslc/src/build-version.inc %build ++++++ 0001-Use-system-third-party-libs.patch ++++++ --- /var/tmp/diff_new_pack.ow1dzN/_old 2023-03-30 22:50:51.312442561 +0200 +++ /var/tmp/diff_new_pack.ow1dzN/_new 2023-03-30 22:50:51.316442583 +0200 @@ -1,13 +1,14 @@ --- - CMakeLists.txt | 7 ------- - libshaderc/CMakeLists.txt | 2 ++ - 2 files changed, 2 insertions(+), 7 deletions(-) + CMakeLists.txt | 3 +-- + libshaderc/CMakeLists.txt | 2 ++ + utils/update_build_version.sh | 1 + + 3 files changed, 4 insertions(+), 2 deletions(-) -Index: shaderc-2020.5/CMakeLists.txt +Index: shaderc-2023.2/CMakeLists.txt =================================================================== ---- shaderc-2020.5.orig/CMakeLists.txt -+++ shaderc-2020.5/CMakeLists.txt -@@ -112,7 +112,6 @@ endif(MSVC) +--- shaderc-2023.2.orig/CMakeLists.txt ++++ shaderc-2023.2/CMakeLists.txt +@@ -130,7 +130,6 @@ endif(MSVC) # Configure subdirectories. # We depend on these for later projects, so they should come first. @@ -15,24 +16,20 @@ add_subdirectory(libshaderc_util) add_subdirectory(libshaderc) -@@ -121,12 +120,6 @@ if(${SHADERC_ENABLE_EXAMPLES}) - add_subdirectory(examples) - endif() +@@ -141,7 +140,7 @@ endif() --add_custom_target(build-version -- ${PYTHON_EXECUTABLE} + add_custom_target(build-version + ${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).") -- - function(define_pkg_config_file NAME LIBS) - add_custom_target(${NAME}-pkg-config ALL - COMMAND ${CMAKE_COMMAND} -Index: shaderc-2020.5/libshaderc/CMakeLists.txt ++ ${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.2/libshaderc/CMakeLists.txt =================================================================== ---- shaderc-2020.5.orig/libshaderc/CMakeLists.txt -+++ shaderc-2020.5/libshaderc/CMakeLists.txt -@@ -66,6 +66,8 @@ set(SHADERC_LIBS +--- shaderc-2023.2.orig/libshaderc/CMakeLists.txt ++++ shaderc-2023.2/libshaderc/CMakeLists.txt +@@ -67,6 +67,8 @@ set(SHADERC_LIBS shaderc_util SPIRV # from glslang SPIRV-Tools @@ -41,4 +38,10 @@ ) target_link_libraries(shaderc PRIVATE ${SHADERC_LIBS}) +Index: shaderc-2023.2/utils/update_build_version.sh +=================================================================== +--- /dev/null ++++ shaderc-2023.2/utils/update_build_version.sh +@@ -0,0 +1 @@ ++#!/bin/true ++++++ v2022.4.tar.gz -> v2023.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2022.4/CHANGES new/shaderc-2023.2/CHANGES --- old/shaderc-2022.4/CHANGES 2022-12-01 01:13:31.000000000 +0100 +++ new/shaderc-2023.2/CHANGES 2023-01-18 21:58:09.000000000 +0100 @@ -1,5 +1,15 @@ Revision history for Shaderc +v2023.2 2022-01-18 + - Update DEPS to pull in SPIRV-Tools bugfix #5049 + +v2023.1 2022-01-13 + - General/Build + - Removed support for GCC-based code coverage builds + - Update minimum CMake to 3.17.2 + - Fix C++20 compatibility: explicitly construct string_piece when + comparing to `char*` + v2022.4 2022-11-30 - Update to Glslang 11 - Update SPIRV-Tools, SPIRV-Headers dependencies diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2022.4/CMakeLists.txt new/shaderc-2023.2/CMakeLists.txt --- old/shaderc-2022.4/CMakeLists.txt 2022-12-01 01:13:31.000000000 +0100 +++ new/shaderc-2023.2/CMakeLists.txt 2023-01-18 21:58:09.000000000 +0100 @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.17.2) if (POLICY CMP00091) # Enable MSVC Runtime Library Property diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2022.4/DEPS new/shaderc-2023.2/DEPS --- old/shaderc-2022.4/DEPS 2022-12-01 01:13:31.000000000 +0100 +++ new/shaderc-2023.2/DEPS 2023-01-18 21:58:09.000000000 +0100 @@ -5,11 +5,11 @@ 'khronos_git': 'https://github.com/KhronosGroup', 'effcee_revision' : '35912e1b7778ec2ddcff7e7188177761539e59', - 'glslang_revision': '728c689574fba7e53305b475cd57f196c1a21226', + 'glslang_revision': '1fb2f1d7896627d62a289439a2c3e750e551a7ab', 'googletest_revision': 'd9bb8412d60b993365abb53f00b6dad9b2c01b62', - 're2_revision': 'd2836d1b1c34c4e330a85a1006201db474bf2c8a', - 'spirv_headers_revision': 'c214f6f2d1a7253bb0e9f195c2dc5b0659dc99ef', - 'spirv_tools_revision': 'd9446130d5165f7fafcb3599252a22e264c7d4bd', + 're2_revision': '954656f47fe8fb505d4818da1e128417a79ea500', + 'spirv_headers_revision': 'd13b52222c39a7e9a401b44646f0ca3a640fbd47', + 'spirv_tools_revision': '63de608daeb7e91fbea6d7477a50debe7cac57ce', } deps = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2022.4/README.md new/shaderc-2023.2/README.md --- old/shaderc-2022.4/README.md 2022-12-01 01:13:31.000000000 +0100 +++ new/shaderc-2023.2/README.md 2023-01-18 21:58:09.000000000 +0100 @@ -166,15 +166,6 @@ - Shaderc is tested with cmake 3.17.2 - [Python 3](http://www.python.org/): for utility scripts and running the test suite. -On Linux, the following tools should be installed: - -- [`gcov`](https://gcc.gnu.org/onlinedocs/gcc/Gcov.html): for testing code - coverage, provided by the `gcc` package on Ubuntu. -- [`lcov`](http://ltp.sourceforge.net/coverage/lcov.php): a graphical frontend - for `gcov`, provided by the `lcov` package on Ubuntu. -- [`genhtml`](http://linux.die.net/man/1/genhtml): for creating reports in html - format from `lcov` output, provided by the `lcov` package on Ubuntu. - On Linux, if cross compiling to Windows: - [`mingw`](http://www.mingw.org): A GCC-based cross compiler targeting Windows so that generated executables use the Microsoft C runtime libraries. @@ -225,20 +216,6 @@ We track bugs using GitHub -- click on the "Issues" button on [the project's GitHub page](https://github.com/google/shaderc). -## Test coverage - -On Linux, you can obtain test coverage as follows: - -```sh -cd $BUILD_DIR -cmake -GNinja -DCMAKE_BUILD_TYPE=Debug -DENABLE_CODE_COVERAGE=ON $SOURCE_DIR -ninja -ninja report-coverage -``` - -Then the coverage report can be found under the `$BUILD_DIR/coverage-report` -directory. - ## Bindings Bindings are maintained by third parties, may contain content diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2022.4/cmake/setup_build.cmake new/shaderc-2023.2/cmake/setup_build.cmake --- old/shaderc-2022.4/cmake/setup_build.cmake 2022-12-01 01:13:31.000000000 +0100 +++ new/shaderc-2023.2/cmake/setup_build.cmake 2023-01-18 21:58:09.000000000 +0100 @@ -52,80 +52,6 @@ find_package(PythonInterp 3 REQUIRED) endif() - -option(ENABLE_CODE_COVERAGE "Enable collecting code coverage." OFF) -if (ENABLE_CODE_COVERAGE) - message(STATUS "Shaderc: code coverage report is on.") - if (NOT UNIX) - message(FATAL_ERROR "Code coverage on non-UNIX system not supported yet.") - endif() - if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug") - message(FATAL_ERROR "Code coverage with non-Debug build can be misleading.") - endif() - find_program(LCOV_EXE NAMES lcov) - if (NOT LCOV_EXE) - message(FATAL_ERROR "lcov was not found") - endif() - find_program(GENHTML_EXE NAMES genhtml) - if (NOT GENHTML_EXE) - message(FATAL_ERROR "genhtml was not found") - endif() - - set(LCOV_BASE_DIR ${CMAKE_BINARY_DIR}) - set(LCOV_INFO_FILE ${LCOV_BASE_DIR}/lcov.info) - set(COVERAGE_STAT_HTML_DIR ${LCOV_BASE_DIR}/coverage-report) - - add_custom_target(clean-coverage - # Remove all gcov .gcda files in the directory recursively. - COMMAND ${LCOV_EXE} --directory . --zerocounters -q - # Remove all lcov .info files. - COMMAND ${CMAKE_COMMAND} -E remove ${LCOV_INFO_FILE} - # Remove all html report files. - COMMAND ${CMAKE_COMMAND} -E remove_directory ${COVERAGE_STAT_HTML_DIR} - # TODO(antiagainst): the following two commands are here to remedy the - # problem of "reached unexpected end of file" experienced by lcov. - # The symptom is that some .gcno files are wrong after code change and - # recompiling. We don't know the exact reason yet. Figure it out. - # Remove all .gcno files in the directory recursively. - COMMAND ${PYTHON_EXECUTABLE} - ${shaderc_SOURCE_DIR}/utils/remove-file-by-suffix.py . ".gcno" - # .gcno files are not tracked by CMake. So no recompiling is triggered - # even if they are missing. Unfortunately, we just removed all of them - # in the above. - COMMAND ${CMAKE_COMMAND} --build . --target clean - WORKING_DIRECTORY ${LCOV_BASE_DIR} - COMMENT "Clean coverage files" - ) - - add_custom_target(report-coverage - COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} - # Run all tests. - COMMAND ctest --output-on-failure - # Collect coverage data from gcov .gcda files. - COMMAND ${LCOV_EXE} --directory . --capture -o ${LCOV_INFO_FILE} - # Remove coverage info for system header files. - COMMAND ${LCOV_EXE} - --remove ${LCOV_INFO_FILE} '/usr/include/*' -o ${LCOV_INFO_FILE} - # Remove coverage info for external and third_party code. - COMMAND ${LCOV_EXE} - --remove ${LCOV_INFO_FILE} '${shaderc_SOURCE_DIR}/ext/*' - -o ${LCOV_INFO_FILE} - - COMMAND ${LCOV_EXE} - --remove ${LCOV_INFO_FILE} '${shaderc_SOURCE_DIR}/third_party/*' - -o ${LCOV_INFO_FILE} - # Remove coverage info for tests. - COMMAND ${LCOV_EXE} - --remove ${LCOV_INFO_FILE} '*_test.cc' -o ${LCOV_INFO_FILE} - # Generate html report file. - COMMAND ${GENHTML_EXE} - ${LCOV_INFO_FILE} -t "Coverage Report" -o ${COVERAGE_STAT_HTML_DIR} - DEPENDS clean-coverage - WORKING_DIRECTORY ${LCOV_BASE_DIR} - COMMENT "Collect and analyze coverage data" - ) -endif() - option(DISABLE_RTTI "Disable RTTI in builds") if(DISABLE_RTTI) if(UNIX) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2022.4/kokoro/linux/continuous_gcc_coverage.cfg new/shaderc-2023.2/kokoro/linux/continuous_gcc_coverage.cfg --- old/shaderc-2022.4/kokoro/linux/continuous_gcc_coverage.cfg 2022-12-01 01:13:31.000000000 +0100 +++ new/shaderc-2023.2/kokoro/linux/continuous_gcc_coverage.cfg 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -# Copyright (C) 2017 Google Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Continuous build configuration. -build_file: "shaderc/kokoro/linux/build_gcc_coverage.sh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2022.4/kokoro/linux/presubmit_gcc_coverage.cfg new/shaderc-2023.2/kokoro/linux/presubmit_gcc_coverage.cfg --- old/shaderc-2022.4/kokoro/linux/presubmit_gcc_coverage.cfg 2022-12-01 01:13:31.000000000 +0100 +++ new/shaderc-2023.2/kokoro/linux/presubmit_gcc_coverage.cfg 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -# Copyright (C) 2017 Google Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Presubmit build configuration. -build_file: "shaderc/kokoro/linux/build_gcc_coverage.sh" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2022.4/libshaderc_util/include/libshaderc_util/string_piece.h new/shaderc-2023.2/libshaderc_util/include/libshaderc_util/string_piece.h --- old/shaderc-2022.4/libshaderc_util/include/libshaderc_util/string_piece.h 2022-12-01 01:13:31.000000000 +0100 +++ new/shaderc-2023.2/libshaderc_util/include/libshaderc_util/string_piece.h 2023-01-18 21:58:09.000000000 +0100 @@ -332,7 +332,7 @@ } inline bool operator==(const char* first, const string_piece second) { - return second == first; + return second == string_piece(first); } inline bool operator!=(const char* first, const string_piece second) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2022.4/utils/roll-deps new/shaderc-2023.2/utils/roll-deps --- old/shaderc-2022.4/utils/roll-deps 2022-12-01 01:13:31.000000000 +0100 +++ new/shaderc-2023.2/utils/roll-deps 2023-01-18 21:58:09.000000000 +0100 @@ -25,11 +25,11 @@ googletest_dir="third_party/googletest/" googletest_trunk="origin/master" re2_dir="third_party/re2/" -re2_trunk="origin/master" +re2_trunk="origin/main" spirv_headers_dir="third_party/spirv-headers/" -spirv_headers_trunk="origin/master" +spirv_headers_trunk="origin/main" spirv_tools_dir="third_party/spirv-tools/" -spirv_tools_trunk="origin/master" +spirv_tools_trunk="origin/main" # This script assumes it's parent directory is the repo root. repo_path=$(dirname "$0")/..
