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 5F28715800F for ; Tue, 24 Jan 2023 21:40:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 54998E0788; Tue, 24 Jan 2023 21:40:14 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 3CFDDE0788 for ; Tue, 24 Jan 2023 21:40:14 +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 4792B340E9E for ; Tue, 24 Jan 2023 21:40:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C0A484D for ; Tue, 24 Jan 2023 21:40:11 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1674596334.197d625a5ae3b8d9745146b795c10db4aa5f2196.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/dxvk/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/dxvk/dxvk-9999.ebuild X-VCS-Directories: app-emulation/dxvk/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 197d625a5ae3b8d9745146b795c10db4aa5f2196 X-VCS-Branch: master Date: Tue, 24 Jan 2023 21:40:11 +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: 3852738c-7ffa-485c-9c51-b75f88293476 X-Archives-Hash: e84752eb04ee1727af0aa22bdf0a638c commit: 197d625a5ae3b8d9745146b795c10db4aa5f2196 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Jan 24 21:37:32 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Jan 24 21:38:54 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=197d625a app-emulation/dxvk: sync live Signed-off-by: Ionen Wolkens gentoo.org> app-emulation/dxvk/dxvk-9999.ebuild | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/app-emulation/dxvk/dxvk-9999.ebuild b/app-emulation/dxvk/dxvk-9999.ebuild index 9b78cd87364a..7b1ccff1d6f4 100644 --- a/app-emulation/dxvk/dxvk-9999.ebuild +++ b/app-emulation/dxvk/dxvk-9999.ebuild @@ -1,10 +1,11 @@ -# Copyright 2022 Gentoo Authors +# Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +PYTHON_COMPAT=( python3_{9..11} ) MULTILIB_COMPAT=( abi_x86_{32,64} ) -inherit flag-o-matic meson-multilib +inherit flag-o-matic meson-multilib python-any-r1 if [[ ${PV} == 9999 ]]; then inherit git-r3 @@ -17,13 +18,15 @@ if [[ ${PV} == 9999 ]]; then else HASH_SPIRV=0bcc624926a25a2a273d07877fd25a6ff5ba1cfb HASH_VULKAN=98f440ce6868c94f5ec6e198cc1adda4760e8849 + HASH_DISPLAYINFO=d39344f466caae0495ebac4d49b03a886d83ba3a SRC_URI=" https://github.com/doitsujin/dxvk/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz -> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz - -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz" + -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz + https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/${HASH_DISPLAYINFO}/${PN}-libdisplay-info-${HASH_DISPLAYINFO::10}.tar.bz2" KEYWORDS="-* ~amd64 ~x86" fi # setup_dxvk.sh is no longer provided, fetch old until a better solution @@ -41,6 +44,7 @@ REQUIRED_USE=" d3d11? ( dxgi )" BDEPEND=" + ${PYTHON_DEPS} dev-util/glslang !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )" @@ -67,9 +71,10 @@ pkg_pretend() { src_prepare() { if [[ ${PV} != 9999 ]]; then - rmdir include/{spirv,vulkan} || die + rmdir include/{spirv,vulkan} subprojects/libdisplay-info || die mv ../SPIRV-Headers-${HASH_SPIRV} include/spirv || die mv ../Vulkan-Headers-${HASH_VULKAN} include/vulkan || die + mv ../libdisplay-info-${HASH_DISPLAYINFO} subprojects/libdisplay-info || die fi default @@ -82,7 +87,8 @@ src_configure() { use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH} # AVX has a history of causing issues with this package, disable for safety - # https://github.com/Tk-Glitch/PKGBUILDS/issues/515 + # https://bugs.winehq.org/show_bug.cgi?id=43516 + # https://bugs.winehq.org/show_bug.cgi?id=45289 append-flags -mno-avx if [[ ${CHOST} != *-mingw* ]]; then