From 3f71901f8c228f4de570abed1831ce3ee425343e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 8 Sep 2018 10:50:14 +0100 Subject: gentoo resync 08.09.2018 --- dev-util/vulkan-tools/Manifest | 3 +- .../vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild | 106 +++++++++++++++++++++ dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 23 +++++ 3 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild (limited to 'dev-util/vulkan-tools') diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest index d7e748752a9a..79349c02400f 100644 --- a/dev-util/vulkan-tools/Manifest +++ b/dev-util/vulkan-tools/Manifest @@ -1,4 +1,5 @@ DIST vulkan-tools-1.1.77.0.tar.gz 330131 BLAKE2B 3190c59745f6068fc00871f7c7c889ec2e429095d5090b0b02e1d3bbdd8613147febbbe4da3f1d48690a34577bff21bf5fd90bed77a621d0716e1b10dd9e8207 SHA512 e569e1d6da651a9f3c4669de0d4ebd301528036e283ea46049abdabca6b1b993f07e48643f91b29a38859a44770e55c8222058cf1f2a0dfd4838c37f801ba725 EBUILD vulkan-tools-1.1.77.0-r1.ebuild 2419 BLAKE2B c9c634e4d3af512986c20b1c8e871c7f811f35b2fbb41244cb9bf52d57a16babfb07eebca75c281f54d95bad665df02c85baf2e0d9821c77e4571efeac7b5eef SHA512 e859d13744108b459b2e1434c57e2de8c0838e1eea46978f4afee607c3f9d601b49f0b09df27abcfce580ea08e19760b54f696d8299abef450b27c4d064e885d -EBUILD vulkan-tools-9999.ebuild 2419 BLAKE2B c9c634e4d3af512986c20b1c8e871c7f811f35b2fbb41244cb9bf52d57a16babfb07eebca75c281f54d95bad665df02c85baf2e0d9821c77e4571efeac7b5eef SHA512 e859d13744108b459b2e1434c57e2de8c0838e1eea46978f4afee607c3f9d601b49f0b09df27abcfce580ea08e19760b54f696d8299abef450b27c4d064e885d +EBUILD vulkan-tools-1.1.77.0-r2.ebuild 2668 BLAKE2B d3f677d402b723cdc7ccdda4d33500656a68c1fa83b8bef6a17e8ea2ebc78bc9aaca066beb3f03b756c365a9e791ea723753bd78702b34a6cb02f2792e6f3c46 SHA512 0ad2d536ce9d84a54d52722c8a82dac94d237c0df576e8aed3e2b7910bc226084c421b054806829436c0a6b5d4b4349a112c4e49390b9293be048661483d5b93 +EBUILD vulkan-tools-9999.ebuild 2800 BLAKE2B dc878a77db0055768c025df077d50988d0dc97766595e7e95108c22e1c1604effb7a8d2d56be6271a8ac60468fd2d5532ef8b0f6767901a2128d07d5bbb4500d SHA512 acd8008c137cfbc5a9398862739d6868ddc0079baffe77a605fdea532100e81892292e14c224bee3879a60de8f5d9e210feabad6a564176809b7a43ee4071798 MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854 diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild new file mode 100644 index 000000000000..76c30998e49b --- /dev/null +++ b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python3_{4,5,6} ) + +if [[ "${PV}" == "9999" ]]; then + EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + EGIT_COMMIT="384fff68c802a10b5d7f4f352a4bb43b3efe5f23" + KEYWORDS="~amd64" + SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz" + S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}" +fi + +inherit python-any-r1 cmake-multilib + +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 +vulkaninfo X wayland" + +# Old packaging will cause file collisions +RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999" +DEPEND="${PYTHON_DEPS} + cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) + dev-util/vulkan-headers + media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?] + wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + )" + +# Vulkaninfo does not support wayland +REQUIRED_USE="|| ( X wayland ) + vulkaninfo? ( X )" + +pkg_setup() { + MULTILIB_CHOST_TOOLS=() + + if use vulkaninfo; then + MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo ) + fi + + if use cube; then + MULTILIB_CHOST_TOOLS+=( + /usr/bin/vulkancube + /usr/bin/vulkancubecpp + ) + fi + + python-any-r1_pkg_setup +} + +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) + -DBUILD_WSI_XLIB_SUPPORT=$(usex X) + -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() { + cmake-utils_src_install + + 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 6fa37cabcccd..3fce8b8e6862 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild @@ -40,6 +40,29 @@ DEPEND="${PYTHON_DEPS} REQUIRED_USE="|| ( X wayland ) vulkaninfo? ( X )" +MULTILIB_CHOST_TOOLS=( + /usr/bin/vulkancube + /usr/bin/vulkancubecpp + /usr/bin/vulkaninfo +) + +pkg_setup() { + MULTILIB_CHOST_TOOLS=() + + if use vulkaninfo; then + MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo ) + fi + + if use cube; then + MULTILIB_CHOST_TOOLS+=( + /usr/bin/vulkancube + /usr/bin/vulkancubecpp + ) + fi + + python-any-r1_pkg_setup +} + multilib_src_configure() { local mycmakeargs=( -DCMAKE_SKIP_RPATH=True -- cgit v1.2.3