From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E1B2415808B for ; Fri, 15 Apr 2022 19:31:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2EFFDE08CE; Fri, 15 Apr 2022 19:31:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A6D02E08CE for ; Fri, 15 Apr 2022 19:31:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A4ED4342026 for ; Fri, 15 Apr 2022 19:31:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 24E80250 for ; Fri, 15 Apr 2022 19:31:24 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1650051060.13386b69774d914d57a9d17f007077d9ca3f4fb6.sarnex@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/vkd3d/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/vkd3d/vkd3d-1.2.ebuild app-emulation/vkd3d/vkd3d-9999.ebuild X-VCS-Directories: app-emulation/vkd3d/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: 13386b69774d914d57a9d17f007077d9ca3f4fb6 X-VCS-Branch: master Date: Fri, 15 Apr 2022 19:31:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1deed3b9-923b-4ebb-a4ed-3927922311cb X-Archives-Hash: f584e08e2f2658883a2f1e922f2824dc commit: 13386b69774d914d57a9d17f007077d9ca3f4fb6 Author: Nick Sarnie gentoo org> AuthorDate: Fri Apr 15 19:30:35 2022 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Fri Apr 15 19:31:00 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13386b69 app-emulation/vkd3d: Sync with ::wine Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Nick Sarnie gentoo.org> app-emulation/vkd3d/vkd3d-1.2.ebuild | 5 ++++- 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)