shaderc-shared.patch

   1 diff -urNp -x '*.orig' shaderc-2024.0.org/CMakeLists.txt shaderc-2024.0/CMakeLists.txt
   2 --- shaderc-2024.0.org/CMakeLists.txt   2024-04-04 01:12:49.909224636 +0200
   3 +++ shaderc-2024.0/CMakeLists.txt       2024-04-04 01:12:49.953225227 +0200
   4 @@ -158,6 +158,6 @@ function(define_pkg_config_file NAME LIB
   5    endif()
   6  endfunction()
   7
   8 -define_pkg_config_file(shaderc -lshaderc_shared)
   9 +define_pkg_config_file(shaderc -lshaderc)
  10  define_pkg_config_file(shaderc_static "-lshaderc ${EXTRA_STATIC_PKGCONFIG_LIBS} -lshaderc_util")
  11  define_pkg_config_file(shaderc_combined -lshaderc_combined)
  12 diff -urNp -x '*.orig' shaderc-2024.0.org/glslc/CMakeLists.txt shaderc-2024.0/glslc/CMakeLists.txt
  13 --- shaderc-2024.0.org/glslc/CMakeLists.txt     2024-03-08 19:52:40.000000000 +0100
  14 +++ shaderc-2024.0/glslc/CMakeLists.txt 2024-04-04 01:12:49.953225227 +0200
  15 @@ -30,7 +30,7 @@ add_library(glslc STATIC
  16  )
  17
  18  shaderc_default_compile_options(glslc)
  19 -target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})
  20 +target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../libshaderc_util/include)
  21
  22  if (SHADERC_ENABLE_WGSL_OUTPUT)
  23    if (IS_DIRECTORY "${tint_SOURCE_DIR}/include")
  24 @@ -43,16 +43,14 @@ if (SHADERC_ENABLE_WGSL_OUTPUT)
  25  endif(SHADERC_ENABLE_WGSL_OUTPUT)
  26
  27  target_link_libraries(glslc PRIVATE
  28 -  glslang SPIRV    # Glslang libraries
  29 -  $<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint>      # Tint libraries, optional
  30 -  shaderc_util shaderc                                  # internal Shaderc libraries
  31 +  shaderc_shared
  32    ${CMAKE_THREAD_LIBS_INIT})
  33
  34  add_executable(glslc_exe src/main.cc)
  35  shaderc_default_compile_options(glslc_exe)
  36 -target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${spirv-tools_SOURCE_DIR}/include)
  37 +target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../libshaderc_util/include ${CMAKE_CURRENT_SOURCE_DIR}/../libshaderc/include ${spirv-tools_SOURCE_DIR}/include)
  38  set_target_properties(glslc_exe PROPERTIES OUTPUT_NAME glslc)
  39 -target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc)
  40 +target_link_libraries(glslc_exe PRIVATE glslc shaderc_shared shaderc_util SPIRV-Tools)
  41  add_dependencies(glslc_exe build-version)
  42
  43  shaderc_add_tests(
  44 diff -urNp -x '*.orig' shaderc-2024.0.org/libshaderc/CMakeLists.txt shaderc-2024.0/libshaderc/CMakeLists.txt
  45 --- shaderc-2024.0.org/libshaderc/CMakeLists.txt        2024-03-08 19:52:40.000000000 +0100
  46 +++ shaderc-2024.0/libshaderc/CMakeLists.txt    2024-04-04 01:12:49.953225227 +0200
  47 @@ -41,7 +41,7 @@ target_compile_definitions(shaderc_share
  48      PRIVATE SHADERC_IMPLEMENTATION
  49      PUBLIC SHADERC_SHAREDLIB
  50  )
  51 -set_target_properties(shaderc_shared PROPERTIES SOVERSION 1)
  52 +set_target_properties(shaderc_shared PROPERTIES OUTPUT_NAME shaderc SOVERSION 1)
  53
  54  if(SHADERC_ENABLE_INSTALL)
  55    install(