media-libs/vulkan-layers: Bump to 1.2.154

Closes: https://bugs.gentoo.org/751262
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Nick Sarnie <sarnex@gentoo.org>

3 files changed, 58 insertions, 3 deletions

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 810efed1ec6c..ee9fa6bbfb7d 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1 +1,2 @@
 DIST vulkan-layers-1.2.141.tar.gz 2046629 BLAKE2B 03f334b365e39d3e89c3896e1eb407876c4f56841e64f25b267c66e37478825519b41599d228a4d65b89a49ecf806c92270d43016c40d562c0ec4ea053f78f2c SHA512 482594bdcd780276f9b7b42256951c143b798f2de2be8e54515aece30fd94fc0f913fc52f5b5cc6d8a9b5f38eb345b941a1853532df9d3e6c686fa6f79e8a5ac
+DIST vulkan-layers-1.2.154.tar.gz 2312569 BLAKE2B 01415b6bb1a2b3e89569ac1a5010be12f752d1a6cb8885aa8ba2d062e5742313f75c8cb51c078b2020afcecffbbf8139a8a97220beae556191427bbcbc7a21e7 SHA512 44cdf3c72d6933969959ee959121de8e32a225bb941d9d7f3b2785bbae26d56cfdb0efb072c11649c316b5cef00b44f2f2415071c39faa0fe00a9e7c66098b7f
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild
new file mode 100644
index 000000000000..ca8b8864d1ee
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.154.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-ValidationLayers
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}"/${MY_PN}-${PV}
+fi
+
+DESCRIPTION="Vulkan Validation Layers"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="wayland X"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
+DEPEND="${PYTHON_DEPS}
+	>=dev-util/glslang-10.11.0.0_pre20200924:=[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-2020.5_pre20200922:=[${MULTILIB_USEDEP}]
+	>=dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_LAYER_SUPPORT_FILES=ON
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DBUILD_TESTS=OFF
+		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
+		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
+		-DSPIRV_HEADERS_INSTALL_DIR="${EPREFIX}/usr/include/spirv"
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 2b938a6f8414..ca8b8864d1ee 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
@@ -27,8 +27,8 @@ IUSE="wayland X"
 
 BDEPEND=">=dev-util/cmake-3.10.2"
 DEPEND="${PYTHON_DEPS}
-	>=dev-util/glslang-8.13.3560_pre20200404:=[${MULTILIB_USEDEP}]
-	>=dev-util/spirv-tools-9999:=[${MULTILIB_USEDEP}]
+	>=dev-util/glslang-10.11.0.0_pre20200924:=[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-2020.5_pre20200922:=[${MULTILIB_USEDEP}]
 	>=dev-util/vulkan-headers-${PV}
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
@@ -47,6 +47,7 @@ multilib_src_configure() {
 		-DBUILD_TESTS=OFF
 		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
 		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
+		-DSPIRV_HEADERS_INSTALL_DIR="${EPREFIX}/usr/include/spirv"
 	)
 	cmake_src_configure
 }