commit: 89e57fb8b4db589e811846dd108f1076842b66bd
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 22 22:58:35 2018 +0000
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sun Apr 22 23:03:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89e57fb8
media-libs/vulkan-loader: Fix the installation directory of the layers
Upstream installs them into ${prefix}/etc, but these are not configuration
files. They should be in the data root directory.
This change is based on an idea from stephan wezel <s.wezel <AT> web.de>
Bug: https://bugs.gentoo.org/619124
Package-Manager: Portage-2.3.31, Repoman-2.3.9
...ulkan-loader-Fix-layers-install-directory.patch | 26 ++++++++++++++++++++++
...999.ebuild => vulkan-loader-1.1.70.0-r1.ebuild} | 6 ++++-
media-libs/vulkan-loader/vulkan-loader-9999.ebuild | 5 ++++-
3 files changed, 35 insertions(+), 2 deletions(-)
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
new file mode 100644
index 00000000000..193a8e55a46
--- /dev/null
+++
b/media-libs/vulkan-loader/files/vulkan-loader-Fix-layers-install-directory.patch
@@ -0,0 +1,26 @@
+From 4ae095d8d3e668311b3db3657af753dfb39a149c Mon Sep 17 00:00:00 2001
+From: Nick Sarnie <[email protected]>
+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 <[email protected]>
+---
+ 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/vulkan-loader-9999.ebuild
b/media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild
similarity index 88%
copy from media-libs/vulkan-loader/vulkan-loader-9999.ebuild
copy to media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild
index b83dbcb76bc..980db94c32f 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild
@@ -36,7 +36,11 @@ DEPEND="${PYTHON_DEPS}
x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
)"
-PATCHES=(
"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch" )
+PATCHES=(
+
"${FILESDIR}/${P}-Dont-require-glslang-if-not-building-layers.patch"
+ "${FILESDIR}/${PN}-Fix-layers-install-directory.patch"
+
"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
+ )
multilib_src_configure() {
local mycmakeargs=(
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index b83dbcb76bc..6d43117ed79 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -36,7 +36,10 @@ DEPEND="${PYTHON_DEPS}
x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
)"
-PATCHES=(
"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-Fix-layers-install-directory.patch"
+
"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
+ )
multilib_src_configure() {
local mycmakeargs=(
