gentoo resync : 14.07.2018

3 files changed, 67 insertions, 0 deletions

diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 61241f12f6f6..371de401c985 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,6 @@
+AUX vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch 1337 BLAKE2B e649394daae60a399b2659f666ecb42aa2e6aa65b9eda372d052c6d27915a7e51b0d81d7bf1916dbab442a7ba7cd585a5fd828600cd466039f9c4a7df30d7dd8 SHA512 89c869de7a3ec1c9fe98095e67879c15f5d45337393f680812d8e55d26a970e04baa584b1dc18a5ff9b50f2d9780a7f76607f153d20cf1d5c4085035731a33e7
 DIST vulkan-headers-1.1.77.0.tar.gz 459383 BLAKE2B 4c08cb5264d2cae036e7a5c9260915186ba237067a003f69300ef550f1d944123223dce3c1084cf2e2a44f571b957928771e4d907e5714415841cda60dd5387d SHA512 097d6d532215751715c9ce0d97f4e7793318c5e37633754cda2f451201ef34121e14e99ecbf8d3281a417d1ece11f1065852ac5409d7b16a1370e27f065c3a78
+EBUILD vulkan-headers-1.1.77.0-r1.ebuild 798 BLAKE2B f9e8dd53cea3c090bd4fec3db52a74ef465890b67faec0c6cb949ca944a2a5a4c9551dbea3f9b5ddeda5c3047eef3a294c20e9c7150d0d63055f87f8388889f5 SHA512 8be8f391a31ce52ee5eb780972da4cec319e46c01b98ef5cc7e36d500945225c45cc433752f98e5289d0ee1809b0437ff40fbc9a80d25b372243a610a9c330be
 EBUILD vulkan-headers-1.1.77.0.ebuild 723 BLAKE2B 6754a5857b67a4dacd6d90e356f47b3beecebab79b73a646d5aad3f5f9c02076cc58bde8bc42af9e9bc4d5049992f6bb755ceb56892bce8e248c60c5c3ccb3db SHA512 c21e42db4c3ee0e745c8ede00478ea319004899b44211ea0ed1e3e530aec30e290fb8f1b83b624fe5087f779813eaa612efc88c3893363812d9b24bb469265ba
 EBUILD vulkan-headers-9999.ebuild 723 BLAKE2B 6754a5857b67a4dacd6d90e356f47b3beecebab79b73a646d5aad3f5f9c02076cc58bde8bc42af9e9bc4d5049992f6bb755ceb56892bce8e248c60c5c3ccb3db SHA512 c21e42db4c3ee0e745c8ede00478ea319004899b44211ea0ed1e3e530aec30e290fb8f1b83b624fe5087f779813eaa612efc88c3893363812d9b24bb469265ba
 MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
diff --git a/dev-util/vulkan-headers/files/vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch b/dev-util/vulkan-headers/files/vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch
new file mode 100644
index 000000000000..9cf443a22444
--- /dev/null
+++ b/dev-util/vulkan-headers/files/vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch
@@ -0,0 +1,38 @@
+From 396f82798a4d19b57fc9933490dc1bd7624c9bbb Mon Sep 17 00:00:00 2001
+From: Lenny Komow <lenny@lunarg.com>
+Date: Mon, 25 Jun 2018 13:59:47 -0600
+Subject: [PATCH] headers: Remove loader/layer dependency
+
+The header vk_layer.h included vk_layer_dispatch_table.h, which is not
+present in this repo. Instead, it had to be generated from either the
+Vulkan-Loader or Vulkan-ValidationLayers repo. This change removes
+that dependency.
+---
+ include/vulkan/vk_layer.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/include/vulkan/vk_layer.h b/include/vulkan/vk_layer.h
+index e8300c3..823c88a 100644
+--- a/include/vulkan/vk_layer.h
++++ b/include/vulkan/vk_layer.h
+@@ -35,9 +35,6 @@
+ #define VK_LAYER_EXPORT
+ #endif
+ 
+-// Definition for VkLayerDispatchTable and VkLayerInstanceDispatchTable now appear in externally generated header
+-#include "vk_layer_dispatch_table.h"
+-
+ #define MAX_NUM_UNKNOWN_EXTS 250
+ 
+  // Loader-Layer version negotiation API.  Versions add the following features:
+@@ -50,6 +47,9 @@
+ 
+ #define VK_CURRENT_CHAIN_VERSION 1
+ 
++// Typedef for use in the interfaces below
++typedef PFN_vkVoidFunction (VKAPI_PTR *PFN_GetPhysicalDeviceProcAddr)(VkInstance instance, const char* pName);
++
+ // Version negotiation values
+ typedef enum VkNegotiateLayerStructType {
+     LAYER_NEGOTIATE_UNINTIALIZED = 0,
+
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.77.0-r1.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.77.0-r1.ebuild
new file mode 100644
index 000000000000..b41d734e0bbf
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.1.77.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="b1577d5fbd5424c863710aa156aaafa77cae3de8"
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
+fi
+
+DESCRIPTION="Vulkan Header files and API registry"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# Old packaging will cause file collisions
+RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
+
+PATCHES=( "${FILESDIR}/${PN}"-1.1.77.0-r1-Remove-loader-layer-dep.patch )