gentoo auto-resync : 19:01:2025 - 06:42:08

3 files changed, 95 insertions, 14 deletions

diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 84ee51e8f02d..4bde2b1a38f2 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +1,8 @@
 DIST vulkan-tools-1.3.290.0.tar.gz 754806 BLAKE2B 322763f930660b52ac1fd4b56f5b7cd133b49da7a5ecf4f6d36712029dfba44edaa61ab65eaf4f9771ec5e5fac159e8d30b46b0f057b3d9b61220e58dab07ff8 SHA512 e5f6daa12ba2e8098f939cc06e732efd89f616fd9babf00d2fb8b9a73671143961a4c5b84879a4f9c4a7312bb393874f065222602e3619db5ad7fb9f8b868422
 DIST vulkan-tools-1.3.296.0.tar.gz 757355 BLAKE2B b5fa5ad2cc1aacd1f31361a85eb4df95701c7dd0207092722941ace9d5b215c1a094982f3713b3a8e77dc4ffb46e0cbbf7957bdf7ff089d2174e697dafdd9a0b SHA512 66bc89272f150198cd52f2971ad67a2fd6c922ac4bafb420c0d54788ca6bab2246e8a153a09eccce15a87e1fe16fdeef16af1c6b6b13386bff79dd73858f3cae
+DIST vulkan-tools-1.4.304.0.tar.gz 758609 BLAKE2B 81a55a4d84d3bd95c033e790b823a19b1c2776675061be37e325ef5bd98ad77afc328bce8372b0d87028922241c48a975f34f8d199cc2876659ac02f2133b7bd SHA512 9ef9fdda000977f913869419702b3e2ea2a6e41525c47711bc9aad9df5b538b7fad164c3ae43b87f183146f2f27c928b600eadc5ac2bb0e6c81f12a3487cb21c
 EBUILD vulkan-tools-1.3.290.0.ebuild 2067 BLAKE2B 3c9209c0d62c15724a711a426483b33938ce57661b79cc8434964d70fbaf0baec07c0bac572804ada6a8a8f1e8157efaf21d4f647e0aabf629285ebabff3041a SHA512 3ffe1e3ab44b872f9d7d0e2e3acf7e3acf9011cbb40649f8f473ca4631c71cc1ecf5968fa7403a0e1ad9a7f61b9cb7749a3823c52669ac8e47b1d06bac4ae155
 EBUILD vulkan-tools-1.3.296.0.ebuild 2069 BLAKE2B 6a74ffcdf448177051113c144a3b231cffe8b27c4a5a891b78d3a18e58a96aab201ca069549db4f4bc81ad1c6cd47b4189a8ad7ad2205baade07bed3c4a809d1 SHA512 ca64fad3ef661f3b6301be681fcb5c123299a9bfe7313f1ef47792aed1d04c53cec7b57a991e612c4f8cb6041b9d4c1f479abd63b42f6cefa850e95c1eda790d
-EBUILD vulkan-tools-9999.ebuild 2072 BLAKE2B bb479503cd72cc680496635a6254675c0013334f119f9697bd2eaac1ee27a1ac423c4940f0d3841f332b2a5ad085a7e3d939a636111d6484de3ebe1fedf5b067 SHA512 3dfe92bb9b8bae8cc62518c6f1f7af5d88528aa01cb12e1c805a8e8d767a49e47722c29b3d695bc3fa0786700339c57f925e04efc2cc7bb547a65f835b697986
+EBUILD vulkan-tools-1.4.304.0.ebuild 2195 BLAKE2B 39e8e5ca4a9e91b6de66a14f356d8485a9447b9bbdb1f04cdd67d6261cbe88375c07b7b000e3e330d47265fa4637f3de9b83647cdac6a3bed35a2db40724e547 SHA512 799e1883cd3235ccc82c126665d359a9ef53a7499da4c035122275e509dce294c139394e07e13bd951f88dc99fb67716fe84cc0ad1af07ad0a3c0db6bedf4af2
+EBUILD vulkan-tools-9999.ebuild 2195 BLAKE2B 39e8e5ca4a9e91b6de66a14f356d8485a9447b9bbdb1f04cdd67d6261cbe88375c07b7b000e3e330d47265fa4637f3de9b83647cdac6a3bed35a2db40724e547 SHA512 799e1883cd3235ccc82c126665d359a9ef53a7499da4c035122275e509dce294c139394e07e13bd951f88dc99fb67716fe84cc0ad1af07ad0a3c0db6bedf4af2
 MISC metadata.xml 409 BLAKE2B 92472d6c8620665d243fa5b7df59caffca7eb8761150cc1474fe80077e1bcb31470d4df8decbc61b0e3bbb04eabe18f19cf350d97ec47bca7bca7eacfaebfe8d SHA512 bca2fb46cbea1137524ebda2c66e88249b77b2fa8248d2f7984583e4da02fdcb97e28b682e590746631d8ccee5c238bffa879c244948f2e81c187faee933e30c
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.4.304.0.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.4.304.0.ebuild
new file mode 100644
index 000000000000..1492f1179004
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.4.304.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-Tools
+PYTHON_COMPAT=( python3_{10..13} )
+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
+	)
+
+	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"
+	)
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	if use cube; then
+		einfo "As of version 1.4.304.0, the window system for 'vkcube' and 'vkcubepp'"
+		einfo "can be selected at runtime using the '--wsi' runtime argument."
+		einfo "For example, Wayland can be selected using '--wsi wayland'."
+		einfo "As such, 'vkcube-wayland' has been removed and the runtime argument"
+		einfo "must be used instead. See 'vkcube --help' for more information."
+	fi
+}
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 1c19288ef980..1492f1179004 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -50,9 +50,6 @@ pkg_setup() {
 		/usr/bin/vkcube
 		/usr/bin/vkcubepp
 	)
-	use cube && use wayland && MULTILIB_CHOST_TOOLS+=(
-		/usr/bin/vkcube-wayland
-	)
 
 	python-any-r1_pkg_setup
 }
@@ -71,15 +68,15 @@ multilib_src_configure() {
 		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
 	)
 
+	cmake_src_configure
+}
+
+pkg_postinst() {
 	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
+		einfo "As of version 1.4.304.0, the window system for 'vkcube' and 'vkcubepp'"
+		einfo "can be selected at runtime using the '--wsi' runtime argument."
+		einfo "For example, Wayland can be selected using '--wsi wayland'."
+		einfo "As such, 'vkcube-wayland' has been removed and the runtime argument"
+		einfo "must be used instead. See 'vkcube --help' for more information."
 	fi
-
-	cmake_src_configure
 }