diff options
author | Michael Mair-Keimberger <m.mairkeimberger@gmail.com> | 2018-09-30 14:46:46 +0200 |
---|---|---|
committer | Matt Turner <mattst88@gentoo.org> | 2018-09-30 15:11:32 +0200 |
commit | f7531cadff953f5213d0b1e407ea3aedd30b1431 (patch) | |
tree | ec418343bc7e69e8fcb24148543054ceb953ed1d /media-libs/vulkan-loader/files | |
parent | dev-libs/botan: Fix HPPA build. (diff) | |
download | gentoo-f7531cadff953f5213d0b1e407ea3aedd30b1431.tar.gz gentoo-f7531cadff953f5213d0b1e407ea3aedd30b1431.tar.bz2 gentoo-f7531cadff953f5213d0b1e407ea3aedd30b1431.zip |
media-libs/vulkan-loader: remove unused patches
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/10025
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'media-libs/vulkan-loader/files')
3 files changed, 0 insertions, 113 deletions
diff --git a/media-libs/vulkan-loader/files/vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch b/media-libs/vulkan-loader/files/vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch deleted file mode 100644 index 3c5a30b10a00..000000000000 --- a/media-libs/vulkan-loader/files/vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4efbd5c81cfb9071757e446d57957aa81e9d9374 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <chewi@gentoo.org> -Date: Thu, 15 Mar 2018 22:25:19 +0000 -Subject: [PATCH] build: Don't require glslang if not building layers - ---- - CMakeLists.txt | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 713a9cdfd3..c9f73ce965 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -350,6 +350,10 @@ macro(run_external_revision_generate source_dir symbol_name output) - endmacro() - - # Custom target for generated vulkan helper file dependencies -+set(generate_helper_files_DEPENDS) -+if(BUILD_LAYERS) -+ LIST(APPEND generate_helper_files_DEPENDS spirv_tools_commit_id.h) -+endif() - add_custom_target(generate_helper_files DEPENDS - vk_enum_string_helper.h - vk_safe_struct.h -@@ -359,7 +363,7 @@ add_custom_target(generate_helper_files DEPENDS - vk_dispatch_table_helper.h - vk_extension_helper.h - vk_typemap_helper.h -- spirv_tools_commit_id.h -+ ${generate_helper_files_DEPENDS} - ) - set_target_properties(generate_helper_files PROPERTIES FOLDER ${LVL_TARGET_FOLDER}) - -@@ -372,7 +376,9 @@ run_vk_xml_generate(helper_file_generator.py vk_enum_string_helper.h) - 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) --run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) -+if(BUILD_LAYERS) -+ run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) -+endif() - - - - diff --git a/media-libs/vulkan-loader/files/vulkan-loader-Fix-layers-install-directory.patch b/media-libs/vulkan-loader/files/vulkan-loader-Fix-layers-install-directory.patch deleted file mode 100644 index 193a8e55a465..000000000000 --- a/media-libs/vulkan-loader/files/vulkan-loader-Fix-layers-install-directory.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4ae095d8d3e668311b3db3657af753dfb39a149c Mon Sep 17 00:00:00 2001 -From: Nick Sarnie <sarnex@gentoo.org> -Date: Sun, 22 Apr 2018 18:44:48 -0400 -Subject: [PATCH] Make the layers install into the data root directory - -Signed-off-by: Nick Sarnie <sarnex@gentoo.org> ---- - layers/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt -index 9ade6a03..c1a3cedd 100644 ---- a/layers/CMakeLists.txt -+++ b/layers/CMakeLists.txt -@@ -142,7 +142,7 @@ if(UNIX) - VERBATIM - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/linux/${config_file}.json - ) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/staging-json/${config_file}.json DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/vulkan/explicit_layer.d) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/staging-json/${config_file}.json DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/vulkan/explicit_layer.d) - endforeach(config_file) - endif() - endif() --- -2.17.0 - 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 deleted file mode 100644 index 066f126e437d..000000000000 --- a/media-libs/vulkan-loader/files/vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch +++ /dev/null @@ -1,42 +0,0 @@ -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 - - |