- updated to 2019.1

- updated system-libs patch

diff --git a/shaderc-system-libs.patch b/shaderc-system-libs.patch
index fa08760994e6efe93045e3ba5f6dbcd6551a36a1..b28c0fbbccf994878e3c3d0306bf7edf7fc5f4ae 100644 (file)
--- a/shaderc-system-libs.patch
+++ b/shaderc-system-libs.patch
@@ -1,6 +1,6 @@
---- shaderc-3c85d2636607054666a0966486ea78e3a553b209/CMakeLists.txt.orig       2017-05-16 19:32:41.000000000 +0200
-+++ shaderc-3c85d2636607054666a0966486ea78e3a553b209/CMakeLists.txt    2017-05-30 21:41:43.451874678 +0200
-@@ -46,7 +46,8 @@
+--- shaderc-2019.1/CMakeLists.txt.orig 2020-01-22 21:15:53.000000000 +0100
++++ shaderc-2019.1/CMakeLists.txt      2020-03-14 22:21:55.921268637 +0100
+@@ -92,7 +92,8 @@
  
  # Configure subdirectories.
  # We depend on these for later projects, so they should come first.
@@ -8,15 +8,17 @@
 +set(glslang_SOURCE_DIR /usr/include/glslang)
 +set(spirv-tools_SOURCE_DIR /usr)
  
- add_subdirectory(libshaderc_util)
- add_subdirectory(libshaderc)
-@@ -57,5 +57,5 @@
+ if(SHADERC_ENABLE_SPVC)
+ add_subdirectory(libshaderc_spvc)
+@@ -106,7 +107,7 @@
  add_custom_target(build-version
-   ${PYTHON_EXE}
+   ${PYTHON_EXECUTABLE}
    ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py
--  ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR}
-+  ${shaderc_SOURCE_DIR}
+-  ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc
++  ${shaderc_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)
 --- shaderc-3c85d2636607054666a0966486ea78e3a553b209/glslc/test/CMakeLists.txt.orig    2017-05-16 19:32:41.000000000 +0200
 +++ shaderc-3c85d2636607054666a0966486ea78e3a553b209/glslc/test/CMakeLists.txt 2017-05-30 21:50:42.181868527 +0200
 @@ -5,6 +5,6 @@
@@ -27,17 +29,17 @@
 +    $<TARGET_FILE:glslc_exe> spirv-dis
      --test-dir ${CMAKE_CURRENT_SOURCE_DIR})
  endif()
---- shaderc-3c85d2636607054666a0966486ea78e3a553b209/utils/update_build_version.py.orig        2017-05-16 19:32:41.000000000 +0200
-+++ shaderc-3c85d2636607054666a0966486ea78e3a553b209/utils/update_build_version.py     2017-05-30 21:58:02.445196831 +0200
-@@ -113,12 +113,12 @@
+--- shaderc-2019.1/utils/update_build_version.py.orig  2020-03-14 22:19:00.495552333 +0100
++++ shaderc-2019.1/utils/update_build_version.py       2020-03-14 22:22:37.814375016 +0100
+@@ -128,18 +128,18 @@
  
  
  def main():
--    if len(sys.argv) != 4:
--        print('usage: {} <shaderc-dir> <spirv-tools-dir> <glslang-dir>'.format(
-+    if len(sys.argv) != 2:
-+        print('usage: {} <shaderc-dir>'.format(
-             sys.argv[0]))
+-    if len(sys.argv) != 5:
+-        print(('usage: {} <shaderc-dir> <spirv-tools-dir> <glslang-dir> <output-file>'.format(
++    if len(sys.argv) != 3:
++        print(('usage: {} <shaderc-dir> <output-file>'.format(
+             sys.argv[0])))
          sys.exit(1)
  
 -    projects = ['shaderc', 'spirv-tools', 'glslang']
@@ -45,6 +47,13 @@
      new_content = ''.join([
          '"{}\\n"\n'.format(get_version_string(p, d))
          for (p, d) in zip(projects, sys.argv[1:])
+     ])
+ 
+-    output_file = sys.argv[4]
++    output_file = sys.argv[2]
+     mkdir_p(os.path.dirname(output_file))
+ 
+     if os.path.isfile(output_file):
 --- shaderc-d1f763cc3742b93f0fc090493be8ba0588f296da/libshaderc/CMakeLists.txt.orig    2018-10-26 20:30:19.875918754 +0200
 +++ shaderc-d1f763cc3742b93f0fc090493be8ba0588f296da/libshaderc/CMakeLists.txt 2018-10-26 20:30:36.765918565 +0200
 @@ -37,7 +37,7 @@

diff --git a/shaderc.spec b/shaderc.spec
index 171a893f55208256102e20ff999831ba899cb3ac..0b7a07f5f802ed867079f8f73a46c6d3d4e089e1 100644 (file)
--- a/shaderc.spec
+++ b/shaderc.spec
@@ -2,25 +2,27 @@
 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:       2019.0
+Version:       2019.1
 Release:       1
 License:       Apache v2.0
 Group:         Libraries
 #Source0Download: https://github.com/google/shaderc/releases
-# TODO:                https://github.com/google/shaderc/archive/v%{version}/%{name}-%{version}.tar.gz
-Source0:       https://github.com/google/shaderc/archive/v%{version}.tar.gz
-# Source0-md5: 8eb2b40712db2762a5cc40b568fd8ad9
+Source0:       https://github.com/google/shaderc/archive/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: cc408cef9a62f498d55b041e61ece2cd
 Patch0:                %{name}-system-libs.patch
 Patch1:                %{name}-shared.patch
 URL:           https://github.com/google/shaderc
 # for docs
 #BuildRequires:        asciidoctor
 BuildRequires: cmake >= 2.8.12
-BuildRequires: glslang-devel >= 7.12.3352
+# with vulkan1.2 patch
+BuildRequires: glslang-devel >= 8.13.3559-1
 BuildRequires: libstdc++-devel >= 6:4.7
 BuildRequires: python3 >= 1:3
 BuildRequires: spirv-tools >= 1:2019.4
 BuildRequires: spirv-tools-devel >= 1:2019.4
+%requires_ge   glslang
+%requires_ge_to        spirv-tools-libs spirv-tools-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description