summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Sarnie <commendsarnex@gmail.com>2018-03-23 21:57:37 -0400
committerMatt Turner <mattst88@gentoo.org>2018-04-14 12:50:21 -0700
commit7b7094dde1494d5a38fdc6b8bdb207e8a2d8a0d3 (patch)
tree6f41d3731556fa7b561bb15acdb7c4ab2d536c27 /media-libs/vulkan-loader/files
parentdev-util/spirv-tools: Revbump and add a header that includes git SHA1 for vul... (diff)
downloadgentoo-7b7094dde1494d5a38fdc6b8bdb207e8a2d8a0d3.tar.gz
gentoo-7b7094dde1494d5a38fdc6b8bdb207e8a2d8a0d3.tar.bz2
gentoo-7b7094dde1494d5a38fdc6b8bdb207e8a2d8a0d3.zip
media-libs/vulkan-loader: Add layers USE
Closes: https://bugs.gentoo.org/619124
Diffstat (limited to 'media-libs/vulkan-loader/files')
-rw-r--r--media-libs/vulkan-loader/files/vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/media-libs/vulkan-loader/files/vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch b/media-libs/vulkan-loader/files/vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch
new file mode 100644
index 000000000000..066f126e437d
--- /dev/null
+++ b/media-libs/vulkan-loader/files/vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch
@@ -0,0 +1,42 @@
+From 58299a001068a28f5d5f6985c2066b7c4caa7b18 Mon Sep 17 00:00:00 2001
+From: Nick Sarnie <commendsarnex@gmail.com>
+Date: Fri, 23 Mar 2018 20:23:54 -0400
+Subject: [PATCH] Use a file to get the spirv-tools commit ID
+
+Signed-off-by: Nick Sarnie <commendsarnex@gmail.com>
+---
+ CMakeLists.txt | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c9f73ce9..c3e200b3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -349,6 +349,14 @@ macro(run_external_revision_generate source_dir symbol_name output)
+ )
+ endmacro()
+
++macro(run_external_revision_generate_spirv_tools source_dir symbol_name output)
++ add_custom_command(OUTPUT ${output}
++ COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --rev_file ${source_dir}/spirv-tools-commit.h -s ${symbol_name} -o ${output}
++ DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${source_dir}/spirv-tools-commit.h
++ )
++endmacro()
++
++
+ # Custom target for generated vulkan helper file dependencies
+ set(generate_helper_files_DEPENDS)
+ if(BUILD_LAYERS)
+@@ -377,7 +385,7 @@ run_vk_xml_generate(helper_file_generator.py vk_object_types.h)
+ run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h)
+ run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h)
+ if(BUILD_LAYERS)
+- run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
++ run_external_revision_generate_spirv_tools(/usr/include/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h)
+ endif()
+
+
+--
+2.16.3
+
+