- rediffed

diff --git a/shaderc-shared.patch b/shaderc-shared.patch
index aa6265e06bf54ad654a343b3d0efc56aba150a97..b487f111bc6f3d75217e97b683c4ca8964d69d05 100644 (file)
--- a/shaderc-shared.patch
+++ b/shaderc-shared.patch
@@ -1,13 +1,14 @@
---- shaderc-d1f763cc3742b93f0fc090493be8ba0588f296da/libshaderc/CMakeLists.txt.orig    2018-10-26 20:30:58.662584981 +0200
-+++ shaderc-d1f763cc3742b93f0fc090493be8ba0588f296da/libshaderc/CMakeLists.txt 2018-10-26 21:20:56.322550754 +0200
-@@ -15,6 +15,7 @@
- target_include_directories(shaderc PUBLIC include PRIVATE ${glslang_SOURCE_DIR})
+--- shaderc-2021.0/libshaderc/CMakeLists.txt.orig      2021-04-28 20:30:58.667969817 +0200
++++ shaderc-2021.0/libshaderc/CMakeLists.txt   2021-04-28 20:31:43.873665942 +0200
+@@ -41,7 +41,7 @@ target_compile_definitions(shaderc_share
+     PRIVATE SHADERC_IMPLEMENTATION
+     PUBLIC SHADERC_SHAREDLIB
+ )
+-set_target_properties(shaderc_shared PROPERTIES SOVERSION 1)
++set_target_properties(shaderc_shared PROPERTIES OUTPUT_NAME shaderc SOVERSION 1)
  
- add_library(shaderc_shared SHARED ${SHADERC_SOURCES})
-+set_target_properties(shaderc_shared PROPERTIES OUTPUT_NAME shaderc)
- shaderc_default_compile_options(shaderc_shared)
- target_include_directories(shaderc_shared PUBLIC include PRIVATE ${glslang_SOURCE_DIR})
- target_compile_definitions(shaderc_shared
+ if(SHADERC_ENABLE_INSTALL)
+   install(
 --- 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 @@

diff --git a/shaderc-system-libs.patch b/shaderc-system-libs.patch
index b28c0fbbccf994878e3c3d0306bf7edf7fc5f4ae..09be4a8bb9e865a485d768ac248557f5f4f07d8d 100644 (file)
--- a/shaderc-system-libs.patch
+++ b/shaderc-system-libs.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- shaderc-2021.0/CMakeLists.txt.orig 2021-04-21 23:13:25.000000000 +0200
++++ shaderc-2021.0/CMakeLists.txt      2021-04-28 20:29:52.644518932 +0200
+@@ -112,7 +112,8 @@ endif(MSVC)
  
  # Configure subdirectories.
  # We depend on these for later projects, so they should come first.
@@ -8,9 +8,9 @@
 +set(glslang_SOURCE_DIR /usr/include/glslang)
 +set(spirv-tools_SOURCE_DIR /usr)
  
- if(SHADERC_ENABLE_SPVC)
- add_subdirectory(libshaderc_spvc)
-@@ -106,7 +107,7 @@
+ add_subdirectory(libshaderc_util)
+ add_subdirectory(libshaderc)
+@@ -124,7 +125,7 @@ endif()
  add_custom_target(build-version
    ${PYTHON_EXECUTABLE}
    ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py
@@ -19,11 +19,11 @@
    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 @@
+--- shaderc-2021.0/glslc/test/CMakeLists.txt.orig      2021-04-28 20:27:40.587616637 +0200
++++ shaderc-2021.0/glslc/test/CMakeLists.txt   2021-04-28 20:30:44.457227056 +0200
+@@ -23,6 +23,6 @@ if(${SHADERC_ENABLE_TESTS})
    add_test(NAME glslc_tests
-     COMMAND ${PYTHON_EXE}
+     COMMAND ${PYTHON_EXECUTABLE}
      ${CMAKE_CURRENT_SOURCE_DIR}/glslc_test_framework.py
 -    $<TARGET_FILE:glslc_exe> $<TARGET_FILE:spirv-dis>
 +    $<TARGET_FILE:glslc_exe> spirv-dis