From 0c100b7dd2b30e75b799d806df4ef899fd98e1ea Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Apr 2022 13:07:24 +0100 Subject: gentoo resync : 16.04.2022 --- app-emulation/vkd3d/Manifest | 4 ++-- app-emulation/vkd3d/vkd3d-1.2.ebuild | 5 ++++- app-emulation/vkd3d/vkd3d-9999.ebuild | 14 ++++++-------- 3 files changed, 12 insertions(+), 11 deletions(-) (limited to 'app-emulation/vkd3d') diff --git a/app-emulation/vkd3d/Manifest b/app-emulation/vkd3d/Manifest index d9ad668d1b2c..509aed599aab 100644 --- a/app-emulation/vkd3d/Manifest +++ b/app-emulation/vkd3d/Manifest @@ -5,6 +5,6 @@ DIST vkd3d-1.2.tar.xz 611240 BLAKE2B e7ea3f7120ad1092be0239bdc2e6d0dfdfecc3b1c2e EBUILD vkd3d-1.0.ebuild 926 BLAKE2B 414506ab4d6f240d57ca56e6e3ac080722d2bd375db9c790089ca310ff6340af1d5cd33185af795cdd581405d93f19610b1026087eedd358a3769159b29d4eb1 SHA512 29625db76407d29252f534b11296f0d3df7dcdbc567c9a0e0201765ee75370b28bf9098e96752e128ec4533209eef8dd0bf1f3000f818b5c97bdf12a32404466 EBUILD vkd3d-1.1-r1.ebuild 980 BLAKE2B daaff20825a376043e4fceb986c67f317967a6b59c1d005060e4e5ced5f1b8ffc9e6f8d0d6ed3c03088c7345be584c5815d978668ef9be936e94aff7db396c7a SHA512 485bc1411a2f71639a107b3f75081a315e4fd8a948116b77f99400ce9b67a21c2e8d0c6de5e26c80cd7d9507306c85ff36f792070691fd65f081cc31a7b27cc2 EBUILD vkd3d-1.1.ebuild 929 BLAKE2B 3b1a8b289d47ab301fec2a45d5bde71759a0c23a36c6f9009ea7626860436a77f3bb3ff45184ed94f1b26cb859b5a6ae874cb66258edb0a52b8bf78b0ae9dfaf SHA512 db1e44ca23bcc636a61f9019a02558efc948bf7347e6ba11034ac0bae7cd0562555788b69dc98f0ccf67f4760b4c02338e81c54d5ccd8ee8d3ccd004bbbf66a4 -EBUILD vkd3d-1.2.ebuild 953 BLAKE2B f0d70bc3005610e1833e9879f35acb0a5212ee046f92f43e8cbf382a3cf35ebfa674d41151722763d3a27892e56daa99b3dc57d08d0c2ca0c0f6874132f1e420 SHA512 ce7968e460c9d860b3ab3e6f52a32a5964ffcc4c35110fc377272e3200a5afb18ce57d68d2a5bd4ba58b8df30068923bcbbd1b1fe21c7049eb535f234ca94558 -EBUILD vkd3d-9999.ebuild 1011 BLAKE2B 3f875afa1f84e843b73187341d8b09ef36bb3fa37a82a616c1089682fe86e72ca6f7d68827f293d797d5fa6d4cbe04c551aacba5b18976cec9844529a2f9c4f0 SHA512 dacb8ec424d57b3e87105a99f4fc7d46a2e5514cff1b894c50ff5e96c2f729822ab0a4027443e7515b62f4aabcdb72cf3ad8572f4e62c437cbdc5d45e38a9e87 +EBUILD vkd3d-1.2.ebuild 1014 BLAKE2B f4305c940dde99c678485c66800e9a5713ea293c8e4b7d523e8004a3e69a45e297a4fb15ebaf04be435fbb5990e9c293fc54b42653e05cc3bf797e9222dd2358 SHA512 237c2b4c0964be401ad514529e2753e88489f02557eef60816d18c494a6fd20b18f11b5dd2cbbdc234897333cc3dcf6690ec1bcac8826a7bcd8fc8b0c68206e9 +EBUILD vkd3d-9999.ebuild 1016 BLAKE2B 6c1a5f13d7a3f4eeab2548ed0860034b1d397bca2669ea56db9a4619431aa2ca8ecabea788f1b7ec3e340f0a18c013dfc4a06f70178cea0d582a53a79b9555fd SHA512 e56dc910a014e4c93621073aed8a6f9f20af0f719dcfcdc278502f1134a257e787629007abf84c1872ece3b6a9a5b9fe272e70619b4d16dd75810cfe68bb70d7 MISC metadata.xml 563 BLAKE2B c976a16a495bdb5863811acda56b2cc628683a63fc2a22c18d2a09775d3a38c845e00f83b97b318d9a0e5267bb470dd56d334dc9f43e3716784254802b8db60b SHA512 3d5afb7890b3b10ad424fcfe3fa2b42a9227ba0b82be8ab85308126966f476798818ee0ecc88c53105b218f465a72b213efe00968112431169884a4a6f48c6a8 diff --git a/app-emulation/vkd3d/vkd3d-1.2.ebuild b/app-emulation/vkd3d/vkd3d-1.2.ebuild index 3589b8daabec..f1338881d76e 100644 --- a/app-emulation/vkd3d/vkd3d-1.2.ebuild +++ b/app-emulation/vkd3d/vkd3d-1.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,6 +13,9 @@ else SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz" fi +#Tests fail: https://bugs.gentoo.org/838655 +RESTRICT="test" + IUSE="spirv-tools" RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] ) media-libs/vulkan-loader[${MULTILIB_USEDEP},X] diff --git a/app-emulation/vkd3d/vkd3d-9999.ebuild b/app-emulation/vkd3d/vkd3d-9999.ebuild index 5d4e2900196e..e64cc1a24558 100644 --- a/app-emulation/vkd3d/vkd3d-9999.ebuild +++ b/app-emulation/vkd3d/vkd3d-9999.ebuild @@ -3,16 +3,19 @@ EAPI=6 -inherit multilib-minimal autotools +inherit multilib-minimal if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="https://source.winehq.org/git/vkd3d.git" inherit git-r3 else - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~x86" SRC_URI="https://dl.winehq.org/vkd3d/source/${P}.tar.xz" fi +#Tests fail: https://bugs.gentoo.org/838655 +RESTRICT="test" + IUSE="spirv-tools" RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] ) media-libs/vulkan-loader[${MULTILIB_USEDEP},X] @@ -22,7 +25,7 @@ RDEPEND="spirv-tools? ( dev-util/spirv-tools:=[${MULTILIB_USEDEP}] ) DEPEND="${RDEPEND} dev-util/spirv-headers - >=dev-util/vulkan-headers-1.1.114" + dev-util/vulkan-headers" DESCRIPTION="D3D12 to Vulkan translation library" HOMEPAGE="https://source.winehq.org/git/vkd3d.git/" @@ -30,11 +33,6 @@ HOMEPAGE="https://source.winehq.org/git/vkd3d.git/" LICENSE="LGPL-2.1" SLOT="0" -src_prepare() { - default - eautoreconf -} - multilib_src_configure() { local myconf=( $(use_with spirv-tools) -- cgit v1.2.3