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

[Nick Sarnie]

commit:     e7cfa4d13e08fc79007c85f5b111e46aa4f04095
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  2 11:14:11 2018 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sat Jun  2 11:34:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7cfa4d1

media-libs/vulkan-loader: Support new vulkan-headers install target for 9999

Upstream cleaned this up, so we can drop the patch and use a variable

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 ...an-loader-9999-Use-usr-for-vulkan-headers.patch | 51 ----------------------
 media-libs/vulkan-loader/vulkan-loader-9999.ebuild |  5 +--
 2 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/media-libs/vulkan-loader/files/vulkan-loader-9999-Use-usr-for-vulkan-headers.patch b/media-libs/vulkan-loader/files/vulkan-loader-9999-Use-usr-for-vulkan-headers.patch
deleted file mode 100644
index 49dd54c83c8..00000000000
--- a/media-libs/vulkan-loader/files/vulkan-loader-9999-Use-usr-for-vulkan-headers.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From d9b3835e1ad455853e3a58ec0d2a0653e5952a21 Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <sarnex@g.o>
-Date: Mon, 26 May 2018 16:57:33 -0400
-Subject: [PATCH] Use /usr for vulkan-headers
-
-Signed-off-by: Nick Sarnie <sarnex@g.o>
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e0b744a87..14034d33c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -68,7 +68,7 @@ if(WIN32)
- endif()
- 
- set(SCRIPTS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/scripts")
--set(HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers")
-+set(HEADERS_DIR "/usr")
- 
- # Output warning if vulkan headers submodule contents are not present
- if (NOT EXISTS "${HEADERS_DIR}/include/vulkan/vulkan_core.h")
-@@ -131,8 +131,9 @@ set (PYTHON_CMD ${PYTHON_EXECUTABLE})
- # Define macro used for building vkxml generated files
- macro(run_vk_xml_generate dependency output)
-     add_custom_command(OUTPUT ${output}
--    COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${HEADERS_DIR}/registry/vk.xml ${output}
--    DEPENDS ${HEADERS_DIR}/registry/vk.xml ${HEADERS_DIR}/registry/generator.py ${SCRIPTS_DIR}/${dependency} ${SCRIPTS_DIR}/lvl_genvk.py ${HEADERS_DIR}/registry/reg.py
-+    COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/lvl_genvk.py -registry ${HEADERS_DIR}/include/vulkan/registry/vk.xml ${output}
-+    DEPENDS ${HEADERS_DIR}/include/vulkan/registry/vk.xml ${HEADERS_DIR}/include/vulkan/registry/generator.py
-+    ${SCRIPTS_DIR}/${dependency}  ${SCRIPTS_DIR}/lvl_genvk.py ${HEADERS_DIR}/include/vulkan/registry/reg.py
-     )
- endmacro()
- 
-diff --git a/scripts/lvl_genvk.py b/scripts/lvl_genvk.py
-index 0de555fae..dab543ed3 100644
---- a/scripts/lvl_genvk.py
-+++ b/scripts/lvl_genvk.py
-@@ -17,7 +17,7 @@
- import argparse, cProfile, pdb, string, sys, time, os
- 
- scripts_dir = os.path.dirname(os.path.abspath(__file__))
--registry_dir = os.path.join(scripts_dir, '../Vulkan-Headers/registry')
-+registry_dir = os.path.join(scripts_dir, '/usr/include/vulkan/registry')
- sys.path.insert(0, registry_dir)
- 
- from reg import *
--- 
-2.17.0
-

diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 5f573a4c1ce..9e747482213 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -32,10 +32,6 @@ DEPEND="${PYTHON_DEPS}
 		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
 	)"
 
-PATCHES=(
-	"${FILESDIR}/${P}-Use-usr-for-vulkan-headers.patch"
-)
-
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=True
@@ -45,6 +41,7 @@ multilib_src_configure() {
 		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
 	)
 	cmake-utils_src_configure
 }