gentoo auto-resync : 03:04:2024 - 08:13:58

3 files changed, 70 insertions, 8 deletions

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 4501ef4116e6..4fb2b36d5160 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.275.tar.gz 5280585 BLAKE2B a9707dc18c4802b1f6fd851ec7b16201035c1809c7e42fcd2d3f08dd7de162a18ee240f9269e233a67c93b49bd69f3babda73265bb9ac343e2924b19fa6288dd SHA512 755bdde7e7129b7a3ed06a4bebdaf11212288802119e0dc224aab63491de30c9b1c25972bdafd4fedbfea43bf6c29cdbc409374e57fbf0331798530a8ae94a70
+DIST vulkan-layers-1.3.280.0.tar.gz 5465068 BLAKE2B c0b568b59cb8a17bea7dd1c1522c0a72279ad6a07f2f11383bc069f141fbb179529dd4ccd34b2a7a9a9a4af0e173ebbc49541a42c2b32ea8b54d90302f7ee449 SHA512 b397d4aa5406e25eb241a72f006fb05554d8ec96eec4c31ed08ef34d0b362f8e544a2e8bcf044112bdbb2733f2a9f50bf8b63aff64e143e450fa01298dc7838a
 EBUILD vulkan-layers-1.3.275.ebuild 1644 BLAKE2B 5d03caef5de18f10040bbe5fcfa23526c51684ef95fd9953efdfaa1b217cf11d5e6561ffeb14390c62ab32ea6bd38fcd002120b3a4b0fed80d386ffde9d9f08b SHA512 bd2e9eced89d8161eca83c07d27342abb68e147d60094285437c83aeb9089ff30eef038ff8d70679f24a71eb18f772532df5d91b1223306a02107e9c75dee537
-EBUILD vulkan-layers-9999.ebuild 1642 BLAKE2B 4f3b7567bb5a183f3d3a1929531349a67c732c2dfe9fe2375c4516513f1af16675a622c566b8f47df1a3cc4b575601e1a25acf87c790c2a971d1adfdb5b69bf5 SHA512 7ca20decc9501fc86cddb8b14bab9ec1945d7e2f2a3c6634f02c35b95823be376a875da1941b354d5c76901e29b97b5a470657aea92c9fe0eab875f311ab789e
+EBUILD vulkan-layers-1.3.280.0.ebuild 1646 BLAKE2B 624c9d714e188a4865ac48e7ef1408bfd60e9d079d2036f3ae782daa6f0209218bb341d479873f481d4a270c26042b1c68152a2eafacfb8bc7a69a611ba4c8ac SHA512 0c80de23d7d1d5fbd9636f4d860c845d8874fac759edf3875a0a1022866759a8ec8362b1b20408fd5b1b5363cd67e820d311b0459f347c6cdfbfaf6392aaf4a1
+EBUILD vulkan-layers-9999.ebuild 1646 BLAKE2B 624c9d714e188a4865ac48e7ef1408bfd60e9d079d2036f3ae782daa6f0209218bb341d479873f481d4a270c26042b1c68152a2eafacfb8bc7a69a611ba4c8ac SHA512 0c80de23d7d1d5fbd9636f4d860c845d8874fac759edf3875a0a1022866759a8ec8362b1b20408fd5b1b5363cd67e820d311b0459f347c6cdfbfaf6392aaf4a1
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.280.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.280.0.ebuild
new file mode 100644
index 000000000000..8e97234b84e0
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.280.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-ValidationLayers
+PYTHON_COMPAT=( python3_{10..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/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
+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/spirv-headers-${PV}
+	~dev-util/vulkan-headers-${PV}
+	~dev-util/vulkan-utility-libraries-${PV}:=[${MULTILIB_USEDEP}]
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+
+QA_SONAME="/usr/lib[^/]*/libVkLayer_khronos_validation.so"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=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-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index b1f4f7dd83eb..8e97234b84e0 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 MY_PN=Vulkan-ValidationLayers
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..12} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
@@ -12,9 +12,9 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/vulkan-sdk-${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
 fi
 
 DESCRIPTION="Vulkan Validation Layers"
@@ -24,12 +24,12 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="wayland X"
 
-RDEPEND="~dev-util/spirv-tools-99999999:=[${MULTILIB_USEDEP}]"
+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/spirv-headers-99999999
+	~dev-util/spirv-headers-${PV}
 	~dev-util/vulkan-headers-${PV}
 	~dev-util/vulkan-utility-libraries-${PV}:=[${MULTILIB_USEDEP}]
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
 	)
 "
 
-PATCHES="${FILESDIR}/${PN}-1.3.250-Build-shared-libs.patch"
+QA_SONAME="/usr/lib[^/]*/libVkLayer_khronos_validation.so"
 
 multilib_src_configure() {
 	local mycmakeargs=(