rpms/shaderc
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 2020.4

Browse Source 
Close: rhbz#1906260

Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
This commit is contained in:
Robert-André Mauchin 2020-12-26 15:38:17 +01:00
parent e8a0957709
commit 8ad38eb650
No known key found for this signature in database
GPG Key ID: F07E690B12A82D56
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@
/shaderc-7c2aa93.tar.gz /shaderc-7c2aa93.tar.gz
/shaderc-4162bb1.tar.gz /shaderc-4162bb1.tar.gz
/shaderc-1fce597.tar.gz /shaderc-1fce597.tar.gz
/shaderc-0dbd899.tar.gz

11
0001-Drop-third-party-code-in-CMakeLists.txt.patch
View File

@ -1,15 +1,12 @@
diff -up shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt 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.orig 2020-01-22 21:15:53.000000000 +0100
+++ shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt 2020-02-02 21:06:15.193583552 +0100 +++ shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt 2020-02-02 21:06:15.193583552 +0100
@@ -98,7 +98,6 @@ endif(MSVC) @@ -102,18 +102,10 @@ endif(MSVC)
# Configure subdirectories. # Configure subdirectories.
# We depend on these for later projects, so they should come first. # We depend on these for later projects, so they should come first.
-add_subdirectory(third_party) -add_subdirectory(third_party)
if(SHADERC_ENABLE_SPVC)
add_subdirectory(libshaderc_spvc)
@@ -107,13 +106,6 @@ endif()
add_subdirectory(libshaderc_util) add_subdirectory(libshaderc_util)
add_subdirectory(libshaderc) add_subdirectory(libshaderc)
add_subdirectory(glslc) add_subdirectory(glslc)
@ -20,6 +17,6 @@ diff -up shaderc-f76bb2f09f858c3014b329961d836964e515095d/CMakeLists.txt.orig sh
- ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py - ${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 - ${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).") - COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).")
function(define_pkg_config_file NAME LIBS) function(define_pkg_config_file NAME LIBS)
add_custom_target(${NAME}-pkg-config ALL add_custom_target(${NAME}-pkg-config ALL

12
shaderc.spec
View File

@ -1,16 +1,16 @@
# Force out of source build # Force out of source build
%undefine __cmake_in_source_build %undefine __cmake_in_source_build
# Release 2020.3 # Release 2020.4
%global commit 1fce59794079f90ceb091190adbbb5499acd4e95 %global commit 0dbd899941a43ffd55df527d65128b3b66e75c9c
%global shortcommit %(c=%{commit}; echo ${c:0:7}) %global shortcommit %(c=%{commit}; echo ${c:0:7})
%global snapshotdate 20200902 %global snapshotdate 20201226
# Glslang revision from packaged version # Glslang revision from packaged version
%global glslang_version d550bebee919179c9e332a0ab28a67f8fe3ca239 %global glslang_version d550bebee919179c9e332a0ab28a67f8fe3ca239
Name: shaderc Name: shaderc
Version: 2020.3 Version: 2020.4
Release: 1%{?dist} Release: 1%{?dist}
Summary: A collection of tools, libraries, and tests for Vulkan shader compilation Summary: A collection of tools, libraries, and tests for Vulkan shader compilation
@ -126,6 +126,10 @@ sed -i 's|SPIRV/GlslangToSpv.h|glslang/SPIRV/GlslangToSpv.h|' libshaderc_util/sr
%{_libdir}/pkgconfig/shaderc_combined.pc %{_libdir}/pkgconfig/shaderc_combined.pc
%changelog %changelog
* Sat Dec 26 15:21:39 CET 2020 Robert-André Mauchin <zebob.m@gmail.com> - 2020.4-1
- Update to 2020.4
- Close: rhbz#1906260
* Sat Dec 05 2020 Robert-André Mauchin <zebob.m@gmail.com> - 2020.3-1 * Sat Dec 05 2020 Robert-André Mauchin <zebob.m@gmail.com> - 2020.3-1
- Update to 2020.3 - Update to 2020.3
- Close: rhbz#1875183 - Close: rhbz#1875183

2
sources
View File

@ -1 +1 @@
SHA512 (shaderc-1fce597.tar.gz) = 7622bedab115645da353f63443e1ab3d3e30d4a80ac5bc0dad82019b35d41c64ec20ff8846f8611d9f6598103cb902289f25597cf54887af2c838aaa6d18726d SHA512 (shaderc-0dbd899.tar.gz) = fe85aa633abaff22ae2a52af474cc45d068d018aa2821efd1e7c1016be598eb29085be1822400865826aa4d481ae0286a93c5925cc83f364070815fc1172d027