diff options
author | Nick Sarnie <sarnex@gentoo.org> | 2022-04-15 15:30:35 -0400 |
---|---|---|
committer | Nick Sarnie <sarnex@gentoo.org> | 2022-04-15 15:31:00 -0400 |
commit | 13386b69774d914d57a9d17f007077d9ca3f4fb6 (patch) | |
tree | 4ce46a2e9948cd3a3d29395ecf25e49118e2af0c | |
parent | gnome-base/gnome-shell: Require gtk3 and gtk4 support in ibus (diff) | |
download | gentoo-13386b69774d914d57a9d17f007077d9ca3f4fb6.tar.gz gentoo-13386b69774d914d57a9d17f007077d9ca3f4fb6.tar.bz2 gentoo-13386b69774d914d57a9d17f007077d9ca3f4fb6.zip |
app-emulation/vkd3d: Sync with ::wine
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
-rw-r--r-- | app-emulation/vkd3d/vkd3d-1.2.ebuild | 5 | ||||
-rw-r--r-- | app-emulation/vkd3d/vkd3d-9999.ebuild | 14 |
2 files changed, 10 insertions, 9 deletions
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) |