gentoo Easter resync : 12.04.2020

5 files changed, 160 insertions, 24 deletions

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index f3fe9d6929bc..0c6374ddb43e 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,4 +1,9 @@
+AUX vulkan-layers-1.2.133-Fix-build.patch 588 BLAKE2B fe510a968105213a54a3bc98cb1da386f64d3e7c85c601535f0cabce72408c237492c7382fad6274b72386a46f95ee3bb69f1c67ee749c457e484350f70cebda SHA512 e99f84e6fde309804118d5d68f0ceae61c156808b374bd273982f62be94c3868afe07471e6b2e5d5610e044941307c9721fda1ad49cb402f9795557b88732152
 DIST vulkan-layers-1.1.125.tar.gz 1763589 BLAKE2B e6db1c8b2469afcc9565a55e3977443952cf8a176b6b2b2f5747fbfdb887074e014138b4626f58ddb5c24f87260af32c0c589aef237366aee5acfd3b31ad06ee SHA512 07fcfa9737711671a1a537285f69b63b1a14cf9201dcc169fbe99e19febe612ba8a1e7b448d18bfd01a35d90fb99a261ada0ae9b8facb36d04079bcf3c5c72e0
+DIST vulkan-layers-1.2.133a.tar.gz 1864458 BLAKE2B 8da19effe360dfdd7b4896407a62870c825bed62aafc3fe68dc0ca7d9fb92dc7d9337101b9e46535ae901ec24f8d4f6d0301c4e72a5c29ebdf4f28e07e4c49ba SHA512 a7fe404f8732486c12ddee0443649fc5a5b4a67bb255a439d8f55939b171e447f5711632726eaca0e492bd6ab80e3ebd7efd3156e8bd0fc5b15dcec8b791301f
+DIST vulkan-layers-1.2.135.tar.gz 1963632 BLAKE2B 89069971266d0797e57f868ad996218d555687a40878b5d5cbf37dcbc392316e53066e8d457fb7b2505727b6529c217d8d6118b45c76416bf8dab7830d2d6818 SHA512 44a660b4c3bfa6f5ea355d7d1121f239c92e96cf2ef941d85b0d4a12154c4bec218b4c4c19e18c7a42cbb03a468f90ffcd6752ec773a8223e67cc182e1e96324
 EBUILD vulkan-layers-1.1.125-r2.ebuild 1462 BLAKE2B 33e3d3d8578f6620fa64b19deafe8df8b62c2811da3fe2aae1c5154524cdf0fdf829ac988a9364a32478480132957982854dfd398216e9768ce1412d5e093d60 SHA512 86984927f83bcc8eaaef651a43285ffb4401acf64a960fcfe69c10c734960c3ec1199929fbf5f5dd20bf9972c1b32fbb92f4fa1ddeb9461a6754a83eaa360d76
-EBUILD vulkan-layers-9999.ebuild 1446 BLAKE2B d50ebd62ea8c8b52b9129374fa6a86209828c822031fc044c577c998365c129a4e548756f21dd4f539ea048e5ff57325b2b8cd939a71192b9e8515fb8474fe18 SHA512 10de6ff6bbd8d66c4e7f0160bf675eaa8799beb765f95cf818a9f7374afde563b4724e340eada551225bb6372eaf41c2f538940de086ab4ac281bfd3a5e02ec4
+EBUILD vulkan-layers-1.2.133-r1.ebuild 1467 BLAKE2B 26403477675e3cfcb7314d98889e6be1ad16f7e10a794bb7a1cadc69a10233b0d74d4f57e53a0de799a247a8e9d48cdf7d13b4f655fe9b797b8f021c20e06943 SHA512 a943f5209fa779cb5259d7782f00c7a2fc09f1c2b21fe6da84240f51b618fbe38dc996ca2d9122d778c0a73138070e261b637a2aa7370bee509fcf77da801be0
+EBUILD vulkan-layers-1.2.135.ebuild 1408 BLAKE2B bf5e56a00864183299d79b38789c17495394e62be0973a936b16a8ee377791e5a927637bb7fcfeedc703ff4a5d9b624821795d691403c5149bf1145f019d4847 SHA512 72eddd500a610bbbc81d1e82bc571b4af89bb7041ceb332cbd727f03f1d7f713bdd1eb25532732d7178eb9946644299d4f33724a987cd85cae61b2828c904587
+EBUILD vulkan-layers-9999.ebuild 1408 BLAKE2B bf5e56a00864183299d79b38789c17495394e62be0973a936b16a8ee377791e5a927637bb7fcfeedc703ff4a5d9b624821795d691403c5149bf1145f019d4847 SHA512 72eddd500a610bbbc81d1e82bc571b4af89bb7041ceb332cbd727f03f1d7f713bdd1eb25532732d7178eb9946644299d4f33724a987cd85cae61b2828c904587
 MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.2.133-Fix-build.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.2.133-Fix-build.patch
