From 9aa80713372911cec499b3adb2cd746790920916 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 29 Jun 2021 10:15:54 +0100 Subject: gentoo resync : 29.06.2021 --- dev-util/vulkan-tools/Manifest | 4 ++-- dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild | 10 +++++----- dev-util/vulkan-tools/vulkan-tools-9999.ebuild | 8 ++++---- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'dev-util/vulkan-tools') diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest index 622777301cc4..c66c48b6c3f1 100644 --- a/dev-util/vulkan-tools/Manifest +++ b/dev-util/vulkan-tools/Manifest @@ -3,6 +3,6 @@ DIST vulkan-tools-1.2.170.tar.gz 835063 BLAKE2B 5b7b9c9ea07b3a25d2b989a0981417b4 DIST vulkan-tools-1.2.179.tar.gz 843725 BLAKE2B 0304f7672b5405404dca9b9800dd0927f3af0f17580f021bc30e651ecda5b5e6194971a6a95e30cce956d094cc8fbab580f0f0ecd8fa4c81a9bc15ced5ad92ac SHA512 227b5023c21720c94fb5583f0f6635cf2b9d8067cae02dc6f22f39a106bc0b3e569b2730a1dc4fd469fe0a5e5653167fdc56fe37852a1acfc38df953b4524dcc EBUILD vulkan-tools-1.2.162.ebuild 1881 BLAKE2B 4c9129b5619a374830b27c7d425f2c119e1613a667c9d901101cdf0a59ae5c9c70d340e5fdf885b1b84901df01f152b03a4e687d1674d9d8ad65620fdb30a386 SHA512 ec5501ccda226135f0b33c818c6c5fe1fd33325d3bb01586775a55d6236e1d5aec3bac9c87cc309f88a648df0754bfaae310cfd92e4a818c4bd8024d3c46e3b1 EBUILD vulkan-tools-1.2.170.ebuild 1881 BLAKE2B 4c9129b5619a374830b27c7d425f2c119e1613a667c9d901101cdf0a59ae5c9c70d340e5fdf885b1b84901df01f152b03a4e687d1674d9d8ad65620fdb30a386 SHA512 ec5501ccda226135f0b33c818c6c5fe1fd33325d3bb01586775a55d6236e1d5aec3bac9c87cc309f88a648df0754bfaae310cfd92e4a818c4bd8024d3c46e3b1 -EBUILD vulkan-tools-1.2.179.ebuild 1886 BLAKE2B 9c2492531c87da11e3a5cdb6c9fd863ae721013392c867a0ab47f21a07b872e910d13c2c0147bb364dca8c0dca0bb59a2f31cbab9d48d7861427b2d2e43e7851 SHA512 314aa393ac36a75192062eac58ea3eeb3fbaa5d67565757db67cf30a674fa49cfe16a675d413cdcd0249d03b9e559a94a06ff46610c3cd28565f1a8bd699ff5c -EBUILD vulkan-tools-9999.ebuild 1886 BLAKE2B 2afef23e4399f9547e7fd691ec1050473993ca0decefa62e56a1d5499663bc5071aaa680d0a743a4776993997c0adc5bc92587ad24dc0cce3ffa6c325a86b35c SHA512 1769b436f7e1a8d4c4c22a7f99d1c2884db790b0f15dcdd8dc4e7cb144796654c48cfa6a75ff413653a5a2bf974c142c7a1dc0e81804fd7968e8d7a78bf5fb39 +EBUILD vulkan-tools-1.2.179.ebuild 1865 BLAKE2B d1666ff63c8fc969109848012d01ca40071995b98fda6203c5663a9cc4443d4f452272837a1c1aafc74646e95a78057971ddbeb4633f1d13158108fb297e16b3 SHA512 abe5dcc70239e8d31d31412a8beed52c8c3dfcd03889857e8ae91923f16435fc413fdda9aa5137f4b7801ab2deb0f6b94c3aea6e0f53c8cf33b32eae127bda70 +EBUILD vulkan-tools-9999.ebuild 1860 BLAKE2B 90d45eff50aecafa4f59ddfcfe22919ad54c32d75f8d1c398cc91286ce092a32bfe34c168f29355b51284226f04879f3de7b236770dc8f4e4599b0466ad22cdf SHA512 ae072450e257f0766f657be7bcad7180679eed3983858284fe649e59f9acdc2039cf6f23f146aa67c542d7576caae9b564d9f31b88fd4db034a541ce9a552b15 MISC metadata.xml 499 BLAKE2B 9ede9725de281e0877f865e41ce68be15d5c04fd95023d3ab1180f4987c506a8f12ad23412ecf5795f6f8e6f36e576bc65f7cef786ced70296f5a4a8584ac4f1 SHA512 eb5dbcfbb58449c5a6ae7580f0c8a25c06f85fd6ac32fe1354fffe550214465921dace3c05264c11517d7dbeeffa444eb468d63f4781c6383f4be8a4202ecefd diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild index dd3ff96da94c..fd88aef18326 100644 --- a/dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild +++ b/dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild @@ -5,7 +5,7 @@ EAPI=7 MY_PN=Vulkan-Tools CMAKE_ECLASS="cmake" -PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_COMPAT=( python3_{8,9} ) inherit cmake-multilib python-any-r1 if [[ ${PV} == *9999* ]]; then @@ -14,7 +14,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 @@ -26,7 +26,7 @@ SLOT="0" IUSE="cube wayland +X" # Cube demo only supports one window system at a time -REQUIRED_USE="!cube? ( || ( X wayland ) ) cube? ( ^^ ( X wayland ) )" +REQUIRED_USE="cube? ( ^^ ( X wayland ) )" BDEPEND="${PYTHON_DEPS} >=dev-util/cmake-3.10.2 @@ -65,11 +65,11 @@ multilib_src_configure() { -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) -DBUILD_WSI_XCB_SUPPORT=$(usex X) -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - -DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr" + -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" ) use cube && mycmakeargs+=( - -DGLSLANG_INSTALL_DIR="${EPREFIX}/usr" + -DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr" -DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND) ) diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild index e9b91a71bdd7..217cda131c45 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-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -26,7 +26,7 @@ SLOT="0" IUSE="cube wayland +X" # Cube demo only supports one window system at a time -REQUIRED_USE="!cube? ( || ( X wayland ) ) cube? ( ^^ ( X wayland ) )" +REQUIRED_USE="cube? ( ^^ ( X wayland ) )" BDEPEND="${PYTHON_DEPS} >=dev-util/cmake-3.10.2 @@ -65,11 +65,11 @@ multilib_src_configure() { -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) -DBUILD_WSI_XCB_SUPPORT=$(usex X) -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - -DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr" + -DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr" ) use cube && mycmakeargs+=( - -DGLSLANG_INSTALL_DIR="${EPREFIX}/usr" + -DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr" -DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND) ) -- cgit v1.2.3