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-09-07 21:12:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/shaderc (Old)
and /work/SRC/openSUSE:Factory/.shaderc.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shaderc"
Thu Sep 7 21:12:10 2023 rev:23 rq:1109373 version:2023.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/shaderc/shaderc.changes 2023-06-03
00:05:21.273326732 +0200
+++ /work/SRC/openSUSE:Factory/.shaderc.new.1766/shaderc.changes
2023-09-07 21:12:20.728456930 +0200
@@ -1,0 +2,6 @@
+Wed Sep 6 22:58:36 UTC 2023 - Jan Engelhardt <jeng...@inai.de>
+
+- Update to release 2023.6
+ * Build system updates only
+
+-------------------------------------------------------------------
Old:
----
v2023.4.tar.gz
New:
----
v2023.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ shaderc.spec ++++++
--- /var/tmp/diff_new_pack.RbFKGb/_old 2023-09-07 21:12:22.084505406 +0200
+++ /var/tmp/diff_new_pack.RbFKGb/_new 2023-09-07 21:12:22.084505406 +0200
@@ -19,7 +19,7 @@
# Remember to bump in baselibs.conf
%define lname libshaderc_shared1
Name: shaderc
-Version: 2023.4
+Version: 2023.6
Release: 0
Summary: A collection of tools, libraries and tests for shader
compilation
License: Apache-2.0
@@ -31,10 +31,10 @@
Patch1: 0001-Use-system-third-party-libs.patch
BuildRequires: c++_compiler
BuildRequires: cmake >= 2.8.12
-BuildRequires: glslang-devel >= 12.2
+BuildRequires: glslang-devel >= 12.3.1+sdk261
BuildRequires: glslang-nonstd-devel
-BuildRequires: spirv-headers >= 1.6.1~sdk250
-BuildRequires: spirv-tools-devel >= 2023.3~rc1
+BuildRequires: spirv-headers >= 1.6.1~sdk261
+BuildRequires: spirv-tools-devel >= 2023.4~rc2
%description
A collection of tools, libraries and tests for shader compilation.
++++++ v2023.4.tar.gz -> v2023.6.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shaderc-2023.4/.gitignore
new/shaderc-2023.6/.gitignore
--- old/shaderc-2023.4/.gitignore 2023-05-24 21:30:26.000000000 +0200
+++ new/shaderc-2023.6/.gitignore 2023-08-09 17:26:10.000000000 +0200
@@ -6,6 +6,7 @@
compile_commands.json
.ycm_extra_conf.py
cscope.*
+third_party/abseil_cpp
third_party/effcee
third_party/glslang
third_party/googletest
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shaderc-2023.4/CHANGES new/shaderc-2023.6/CHANGES
--- old/shaderc-2023.4/CHANGES 2023-05-24 21:30:26.000000000 +0200
+++ new/shaderc-2023.6/CHANGES 2023-08-09 17:26:10.000000000 +0200
@@ -1,6 +1,16 @@
Revision history for Shaderc
-v2023.4 2022-05-24
+v2023.6 2023-08-09
+ - Update dependencies, including SPIRV-Tools v2023.4.rc2
+
+v2023.5 2023-07-19
+ - Update dependencies
+ - Update to Android NDK r25c
+ - Update Android API level for test project (#1333)
+ - For testing, add a dependency on Abseil's C++ library
+ - Fix MSVC runtime library linking in CMake (#1339)
+
+v2023.4 2023-05-24
- Refresh Glslang, SPIRV-Tools, SPIRV-Headers
- Android.mk:
- Require NDK 21d or later
@@ -9,16 +19,16 @@
- glslc and APIs:
- Add options to control mesh shading limits
-v2023.3 2022-03-17
+v2023.3 2023-03-17
- Shaderc now requires C++17
- Drop support for VS 2015
- Add glslc option -fpreserve-bindings
- Refresh Glslang, SPIRV-Tools
-v2023.2 2022-01-18
+v2023.2 2023-01-18
- Update DEPS to pull in SPIRV-Tools bugfix #5049
-v2023.1 2022-01-13
+v2023.1 2023-01-13
- General/Build
- Removed support for GCC-based code coverage builds
- Update minimum CMake to 3.17.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shaderc-2023.4/CMakeLists.txt
new/shaderc-2023.6/CMakeLists.txt
--- old/shaderc-2023.4/CMakeLists.txt 2023-05-24 21:30:26.000000000 +0200
+++ new/shaderc-2023.6/CMakeLists.txt 2023-08-09 17:26:10.000000000 +0200
@@ -14,11 +14,6 @@
cmake_minimum_required(VERSION 3.17.2)
-if (POLICY CMP00091)
- # Enable MSVC Runtime Library Property
- cmake_policy(SET CMP0091 NEW)
-endif()
-
project(shaderc)
enable_testing()
@@ -114,17 +109,12 @@
if(MSVC)
option(SHADERC_ENABLE_SHARED_CRT
"Use the shared CRT instead of the static CRT"
- ${SHADERC_ENABLE_SHARED_CRT})
- if (NOT SHADERC_ENABLE_SHARED_CRT)
- # Link executables statically by replacing /MD with /MT everywhere.
- foreach(flag_var
- CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
- CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
- if(${flag_var} MATCHES "/MD")
- string(REGEX REPLACE "/MD" "/MT" ${flag_var} "${${flag_var}}")
- endif(${flag_var} MATCHES "/MD")
- endforeach(flag_var)
- endif(NOT SHADERC_ENABLE_SHARED_CRT)
+ OFF)
+ if (SHADERC_ENABLE_SHARED_CRT)
+ set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>DLL")
+ else()
+ set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+ endif()
endif(MSVC)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shaderc-2023.4/DEPS new/shaderc-2023.6/DEPS
--- old/shaderc-2023.4/DEPS 2023-05-24 21:30:26.000000000 +0200
+++ new/shaderc-2023.6/DEPS 2023-08-09 17:26:10.000000000 +0200
@@ -1,18 +1,23 @@
use_relative_paths = True
vars = {
+ 'abseil_git': 'https://github.com/abseil',
'google_git': 'https://github.com/google',
'khronos_git': 'https://github.com/KhronosGroup',
- 'effcee_revision' : '66edefd2bb641de8a2f46b476de21f227fc03a28',
- 'glslang_revision': '9fbc561947f6b5275289a1985676fb7267273e09',
- 'googletest_revision': 'd9c309fdab807b716c2cf4d4a42989b8c34f712a',
- 're2_revision': '3a8436ac436124a57a4e22d5c8713a2d42b381d7',
- 'spirv_headers_revision': 'bdbfd019be6952fd8fa9bd5606a8798a7530c853',
- 'spirv_tools_revision': 'e7c6084fd1d6d6f5ac393e842728d8be309688ca',
+ 'abseil_revision': '5be22f98733c674d532598454ae729253bc53e82',
+ 'effcee_revision' : '19b4aa87af25cb4ee779a071409732f34bfc305c',
+ 'glslang_revision': '76b52ebf77833908dc4c0dd6c70a9c357ac720bd',
+ 'googletest_revision': 'c541e7c11044b1e0303103ef8a47d7a9632c479b',
+ 're2_revision': 'c9cba76063cf4235c1a15dd14a24a4ef8d623761',
+ 'spirv_headers_revision': '124a9665e464ef98b8b718d572d5f329311061eb',
+ 'spirv_tools_revision': 'e553b884c7c9febaa4e52334f683641fb5f196a0',
}
deps = {
+ 'third_party/abseil_cpp':
+ Var('abseil_git') + '/abseil-cpp.git@' + Var('abseil_revision'),
+
'third_party/effcee': Var('google_git') + '/effcee.git@' +
Var('effcee_revision'),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shaderc-2023.4/README.md new/shaderc-2023.6/README.md
--- old/shaderc-2023.4/README.md 2023-05-24 21:30:26.000000000 +0200
+++ new/shaderc-2023.6/README.md 2023-08-09 17:26:10.000000000 +0200
@@ -42,7 +42,7 @@
[Android NDK](https://developer.android.com/ndk/index.html) since version r12b.
(The NDK build uses sources from
https://android.googlesource.com/platform/external/shaderc/.
Those repos are downstream from GitHub.)
-We currently require r21d.
+We currently require r25c.
For licensing terms, please see the [`LICENSE`](LICENSE) file. If interested
in
contributing to this project, please see [`CONTRIBUTING.md`](CONTRIBUTING.md).
@@ -69,8 +69,13 @@
Shaderc depends on [SPIRV-Tools][spirv-tools] for assembling, disassembling,
and transforming SPIR-V binaries.
-Shaderc depends on the [Google Test](https://github.com/google/googletest)
-testing framework.
+For testing, Shaderc depends on:
+| Library | URL | Description |
+| -- | -- | -- |
+| Googletest | https://github.com/google/googletest | Testing framework |
+| Effcee | https://github.com/google/effcee | Stateful pattern matcher
inspired by LLVM's FileCheck |
+| RE2 | https://github.com/google/re2 | Regular expression matcher |
+| Abseil | https://github.com/abseil/abseil-cpp | Common basic utilities in
C++ |
In the following sections, `$SOURCE_DIR` is the directory you intend to clone
Shaderc into.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shaderc-2023.4/android_test/jni/Application.mk
new/shaderc-2023.6/android_test/jni/Application.mk
--- old/shaderc-2023.4/android_test/jni/Application.mk 2023-05-24
21:30:26.000000000 +0200
+++ new/shaderc-2023.6/android_test/jni/Application.mk 2023-08-09
17:26:10.000000000 +0200
@@ -15,4 +15,6 @@
APP_ABI := all
APP_BUILD_SCRIPT := Android.mk
APP_STL := c++_static
-APP_PLATFORM := android-16
+# Vulkan was added at API level 24.
+# Android NDK 26 will drop support for APIs before 21.
+APP_PLATFORM := android-24
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/shaderc-2023.4/kokoro/android-release/build-docker.sh
new/shaderc-2023.6/kokoro/android-release/build-docker.sh
--- old/shaderc-2023.4/kokoro/android-release/build-docker.sh 2023-05-24
21:30:26.000000000 +0200
+++ new/shaderc-2023.6/kokoro/android-release/build-docker.sh 2023-08-09
17:26:10.000000000 +0200
@@ -27,7 +27,7 @@
using cmake-3.17.2
using ninja-1.10.0
-using ndk-r21d # Sets ANDROID_NDK_HOME, pointing at the NDK's root dir
+using ndk-r25c # Sets ANDROID_NDK_HOME, pointing at the NDK's root dir
cd $ROOT_DIR
./utils/git-sync-deps
@@ -49,7 +49,7 @@
-DANDROID_NDK=$ANDROID_NDK_HOME ..
echo $(date): Build glslang...
-ninja glslangValidator
+ninja glslang-standalone
echo $(date): Build everything...
ninja
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shaderc-2023.4/kokoro/linux/build-docker.sh
new/shaderc-2023.6/kokoro/linux/build-docker.sh
--- old/shaderc-2023.4/kokoro/linux/build-docker.sh 2023-05-24
21:30:26.000000000 +0200
+++ new/shaderc-2023.6/kokoro/linux/build-docker.sh 2023-08-09
17:26:10.000000000 +0200
@@ -69,7 +69,7 @@
cmake -GNinja -DCMAKE_INSTALL_PREFIX=$KOKORO_ARTIFACTS_DIR/install
-DRE2_BUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=$BUILD_TYPE $ADDITIONAL_CMAKE_FLAGS
..
echo $(date): Build glslang...
-ninja glslangValidator
+ninja glslang-standalone
echo $(date): Build everything...
ninja
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/shaderc-2023.4/kokoro/linux/presubmit_mingw_release.cfg
new/shaderc-2023.6/kokoro/linux/presubmit_mingw_release.cfg
--- old/shaderc-2023.4/kokoro/linux/presubmit_mingw_release.cfg 1970-01-01
01:00:00.000000000 +0100
+++ new/shaderc-2023.6/kokoro/linux/presubmit_mingw_release.cfg 2023-08-09
17:26:10.000000000 +0200
@@ -0,0 +1,16 @@
+# 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_mingw_release.sh"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shaderc-2023.4/kokoro/macos/build.sh
new/shaderc-2023.6/kokoro/macos/build.sh
--- old/shaderc-2023.4/kokoro/macos/build.sh 2023-05-24 21:30:26.000000000
+0200
+++ new/shaderc-2023.6/kokoro/macos/build.sh 2023-08-09 17:26:10.000000000
+0200
@@ -43,7 +43,7 @@
cmake -GNinja -DCMAKE_INSTALL_PREFIX=$KOKORO_ARTIFACTS_DIR/install
-DRE2_BUILD_TESTING=OFF -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
-DCMAKE_BUILD_TYPE=$BUILD_TYPE ..
echo $(date): Build glslang...
-ninja glslangValidator
+ninja glslang-standalone
echo $(date): Build everything...
ninja
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shaderc-2023.4/kokoro/ndk-build/build-docker.sh
new/shaderc-2023.6/kokoro/ndk-build/build-docker.sh
--- old/shaderc-2023.4/kokoro/ndk-build/build-docker.sh 2023-05-24
21:30:26.000000000 +0200
+++ new/shaderc-2023.6/kokoro/ndk-build/build-docker.sh 2023-08-09
17:26:10.000000000 +0200
@@ -40,7 +40,7 @@
# Get source for dependencies, as specified in the DEPS file
/usr/bin/python3 utils/git-sync-deps --treeless
-using ndk-r21d
+using ndk-r25c
clean_dir "$ROOT_DIR/build"
cd "$ROOT_DIR/build"
@@ -58,9 +58,14 @@
-j8 $@
}
+# Builds all the ABIs (see APP_ABI in jni/Application.mk)
do_ndk_build
# Check that libshaderc_combined builds
-do_ndk_build libshaderc_combined
+# Explicitly set each ABI, otherwise it will only pick x86.
+# It seems to be the behaviour when specifying an explicit target.
+for abi in x86 x86_64 armeabi-v7a arm64-v8a; do
+ do_ndk_build APP_ABI=$abi libshaderc_combined
+done
echo $(date): ndk-build completed.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shaderc-2023.4/kokoro/windows/build.bat
new/shaderc-2023.6/kokoro/windows/build.bat
--- old/shaderc-2023.4/kokoro/windows/build.bat 2023-05-24 21:30:26.000000000
+0200
+++ new/shaderc-2023.6/kokoro/windows/build.bat 2023-08-09 17:26:10.000000000
+0200
@@ -59,7 +59,7 @@
if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
echo "Build glslang... %DATE% %TIME%"
-ninja glslangValidator
+ninja glslang-standalone
if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
echo "Build everything... %DATE% %TIME%"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shaderc-2023.4/third_party/CMakeLists.txt
new/shaderc-2023.6/third_party/CMakeLists.txt
--- old/shaderc-2023.4/third_party/CMakeLists.txt 2023-05-24
21:30:26.000000000 +0200
+++ new/shaderc-2023.6/third_party/CMakeLists.txt 2023-08-09
17:26:10.000000000 +0200
@@ -17,6 +17,8 @@
"Location of re2 source")
set(SHADERC_TINT_DIR "${SHADERC_THIRD_PARTY_ROOT_DIR}/tint" CACHE STRING
"Location of tint source")
+set(SHADERC_ABSL_DIR "${SHADERC_THIRD_PARTY_ROOT_DIR}/abseil_cpp" CACHE STRING
+ "Location of re2 source")
set( SKIP_GLSLANG_INSTALL ${SHADERC_SKIP_INSTALL} )
set( SKIP_SPIRV_TOOLS_INSTALL ${SHADERC_SKIP_INSTALL} )
@@ -49,7 +51,13 @@
# Also skip building tests in SPIRV-Tools.
set(SPIRV_SKIP_TESTS ON CACHE BOOL "Skip building SPIRV-Tools tests")
elseif(NOT "${SPIRV_SKIP_TESTS}")
- # SPIRV-Tools requires effcee and re2 to build tests.
+ # SPIRV-Tools requires effcee, re2, and abseil to build tests.
+ # re2 depends on abseil, so abseil must be added first.
+ set(ABSL_INTERNAL_AT_LEAST_CXX17 ON)
+ set(ABSL_PROPAGATE_CXX_STD ON)
+ set(ABSL_ENABLE_INSTALL ON)
+ add_subdirectory(${SHADERC_ABSL_DIR} absl EXCLUDE_FROM_ALL)
+
# re2 tests take a long time and do not add much value, since re2 is a
# dependency of a dependency, so not running them.
set(RE2_BUILD_TESTING OFF CACHE STRING "Run RE2 Tests")
@@ -57,6 +65,16 @@
add_subdirectory(${SHADERC_EFFCEE_DIR} effcee)
endif()
add_subdirectory(${SHADERC_SPIRV_TOOLS_DIR} spirv-tools)
+ if (NOT "${SPIRV_SKIP_TESTS}")
+ if (MSVC)
+ if (${MSVC_VERSION} LESS 1920)
+ # VS 2017 requires /bigobj on test_opt
+ # https://github.com/google/shaderc/issues/1345
+ # https://github.com/KhronosGroup/SPIRV-Tools/issues/5335
+ target_compile_options(test_opt PRIVATE /bigobj)
+ endif()
+ endif()
+ endif()
endif()
if (NOT TARGET SPIRV-Tools)
message(FATAL_ERROR "SPIRV-Tools was not found - required for compilation")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/shaderc-2023.4/utils/update_build_version.py
new/shaderc-2023.6/utils/update_build_version.py
--- old/shaderc-2023.4/utils/update_build_version.py 2023-05-24
21:30:26.000000000 +0200
+++ new/shaderc-2023.6/utils/update_build_version.py 2023-08-09
17:26:10.000000000 +0200
@@ -75,7 +75,7 @@
# Allow trailing whitespace in the checked-out source code has
# unexpected carriage returns on a linefeed-only system such as
# Linux.
- pattern = re.compile(r'^(v\d+\.\d+(-dev)?) \d\d\d\d-\d\d-\d\d\s*$')
+ pattern = re.compile(r'^(v\d+\.\d+(-dev|[\.-]rc\d+)?)
\d\d\d\d-\d\d-\d\d\s*$')
changes_file = os.path.join(directory, 'CHANGES')
with open(changes_file, errors='replace') as f:
for line in f.readlines():
