Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/shaderc.git#3b1492aaeff6bedab22ddfafdd47ca950d4d5c6a
This commit is contained in:
DistroBaker 2021-03-11 20:04:38 +00:00
parent 75033ed5fd
commit 9ead6910de
4 changed files with 21 additions and 14 deletions

1
.gitignore vendored
View File

@ -6,3 +6,4 @@
/shaderc-4162bb1.tar.gz
/shaderc-1fce597.tar.gz
/shaderc-0dbd899.tar.gz
/shaderc-24275a1.tar.gz

View File

@ -1,22 +1,24 @@
diff -up shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt
--- shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig 2020-01-22 21:15:53.000000000 +0100
+++ shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt 2020-02-02 21:06:15.193583552 +0100
@@ -102,18 +102,10 @@ endif(MSVC)
diff -up shaderc-24275a11d81a6b33ef345878f8a4ef929c95a116/CMakeLists.txt.orig shaderc-24275a11d81a6b33ef345878f8a4ef929c95a116/CMakeLists.txt
--- shaderc-24275a11d81a6b33ef345878f8a4ef929c95a116/CMakeLists.txt.orig 2021-03-05 13:50:35.469018657 +0100
+++ shaderc-24275a11d81a6b33ef345878f8a4ef929c95a116/CMakeLists.txt 2021-03-05 13:52:02.679524176 +0100
@@ -112,20 +112,10 @@ endif(MSVC)
# Configure subdirectories.
# We depend on these for later projects, so they should come first.
-add_subdirectory(third_party)
add_subdirectory(libshaderc_util)
add_subdirectory(libshaderc)
add_subdirectory(glslc)
-add_subdirectory(examples)
-if(${SHADERC_ENABLE_EXAMPLES})
- add_subdirectory(examples)
-endif()
-
-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

View File

@ -2,16 +2,16 @@
%undefine __cmake_in_source_build
# Release 2020.4
%global commit 0dbd899941a43ffd55df527d65128b3b66e75c9c
%global commit 24275a11d81a6b33ef345878f8a4ef929c95a116
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global snapshotdate 20201226
%global snapshotdate 20210219
# Glslang revision from packaged version
%global glslang_version d550bebee919179c9e332a0ab28a67f8fe3ca239
%global glslang_version c594de23cdd790d64ad5f9c8b059baae0ee2941d
Name: shaderc
Version: 2020.4
Release: 2%{?dist}
Version: 2020.5
Release: 1%{?dist}
Summary: A collection of tools, libraries, and tests for Vulkan shader compilation
License: ASL 2.0
@ -126,6 +126,10 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr
%{_libdir}/pkgconfig/shaderc_combined.pc
%changelog
* Fri Mar 5 13:43:44 CET 2021 Robert-André Mauchin <zebob.m@gmail.com> - 2020.5-1
- Update to 2020.5
- Close: rhbz#1931006
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2020.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (shaderc-0dbd899.tar.gz) = fe85aa633abaff22ae2a52af474cc45d068d018aa2821efd1e7c1016be598eb29085be1822400865826aa4d481ae0286a93c5925cc83f364070815fc1172d027
SHA512 (shaderc-24275a1.tar.gz) = 4e5cd96888c555b7337154e64fc2b690a26e3fe044c605eb542dc2ff68c2cd0cfb2e945348eb6a8d97daab2449082949c8f780407e793a671a02246fb1fb1f59