gentoo resync : 13.03.2018

4 files changed, 48 insertions, 5 deletions

diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 267069a097fb..6b2b43b86fc4 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,4 +1,5 @@
 AUX vulkan-loader-1.0.54.0-remove-executable-stack.patch 691 BLAKE2B 8bee7ed09784ac0528b91a3b52d99e51fd3b09be73a468276d491549987cbadc1d0a402b253055e95f3ba794e6d218f22f72c103944793606165ad32b64e15d7 SHA512 b19e8aee1bb1dcf081017d41a4ea228d98515bf403e84a3d81f9ff359014cf1aaf28a7f1d29bce3951000d49df2b260a2f4ff6c27f368ec12791dfad28a4257b
+AUX vulkan-loader-9999-no-external-sources.patch 1160 BLAKE2B 82029e4886aef29f814c811572e19fe41ecbc9b22bc6369e147aa7a80fb4298ad561f3459d4ba46dedd8cd48ce419457107e8987ec22cd96a38c0ea1d9e9ebe0 SHA512 9fc61a4d37e75baa1f8dcb40b2f587aeb3fe95e6ef50da3466f245d088f519b80bfea93870eccce0f5ba267627524cbb28d753283a7041399c85294fe7adb212
 DIST vulkan-loader-1.0.42.0.tar.gz 3699030 BLAKE2B acf29a2379f37367b37f2d8278cf1b512fb016c05fb5f5ee0d5d4b9c995123310728a01d1f0e341686bc2041265a9d9f64c19be451e8e6e608b748ee4d3035af SHA512 2c35aecffc60992023184e499d036d99a3c39b3b3856341f341fc9c5b2b0c71cc49a4658634165f4d5218a7202f4c2ddfb95107ba95f2c8a9870e375cff7a15b
 DIST vulkan-loader-1.0.42.2.tar.gz 3701608 BLAKE2B b6769a29c1a385ec564cdd897255a1055c583c95d9948ee8bd653606bcfb0d07dbf4abf10c3d2711059635a0d9d73edb82fda4f7aeb12107f0b2b705c809ade4 SHA512 6f591bcb69edde516cf170936e23a3f19f2f57a22b65d19683c10528ed6559501d3dae29ee1d3e820a81a5cd6e608f5710ba15f7c9bc050ea0eaceef2cf82d37
 DIST vulkan-loader-1.0.46.0.tar.gz 3732605 BLAKE2B 364f6a763d016bebb1100dc594a006da7b4a27147398ce9efdceac4ca7bc5ced235ab6bad978cfa9bca4489e6a069c145030b38354778dccbc8559babba1cbf5 SHA512 dc0728c00e017a2ed0b1e34a500a6335f6dee5dd77c7801d7d450c68c6e8c7cd5dec640be6dec1dea28941d927764a636b82a628e0260ca724163afa4152d8b6
@@ -11,5 +12,5 @@ EBUILD vulkan-loader-1.0.46.0.ebuild 1277 BLAKE2B e50d6ff15c36cb302b8afe331d203c
 EBUILD vulkan-loader-1.0.51.0.ebuild 1278 BLAKE2B 22ee349f9896e57a3fe4abdb46114000ec6e555b6daa88ebf9ff3cb933f76b3bade931006a3349322a0757fcca4812c0a225326c04c2c84173584971fb4eee7d SHA512 2fed44bc56f923aecb47ad0bdd576d1bf69bf0c764ff6d8ca54def5f39a58eafffc68bd880ffd769fe41e234633031c0675657fd56b0214812608b327664a46f
 EBUILD vulkan-loader-1.0.54.0.ebuild 1340 BLAKE2B 45d4ca3d73be49bec8500a58775d5e2f42b850545a598c50a4058ac0d93ba132d38c0c58225a769aa593eeaac435757153a1be3a29de54c456d8b81dba33b859 SHA512 aab75dbf1d379074f5b856e38ec05b4dd2a8d05ccaf6a1a355c8efb58f95ec547aff6b57a1e5debd0dd6a8c22a45d606585bc68992671e53b6ba9fd2bb749180
 EBUILD vulkan-loader-1.0.61.1.ebuild 1280 BLAKE2B f24d954fddbf81b22366030b3fd7295557af6b337dfceaffca0275e63823c64daf442fdef54161dc4e89531aaff82ef649305fc1f7551b06bc221fb9285a723b SHA512 2302e7294eea97962b6943648c9caefd45ad49f6fe19dae50215ad444eb4da2059afeefb09c40d8facf23fb4bd037b822d6a20d843c3e6114dda68b56dd3216e
