diff --git a/0001-Use-system-third-party-libs.patch b/0001-Use-system-third-party-libs.patch index 1cb745f..82fb7a8 100644 --- a/0001-Use-system-third-party-libs.patch +++ b/0001-Use-system-third-party-libs.patch @@ -1,8 +1,13 @@ -Index: shaderc-2020.4/CMakeLists.txt +--- + CMakeLists.txt | 7 ------- + libshaderc/CMakeLists.txt | 2 ++ + 2 files changed, 2 insertions(+), 7 deletions(-) + +Index: shaderc-2020.5/CMakeLists.txt =================================================================== ---- shaderc-2020.4.orig/CMakeLists.txt -+++ shaderc-2020.4/CMakeLists.txt -@@ -102,18 +102,12 @@ endif(MSVC) +--- shaderc-2020.5.orig/CMakeLists.txt ++++ shaderc-2020.5/CMakeLists.txt +@@ -112,7 +112,6 @@ endif(MSVC) # Configure subdirectories. # We depend on these for later projects, so they should come first. @@ -10,21 +15,23 @@ Index: shaderc-2020.4/CMakeLists.txt add_subdirectory(libshaderc_util) add_subdirectory(libshaderc) - add_subdirectory(glslc) - add_subdirectory(examples) +@@ -121,12 +120,6 @@ 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 -Index: shaderc-2020.4/libshaderc/CMakeLists.txt + COMMAND ${CMAKE_COMMAND} +Index: shaderc-2020.5/libshaderc/CMakeLists.txt =================================================================== ---- shaderc-2020.4.orig/libshaderc/CMakeLists.txt -+++ shaderc-2020.4/libshaderc/CMakeLists.txt +--- shaderc-2020.5.orig/libshaderc/CMakeLists.txt ++++ shaderc-2020.5/libshaderc/CMakeLists.txt @@ -66,6 +66,8 @@ set(SHADERC_LIBS shaderc_util SPIRV # from glslang diff --git a/shaderc.changes b/shaderc.changes index 5dddc9e..801ce94 100644 --- a/shaderc.changes +++ b/shaderc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 1 08:44:37 UTC 2021 - Jan Engelhardt + +- Update to release 2020.5 + * Support newer glslang + ------------------------------------------------------------------- Mon Jan 11 00:50:07 UTC 2021 - Dirk Müller diff --git a/shaderc.spec b/shaderc.spec index 42d9e5a..e9c75d7 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -18,7 +18,7 @@ Name: shaderc %define lname libshaderc_shared1 -Version: 2020.4 +Version: 2020.5 Release: 0 Summary: A collection of tools, libraries and tests for shader compilation License: Apache-2.0 @@ -30,7 +30,7 @@ Source: https://github.com/google/shaderc/archive/v%version.tar.gz Patch1: 0001-Use-system-third-party-libs.patch BuildRequires: c++_compiler BuildRequires: cmake -BuildRequires: glslang-devel >= 8.13.3727+git4 +BuildRequires: glslang-devel >= 11.1 BuildRequires: python-xml BuildRequires: spirv-headers >= 1.5.1.corrected+git24 BuildRequires: spirv-tools-devel >= 2020.2 diff --git a/v2020.4.tar.gz b/v2020.4.tar.gz deleted file mode 100644 index 297060b..0000000 --- a/v2020.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:19e4c812bfbdbabbfb658062628c377339d14894080b5c169216a1d86483bdcc -size 220148 diff --git a/v2020.5.tar.gz b/v2020.5.tar.gz new file mode 100644 index 0000000..5a71d02 --- /dev/null +++ b/v2020.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e96d8cb208b796cecb9e6cce437c7d1116343158ef3ea26277eb13b62cf56834 +size 220159