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 D0E1D158020 for ; Tue, 29 Nov 2022 12:13:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C99E0E05AC; Tue, 29 Nov 2022 12:13:28 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B2A3DE05AC for ; Tue, 29 Nov 2022 12:13:28 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CD4E23411DF for ; Tue, 29 Nov 2022 12:13:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6147F73C for ; Tue, 29 Nov 2022 12:13:26 +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: <1669723998.e2f4a3f59827dbb84f7935ddbe170e7ed5947462.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: e2f4a3f59827dbb84f7935ddbe170e7ed5947462 X-VCS-Branch: master Date: Tue, 29 Nov 2022 12:13:26 +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: 488e7730-11ab-4817-8a15-22fe5486b11a X-Archives-Hash: 205cd7f1e2f5896b30b03754b17581df commit: e2f4a3f59827dbb84f7935ddbe170e7ed5947462 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Nov 29 12:01:46 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue Nov 29 12:13:18 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2f4a3f5 app-emulation/dxvk: update live Roughly anyway, this will need more attention. Ideally hoping upstream will provide some better options than raw instructions to the removed setup_dxvk.sh, or may have to make our own one given this is rather annoying to handle manually. Signed-off-by: Ionen Wolkens gentoo.org> app-emulation/dxvk/dxvk-9999.ebuild | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/app-emulation/dxvk/dxvk-9999.ebuild b/app-emulation/dxvk/dxvk-9999.ebuild index 19174e20a451..167b7c5d6901 100644 --- a/app-emulation/dxvk/dxvk-9999.ebuild +++ b/app-emulation/dxvk/dxvk-9999.ebuild @@ -12,14 +12,18 @@ if [[ ${PV} == 9999 ]]; then EGIT_SUBMODULES=( # picky about headers and is cross-compiled making -I/usr/include troublesome include/{spirv,vulkan} + subprojects/libdisplay-info ) else HASH_SPIRV=0bcc624926a25a2a273d07877fd25a6ff5ba1cfb HASH_VULKAN=98f440ce6868c94f5ec6e198cc1adda4760e8849 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" + 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" KEYWORDS="-* ~amd64 ~x86" fi @@ -67,8 +71,6 @@ src_prepare() { fi default - - sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_dxvk.sh || die } src_configure() { @@ -116,7 +118,6 @@ multilib_src_configure() { } multilib_src_install_all() { - dobin setup_dxvk.sh dodoc README.md dxvk.conf find "${ED}" -type f -name '*.a' -delete || die @@ -127,13 +128,15 @@ pkg_preinst() { } pkg_postinst() { - if [[ ! ${REPLACING_VERSIONS} ]]; then - elog "To enable ${PN} on a wine prefix, you can run the following command:" - elog - elog " WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink" - elog - elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details." - elif [[ -v DXVK_HAD_OVERLAY ]]; then + # TODO: setup_dxvk.sh script was removed, need to figure out a new way to + # explain/handle (leaving this alone for now in live in case gets restored) +# if [[ ! ${REPLACING_VERSIONS} ]]; then +# elog "To enable ${PN} on a wine prefix, you can run the following command:" +# elog +# elog " WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink" +# elog +# elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details." + if [[ -v DXVK_HAD_OVERLAY ]]; then # temporary warning until this version is more widely used elog "Gentoo's main repo ebuild for ${PN} uses different paths than most overlays." elog "If you were using symbolic links in wine prefixes it may be necessary to"