- updated to 2021.0

- updated shared patch

diff --git a/shaderc-shared.patch b/shaderc-shared.patch
index 7d3dafa1877bfb35eeefe9c76d187b5cad868d09..aa6265e06bf54ad654a343b3d0efc56aba150a97 100644 (file)
--- a/shaderc-shared.patch
+++ b/shaderc-shared.patch
@@ -8,17 +8,27 @@
  shaderc_default_compile_options(shaderc_shared)
  target_include_directories(shaderc_shared PUBLIC include PRIVATE ${glslang_SOURCE_DIR})
  target_compile_definitions(shaderc_shared
---- shaderc-d1f763cc3742b93f0fc090493be8ba0588f296da/glslc/CMakeLists.txt.orig 2018-02-26 19:23:46.000000000 +0100
-+++ shaderc-d1f763cc3742b93f0fc090493be8ba0588f296da/glslc/CMakeLists.txt      2018-10-26 21:22:00.139216692 +0200
-@@ -17,15 +17,13 @@
+--- shaderc-2021.0/glslc/CMakeLists.txt.orig   2021-04-28 18:26:01.925013098 +0200
++++ shaderc-2021.0/glslc/CMakeLists.txt        2021-04-28 18:34:04.012401406 +0200
+@@ -30,7 +30,7 @@
+ )
  
  shaderc_default_compile_options(glslc)
 -target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})
--target_link_libraries(glslc PRIVATE glslang OSDependent OGLCompiler
--  HLSL glslang SPIRV ${CMAKE_THREAD_LIBS_INIT})
--target_link_libraries(glslc PRIVATE shaderc_util shaderc)
 +target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../libshaderc_util/include)
-+target_link_libraries(glslc PRIVATE shaderc_shared ${CMAKE_THREAD_LIBS_INIT})
+ 
+ if (SHADERC_ENABLE_WGSL_OUTPUT)
+   if (IS_DIRECTORY "${tint_SOURCE_DIR}/include")
+@@ -42,17 +42,14 @@
+   add_definitions(-DSHADERC_ENABLE_WGSL_OUTPUT=1)
+ endif(SHADERC_ENABLE_WGSL_OUTPUT)
+ 
+-target_link_libraries(glslc PRIVATE
+-  glslang OSDependent OGLCompiler HLSL glslang SPIRV    # Glslang libraries
+-  $<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint>      # Tint libraries, optional
+-  shaderc_util shaderc                                  # internal Shaderc libraries
++target_link_libraries(glslc PRIVATE shaderc_shared
+   ${CMAKE_THREAD_LIBS_INIT})
  
  add_executable(glslc_exe src/main.cc)
  shaderc_default_compile_options(glslc_exe)

diff --git a/shaderc.spec b/shaderc.spec
index 29c8ec86c051649995a0cb523675358849cab817..7b8e40ec65eedd7139eafa57f7883293e1f5d4f6 100644 (file)
--- a/shaderc.spec
+++ b/shaderc.spec
@@ -2,13 +2,13 @@
 Summary:       Collection of tools, libraries and tests for shader compilation
 Summary(pl.UTF-8):     Zestaw narzędzi, bibliotek i testów do kompilacji shaderów
 Name:          shaderc
-Version:       2020.0
+Version:       2021.0
 Release:       1
 License:       Apache v2.0
 Group:         Libraries
 #Source0Download: https://github.com/google/shaderc/releases
 Source0:       https://github.com/google/shaderc/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 9ddf5841214875aac171816c8aad554d
+# Source0-md5: 0391f2345f0cfdd6a9995535606d66b3
 Patch0:                %{name}-system-libs.patch
 Patch1:                %{name}-shared.patch
 URL:           https://github.com/google/shaderc
@@ -16,11 +16,11 @@ URL:                https://github.com/google/shaderc
 #BuildRequires:        asciidoctor
 BuildRequires: cmake >= 2.8.12
 # with vulkan1.2 patch
-BuildRequires: glslang-devel >= 8.13.3559-1
+BuildRequires: glslang-devel >= 11.1
 BuildRequires: libstdc++-devel >= 6:4.7
 BuildRequires: python3 >= 1:3
-BuildRequires: spirv-tools >= 1:2019.4
-BuildRequires: spirv-tools-devel >= 1:2019.4
+BuildRequires: spirv-tools >= 1:2020.6
+BuildRequires: spirv-tools-devel >= 1:2020.6
 %requires_ge   glslang
 %requires_ge_to        spirv-tools-libs spirv-tools-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)