diff --git a/0001-Use-system-third-party-libs.patch b/0001-Use-system-third-party-libs.patch index b109fd8..deb5e51 100644 --- a/0001-Use-system-third-party-libs.patch +++ b/0001-Use-system-third-party-libs.patch @@ -4,11 +4,11 @@ utils/update_build_version.sh | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) -Index: shaderc-2023.2/CMakeLists.txt +Index: shaderc-2023.8/CMakeLists.txt =================================================================== ---- shaderc-2023.2.orig/CMakeLists.txt -+++ shaderc-2023.2/CMakeLists.txt -@@ -130,7 +130,6 @@ endif(MSVC) +--- shaderc-2023.8.orig/CMakeLists.txt ++++ shaderc-2023.8/CMakeLists.txt +@@ -124,7 +124,6 @@ endif(MSVC) # Configure subdirectories. # We depend on these for later projects, so they should come first. @@ -16,7 +16,7 @@ Index: shaderc-2023.2/CMakeLists.txt add_subdirectory(libshaderc_util) add_subdirectory(libshaderc) -@@ -141,7 +140,7 @@ endif() +@@ -135,7 +134,7 @@ endif() add_custom_target(build-version ${PYTHON_EXECUTABLE} @@ -25,10 +25,10 @@ Index: shaderc-2023.2/CMakeLists.txt ${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).") -Index: shaderc-2023.2/libshaderc/CMakeLists.txt +Index: shaderc-2023.8/libshaderc/CMakeLists.txt =================================================================== ---- shaderc-2023.2.orig/libshaderc/CMakeLists.txt -+++ shaderc-2023.2/libshaderc/CMakeLists.txt +--- shaderc-2023.8.orig/libshaderc/CMakeLists.txt ++++ shaderc-2023.8/libshaderc/CMakeLists.txt @@ -67,6 +67,8 @@ set(SHADERC_LIBS shaderc_util SPIRV # from glslang @@ -38,9 +38,9 @@ Index: shaderc-2023.2/libshaderc/CMakeLists.txt ) target_link_libraries(shaderc PRIVATE ${SHADERC_LIBS}) -Index: shaderc-2023.2/utils/update_build_version.sh +Index: shaderc-2023.8/utils/update_build_version.sh =================================================================== --- /dev/null -+++ shaderc-2023.2/utils/update_build_version.sh ++++ shaderc-2023.8/utils/update_build_version.sh @@ -0,0 +1 @@ +#!/bin/true diff --git a/shaderc.changes b/shaderc.changes index 2cd8ccd..12ad3f4 100644 --- a/shaderc.changes +++ b/shaderc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 19 13:04:49 UTC 2024 - Jan Engelhardt + +- Update to release 2023.8 + * API: Expose rlaxed Vulkan rules from glslang + ------------------------------------------------------------------- Thu Nov 9 15:46:07 UTC 2023 - Dominique Leuenberger diff --git a/shaderc.spec b/shaderc.spec index bb2bdf1..f271e9e 100644 --- a/shaderc.spec +++ b/shaderc.spec @@ -1,7 +1,7 @@ # # spec file for package shaderc # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ # Remember to bump in baselibs.conf %define lname libshaderc_shared1 Name: shaderc -Version: 2023.7 +Version: 2023.8 Release: 0 Summary: A collection of tools, libraries and tests for shader compilation License: Apache-2.0 @@ -31,10 +31,11 @@ Source99: baselibs.conf Patch1: 0001-Use-system-third-party-libs.patch BuildRequires: c++_compiler BuildRequires: cmake >= 2.8.12 -BuildRequires: glslang-devel >= 12.3.1+sdk261 +BuildRequires: glslang-devel >= 14 BuildRequires: glslang-nonstd-devel -BuildRequires: spirv-headers >= 1.6.1~sdk261 -BuildRequires: spirv-tools-devel >= 2023.4~rc2 +BuildRequires: python3-base +BuildRequires: spirv-headers >= 1.6.1~sdk275 +BuildRequires: spirv-tools-devel >= 2023.6~rc1 %description A collection of tools, libraries and tests for shader compilation. @@ -68,6 +69,7 @@ Shaderc wraps around core functionality in glslang and SPIRV-Tools %autosetup -p1 chmod a+x utils/update_build_version.sh echo "\"%version\"" >glslc/src/build-version.inc +find . -type f -exec grep -l '#!/usr/bin/env python' {} + | xargs perl -i -lpe 's{/env python\w*}{/python3}g' %build export CXXFLAGS="%{optflags} -I%_includedir/External" diff --git a/v2023.7.tar.gz b/v2023.7.tar.gz deleted file mode 100644 index 97118dd..0000000 --- a/v2023.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:681e1340726a0bf46bea7e31f10cbfe78e01e4446a35d90fedc2b78d400fcdeb -size 227360 diff --git a/v2023.8.tar.gz b/v2023.8.tar.gz new file mode 100644 index 0000000..24216c6 --- /dev/null +++ b/v2023.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dfec5045f30d8f6d3d3914ab5b3cc2695947f266d41261b1459177cd789308d1 +size 227238