7 files changed, 204 insertions, 0 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 79084954e5dd..4af25f882c1a 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/shaderc/Manifest b/media-libs/shaderc/Manifest
index 2f14c879a737..7322ced295b6 100644
--- a/media-libs/shaderc/Manifest
+++ b/media-libs/shaderc/Manifest
@@ -1,4 +1,6 @@
 AUX shaderc-2020.4-fix-build.patch 424 BLAKE2B 6d8760ef64bf9f4d6e291d7b3b37735573b1cf43f510870a43f8169a6ea1909d72c1b3d7c0fb295733c07f6e626d4b148ca2deb384d7aae4554c8da01482b930 SHA512 95cbd65997146c3ba018c81d49f90a7713f99f5bc86b6c30d6c83ca9bb139309df763d325b75c9b1d02ca60ed3bddd003eb08e64e3856867bc15d58c620341ed
 DIST shaderc-2023.4.tar.gz 225728 BLAKE2B b033f9d5e8afdf53afb5c3299a2b0496558b25d4fb1b04eab0ab1610377c391084fcb952bf2836bf88078e902e78bd579d46ae8f07aaed42569edbbc21b0d5c9 SHA512 18b7c31eec9408fc038211d4424d5d82414f427a580ec6f412e9e8d6a7e060e4c39d2c223bfbbf4bd167a1575a7bb900591ff834b3356f4024772e0b96993e91
+DIST shaderc-2023.6.tar.gz 226361 BLAKE2B 023ce15caaff6ff9474f361c6c5442fd8c58bbb079774fd3c8525824e70e63c1b8fff37490601b599f4ed44f4bfaec3ca746b7a734782fc2af8d78c4f1f1de53 SHA512 6580384ac27c4f2225529873ba46ca61240bdf63f4f5b89875e9bd20a774fed49328094379b7f469c3b97b6a3744cb649998c0d6d5a391023317a64a91754bb1
 EBUILD shaderc-2023.4.ebuild 1899 BLAKE2B 1750ba01044a0e6f369fe72796280836c71af9442bfc934d9a9b3a9d40f46fa23243e05bcde109dda9f659a5b169837dc23887a9997b0c15be3edb54e6a17a00 SHA512 8ea726bf609eb38785455797087bd87cad0aaca33e720def5140a2fbc50f5b95a7cb0b6c58ebb68125e78633b24b6ff4970834b81c6de850c2836c64100595b9
+EBUILD shaderc-2023.6.ebuild 1902 BLAKE2B 7885fbcf53a391cf84e6a52ddaaba024fbf3a470bc63a52f92a3977ea0f878935e59207724f2e52ff365941ed10e06e0dfba6563e066852c184872ab7b15081c SHA512 943d684412062054e649c167bbb1685008f00b3326a63e5ab5de286bd8ec18ca8ec7d7723247b8d3f072b84aed0d22f96d740a37ad1bb37741499d64326a8511
 MISC metadata.xml 336 BLAKE2B 5dbc5d2e5dc2e389582376ea40375fed6b20e766cd59415f8f23fd81af9abac9c07379f341dff21901fc5934920c6534c525452c67aa606783350b84f071c88e SHA512 b72710b6ca796b364037d6c8646b0760688ee06a3854ae74dfff15d902dd7a2d94ba9872c42110e9e8e005ef8cc443b89108553fc11b79c1b5872daeff7b0f70
