diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:18:26 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:18:26 +0100 |
commit | 6c30cc2d5bd48ddbdbe8d75544899cd5dbfcaba4 (patch) | |
tree | 6ef7f6e1d48141a5da904d788b906da5bba4b697 /dev-util/vulkan-tools | |
parent | 62f82c107c3904ac6917ece47301d2999c7dd90e (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-util/vulkan-tools')
-rw-r--r-- | dev-util/vulkan-tools/Manifest | 6 | ||||
-rw-r--r-- | dev-util/vulkan-tools/metadata.xml | 4 | ||||
-rw-r--r-- | dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r1.ebuild (renamed from dev-util/vulkan-tools/vulkan-tools-1.1.77.0.ebuild) | 43 | ||||
-rw-r--r-- | dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 43 |
4 files changed, 89 insertions, 7 deletions
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest index e15448b7f3a3..911300042526 100644 --- a/dev-util/vulkan-tools/Manifest +++ b/dev-util/vulkan-tools/Manifest @@ -1,4 +1,4 @@ DIST vulkan-tools-1.1.77.0.tar.gz 330131 BLAKE2B 3190c59745f6068fc00871f7c7c889ec2e429095d5090b0b02e1d3bbdd8613147febbbe4da3f1d48690a34577bff21bf5fd90bed77a621d0716e1b10dd9e8207 SHA512 e569e1d6da651a9f3c4669de0d4ebd301528036e283ea46049abdabca6b1b993f07e48643f91b29a38859a44770e55c8222058cf1f2a0dfd4838c37f801ba725 -EBUILD vulkan-tools-1.1.77.0.ebuild 1465 BLAKE2B bd973e88e2bc8ad9a843f6e732233a74977acee79183f7ffbc57ebfccacb80caf6967025f6f7fc59683ffcd289b84b8d517a1221c18c979322099df6d605b404 SHA512 e9f0af61f4f1e1c686e7e9b0d4bf6864114db3dc781a6e60392e66a912d88cf55d18c14e309b7c35ebf2a835ddcb6feb51c503b574b411078b184126af1760ad -EBUILD vulkan-tools-9999.ebuild 1465 BLAKE2B bd973e88e2bc8ad9a843f6e732233a74977acee79183f7ffbc57ebfccacb80caf6967025f6f7fc59683ffcd289b84b8d517a1221c18c979322099df6d605b404 SHA512 e9f0af61f4f1e1c686e7e9b0d4bf6864114db3dc781a6e60392e66a912d88cf55d18c14e309b7c35ebf2a835ddcb6feb51c503b574b411078b184126af1760ad -MISC metadata.xml 430 BLAKE2B dd9ef031ce380e8c4f37ab9d1c6bde97ce580b860ddcb6d41ba6b367e1c049528dc1562f228e9e8fd9d8109ed60a32d82faaec5b60e204bda4fc62d054feebc5 SHA512 8a2d53130be6108388981f63b4c2102ad901135254bb14a0568910fc0dc599374962cd39f1d7920cc5d1cab6700f67440f5b637e2850449a9ae16b666c153668 +EBUILD vulkan-tools-1.1.77.0-r1.ebuild 2403 BLAKE2B 4016b284324e8daaa6a92fc3b4d5dcda0a533d8c87b470b12523d66fcd43c73be07fdcb3beb5129d64caf06599bf14cc3ced8524d03ac30de190fbda6e892a9d SHA512 fd47ca341d96649a5506f1d7a3bd8bca61f7e08ba75b3a8829563ce0dcfd23b6ec4510256aa5f61d16c1bbd770a04fea30967b0c5af5d1226ffc4bdd416c4278 +EBUILD vulkan-tools-9999.ebuild 2403 BLAKE2B 4016b284324e8daaa6a92fc3b4d5dcda0a533d8c87b470b12523d66fcd43c73be07fdcb3beb5129d64caf06599bf14cc3ced8524d03ac30de190fbda6e892a9d SHA512 fd47ca341d96649a5506f1d7a3bd8bca61f7e08ba75b3a8829563ce0dcfd23b6ec4510256aa5f61d16c1bbd770a04fea30967b0c5af5d1226ffc4bdd416c4278 +MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854 diff --git a/dev-util/vulkan-tools/metadata.xml b/dev-util/vulkan-tools/metadata.xml index a670686d9eb6..bee42ed5665e 100644 --- a/dev-util/vulkan-tools/metadata.xml +++ b/dev-util/vulkan-tools/metadata.xml @@ -9,6 +9,10 @@ <email>sarnex@gentoo.org</email> <name>Nick Sarnie</name> </maintainer> + <use> + <flag name="cube">Build the cube/cubepp demos</flag> + <flag name="vulkaninfo">Build the vulkaninfo utility</flag> + </use> <upstream> <remote-id type="github">KhronosGroup/Vulkan-Tools</remote-id> </upstream> diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.77.0.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r1.ebuild index 3ffd734f550b..043d52de1fec 100644 --- a/dev-util/vulkan-tools/vulkan-tools-1.1.77.0.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r1.ebuild @@ -22,12 +22,12 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools" LICENSE="Apache-2.0" SLOT="0" -IUSE="X wayland" +IUSE="+cube +vulkaninfo X wayland" # Old packaging will cause file collisions RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" DEPEND="${PYTHON_DEPS} - dev-util/glslang:=[${MULTILIB_USEDEP}] + cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) dev-util/vulkan-headers media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?] wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) @@ -36,9 +36,15 @@ DEPEND="${PYTHON_DEPS} x11-libs/libXrandr:=[${MULTILIB_USEDEP}] )" +# Vulkaninfo does not support wayland +REQUIRED_USE="|| ( X wayland ) + vulkaninfo? ( X )" + multilib_src_configure() { local mycmakeargs=( -DCMAKE_SKIP_RPATH=True + -DBUILD_CUBE=$(usex cube) + -DBUILD_VULKANINFO=$(usex vulkaninfo) -DBUILD_WSI_MIR_SUPPORT=False -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) -DBUILD_WSI_XCB_SUPPORT=$(usex X) @@ -46,5 +52,38 @@ multilib_src_configure() { -DGLSLANG_INSTALL_DIR="/usr" -DVULKAN_HEADERS_INSTALL_DIR="/usr" ) + + # Upstream only supports one window system at a time + # If X is set at all, even if wayland is set, use X + # + # If -cube and/or -vulkaninfo is set, the flags we set + # are ignored, so we don't need to consider that + if use X; then + mycmakeargs+=( + -DCUBE_WSI_SELECTION="XCB" + -DVULKANINFO_WSI_SELECTION="XCB" + ) + fi + + if ! use X && use wayland; then + mycmakeargs+=( + -DCUBE_WSI_SELECTION="WAYLAND" + ) + fi + cmake-utils_src_configure } + +multilib_src_install() { + default + + if use cube; then + mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die + mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die + fi +} + +pkg_postinst() { + einfo "The cube and cubepp demos have been renamed to" + einfo "vulkancube and vulkancubecpp to prevent collisions" +} diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild index 3ffd734f550b..043d52de1fec 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild @@ -22,12 +22,12 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools" LICENSE="Apache-2.0" SLOT="0" -IUSE="X wayland" +IUSE="+cube +vulkaninfo X wayland" # Old packaging will cause file collisions RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" DEPEND="${PYTHON_DEPS} - dev-util/glslang:=[${MULTILIB_USEDEP}] + cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) dev-util/vulkan-headers media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?] wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) @@ -36,9 +36,15 @@ DEPEND="${PYTHON_DEPS} x11-libs/libXrandr:=[${MULTILIB_USEDEP}] )" +# Vulkaninfo does not support wayland +REQUIRED_USE="|| ( X wayland ) + vulkaninfo? ( X )" + multilib_src_configure() { local mycmakeargs=( -DCMAKE_SKIP_RPATH=True + -DBUILD_CUBE=$(usex cube) + -DBUILD_VULKANINFO=$(usex vulkaninfo) -DBUILD_WSI_MIR_SUPPORT=False -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) -DBUILD_WSI_XCB_SUPPORT=$(usex X) @@ -46,5 +52,38 @@ multilib_src_configure() { -DGLSLANG_INSTALL_DIR="/usr" -DVULKAN_HEADERS_INSTALL_DIR="/usr" ) + + # Upstream only supports one window system at a time + # If X is set at all, even if wayland is set, use X + # + # If -cube and/or -vulkaninfo is set, the flags we set + # are ignored, so we don't need to consider that + if use X; then + mycmakeargs+=( + -DCUBE_WSI_SELECTION="XCB" + -DVULKANINFO_WSI_SELECTION="XCB" + ) + fi + + if ! use X && use wayland; then + mycmakeargs+=( + -DCUBE_WSI_SELECTION="WAYLAND" + ) + fi + cmake-utils_src_configure } + +multilib_src_install() { + default + + if use cube; then + mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die + mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die + fi +} + +pkg_postinst() { + einfo "The cube and cubepp demos have been renamed to" + einfo "vulkancube and vulkancubecpp to prevent collisions" +} |