From 068424b26532f3551a81421a9be67ed206e5c11a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 11 Aug 2021 07:02:28 +0100 Subject: gentoo resync : 11.08.2021 --- dev-util/vulkan-tools/Manifest | 3 +- .../vulkan-tools/vulkan-tools-1.2.182-r1.ebuild | 86 ++++++++++++++++++++++ dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 15 ++-- 3 files changed, 98 insertions(+), 6 deletions(-) create mode 100644 dev-util/vulkan-tools/vulkan-tools-1.2.182-r1.ebuild (limited to 'dev-util/vulkan-tools') diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest index 29d27390c78c..ffd449562d30 100644 --- a/dev-util/vulkan-tools/Manifest +++ b/dev-util/vulkan-tools/Manifest @@ -1,4 +1,5 @@ DIST vulkan-tools-1.2.182.tar.gz 847991 BLAKE2B 5ab9d73383338bcc3c54487f0f433466d9974269d3be2aa0d50281affeee8fb94414eb638fc94be6fd2dc059c0a2d3dca4e9a8caf3e2b8758c03c57373e2f73b SHA512 5cc9500923288641529556e82a708b88f7dc775c75166d10ae2a807562ce9dda3993aa01a261ff4f9c2cc31ea47423a12f21ec64d32e6aee66ef7c3fc2dc17fc +EBUILD vulkan-tools-1.2.182-r1.ebuild 1960 BLAKE2B 58cc40ddc91151c04eccf4fb10a341e10105f20d195fd5c6d988dcabb22c0352ceeaa0807d443af45fbc4e365286059df8e1ad033657194f389a50afebc826aa SHA512 7fa32f411fbe29e6a999c5c591b21c4388d5400c76e1e7a59494f703c68f7af9f38065b6a9d6260685377e6ddedba8695871daa6b431c388c2e6b4e085c6eca6 EBUILD vulkan-tools-1.2.182.ebuild 1860 BLAKE2B 3e3f89a5c3f26601333dc91a3532638d08bb15023f2cf487dd075f300245fbbe109b7b84f4046af3972132504d41a8f8bcb82c03bc8c24f9ad0c738d456beab7 SHA512 ad5a23b0a5e4375d80f0d5f912daceff89992c563ba29858f8ddd9b5b3a34a5c3570a80d57617493662b76aa0033027849b0908f463ac88aed55715c91860c9e -EBUILD vulkan-tools-9999.ebuild 1860 BLAKE2B 90d45eff50aecafa4f59ddfcfe22919ad54c32d75f8d1c398cc91286ce092a32bfe34c168f29355b51284226f04879f3de7b236770dc8f4e4599b0466ad22cdf SHA512 ae072450e257f0766f657be7bcad7180679eed3983858284fe649e59f9acdc2039cf6f23f146aa67c542d7576caae9b564d9f31b88fd4db034a541ce9a552b15 +EBUILD vulkan-tools-9999.ebuild 1960 BLAKE2B 58cc40ddc91151c04eccf4fb10a341e10105f20d195fd5c6d988dcabb22c0352ceeaa0807d443af45fbc4e365286059df8e1ad033657194f389a50afebc826aa SHA512 7fa32f411fbe29e6a999c5c591b21c4388d5400c76e1e7a59494f703c68f7af9f38065b6a9d6260685377e6ddedba8695871daa6b431c388c2e6b4e085c6eca6 MISC metadata.xml 499 BLAKE2B 9ede9725de281e0877f865e41ce68be15d5c04fd95023d3ab1180f4987c506a8f12ad23412ecf5795f6f8e6f36e576bc65f7cef786ced70296f5a4a8584ac4f1 SHA512 eb5dbcfbb58449c5a6ae7580f0c8a25c06f85fd6ac32fe1354fffe550214465921dace3c05264c11517d7dbeeffa444eb468d63f4781c6383f4be8a4202ecefd diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.182-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.182-r1.ebuild new file mode 100644 index 000000000000..82f33ec2490c --- /dev/null +++ b/dev-util/vulkan-tools/vulkan-tools-1.2.182-r1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_PN=Vulkan-Tools +CMAKE_ECLASS="cmake-utils" +CMAKE_MAKEFILE_GENERATOR="emake" +PYTHON_COMPAT=( python3_{8,9} ) +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/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv" + S="${WORKDIR}"/${MY_PN}-${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" + +# Cube demo only supports one window system at a time +REQUIRED_USE="cube? ( ^^ ( X wayland ) )" + +BDEPEND="${PYTHON_DEPS} + >=dev-util/cmake-3.10.2 + cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + >=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}] + ) +" +DEPEND="${RDEPEND} + >=dev-util/vulkan-headers-${PV} +" + +pkg_setup() { + MULTILIB_CHOST_TOOLS=( + /usr/bin/vulkaninfo + ) + + use cube && MULTILIB_CHOST_TOOLS+=( + /usr/bin/vkcube + /usr/bin/vkcubepp + ) + + python-any-r1_pkg_setup +} + +src_prepare() { + cmake-utils_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DCMAKE_SKIP_RPATH=ON + -DBUILD_VULKANINFO=ON + -DBUILD_CUBE=$(usex cube) + -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) + -DBUILD_WSI_XCB_SUPPORT=$(usex X) + -DBUILD_WSI_XLIB_SUPPORT=$(usex X) + -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" + ) + + use cube && mycmakeargs+=( + -DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr" + -DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND) + ) + + cmake-utils_src_configure +} + +multilib_src_install() { + cmake-utils_src_install +} diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild index 217cda131c45..82f33ec2490c 100644 --- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild @@ -4,8 +4,9 @@ EAPI=7 MY_PN=Vulkan-Tools -CMAKE_ECLASS="cmake" -PYTHON_COMPAT=( python3_{7,8,9} ) +CMAKE_ECLASS="cmake-utils" +CMAKE_MAKEFILE_GENERATOR="emake" +PYTHON_COMPAT=( python3_{8,9} ) inherit cmake-multilib python-any-r1 if [[ ${PV} == *9999* ]]; then @@ -14,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then inherit git-r3 else SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv" S="${WORKDIR}"/${MY_PN}-${PV} fi @@ -57,6 +58,10 @@ pkg_setup() { python-any-r1_pkg_setup } +src_prepare() { + cmake-utils_src_prepare +} + multilib_src_configure() { local mycmakeargs=( -DCMAKE_SKIP_RPATH=ON @@ -73,9 +78,9 @@ multilib_src_configure() { -DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND) ) - cmake_src_configure + cmake-utils_src_configure } multilib_src_install() { - cmake_src_install + cmake-utils_src_install } -- cgit v1.2.3