diff --git a/media-libs/shaderc/shaderc-2023.6.ebuild b/media-libs/shaderc/shaderc-2023.6.ebuild
new file mode 100644
index 000000000000..e056906121b3
--- /dev/null
+++ b/media-libs/shaderc/shaderc-2023.6.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..12} )
+inherit cmake-multilib multibuild python-any-r1
+
+DESCRIPTION="Collection of tools, libraries and tests for shader compilation"
+HOMEPAGE="https://github.com/google/shaderc"
+EGIT_COMMIT="${PV}"
+SRC_URI="https://github.com/google/${PN}/archive/v${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-util/glslang-1.3.261:=[${MULTILIB_USEDEP}]
+	>=dev-util/spirv-tools-1.3.261[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/spirv-headers-1.3.261"
+
+BDEPEND="doc? ( dev-ruby/asciidoctor )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2020.4-fix-build.patch
+)
+
+# https://github.com/google/shaderc/issues/470
+RESTRICT=test
+
+src_prepare() {
+	cmake_comment_add_subdirectory examples
+
+	# Unbundle glslang, spirv-headers, spirv-tools
+	cmake_comment_add_subdirectory third_party
+	sed -i \
+		-e "s|\$<TARGET_FILE:spirv-dis>|${EPREFIX}/usr/bin/spirv-dis|" \
+		glslc/test/CMakeLists.txt || die
+
+	# Disable git versioning
+	sed -i -e '/build-version/d' glslc/CMakeLists.txt || die
+
+	# Manually create build-version.inc as we disabled git versioning
+	cat <<- EOF > glslc/src/build-version.inc || die
+		"${P}\n"
+		"$(best_version dev-util/spirv-tools)\n"
+		"$(best_version dev-util/glslang)\n"
+	EOF
+
+	cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DSHADERC_SKIP_TESTS="true"
+		-DSHADERC_ENABLE_WERROR_COMPILE="false"
+	)
+	cmake_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi && use doc; then
+		cmake_src_compile glslc_doc_README
+	fi
+	cmake_src_compile
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		use doc && local HTML_DOCS=( "${BUILD_DIR}/glslc/README.html" )
+	fi
+	cmake_src_install
+}
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index cdc824ca54a6..99d88c9b0629 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,5 +1,7 @@
 AUX vulkan-layers-1.3.250-Build-shared-libs.patch 333 BLAKE2B 557bfc8dc1639f31b873ec950dc9d99f4632d953b7c3d104d0b69b68985a0d214a4d5eb42a64d28aeed41a889515305f47f8a1b3646501d36f99d67c79f24789 SHA512 ddd30ac012cfa0e1ea7cbc84c11d4398272c9f2314bb8f0d3a3758f89162239feaff0e1044284a730a8288754dd1b6cab99b98e28199457a81137a7a22601413
 DIST vulkan-layers-1.3.250.tar.gz 4829919 BLAKE2B 9e05c53d283df1d57c20574224333249e468242eb73f7feb9ce47b4d194a80a1b1958bc71743eed3d108cedba972eeb9aa27ef33e838828e8a0baefe85254613 SHA512 5e8aef501961b49d7b4390d8c8ce09fe0b7657d323859d2052a8a14b042da69d7b1387a8aadede8372711313518b6d75fb78f41e2e0c1ad69c99a5b58524fb82
+DIST vulkan-layers-1.3.261.tar.gz 5005066 BLAKE2B 76eee1121e58892be3b608d4fda17d1ef67bf1e8a361ff9b51651fb9dd80c14b52798e8978d4167d51f7dfe09a680f10868d2a4b576ff5af8938cbf2d0f943fa SHA512 cadd44773701b0937956c1b1f7c6a9f8c574c857af044271a64065367ec8c453dbda04c5bd42e307d7997441e9ad67df5656f18b5a81b315174ec8618cfe0e1a
 EBUILD vulkan-layers-1.3.250.ebuild 1568 BLAKE2B d90b7b98bd974e8dbe15184cb9a64a45f6a696ca1e5a976011f1485ced2f58003d8ee44a3ef29b29f2653548ade2e4703a12f30f51cbbe0fe289466e3051bf5b SHA512 36b28ca8a18303688e9fa2698b33ccf9144054e45a38ebbd74c198d958f461f7ba6453fa38e5cfd0bf6ce11963aa4a90be4f7919492353ed89ad7ffd1e87d392
