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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 48839158090 for ; Tue, 17 May 2022 04:21:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 832BAE0924; Tue, 17 May 2022 04:21:44 +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 58FB6E0924 for ; Tue, 17 May 2022 04:21:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 649D334196E for ; Tue, 17 May 2022 04:21:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DF7B73B8 for ; Tue, 17 May 2022 04:21:40 +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: <1652760953.3f6a6d4b239cef61e4a839a377e2ce67bef5471f.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-1.10.1.ebuild 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: 3f6a6d4b239cef61e4a839a377e2ce67bef5471f X-VCS-Branch: master Date: Tue, 17 May 2022 04:21:40 +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: 2211ca0b-d689-4345-bddd-b367ac44362d X-Archives-Hash: 9894a383b051276095ae74ae8c287cbe commit: 3f6a6d4b239cef61e4a839a377e2ce67bef5471f Author: Ionen Wolkens gentoo org> AuthorDate: Tue May 17 03:46:00 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Tue May 17 04:15:53 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f6a6d4b app-emulation/dxvk: give note about overlay differences Just a courtesy until this version settles in, been in overlays for a long time and switching back & forth can give a poor experience. Similar applies to vkd3d-proton but it's less known and overlays only had live ebuilds. Signed-off-by: Ionen Wolkens gentoo.org> app-emulation/dxvk/dxvk-1.10.1.ebuild | 14 ++++++++++++++ app-emulation/dxvk/dxvk-9999.ebuild | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/app-emulation/dxvk/dxvk-1.10.1.ebuild b/app-emulation/dxvk/dxvk-1.10.1.ebuild index 7d293dd8f8ea..d0bfdb15b8ca 100644 --- a/app-emulation/dxvk/dxvk-1.10.1.ebuild +++ b/app-emulation/dxvk/dxvk-1.10.1.ebuild @@ -102,6 +102,10 @@ multilib_src_install_all() { find "${ED}" -type f -name '*.a' -delete || die } +pkg_preinst() { + [[ -e /usr/$(get_libdir)/dxvk/d3d11.dll ]] && DXVK_HAD_OVERLAY= +} + pkg_postinst() { if [[ ! ${REPLACING_VERSIONS} ]]; then elog "To enable ${PN} on a wine prefix, you can run the following command:" @@ -109,6 +113,16 @@ pkg_postinst() { 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 + # 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" + elog "refresh them by re-running the command:" + elog + elog " WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink" + elog + elog "Also, if you were using /etc/${PN}.conf, ${PN} is no longer patched to load" + elog "it. See ${EROOT}/usr/share/doc/${PF}/README.md* for handling configs." fi # don't try to keep wine-*[vulkan] in RDEPEND, but still give a warning diff --git a/app-emulation/dxvk/dxvk-9999.ebuild b/app-emulation/dxvk/dxvk-9999.ebuild index 7d293dd8f8ea..d0bfdb15b8ca 100644 --- a/app-emulation/dxvk/dxvk-9999.ebuild +++ b/app-emulation/dxvk/dxvk-9999.ebuild @@ -102,6 +102,10 @@ multilib_src_install_all() { find "${ED}" -type f -name '*.a' -delete || die } +pkg_preinst() { + [[ -e /usr/$(get_libdir)/dxvk/d3d11.dll ]] && DXVK_HAD_OVERLAY= +} + pkg_postinst() { if [[ ! ${REPLACING_VERSIONS} ]]; then elog "To enable ${PN} on a wine prefix, you can run the following command:" @@ -109,6 +113,16 @@ pkg_postinst() { 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 + # 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" + elog "refresh them by re-running the command:" + elog + elog " WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink" + elog + elog "Also, if you were using /etc/${PN}.conf, ${PN} is no longer patched to load" + elog "it. See ${EROOT}/usr/share/doc/${PF}/README.md* for handling configs." fi # don't try to keep wine-*[vulkan] in RDEPEND, but still give a warning