6 files changed, 127 insertions, 1 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 73e83a45d350..b62a62f66f04 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index f7c8b44aba53..135dcb54f67c 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,6 +1,8 @@
 AUX vulkan-layers-1.3.231-Make-BUILD_WERROR-actually-work.patch 879 BLAKE2B c9468c7ebada19d1a252b6dc6f8dcc6edd2f5497e86cba815a4da900ad933f619ea8589071d86a387810b07d3cb58fcabcb4a86c15742e539f7333d55679abc3 SHA512 c8f86399a58cd2454c11e2e240def31b4dade136d1546da0b23c77d89de767dc9c126ac3e77a585cd56d82f5557a0316e439f1f724f4ab8e615d28520e66497a
 AUX vulkan-layers-1.3.231-cmake-Cleanup-find_package-SPIRV-code.patch 5089 BLAKE2B e76b6fdedf175c246e227e1317243ceb1842b19ad7f64cc0d7ffa4935f554dbdf5664ee8907b47ac22e7308110ea0faced11aa40f3870f059a9679b4ef1db6f1 SHA512 28cad48b59458e21e8a46d3e7ea915a8d7358962e2c0a7f99db1db99ed9d6090a129be874cce7fc528991476ccc41acccc1f1627b449dfdb8555ce8173dbb179
 DIST vulkan-layers-1.3.231.tar.gz 4408601 BLAKE2B 9b777559a540c34c5f86a93b15c42a223b8b7fd517f06e28d7bd0ba0fdc938063fd86126f7cdb43e692f3cc22296b5f8df924c2f39e3ead38325b2e1442bf3a6 SHA512 550ff2f5d718ab1a272977f3beb89f653107a7a2b89209408233cb3b969206d1d9383e0e8933343bc71fc920dd80e0cf62ad3baa588b671f24ce04cb93d4b606
+DIST vulkan-layers-1.3.236.tar.gz 4519779 BLAKE2B 087ecbfc4e460dbdd65009262d3ddedbed72258742ec902ac6e6e89d779aa350f819d4aa2aad4a30d365bdfb079c25ccaec265b9c5b56066e082db4701300095 SHA512 0ebb9d44b1a465a28702e12c80c6accb55dbd6a53ce2f1eb8e8cd627583a217544e21e8eb7e1619620458d756c0cde244bcde331710ab8244e113e302839f479
 EBUILD vulkan-layers-1.3.231.ebuild 1658 BLAKE2B 290cb1394b931cdc45350f5173b1bf2cdd8311af02143e9a15101ddabb7da469b5dc0853596614c64f4236ba1e865e5a7b4314857be0a431b6e856a38dea4636 SHA512 0986e8a61ca261985ddcc584838b899c52bb1f1ce7fbf0a09e5534e209539b05bb136ee23d37fc4ac276fcc3868d980976063859d244d5b610c3e91b0075442d
