[gentoo-commits] repo/gentoo:master commit in: media-libs/vulkan-loader/, media-libs/vulkan-loader/files/

[Matt Turner]

commit:     e90994a1177a1bd1651e3a0f216319e1e80d0e66
Author:     Nick Sarnie <commendsarnex <AT> gmail <DOT> com>
AuthorDate: Wed Mar 21 23:01:33 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Mar 23 23:36:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e90994a1

media-libs/vulkan-loader: Remove now-unneeded patch from 9999

Not needed after upstream
https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/commit/4efbd5c81cfb9071757e446d57957aa81e9d9374
(Thanks Chewi!)

Signed-off-by: Nick Sarnie <commendsarnex <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/7544

 .../vulkan-loader-9999-no-external-sources.patch   | 33 ----------------------
 media-libs/vulkan-loader/vulkan-loader-9999.ebuild |  2 --
 2 files changed, 35 deletions(-)

diff --git a/media-libs/vulkan-loader/files/vulkan-loader-9999-no-external-sources.patch b/media-libs/vulkan-loader/files/vulkan-loader-9999-no-external-sources.patch
deleted file mode 100644
index 0100d1356c4..00000000000
--- a/media-libs/vulkan-loader/files/vulkan-loader-9999-no-external-sources.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 641052deaaa6a570a6c284d5407ac1bbd60d3d53 Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <commendsarnex@×××××.com>
-Date: Sun, 11 Mar 2018 11:18:25 -0400
-Subject: [PATCH] Do not require external sources to build
-
-Signed-off-by: Nick Sarnie <commendsarnex@×××××.com>
----
- CMakeLists.txt | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 34e10dc3..5fb97b7c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -361,7 +361,6 @@ 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
-     )
- set_target_properties(generate_helper_files PROPERTIES FOLDER ${LVL_TARGET_FOLDER})
- 
-@@ -376,7 +375,6 @@ 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)
- 
- 
- 
--- 
-2.16.2
-

diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index bb9cb32772d..67822d5a388 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -7,8 +7,6 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git"
 	inherit git-r3
-
-	PATCHES=( "${FILESDIR}/${P}-no-external-sources.patch" )
 else
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz"