summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Sarnie <sarnex@gentoo.org>2019-10-21 23:20:26 -0400
committerNick Sarnie <sarnex@gentoo.org>2019-10-21 23:24:05 -0400
commitb80df046136e8783bb48b2fe244f42a17cbd0d3e (patch)
tree019ebbf191f6e62905c967513121412f34e2d994 /media-libs/shaderc/files
parentmedia-libs/shaderc: Add myself as maintainer (diff)
downloadgentoo-b80df046136e8783bb48b2fe244f42a17cbd0d3e.tar.gz
gentoo-b80df046136e8783bb48b2fe244f42a17cbd0d3e.tar.bz2
gentoo-b80df046136e8783bb48b2fe244f42a17cbd0d3e.zip
media-libs/shaderc: Version bump
Fixes: https://bugs.gentoo.org/698126 Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
Diffstat (limited to 'media-libs/shaderc/files')
-rw-r--r--media-libs/shaderc/files/shaderc-2019.0-fix-glslang-link-order.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/media-libs/shaderc/files/shaderc-2019.0-fix-glslang-link-order.patch b/media-libs/shaderc/files/shaderc-2019.0-fix-glslang-link-order.patch
new file mode 100644
index 000000000000..660d1bf8dfd3
--- /dev/null
+++ b/media-libs/shaderc/files/shaderc-2019.0-fix-glslang-link-order.patch
@@ -0,0 +1,26 @@
+diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt
+index acf6fb0..0f5d888 100644
+--- a/glslc/CMakeLists.txt
++++ b/glslc/CMakeLists.txt
+@@ -18,7 +18,7 @@ add_library(glslc STATIC
+ 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})
++ glslang SPIRV HLSL ${CMAKE_THREAD_LIBS_INIT})
+ target_link_libraries(glslc PRIVATE shaderc_util shaderc)
+
+ add_executable(glslc_exe src/main.cc)
+diff --git a/libshaderc_util/CMakeLists.txt b/libshaderc_util/CMakeLists.txt
+index f8ae95d..069c48a 100644
+--- a/libshaderc_util/CMakeLists.txt
++++ b/libshaderc_util/CMakeLists.txt
+@@ -32,7 +32,7 @@ add_definitions(-DENABLE_HLSL)
+
+ find_package(Threads)
+ target_link_libraries(shaderc_util PRIVATE
+- glslang OSDependent OGLCompiler HLSL glslang SPIRV
++ glslang OSDependent OGLCompiler glslang SPIRV HLSL
+ SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
+
+ shaderc_add_tests(