+EBUILD vulkan-layers-1.3.236.ebuild 1530 BLAKE2B 1f35deb8626817ae6db0ea115f2138a6a025c7fba787e045ba9e849ab4a9f9635b895e132eef8b2b0fc4c87aeba6a6b75043ba7970322c88fef3797ee4226430 SHA512 a587392d6c95a8ca022b27ae96b27accf9937effa95a3a26af8d7960f4e16c758d6910c0d558199afb78b5819f36b40a8a686acdf0e9577ebd33600e1d4f0f92
 EBUILD vulkan-layers-9999.ebuild 1533 BLAKE2B 9e2705767f971e0e640e0d2ca94835d1ab35fa33125ef7994b262840dfc9c08d01a9009b5880f313246d951f9a69a56175e1b2852bcb2a7d3c4df16851ebf8a8 SHA512 548e1b678c893d772e3c18401da553081e7f7248d5d5f6b3ac72d5924817c3203b17dec7142d47ed2453c2648c6003471c71ccb0c8808050ee77509a42693d85
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.236.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.236.ebuild
new file mode 100644
index 000000000000..4651b8594c3a
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.236.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-ValidationLayers
+PYTHON_COMPAT=( python3_{8..11} )
+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/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
+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"
+RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-cpp/robin-hood-hashing-3.11.5
+	~dev-util/glslang-${PV}:=[${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_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_LAYER_SUPPORT_FILES=ON
+		-DBUILD_WERROR=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DBUILD_TESTS=OFF
+		-DVulkanRegistry_DIR="${ESYSROOT}/usr/share/vulkan/registry"
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 1c2fe70d8e68..902733801446 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-loader-1.3.231.tar.gz 1609720 BLAKE2B 0e6c2bdb6934502cd7f315636cf17dc0eeca7b990f8573944dcf5aec775272ce8c246efe51ee0395e0c2ed23c63a584be104d8a49a556c6d17e0fa66fda772cf SHA512 07f1a8e7737d9609a138b4e9740f9c2228db1ac56f8ddbf3c1ec0ec3b745647002ba3af4725347941dae2feb63e7c33c9db5f14ab98d2f47dfd2181a559ba849
+DIST vulkan-loader-1.3.236.tar.gz 1646230 BLAKE2B dd4448f32ef6f9ba25cb9bfd07549213ce787bfe21fd7d677fed55940173f583457f9082b75a497f4849afa3584fc147f3973c8d59f2a6a10ab16a10753ad5f8 SHA512 d80f979775e6a98b1a68e079b825984a03c76ecc04d9a8e979ff751f0f0825234662b15f2096a1c183f35bce8a1cfc16dda3238ad8f192f1622da74b9ee4e078
 EBUILD vulkan-loader-1.3.231.ebuild 1722 BLAKE2B c63c31356baef1b2a547f183d4be776b8c8826426b7ada3d2b17dd9583936f102917fbb082b398c929bdc54b87e01749308996ddf8ec80ac9efd6785c2b15eea SHA512 27b112a05d865d20cdd766fb46395967ee22966bfb481194636c340a8657bebc77f696d4d5a826d9b212c4ae6a1612ecc4e357634b4b4174269ac402665af89f
-EBUILD vulkan-loader-9999.ebuild 1752 BLAKE2B b388bec1cfcb652262cd3da49722be05f8905a251949e8a69dca7dd29562bc77c1cd0dd95b1c100b7e30a6f242e88283bc1c159df284886fdd91052e4bfc059d SHA512 2a7b8d50a8317dd4ea7c454ccd5aefc3995f49a2e1c794161331c7fc8277d7dbe64b8ffcee3acc7b49675c9fe44994c91063527696aae137a52b59f3978d8ec3
+EBUILD vulkan-loader-1.3.236.ebuild 1750 BLAKE2B 4915a5b13732028fb1c307b740359526c97dbee6a12a1cb27fb32fa5e86621b88f5f95855204ccc1f4bf491b5a79c4d57dffba6c93bc80d775db3c94f22fdf2e SHA512 e07527b14dd629de30f550ea9610210a6afc6388cd1e1fe2fd9c643407f1b99ff32f9b49a26e3cff9f21e6829084c07db67e1973925421c04eb34ae71e4921ed
+EBUILD vulkan-loader-9999.ebuild 1774 BLAKE2B a0d21e47557eb8b7784dc51e04580ae38e7fc41ecda5e3173ba4d0aba6fc063c51ae746f18be3a4ab3c5f2751783456e22353fad04f78d7e0e214ff09532b659 SHA512 221c14b0b2bb12e25c33f40016e11a4f4bfb9d0d3deca16aa8cd49442f109473c986ada5f89d99a3cb0eb7f5769590d48477d7b3ee180aa9131cb689809dd6c1
 MISC metadata.xml 520 BLAKE2B 5f5add8ab6dcec0fec9ffd20f5dbfababeff0a441855c641e1791727c4dd1c9eb17cebee79b9c4c325c355b1efc91b25f0c6246d11b010dde2109e38d9df6178 SHA512 4274ba14bdeddfe766c7394cbbb44c52aa4726f096ef2567e427fff6a710fe3de23466cb742f40162f4c2890f3a3a62e326364e45680ac1b8a0bca47db0e6e34
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.236.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.236.ebuild
new file mode 100644
index 000000000000..12218ef24e7b
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.3.236.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Loader
+inherit flag-o-matic cmake-multilib toolchain-funcs
+
+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/sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}
+fi
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="layers wayland X"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
+DEPEND="
+	~dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+	# Integrated clang assembler doesn't work with x86 - Bug #698164
+	if tc-is-clang && [[ ${ABI} == x86 ]]; then
+		append-cflags -fno-integrated-as
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_TESTS=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
+		-DENABLE_WERROR=OFF
+	)
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	keepdir /etc/vulkan/icd.d
+
+	cmake_src_install
+}
+
+pkg_postinst() {
+	einfo "USE=demos has been dropped as per upstream packaging"
+	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
+}
diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
index 6c8c92090b8c..91126dbe41df 100644
--- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild
@@ -50,6 +50,7 @@ multilib_src_configure() {
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
 		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
+		-DENABLE_WERROR=OFF
 	)
 	cmake_src_configure
 }