new file mode 100644
index 000000000000..c3f42539bbee
--- /dev/null
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.2.133-Fix-build.patch
@@ -0,0 +1,22 @@
+From 511b30622aa9e7859e5b606b25621a8d84888d40 Mon Sep 17 00:00:00 2001
+From: hedmo <hedmoo@yahoo.com>
+Date: Wed, 18 Mar 2020 20:23:13 +0100
+Subject: [PATCH] layers: Update range_vector.h
+
+Change-Id: I595fb8b5ccf102d652e86846cbf8489c79a1c8e0
+---
+ layers/range_vector.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/layers/range_vector.h b/layers/range_vector.h
+index 5d650586a..37de88ee7 100644
+--- a/layers/range_vector.h
++++ b/layers/range_vector.h
+@@ -28,6 +28,7 @@
+ #include <limits>
+ #include <map>
+ #include <utility>
++#include <cstdint>
+ 
+ #define RANGE_ASSERT(b) assert(b)
+ 
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.133-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.133-r1.ebuild
new file mode 100644
index 000000000000..b8a19367f7bd
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.133-r1.ebuild
@@ -0,0 +1,54 @@
+# 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}a.tar.gz"
+	KEYWORDS="~amd64 ~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-7.12.3353_pre20191027-r1:=[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-2020.1:=[${MULTILIB_USEDEP}]
+	>=dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/${PN}-${PV}-Fix-build.patch" )
+
+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/"
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.135.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.135.ebuild
new file mode 100644
index 000000000000..716f47b5b7c6
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.135.ebuild
@@ -0,0 +1,52 @@
+# 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 ~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-8.13.3560_pre20200404:=[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-2020.1:=[${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/"
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 891fec0fb1cd..716f47b5b7c6 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -2,48 +2,51 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
 
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers.git"
+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
-	EGIT_COMMIT="237d818e81fbffa073d29d94f53a2cbac4f25b9f"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~ppc64 ~x86"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
+	S="${WORKDIR}"/${MY_PN}-${PV}
 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"
+IUSE="wayland X"
 
+BDEPEND=">=dev-util/cmake-3.10.2"
 DEPEND="${PYTHON_DEPS}
-		>=dev-util/glslang-7.12.3353_pre20191027:=[${MULTILIB_USEDEP}]
-		~dev-util/spirv-tools-9999:=[${MULTILIB_USEDEP}]
-		>=dev-util/vulkan-headers-1.1.125
-		wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-		X? (
-		   x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		   x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-		   )"
+	>=dev-util/glslang-8.13.3560_pre20200404:=[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-2020.1:=[${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=True
-		-DBUILD_LAYER_SUPPORT_FILES=True
+		-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=False
-		-DGLSLANG_INSTALL_DIR="/usr"
-		-DCMAKE_INSTALL_INCLUDEDIR="/usr/include/vulkan/"
+		-DBUILD_TESTS=OFF
+		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
+		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/vulkan/"
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }