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-10-23 23:40:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shaderc (Old) and /work/SRC/openSUSE:Factory/.shaderc.new.1945 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shaderc" Mon Oct 23 23:40:18 2023 rev:24 rq:1119385 version:2023.7 Changes: -------- --- /work/SRC/openSUSE:Factory/shaderc/shaderc.changes 2023-09-07 21:12:20.728456930 +0200 +++ /work/SRC/openSUSE:Factory/.shaderc.new.1945/shaderc.changes 2023-10-23 23:40:28.134448703 +0200 @@ -1,0 +2,6 @@ +Fri Oct 20 12:10:45 UTC 2023 - Jan Engelhardt <jeng...@inai.de> + +- Update to release 2023.7 + * Adapt a test to different error message from SPIRV-Tools + +------------------------------------------------------------------- Old: ---- v2023.6.tar.gz New: ---- v2023.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shaderc.spec ++++++ --- /var/tmp/diff_new_pack.DRlg8u/_old 2023-10-23 23:40:28.814473389 +0200 +++ /var/tmp/diff_new_pack.DRlg8u/_new 2023-10-23 23:40:28.818473534 +0200 @@ -19,7 +19,7 @@ # Remember to bump in baselibs.conf %define lname libshaderc_shared1 Name: shaderc -Version: 2023.6 +Version: 2023.7 Release: 0 Summary: A collection of tools, libraries and tests for shader compilation License: Apache-2.0 ++++++ v2023.6.tar.gz -> v2023.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.6/.github/workflows/autoroll.yml new/shaderc-2023.7/.github/workflows/autoroll.yml --- old/shaderc-2023.6/.github/workflows/autoroll.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/shaderc-2023.7/.github/workflows/autoroll.yml 2023-10-13 17:02:17.000000000 +0200 @@ -0,0 +1,66 @@ +# Copyright 2023 The Shaderc Authors. All rights reserved. +# +# 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,s either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +name: Update dependencies +permissions: + contents: read + +on: + schedule: + - cron: '0 2 * * *' + workflow_dispatch: + +jobs: + update-dependencies: + permissions: + contents: write + pull-requests: write + name: Update dependencies + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + + # Checkout the depot tools they are needed by roll_deps.sh + - name: Checkout depot tools + run: git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git + + - name: Update PATH + run: echo "$(pwd)/depot_tools" >> $GITHUB_PATH + + - name: Download dependencies + run: python3 utils/git-sync-deps + + - name: Setup git user information + run: | + git config user.name "GitHub Actions[bot]" + git config user.email "<>" + git checkout -b roll_deps + + - name: Update dependencies + run: | + utils/roll-deps + if [[ `git diff HEAD..origin/main --name-only | wc -l` == 0 ]]; then + echo "changed=false" >> $GITHUB_OUTPUT + else + echo "changed=true" >> $GITHUB_OUTPUT + fi + id: update_dependencies + - name: Push changes and create PR + if: steps.update_dependencies.outputs.changed == 'true' + run: | + git push --force --set-upstream origin roll_deps + gh pr create --label 'kokoro:run' --base main -f || true + env: + GITHUB_TOKEN: ${{ github.token }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.6/CHANGES new/shaderc-2023.7/CHANGES --- old/shaderc-2023.6/CHANGES 2023-08-09 17:26:10.000000000 +0200 +++ new/shaderc-2023.7/CHANGES 2023-10-13 17:02:17.000000000 +0200 @@ -1,5 +1,10 @@ Revision history for Shaderc +v2023.7 2023-10-12 + - Update dependencies + - Finish converting build instructions and flags to always use C++17 + - Add GitHub CI to test more flows + v2023.6 2023-08-09 - Update dependencies, including SPIRV-Tools v2023.4.rc2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.6/DEPS new/shaderc-2023.7/DEPS --- old/shaderc-2023.6/DEPS 2023-08-09 17:26:10.000000000 +0200 +++ new/shaderc-2023.7/DEPS 2023-10-13 17:02:17.000000000 +0200 @@ -7,11 +7,11 @@ 'abseil_revision': '5be22f98733c674d532598454ae729253bc53e82', 'effcee_revision' : '19b4aa87af25cb4ee779a071409732f34bfc305c', - 'glslang_revision': '76b52ebf77833908dc4c0dd6c70a9c357ac720bd', - 'googletest_revision': 'c541e7c11044b1e0303103ef8a47d7a9632c479b', + 'glslang_revision': '48f9ed8b08be974f4e463ef38136c8f23513b2cf', + 'googletest_revision': 'e47544ad31cb3ceecd04cc13e8fe556f8df9fe0b', 're2_revision': 'c9cba76063cf4235c1a15dd14a24a4ef8d623761', - 'spirv_headers_revision': '124a9665e464ef98b8b718d572d5f329311061eb', - 'spirv_tools_revision': 'e553b884c7c9febaa4e52334f683641fb5f196a0', + 'spirv_headers_revision': '4183b260f4cccae52a89efdfcdd43c4897989f42', + 'spirv_tools_revision': '360d469b9eac54d6c6e20f609f9ec35e3a5380ad', } deps = { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.6/README.md new/shaderc-2023.7/README.md --- old/shaderc-2023.6/README.md 2023-08-09 17:26:10.000000000 +0200 +++ new/shaderc-2023.7/README.md 2023-10-13 17:02:17.000000000 +0200 @@ -140,14 +140,11 @@ ``` 4c) Or build with MinGW on Linux for Windows: -(Skip building threaded unit tests due to -[Googletest bug 606](https://github.com/google/googletest/issues/606)) ```sh cd $BUILD_DIR cmake -GNinja -DCMAKE_BUILD_TYPE={Debug|Release|RelWithDebInfo} $SOURCE_DIR \ - -DCMAKE_TOOLCHAIN_FILE=$SOURCE_DIR/cmake/linux-mingw-toolchain.cmake \ - -Dgtest_disable_pthreads=ON + -DCMAKE_TOOLCHAIN_FILE=$SOURCE_DIR/cmake/linux-mingw-toolchain.cmake ninja ``` @@ -167,6 +164,7 @@ For building, testing, and profiling Shaderc, the following tools should be installed regardless of your OS: +- A C++17 compiler. Recent versions of Clang, GCC, and MSVC work. - [CMake](http://www.cmake.org/) 3.14 or later: for generating compilation targets. - Shaderc is tested with cmake 3.17.2 - [Python 3](http://www.python.org/): for utility scripts and running the test suite. @@ -174,6 +172,7 @@ 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. + The MinGW compiler must support C++17. On Windows, the following tools should be installed and available on your path: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.6/cmake/utils.cmake new/shaderc-2023.7/cmake/utils.cmake --- old/shaderc-2023.6/cmake/utils.cmake 2023-08-09 17:26:10.000000000 +0200 +++ new/shaderc-2023.7/cmake/utils.cmake 2023-10-13 17:02:17.000000000 +0200 @@ -59,7 +59,6 @@ function(shaderc_default_compile_options TARGET) shaderc_default_c_compile_options(${TARGET}) if (NOT "${MSVC}") - target_compile_options(${TARGET} PRIVATE -std=c++11) if (NOT SHADERC_ENABLE_SHARED_CRT) if (WIN32) # For MinGW cross compile, statically link to the C++ runtime. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.6/glslc/test/line.py new/shaderc-2023.7/glslc/test/line.py --- old/shaderc-2023.6/glslc/test/line.py 2023-08-09 17:26:10.000000000 +0200 +++ new/shaderc-2023.7/glslc/test/line.py 2023-10-13 17:02:17.000000000 +0200 @@ -36,7 +36,7 @@ #line 1 "a.vert" #line 1 "b.glsl" -void main(){ } +void main() { } #line 3 "a.vert" """ @@ -61,7 +61,7 @@ #line 0 "a.vert" #line 0 "b.glsl" -void main(){ } +void main() { } #line 2 "a.vert" """ @@ -138,7 +138,7 @@ #line 1 "a.vert" #line 1 "b.glsl" -void main(){ } +void main() { } #line 3 "a.vert" """ @@ -161,7 +161,7 @@ #line 0 "a.vert" #line 0 "b.glsl" -void main(){ } +void main() { } #line 2 "a.vert" """ @@ -183,7 +183,7 @@ """#extension GL_GOOGLE_include_directive : enable #line 1 "a.vert" #line 1 "b.glsl" -void main(){ } +void main() { } #line 2 "a.vert" """ @@ -205,7 +205,7 @@ """#extension GL_GOOGLE_include_directive : enable #line 0 "a.vert" #line 0 "b.glsl" -void main(){ } +void main() { } #line 1 "a.vert" """ @@ -230,7 +230,7 @@ #line 1 "a.vert" #line 1 "b.glsl" -void main(){ } +void main() { } #line 3 "a.vert" """ @@ -288,14 +288,14 @@ #line 1 "a.vert" #line 10000 "injected.glsl" -int plus1(int a){ return a + 1;} +int plus1(int a) { return a + 1; } #line 1 "inc.glsl" - int inc(int a){ return a + 1;} + int inc(int a) { return a + 1; } #line 10002 "injected.glsl" - int plus2(int a){ return a + 2;} + int plus2(int a) { return a + 2; } #line 55555 #line 1 "main.glsl" - void main(){ + void main() { gl_Position = vec4(1.); } #line 55556 "injected.glsl" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.6/glslc/test/option_dash_D.py new/shaderc-2023.7/glslc/test/option_dash_D.py --- old/shaderc-2023.6/glslc/test/option_dash_D.py 2023-08-09 17:26:10.000000000 +0200 +++ new/shaderc-2023.7/glslc/test/option_dash_D.py 2023-10-13 17:02:17.000000000 +0200 @@ -224,7 +224,7 @@ expected_stdout = [ """ - void main(){ return 3;} + void main() { return 3; } """] @inside_glslc_testsuite('OptionCapD') @@ -239,18 +239,18 @@ #else void f() { int x; } #endif - void main(){ return 3;} + void main(){ return 3; } """, '.vert') glslc_args = ['-DX', '-E', '-std=450core', shader] expected_stdout = [ """ - void f(){ } + void f() { } - void main(){ return 3;} + void main() { return 3; } """] @inside_glslc_testsuite('OptionCapD') @@ -265,7 +265,7 @@ #else void f() { int x; } #endif - void main(){ return 3;} + void main(){ return 3; } """, '.vert') glslc_args = ['-DX', '-E', '-std=450core', shader] @@ -274,9 +274,9 @@ - void f(){ int x;} + void f() { int x; } - void main(){ return 3;} + void main() { return 3; } """] @@ -292,18 +292,18 @@ #else void f() { int x; } #endif - void main(){ return 3;} + void main() { return 3; } """, '.vert') glslc_args = ['-DX=', '-E', '-std=450core', shader] expected_stdout = [ """ - void f(){ } + void f() { } - void main(){ return 3;} + void main() { return 3; } """] @inside_glslc_testsuite('OptionCapD') @@ -318,7 +318,7 @@ #else void f() { int x; } #endif - void main(){ return 3;} + void main(){ return 3; } """, '.vert') glslc_args = ['-DX=', '-E', '-std=450core', shader] @@ -327,9 +327,9 @@ - void f(){ int x;} + void f() { int x; } - void main(){ return 3;} + void main() { return 3; } """] @inside_glslc_testsuite('OptionCapD') @@ -339,13 +339,13 @@ shader = FileShader( """ - void main(){ return FOO(3);} + void main(){ return FOO(3); } """, '.vert') glslc_args = ['-DFOO(x)=(2*x+1)*x*x', '-E', '-std=450core', shader] expected_stdout = [ """ - void main(){ return(2 * 3 + 1)* 3 * 3;} + void main() { return(2 * 3 + 1) * 3 * 3; } """] @inside_glslc_testsuite('OptionCapD') @@ -355,11 +355,11 @@ shader = FileShader( """ - void main(){ return X;} + void main() { return X; } """, '.vert') glslc_args = ['-DY=4', '-DX=Y', '-E', '-std=450core', shader] expected_stdout = [ """ - void main(){ return 4;} + void main() { return 4; } """] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.6/glslc/test/option_dash_E.py new/shaderc-2023.7/glslc/test/option_dash_E.py --- old/shaderc-2023.6/glslc/test/option_dash_E.py 2023-08-09 17:26:10.000000000 +0200 +++ new/shaderc-2023.7/glslc/test/option_dash_E.py 2023-10-13 17:02:17.000000000 +0200 @@ -22,7 +22,7 @@ """Tests -E without any defines.""" shader = FileShader('#version 140\nvoid main(){}', '.vert') - expected_stdout = '#version 140\nvoid main(){ }\n' + expected_stdout = '#version 140\nvoid main() { }\n' glslc_args = ['-E', shader] @@ -31,7 +31,7 @@ """Tests -E if we provide a .glsl file without an explicit stage.""" shader = FileShader('#version 140\nvoid main(){}', '.glsl') - expected_stdout = '#version 140\nvoid main(){ }\n' + expected_stdout = '#version 140\nvoid main() { }\n' glslc_args = ['-E', shader] @@ -40,7 +40,7 @@ """Tests -E with command-line define.""" shader = FileShader('#version 140\nvoid main(){ int a = X; }', '.vert') - expected_stdout = '#version 140\nvoid main(){ int a = 4;}\n' + expected_stdout = '#version 140\nvoid main() { int a = 4; }\n' glslc_args = ['-DX=4', '-E', shader] @@ -57,7 +57,7 @@ expected_stdout = '''#version 140 -void main(){ +void main() { int a = 4; } ''' @@ -77,7 +77,7 @@ expected_stdout = '''#version 140 -void main(){ +void main() { int a = 4 + 1; } ''' @@ -96,7 +96,7 @@ expected_stdout = '''#version 140 #pragma optimize(off) -void main(){ +void main() { } ''' glslc_args = ['-E', shader] @@ -114,7 +114,7 @@ expected_stdout = '''#version 140 #extension foo : require -void main(){ +void main() { } ''' glslc_args = ['-E', shader] @@ -140,7 +140,7 @@ #line 2 3 -void main(){ +void main() { } ''' glslc_args = ['-E', shader] @@ -176,7 +176,7 @@ ''') expected_stdout = '''#version 140 -void main(){ +void main() { } ''' glslc_args = ['-E', '-fshader-stage=vertex', shader] @@ -193,7 +193,7 @@ ''') expected_stdout = '''#version 140 -void main(){ +void main() { } ''' glslc_args = ['-E', shader] @@ -212,10 +212,10 @@ } ''', '.vert') expected_stdout = '''#version 140 -void main(){ +void main() { } #version 140 -void function(){ +void function() { } ''' glslc_args = ['-E', '-fshader-stage=vertex', shader, shader2] @@ -235,10 +235,10 @@ } ''', '.glsl') expected_stdout = '''#version 140 -void main(){ +void main() { } #version 140 -void function(){ +void function() { } ''' glslc_args = ['-E', shader, shader2] @@ -253,7 +253,7 @@ } ''', '.vert') expected_file_contents = '''#version 140 -void function(){ +void function() { } ''' target_filename = 'foo' @@ -265,7 +265,7 @@ """Tests -E in the presence of -S.""" shader = FileShader('#version 140\nvoid main(){}', '.vert') - expected_stdout = '#version 140\nvoid main(){ }\n' + expected_stdout = '#version 140\nvoid main() { }\n' glslc_args = ['-E', '-S', shader] @@ -274,7 +274,7 @@ """Tests that using -E multiple times works.""" shader = FileShader('#version 140\nvoid main(){}', '.vert') - expected_stdout = '#version 140\nvoid main(){ }\n' + expected_stdout = '#version 140\nvoid main() { }\n' glslc_args = ['-E', '-E', shader, '-E'] @@ -283,7 +283,7 @@ """Tests that using -E after the filename also works.""" shader = FileShader('#version 140\nvoid main(){}', '.vert') - expected_stdout = '#version 140\nvoid main(){ }\n' + expected_stdout = '#version 140\nvoid main() { }\n' glslc_args = [shader, '-E'] @@ -300,10 +300,10 @@ } ''', '.vert') expected_stdout = '''#version 140 -void main(){ +void main() { } #version 140 -void function(){ +void function() { } ''' glslc_args = ['-E', '-c', shader, shader2] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.6/glslc/test/option_dash_M.py new/shaderc-2023.7/glslc/test/option_dash_M.py --- old/shaderc-2023.6/glslc/test/option_dash_M.py 2023-08-09 17:26:10.000000000 +0200 +++ new/shaderc-2023.7/glslc/test/option_dash_M.py 2023-10-13 17:02:17.000000000 +0200 @@ -552,8 +552,8 @@ dependency_info_files_expected_contents.append([{'target': 'b.vert.spv', 'dependency': {'b.vert'}} ]) - expected_stdout = ("#version 140\nvoid main(){ }\n" - "#version 140\nvoid main(){ }\n") + expected_stdout = ("#version 140\nvoid main() { }\n" + "#version 140\nvoid main() { }\n") @inside_glslc_testsuite('OptionsCapM') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.6/kokoro/linux/build-docker.sh new/shaderc-2023.7/kokoro/linux/build-docker.sh --- old/shaderc-2023.6/kokoro/linux/build-docker.sh 2023-08-09 17:26:10.000000000 +0200 +++ new/shaderc-2023.7/kokoro/linux/build-docker.sh 2023-10-13 17:02:17.000000000 +0200 @@ -53,7 +53,7 @@ ADDITIONAL_CMAKE_FLAGS="-DDISABLE_EXCEPTIONS=ON -DDISABLE_RTTI=ON" elif [ $CONFIG = "RELEASE_MINGW" ] then - ADDITIONAL_CMAKE_FLAGS="-Dgtest_disable_pthreads=ON -DCMAKE_TOOLCHAIN_FILE=$ROOT_DIR/cmake/linux-mingw-toolchain.cmake" + ADDITIONAL_CMAKE_FLAGS="-DCMAKE_TOOLCHAIN_FILE=$ROOT_DIR/cmake/linux-mingw-toolchain.cmake" SKIP_TESTS="True" fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.6/libshaderc/Android.mk new/shaderc-2023.7/libshaderc/Android.mk --- old/shaderc-2023.6/libshaderc/Android.mk 2023-08-09 17:26:10.000000000 +0200 +++ new/shaderc-2023.7/libshaderc/Android.mk 2023-10-13 17:02:17.000000000 +0200 @@ -23,7 +23,7 @@ # or delegates that responsibility to SPIRV-Tools' Android.mk. LOCAL_C_INCLUDES:=$(LOCAL_PATH)/include $(SPVHEADERS_LOCAL_PATH)/include LOCAL_STATIC_LIBRARIES:=shaderc_util SPIRV-Tools-opt -LOCAL_CXXFLAGS:=-std=c++11 -fno-exceptions -fno-rtti -DENABLE_HLSL=1 -LOCAL_EXPORT_CPPFLAGS:=-std=c++11 +LOCAL_CXXFLAGS:=-std=c++17 -fno-exceptions -fno-rtti -DENABLE_HLSL=1 +LOCAL_EXPORT_CPPFLAGS:=-std=c++17 LOCAL_EXPORT_LDFLAGS:=-latomic include $(BUILD_STATIC_LIBRARY) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.6/libshaderc/src/shaderc_cpp_test.cc new/shaderc-2023.7/libshaderc/src/shaderc_cpp_test.cc --- old/shaderc-2023.6/libshaderc/src/shaderc_cpp_test.cc 2023-08-09 17:26:10.000000000 +0200 +++ new/shaderc-2023.7/libshaderc/src/shaderc_cpp_test.cc 2023-10-13 17:02:17.000000000 +0200 @@ -545,7 +545,8 @@ // TODO(antiagainst): the error message can be improved to be more // explicit regarding Vulkan 1.1 HasSubstr("compilation succeeded but failed to optimize: " - "Invalid capability operand")); + "Capability GroupNonUniform is not allowed by Vulkan " + "1.0 specification (or requires extension)")); } TEST_F(CppInterface, CompileAndOptimizeForVulkan11Success) { @@ -664,7 +665,7 @@ const PreprocessedSourceCompilationResult result = compiler_.PreprocessGlsl( kMinimalShaderWithMacro, shaderc_glsl_vertex_shader, "shader", options_); EXPECT_TRUE(CompilationResultIsSuccess(result)); - EXPECT_THAT(CompilerOutputAsString(result), HasSubstr("void main(){ }")); + EXPECT_THAT(CompilerOutputAsString(result), HasSubstr("void main() { }")); const std::string kMinimalShaderCloneOption = "#version 140\n" @@ -677,7 +678,7 @@ cloned_options); EXPECT_TRUE(CompilationResultIsSuccess(result_from_cloned_options)); EXPECT_THAT(CompilerOutputAsString(result_from_cloned_options), - HasSubstr("void main(){ }")); + HasSubstr("void main() { }")); } // A shader kind test case needs: 1) A shader text with or without #pragma diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.6/libshaderc/src/shaderc_test.cc new/shaderc-2023.7/libshaderc/src/shaderc_test.cc --- old/shaderc-2023.6/libshaderc/src/shaderc_test.cc 2023-08-09 17:26:10.000000000 +0200 +++ new/shaderc-2023.7/libshaderc/src/shaderc_test.cc 2023-10-13 17:02:17.000000000 +0200 @@ -774,7 +774,7 @@ const std::string preprocessed_text = CompilationOutput(kMinimalShaderWithMacro, shaderc_glsl_vertex_shader, options_.get(), OutputType::PreprocessedText); - EXPECT_THAT(preprocessed_text, HasSubstr("void main(){ }")); + EXPECT_THAT(preprocessed_text, HasSubstr("void main() { }")); const std::string kMinimalShaderWithMacroCloneOption = "#version 150\n" @@ -785,7 +785,7 @@ const std::string preprocessed_text_cloned_options = CompilationOutput( kMinimalShaderWithMacroCloneOption, shaderc_glsl_vertex_shader, options_.get(), OutputType::PreprocessedText); - EXPECT_THAT(preprocessed_text_cloned_options, HasSubstr("void main(){ }")); + EXPECT_THAT(preprocessed_text_cloned_options, HasSubstr("void main() { }")); } // A shader kind test cases needs: 1) A shader text with or without #pragma diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.6/libshaderc_util/Android.mk new/shaderc-2023.7/libshaderc_util/Android.mk --- old/shaderc-2023.6/libshaderc_util/Android.mk 2023-08-09 17:26:10.000000000 +0200 +++ new/shaderc-2023.7/libshaderc_util/Android.mk 2023-10-13 17:02:17.000000000 +0200 @@ -16,7 +16,7 @@ include $(CLEAR_VARS) LOCAL_MODULE:=shaderc_util -LOCAL_CXXFLAGS:=-std=c++11 -fno-exceptions -fno-rtti -DENABLE_HLSL=1 +LOCAL_CXXFLAGS:=-std=c++17 -fno-exceptions -fno-rtti -DENABLE_HLSL=1 LOCAL_EXPORT_C_INCLUDES:=$(LOCAL_PATH)/include LOCAL_SRC_FILES:=src/args.cc \ src/compiler.cc \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/shaderc-2023.6/utils/roll-deps new/shaderc-2023.7/utils/roll-deps --- old/shaderc-2023.6/utils/roll-deps 2023-08-09 17:26:10.000000000 +0200 +++ new/shaderc-2023.7/utils/roll-deps 2023-10-13 17:02:17.000000000 +0200 @@ -18,18 +18,23 @@ # # Depends on roll-dep from depot_path being in PATH. -effcee_dir="third_party/effcee/" -effcee_trunk="origin/main" -glslang_dir="third_party/glslang/" -glslang_trunk="origin/main" -googletest_dir="third_party/googletest/" -googletest_trunk="origin/master" -re2_dir="third_party/re2/" -re2_trunk="origin/main" -spirv_headers_dir="third_party/spirv-headers/" -spirv_headers_trunk="origin/main" -spirv_tools_dir="third_party/spirv-tools/" -spirv_tools_trunk="origin/main" +set -eo pipefail + +function ExitIfIsInterestingError() { + local return_code=$1 + if [[ ${return_code} -ne 0 && ${return_code} -ne 2 ]]; then + exit ${return_code} + fi + return 0 +} + +dependencies=("third_party/effcee/" + "third_party/glslang/" + "third_party/googletest/" + "third_party/re2/" + "third_party/spirv-headers/" + "third_party/spirv-tools/") +branch="origin/main" # This script assumes it's parent directory is the repo root. repo_path=$(dirname "$0")/.. @@ -41,13 +46,12 @@ exit 1 fi -old_head=$(git rev-parse HEAD) +echo "*** Ignore messages about running 'git cl upload' ***" -roll-dep --ignore-dirty-tree --roll-to="${effcee_trunk}" "${effcee_dir}" -roll-dep --ignore-dirty-tree --roll-to="${glslang_trunk}" "${glslang_dir}" -roll-dep --ignore-dirty-tree --roll-to="${googletest_trunk}" "${googletest_dir}" -roll-dep --ignore-dirty-tree --roll-to="${re2_trunk}" "${re2_dir}" -roll-dep --ignore-dirty-tree --roll-to="${spirv_headers_trunk}" "${spirv_headers_dir}" -roll-dep --ignore-dirty-tree --roll-to="${spirv_tools_trunk}" "${spirv_tools_dir}" +set +e -git rebase --interactive "${old_head}" +for dep in ${dependencies[@]}; do + echo "Rolling $dep" + roll-dep --ignore-dirty-tree --roll-to="${branch}" "${dep}" + ExitIfIsInterestingError $? +done
