gentoo resync : 28.04.2018

3 files changed, 93 insertions, 0 deletions

diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 95c17f37d4bd..7cd108c83f6d 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,6 +1,8 @@
 AUX vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch 1736 BLAKE2B 10c31ec7214a64f65daaa265d84b913906f0007a4503a11218f35012aba697b87bef6a93e1120edc3dd33c5951a18abf4b1b54841afdedd7b8dbfb12aed325d1 SHA512 a27135d82d366925487f3fda147c531fe93bb556207fcc36310cc5c361fa5879f812cfbe1c5677da987311e31c09e3f573d69183f60a5788dc0489ac27e63918
+AUX vulkan-loader-Fix-layers-install-directory.patch 1021 BLAKE2B deb7ed63d90f67afce300caa421f4a9760bf182caa4e4f4fe1b70bb4a0216f793dab2af2c1ec197f0bd12a55dc413376f500598c48932cf3bcf58bf35433e6fa SHA512 faaf9bb15bc6930655289db77a75494de996e3aa9bbda359794d942546bdd350480137fc43f2c0152ee0b0f25797920e7ada74eaaf70d98c212e83dcf607820f
 AUX vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1608 BLAKE2B eadbe49f109ce32c7ad75739ba43f7629a3955fb5a9fdf03ac6e16f890394b13b95c979ee456b75964ff421e016dd7a0c47acbe6c79f3a5f28813dbbad61e874 SHA512 d371cde49a630b7530b25a5fa6ccc2324885048320db0a140f9ba09b490a40edf460602ffc156767b1773a88d642d6917d73cb13ac869f811c68b00cfc00d297
 DIST vulkan-loader-1.1.70.0.tar.gz 4107351 BLAKE2B 86859e74839a0a7c667476db62a1bc73d89f22e6bb951f2742bc6990ed498e9201bd17973e887f360b2eec610e29d547e79d5323ed74fd5618cb0fc75dbba063 SHA512 ae57e6890225b6e4607fde04a296a14bc54fd6b61b360b771bd24f00607dcb6fff06b3ec38a761173c92c90628a139f1424445e174c21adad4af6f445b91ed26
+EBUILD vulkan-loader-1.1.70.0-r1.ebuild 1780 BLAKE2B ee2078c51a1368e97e347565d0152b70b636ff094b39e3c44c348c2d37aecba7781140a36deb74f803e90c25d272d34e46dfa4853345c05bb2490cb4c702623d SHA512 4c9254c7cc300db6107e77755117e0c1a86c4e5e5750aaff31f753aa7222516c48e84a4cdabe7fb7f84f92bfbc8f4f84b8ad4287126c423627898ab1fbe3cccd
 EBUILD vulkan-loader-1.1.70.0.ebuild 1723 BLAKE2B d48aae98640a12fd8c12dda77ef3fdb077bf9b4d6989c2163ec83c2f0bd752b1dd9db580861d197a9aefb77bde81a0bff3569a6aacc64c7c8dc6554d4a09ab4a SHA512 517530704b352e470353b4d39e04129a1b09ac264001016bb30d1af10a7803d22d35d6f348b945e7629874b13dfabd725773e603d7855044339f5b4bab69a681
 EBUILD vulkan-loader-9999.ebuild 1649 BLAKE2B cbd06a6d61272d7b4c5a72cd78386bc133c8789c7f0b98af3bdec194262837412398eb4bdff8441d3b05b96f5aae1fa06b62df672e2e892e6490edb8366ba408 SHA512 550bab7fd8d6de1d2c1ddf8071edfa63d69ae89e462ecf2d806ed330cd9b4f2d12708374b87557bfef9b38bd5af5f5698fb753cf74c9e7a9e7f64857491a5b8d
 MISC metadata.xml 474 BLAKE2B a6924616c2d59914dc11c4e8ad4f0f5bfbdaa923d3bf4c6488cc9b52b6319b285d3470d7d724ee38b4bfc27ff442d103209b6681c634bd0770ced3d907597e87 SHA512 8122c1adabb7b4d2128a2885a816f348c5c34e22a14a63f0f7452ce74ff646bd7a4496d730c465740143dbd6b2aeb63fa4a212cea6414dc99d13a26044a29574
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 000000000000..193a8e55a465
--- /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 <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/vulkan-loader-1.1.70.0-r1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild
new file mode 100644
index 000000000000..980db94c32fb
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.70.0-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git"
+	inherit git-r3
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-LoaderAndValidationLayers-sdk-${PV}"
+fi
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="demos layers wayland X"
+REQUIRED_USE="demos? ( X )"
+
+RDEPEND=""
+DEPEND="${PYTHON_DEPS}
+	demos? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
+	layers? (
+			dev-util/glslang:=[${MULTILIB_USEDEP}]
+			>=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
+		)
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)"
+
+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=(
+		-DCMAKE_SKIP_RPATH=True
+		-DBUILD_TESTS=False
+		-DBUILD_LAYERS=$(usex layers)
+		-DBUILD_DEMOS=$(usex demos)
+		-DBUILD_VKJSON=False
+		-DBUILD_LOADER=True
+		-DBUILD_WSI_MIR_SUPPORT=False
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+	)
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	keepdir /etc/vulkan/icd.d
+
+	cmake-utils_src_install
+}