]> git.pld-linux.org Git - packages/shaderc.git/blob - shaderc-shared.patch
- updated to 2023.8 (ready for glslang 14)
[packages/shaderc.git] / shaderc-shared.patch
1 --- shaderc-2021.0/libshaderc/CMakeLists.txt.orig       2021-04-28 20:30:58.667969817 +0200
2 +++ shaderc-2021.0/libshaderc/CMakeLists.txt    2021-04-28 20:31:43.873665942 +0200
3 @@ -41,7 +41,7 @@ target_compile_definitions(shaderc_share
4      PRIVATE SHADERC_IMPLEMENTATION
5      PUBLIC SHADERC_SHAREDLIB
6  )
7 -set_target_properties(shaderc_shared PROPERTIES SOVERSION 1)
8 +set_target_properties(shaderc_shared PROPERTIES OUTPUT_NAME shaderc SOVERSION 1)
9  
10  if(SHADERC_ENABLE_INSTALL)
11    install(
12 --- shaderc-2023.8/glslc/CMakeLists.txt.orig    2024-01-03 18:45:00.000000000 +0100
13 +++ shaderc-2023.8/glslc/CMakeLists.txt 2024-02-18 10:19:55.923036871 +0100
14 @@ -30,7 +30,7 @@ add_library(glslc STATIC
15  )
16  
17  shaderc_default_compile_options(glslc)
18 -target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR})
19 +target_include_directories(glslc PUBLIC ${glslang_SOURCE_DIR} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../libshaderc_util/include)
20  
21  if (SHADERC_ENABLE_WGSL_OUTPUT)
22    if (IS_DIRECTORY "${tint_SOURCE_DIR}/include")
23 @@ -43,16 +43,14 @@ if (SHADERC_ENABLE_WGSL_OUTPUT)
24  endif(SHADERC_ENABLE_WGSL_OUTPUT)
25  
26  target_link_libraries(glslc PRIVATE
27 -  glslang SPIRV    # Glslang libraries
28 -  $<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint>      # Tint libraries, optional
29 -  shaderc_util shaderc                                  # internal Shaderc libraries
30 +  shaderc_shared
31    ${CMAKE_THREAD_LIBS_INIT})
32  
33  add_executable(glslc_exe src/main.cc)
34  shaderc_default_compile_options(glslc_exe)
35 -target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${spirv-tools_SOURCE_DIR}/include)
36 +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)
37  set_target_properties(glslc_exe PROPERTIES OUTPUT_NAME glslc)
38 -target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc)
39 +target_link_libraries(glslc_exe PRIVATE glslc shaderc_shared shaderc_util SPIRV-Tools)
40  add_dependencies(glslc_exe build-version)
41  
42  shaderc_add_tests(
43 --- shaderc-2021.0/CMakeLists.txt.orig  2021-05-02 21:59:17.590975179 +0200
44 +++ shaderc-2021.0/CMakeLists.txt       2021-05-02 22:00:32.646136904 +0200
45 @@ -150,6 +150,6 @@
46    endif()
47  endfunction()
48  
49 -define_pkg_config_file(shaderc -lshaderc_shared)
50 +define_pkg_config_file(shaderc -lshaderc)
51  define_pkg_config_file(shaderc_static "-lshaderc ${EXTRA_STATIC_PKGCONFIG_LIBS} -lshaderc_util")
52  define_pkg_config_file(shaderc_combined -lshaderc_combined)
This page took 0.080298 seconds and 3 git commands to generate.