media-libs/vulkan-layers: Bump to 1.1.82.0

Package-Manager: Portage-2.3.49, Repoman-2.3.10

4 files changed, 82 insertions, 2 deletions

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index e1b0a00434cb..222e6f8e9359 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1 +1,2 @@
 DIST vulkan-layers-1.1.77.0.tar.gz 1099507 BLAKE2B b23efed4b99f3d7ca6a5938467b80fd0e7afed281a44eb5fd24b2e6f1340dd9bcc05d9e4a45ce936a4c90db9d3b8269ae4f4b4a786fefb16f28a0b58df5e265d SHA512 0c7f3cdcf99dafa6ea8d169ef5627c5ee392844bb0e95647faa14998fc3fd121e34ec035ce17567dff61f4efa2d88738e45eda2827b6048ae8ade25adea1a411
+DIST vulkan-layers-1.1.82.0.tar.gz 962993 BLAKE2B 6fe541116f8d4d4370cb5a0b2a98c07139577edf20653359f9f149b503c3d2e9aa98e95af14582c80033b535cc4cec5cc5f148396f472aaf75a8767579978a61 SHA512 c34b691a340830462b917890c97dd86c66eac097ba284183d8bf148267b1a881c909b89c6f9ab78ddd03a60cc884c982bc578cc67e4fbaf37d044004b006a65a
diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.1.82.0-Modify-scripts-to-accomodate-new-exts.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.1.82.0-Modify-scripts-to-accomodate-new-exts.patch
new file mode 100644
index 000000000000..45da36c66c7f
--- /dev/null
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.1.82.0-Modify-scripts-to-accomodate-new-exts.patch
@@ -0,0 +1,23 @@
+From 7bd8575b65e6a7ab9954cf30dcaff398bf9246e9 Mon Sep 17 00:00:00 2001
+From: Shannon McPherson <shannon@lunarg.com>
+Date: Mon, 10 Sep 2018 11:13:02 -0600
+Subject: [PATCH] scripts: Modify scripts to accomodate new exts
+
+Parameter validation was not gathering and processing structure
+information correctly for one of the 84 Headers extensions
+---
+ scripts/parameter_validation_generator.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/scripts/parameter_validation_generator.py b/scripts/parameter_validation_generator.py
+index 8bb8da382..b157a1578 100644
+--- a/scripts/parameter_validation_generator.py
++++ b/scripts/parameter_validation_generator.py
+@@ -711,6 +711,7 @@ def genVkStructureType(self, typename):
+         # Add underscore between lowercase then uppercase
+         value = re.sub('([a-z0-9])([A-Z])', r'\1_\2', typename)
+         value = value.replace('D3_D12', 'D3D12')
++        value = value.replace('ASTCDecode', 'ASTC_Decode')
+         value = value.replace('Device_IDProp', 'Device_ID_Prop')
+         value = value.replace('LODGather', 'LOD_Gather')
+         value = value.replace('Features2', 'FEATURES_2')
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.82.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.82.0.ebuild
new file mode 100644
index 000000000000..af1263d167ff
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.82.0.ebuild
@@ -0,0 +1,56 @@
+# 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-ValidationLayers.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	EGIT_COMMIT="89bbac497742d48c3d483f78b1bba99101784746"
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
+fi
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Vulkan Validation Layers"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="X wayland"
+
+# Old packaging will cause file collisions
+RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
+DEPEND="${PYTHON_DEPS}
+		dev-util/glslang:=[${MULTILIB_USEDEP}]
+		>=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
+		>=dev-util/vulkan-headers-1.1.82.0
+		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+		X? (
+		   x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		   x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+		   )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch"
+	"${FILESDIR}/${PN}-1.1.82.0-Modify-scripts-to-accomodate-new-exts.patch"
+	 )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=True
+		-DBUILD_WSI_MIR_SUPPORT=False
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DBUILD_TESTS=False
+		-DGLSLANG_INSTALL_DIR="/usr"
+		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index b2e238baddb1..c1a86b1bc3aa 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	EGIT_COMMIT="0ec7ce985fba34d5303f84f09fab79cd2b9874a8"
+	EGIT_COMMIT="89bbac497742d48c3d483f78b1bba99101784746"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
@@ -29,7 +29,7 @@ RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
 DEPEND="${PYTHON_DEPS}
 		dev-util/glslang:=[${MULTILIB_USEDEP}]
 		>=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}]
-		>=dev-util/vulkan-headers-1.1.77.0-r1
+		>=dev-util/vulkan-headers-1.1.82.0
 		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 		X? (
 		   x11-libs/libX11:=[${MULTILIB_USEDEP}]