summaryrefslogtreecommitdiff
path: root/dev-util/vulkan-tools
diff options
context:
space:
mode:
Diffstat (limited to 'dev-util/vulkan-tools')
-rw-r--r--dev-util/vulkan-tools/Manifest8
-rw-r--r--dev-util/vulkan-tools/vulkan-tools-1.3.280.0.ebuild2
-rw-r--r--dev-util/vulkan-tools/vulkan-tools-1.3.283.0.ebuild (renamed from dev-util/vulkan-tools/vulkan-tools-1.3.275.ebuild)33
-rw-r--r--dev-util/vulkan-tools/vulkan-tools-9999.ebuild2
4 files changed, 25 insertions, 20 deletions
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 1e3046fa3a53..6d4a26721b74 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +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-1.3.280.0.ebuild 2069 BLAKE2B b123b51b196e8cbe98c2461f4e6a72571de9f7fcb7b08c1028c5c3e7848fec4d4ea6114849eccd376984a4c7bf341479a29acfa23a019a20e3bd0f5503b56691 SHA512 978f74eb81a3c19db6e471f5abd1da46beeb7210db4863d50202ad84f867b3c2b9e2f229f2ad4f02420099e59296508fc1998ceee3db3a6e18a4b505c1cca3bd
-EBUILD vulkan-tools-9999.ebuild 2072 BLAKE2B 721a8bb43366930d47982f7e6b3347fb0fb1a6dc9c7d6ee16977c4bfac7cb717deed4dd20b4627bebd94a7764fdfc0da494786ddeb133e31c85653de75272321 SHA512 35998674d1805a9be6092a4896ba14e0798b8e55532ddceb5c73e93b852cdfb478d4b49b1200cab16a910d35720b1a746bd4792aace28cd82a505c26e55fa746
+DIST vulkan-tools-1.3.283.0.tar.gz 753022 BLAKE2B dbd636186d7674c954f8237e7943f3cb89d172f870d0771d84d5615caec3013f284700a2c07b33a74f12e310e9c1bdd50ef8e93f459b73ace318fb68f33c7503 SHA512 714e2ff89cbd4171dae5c5825b71210572571965ba86c68f38c1ea62c9ff512e1c0dc278c02786d45d3a775985b40e8c1bd47ab37d22668105fd2e09d7524656
+EBUILD vulkan-tools-1.3.280.0.ebuild 2067 BLAKE2B 88034eca59317fc157fa6335ec64878b62d3f7780d3c9e40db36ad4e26df0ab2ecab29a27c3057474220d75639588f5c8f5c2bddcacf17f8892267512dffc762 SHA512 26365f267bb76e4031eeebedb8d14ab68464e676c1e36f2564a95278168889d2c6aeb9e58f885b52e4359cb3e52ef2cc4c2f8285e7247f1c6a17813306c1f28a
+EBUILD vulkan-tools-1.3.283.0.ebuild 2072 BLAKE2B bb479503cd72cc680496635a6254675c0013334f119f9697bd2eaac1ee27a1ac423c4940f0d3841f332b2a5ad085a7e3d939a636111d6484de3ebe1fedf5b067 SHA512 3dfe92bb9b8bae8cc62518c6f1f7af5d88528aa01cb12e1c805a8e8d767a49e47722c29b3d695bc3fa0786700339c57f925e04efc2cc7bb547a65f835b697986
+EBUILD vulkan-tools-9999.ebuild 2072 BLAKE2B bb479503cd72cc680496635a6254675c0013334f119f9697bd2eaac1ee27a1ac423c4940f0d3841f332b2a5ad085a7e3d939a636111d6484de3ebe1fedf5b067 SHA512 3dfe92bb9b8bae8cc62518c6f1f7af5d88528aa01cb12e1c805a8e8d767a49e47722c29b3d695bc3fa0786700339c57f925e04efc2cc7bb547a65f835b697986
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
index 95e6bbb9900b..ce7f09c30592 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.3.280.0.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.3.280.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
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"
+ KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv"
S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}
fi
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.3.275.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.3.283.0.ebuild
index 360955504f57..1c19288ef980 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.3.275.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.3.283.0.ebuild
@@ -4,7 +4,7 @@
EAPI=8
MY_PN=Vulkan-Tools
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..13} )
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"
- KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv"
- S="${WORKDIR}"/${MY_PN}-vulkan-sdk-${PV}.0
+ 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"
@@ -22,24 +22,23 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
LICENSE="Apache-2.0"
SLOT="0"
-IUSE="cube wayland +X"
-
-REQUIRED_USE="cube? ( || ( X wayland ) )"
+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}] )
+ ~media-libs/vulkan-loader-${PV}[${MULTILIB_USEDEP},wayland?,X?]
+ wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] )
X? (
- x11-libs/libX11:=[${MULTILIB_USEDEP}]
- x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+ 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() {
@@ -72,9 +71,15 @@ multilib_src_configure() {
-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
)
- use cube && mycmakeargs+=(
- -DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
- )
+ 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 56ce6ee1887f..1c19288ef980 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_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
inherit cmake-multilib python-any-r1
if [[ ${PV} == *9999* ]]; then