+EBUILD vulkan-layers-1.3.261.ebuild 1574 BLAKE2B 5012ec35f581aee7d0fa2696248b814034fdbc1b9e1190bee24bb6eda41d4cf02f92e23f6f5c7226a04c218fd0cb7d7049f7db834da9b2ba1448116e4b6d9688 SHA512 05d5c4a86b20b5a0a12306c26c70029fd723c9635b207604ab98bc7a82c78698edbcd5d690fb78851b09a05f7835e573b5d54e8275b2486a45c8e58ff3513568
 EBUILD vulkan-layers-9999.ebuild 1577 BLAKE2B 5172b581017817a8db8cc126566a54d8712cdc9456c246b041171fa8811d1e66bd871923face2031f81a077d03ce0d29e93c3973038cee0338c7d577c8b26e27 SHA512 0ce7e8918612899e41a4d93a7380d887df8d06b134303df2ae6f9def522fbddf3e03f9075d8e5e958d7f2c3b4e2e0fd37fba2f7e5938c8729d49b65d6c1d601f
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.261.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.261.ebuild
new file mode 100644
index 000000000000..7af48d11e398
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.261.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-ValidationLayers
+PYTHON_COMPAT=( python3_{9..12} )
+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"
+
+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}]
+	)
+"
+
+PATCHES="${FILESDIR}/${PN}-1.3.250-Build-shared-libs.patch"
+
+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
+	)
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name \*.a -delete || die
+}
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 861f09b8d070..f22512fe2ba9 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-loader-1.3.250.tar.gz 1660983 BLAKE2B 4befda9543f1046cc31bc41848d54f2812c9aac171510523683e003f58c41dd67966a898e0f4ca60d9e61f716f9bc8b968af0b265f80088026903b938323aaa9 SHA512 89561e0343098fdc62c0d469639d6f41ac9ee57ef54f9a91eee0f0645fa12ed15e397575eab9d829b02ec2a4d1bfd2b9239ae27b0ebdc0286f07177880cdf2b5
+DIST vulkan-loader-1.3.261.tar.gz 1684713 BLAKE2B 0321a56329cc8f578e07c24a53846f0a3ac9f81ce897975f0d0732db6a6ab905e682a81cb232d96d01311a9d9b89fb142b3c0eca5330371f42ba52e12c7ed2cc SHA512 f43bf9714c30b0751d9f6725ad7df7f70516b5e12a637bfb4cdf175b33d2be78e1717a3ae9537544ca84e0c89d5b759d537b932eec7f5502fcc871f6cdaa440c
 EBUILD vulkan-loader-1.3.250.ebuild 1554 BLAKE2B e27d35577aa89e029eb29764a73ecfa275373c99257175b708776ac6dd765f4e056b2904df9e1c7ba95c3d3e81c3859cb8206dbdbdf75d72d06f49f5932ab85a SHA512 6bb68b91b0cb1aa75dc5017b6b5d45e24a185f04d623f2f672be62774dc3d27c6a9a560f463c713d34a85c7dc8f486fc5a909a08530fb7452a71cf9aed0ce354
+EBUILD vulkan-loader-1.3.261.ebuild 1560 BLAKE2B a65fd22d2d402d9d4e2db2a9265967022db346d19dc15b75011527012d9c19b9a8c66c7e8d71d3608ed06ffb699b0e93da6314ad0a94a4a6eae21de72109ac2d SHA512 dd7faec6ca58826011703141a4ef22ac4985b087774d0f4d7eb71fa43e9e5ab2b34bb04f7c0d9c8cf90f5d2524bb1d10db4062b0c3435bc78221ac85dcb86926
 EBUILD vulkan-loader-9999.ebuild 1584 BLAKE2B 4eac72c8b9de1c8721ccdfc35ccd31bba3cb6b41cc06f66a8410c2eb9103d9a1df48b6509a237cc8d7a453a5ffdf39047e550f7a1e3a13206270b27786b27bfa SHA512 1031a3d0c76afd82d3ae5e7b3b22ca3fad65d8034709db45ba3ce9c01750ae92fcd2e0102639bc9bcf90b2037ee3723a2496cdc11eadd0219549f00418a1cf1c
 MISC metadata.xml 520 BLAKE2B 5f5add8ab6dcec0fec9ffd20f5dbfababeff0a441855c641e1791727c4dd1c9eb17cebee79b9c4c325c355b1efc91b25f0c6246d11b010dde2109e38d9df6178 SHA512 4274ba14bdeddfe766c7394cbbb44c52aa4726f096ef2567e427fff6a710fe3de23466cb742f40162f4c2890f3a3a62e326364e45680ac1b8a0bca47db0e6e34
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.261.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.261.ebuild
new file mode 100644
index 000000000000..a79a918b7b9b
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.3.261.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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"
+
+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
+}