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

3 files changed, 91 insertions, 4 deletions

diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index cab61e959e50..f0e70c0b5ec5 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,4 +1,6 @@
 DIST vulkan-tools-1.3.275.tar.gz 755289 BLAKE2B 2366a0c55982ef9ef13495ac62d958d0055fcbbbd7cdaab9530ebf15af9369a71bf3b8d3d6479f3a0ee02d44ace027e0fd57b2b93d6a9a373781c60529a48663 SHA512 5d70498341b8d2447128cd5ab3fd081b706830f5f85d9f7e752dfca9c74fa4c1567207eef6e34e9bf99ff65ec2855b835eb30362fd544e1cf61ecc7a7119df06
+DIST vulkan-tools-1.3.280.0.tar.gz 758884 BLAKE2B 99d9157a3e701d6f143f6f893c85c0f1d9df13f0b8ca75cc8b8985e92272f4621a03094e6bc5c0b24eca9036b622a774acb9f539c30196ab2c2c1505870e72a2 SHA512 d28dd0a83e993058f58ba83c148a3104c1bbe4e731b81bfc934a989dfcdf3cc1b22383bcaee2a34545ddb9b053e00bea3da463d48fa10727a18ee7e34641d1cb
 EBUILD vulkan-tools-1.3.275.ebuild 1938 BLAKE2B b7d8535c88d5d3cba35ecdb6f4c6f777628902094a67d83e855f61b0db7e4d848672824003ce863dc8bd8b9b2190dd929047fdc2819c6f331bf395ff977b30f7 SHA512 74f5879b5e53e516b5f3fbd311a57f77ae4d07bf83eaff7a0411f45e95e21df34a1c0e942b474e78031bc14c61fba56623e3da36ef8236a3da4722071383b870
-EBUILD vulkan-tools-9999.ebuild 2075 BLAKE2B 9320eec4ed5af1748ce77e2955dee27b22179683765873df11f32da0d07f80147a3d3412366761e78d13ed18f564c90a074bce5cfd338ec2ad77c3175ef22376 SHA512 a4f2361dd425c785c8257c68ab0799533d1b8682a63d8137da35c8080ed22a7b3eccba86353d39b60b48f4935c41b5646b490edbc21d2d82784a0eb7d28aab1c
+EBUILD vulkan-tools-1.3.280.0.ebuild 2072 BLAKE2B 721a8bb43366930d47982f7e6b3347fb0fb1a6dc9c7d6ee16977c4bfac7cb717deed4dd20b4627bebd94a7764fdfc0da494786ddeb133e31c85653de75272321 SHA512 35998674d1805a9be6092a4896ba14e0798b8e55532ddceb5c73e93b852cdfb478d4b49b1200cab16a910d35720b1a746bd4792aace28cd82a505c26e55fa746
+EBUILD vulkan-tools-9999.ebuild 2072 BLAKE2B 721a8bb43366930d47982f7e6b3347fb0fb1a6dc9c7d6ee16977c4bfac7cb717deed4dd20b4627bebd94a7764fdfc0da494786ddeb133e31c85653de75272321 SHA512 35998674d1805a9be6092a4896ba14e0798b8e55532ddceb5c73e93b852cdfb478d4b49b1200cab16a910d35720b1a746bd4792aace28cd82a505c26e55fa746
 MISC metadata.xml 500 BLAKE2B 9fb4ff756cb14accac7b9c8e262ba8fc0108f68acaeaad81085ea91939ef683a21dfdb68ac4689e71c6b3b490e758af2711b1c436c65a7aa0e3b030aec982c93 SHA512 03a8e309f115934d5195da8aaa7bcd3e4f95f28269671a2eb8426941bb9bae815bcd3448d2e97006ddb2ab7ec52179117604b6fbf0f293e4285b303da573d435
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.280.0.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.280.0.ebuild
new file mode 100644
index 000000000000..56ce6ee1887f
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.3.280.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-Tools
+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"
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
+fi
+
+DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="cube wayland X"
+
+BDEPEND="${PYTHON_DEPS}
+	cube? ( ~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+	~dev-util/volk-${PV}:=[${MULTILIB_USEDEP}]
+	~media-libs/vulkan-loader-${PV}[${MULTILIB_USEDEP},wayland?,X?]
+	wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11[${MULTILIB_USEDEP}]
+		x11-libs/libxcb:=[${MULTILIB_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	~dev-util/vulkan-headers-${PV}
+	X? ( x11-libs/libXrandr[${MULTILIB_USEDEP}] )
+"
+
+pkg_setup() {
+	MULTILIB_CHOST_TOOLS=(
+		/usr/bin/vulkaninfo
+	)
+
+	use cube && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/vkcube
+		/usr/bin/vkcubepp
+	)
+	use cube && use wayland && MULTILIB_CHOST_TOOLS+=(
+		/usr/bin/vkcube-wayland
+	)
+
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_VULKANINFO=ON
+		-DBUILD_CUBE=$(usex cube)
+		-DBUILD_WERROR=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"
+	)
+
+	if use cube; then
+		if use X; then
+			mycmakeargs+=(-DCUBE_WSI_SELECTION=XCB)
+		elif use wayland; then
+			mycmakeargs+=(-DCUBE_WSI_SELECTION=WAYLAND)
+		else
+			mycmakeargs+=(-DCUBE_WSI_SELECTION=DISPLAY)
+		fi
+	fi
+
+	cmake_src_configure
+}
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 14e817838f6c..56ce6ee1887f 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 MY_PN=Vulkan-Tools
-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/vulkan-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"
-	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}.0
+	S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
 fi
 
 DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"