-EBUILD vulkan-loader-9999.ebuild 1280 BLAKE2B f24d954fddbf81b22366030b3fd7295557af6b337dfceaffca0275e63823c64daf442fdef54161dc4e89531aaff82ef649305fc1f7551b06bc221fb9285a723b SHA512 2302e7294eea97962b6943648c9caefd45ad49f6fe19dae50215ad444eb4da2059afeefb09c40d8facf23fb4bd037b822d6a20d843c3e6114dda68b56dd3216e
-MISC metadata.xml 344 BLAKE2B 9944741e87dcc8ca3a904ab9192b0a0e900594bac2d0f9fe9131d3dcda714dc8864e2ebf7954bc742ab8470f5fad961ddbfacfa46f797324c57d1bb634a33817 SHA512 b414949f0a6e2b9293d5d6ce2d3816efd2ccd8425d60ede999e31b9e829ec03439a7c99d529200c5c227523387a2439eefd1e77439663fbd23e846f77142513f
+EBUILD vulkan-loader-9999.ebuild 1450 BLAKE2B 8d08b02b078dc0a9fa752752a1c59892c771270492d077acf77751e246f1e3451662124e22025c87f4d576265e635aa08afefc63c82208169618af589720dab6 SHA512 eb9c72976d75caf54b2fc91f5c1036e9af1c5e7c58885301be0f7fb99da76b68a11ecb15d1d16eb2a034d5debf1cab1bdf7c75ebca6c3ca2327a466e3f1b373f
+MISC metadata.xml 421 BLAKE2B cf66b02385608d94378b1c5ea66886849f73efdcb86ce0584c9998308dff6f050109e9bc4fbd04da7c2df72191825fa8ba5e04adc97170fbb0420ad2fc2936a4 SHA512 800852fbb61d7e27456cfe8c31c969e89bf9de3ef82c64e6b48a972dbc1591401fd1af16f46a473af8c83a7dd76635d3c228cba44ea7c632cca57e5963de7a93
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
new file mode 100644
index 000000000000..0100d1356c48
--- /dev/null
+++ b/media-libs/vulkan-loader/files/vulkan-loader-9999-no-external-sources.patch
@@ -0,0 +1,33 @@
+From 641052deaaa6a570a6c284d5407ac1bbd60d3d53 Mon Sep 17 00:00:00 2001
+From: Nick Sarnie <commendsarnex@gmail.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@gmail.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/metadata.xml b/media-libs/vulkan-loader/metadata.xml
index 1c806f32b436..9e5a300d8633 100644
--- a/media-libs/vulkan-loader/metadata.xml
+++ b/media-libs/vulkan-loader/metadata.xml
@@ -8,4 +8,7 @@
 	<upstream>
 		<remote-id type="github">KhronosGroup/Vulkan-LoaderAndValidationLayers</remote-id>
 	</upstream>
+	<use>
+		<flag name="demos">Build vulkan demos and vulkaninfo</flag>
+	</use>
 </pkgmetadata>
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index c4fe082f0783..bb9cb32772dc 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -7,6 +7,8 @@ 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"
@@ -20,19 +22,23 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="wayland X"
+IUSE="demos wayland X"
 
 RDEPEND=""
 DEPEND="${PYTHON_DEPS}
+	demos? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] )"
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)"
 
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=True
 		-DBUILD_TESTS=False
 		-DBUILD_LAYERS=False
-		-DBUILD_DEMOS=False
+		-DBUILD_DEMOS=$(usex demos)
 		-DBUILD_VKJSON=False
 		-DBUILD_LOADER=True
 		-DBUILD_WSI_MIR_SUPPORT=False