[gentoo-commits] repo/gentoo:master commit in: app-emulation/dxvk/

[Ionen Wolkens]

commit:     56a38a5d1550f50b24ec853d3c6a7b088e4e2597
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 13:09:35 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 13:24:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56a38a5d

app-emulation/dxvk: temporarily restore setup_dxvk.sh

Better than nothing until come up with a solution.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 app-emulation/dxvk/Manifest         |  1 +
 app-emulation/dxvk/dxvk-9999.ebuild | 24 +++++++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index cb5fcb265509..927801e2e7ad 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -2,3 +2,4 @@ DIST dxvk-1.10.3.tar.gz 1204407 BLAKE2B 
3507ffe4abf9c45f2a138b05e7cf706322a6bf3d
 DIST dxvk-2.0.tar.gz 943397 BLAKE2B 
7d59050e8ac3f9be311d11323cc0057d84c3b730360fe9e064ff4a5e2db5bffea5bae3214da366c60295ec5f1577ab08e2776274c9aaff7a7de1b9f2cefa836a
 SHA512 
98537bdec2b5e4f2ead5b93ab49db717e0706fe771a82a6ef1e5b5792c1bdd3f417cd6b6b2deadb1397b8a0740445fa88b9fb6c1f73510cc5c0e7ae35d65bcac
 DIST dxvk-spirv-headers-0bcc624926.tar.gz 437771 BLAKE2B 
08815e36ad99b84777e38ad0c5616b6608a552f993e7f67433f2b8e20de81e9bce41420ac5998f5b67bca70a92ce70aed91b238990bd431c7b97070dfb0c5a60
 SHA512 
5995cf75d5605d41e9643bca81c195ef5aaa17d596e0282807f6fa8f8c494f7b63a41d611c535ae43dc3d609436aabef1e0d89626f37e6f20bad17b5e122e32c
 DIST dxvk-vulkan-headers-98f440ce68.tar.gz 1691979 BLAKE2B 
bf6fd288f16df7adcb5cebeb6e13713db1c26a0b833dead2fb522227861abc60b2d0cda8e3f46f8e89cccb629e01081ba27763989ad6fd336c60a475b198c1c8
 SHA512 
69238d37d0af0162e0fd68094cd2fa9baa320497d34a9de491dea086c23291d0815b51e89218b1f0ee2b3314cbc8ac1809d6edb15ca51fcb282fe1e2b39a1a77
+DIST setup_dxvk.sh 4631 BLAKE2B 
25270e1f6dfd446b1d124eac3bd19da8bc770527d02d987949fc3ae0bead07866dafa25f77a90b9a408413a724354a29a4a156ff5c9dc75e26b66e079824ec86
 SHA512 
257fd84e29a7037f04a1a2a506502c71d527af58f8c84d8c3dfb64597ebdc41c3dca362eaf20ab4bc1982b76428c1f843815d56a6e1369d072e0009e270cb121

diff --git a/app-emulation/dxvk/dxvk-9999.ebuild 
b/app-emulation/dxvk/dxvk-9999.ebuild
index 167b7c5d6901..8f2c2de55196 100644
--- a/app-emulation/dxvk/dxvk-9999.ebuild
+++ b/app-emulation/dxvk/dxvk-9999.ebuild
@@ -26,6 +26,8 @@ else
                        -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz"
        KEYWORDS="-* ~amd64 ~x86"
 fi
+# setup_dxvk.sh is no longer provided, fetch old until a better solution
+SRC_URI+=" 
https://raw.githubusercontent.com/doitsujin/dxvk/cd21cd7fa3b0df3e0819e21ca700b7627a838d69/setup_dxvk.sh";
 
 DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / 
Wine"
 HOMEPAGE="https://github.com/doitsujin/dxvk/";
@@ -71,6 +73,9 @@ src_prepare() {
        fi
 
        default
+
+       sed "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" \
+               "${DISTDIR}"/setup_dxvk.sh > setup_dxvk.sh || die
 }
 
 src_configure() {
@@ -118,6 +123,7 @@ multilib_src_configure() {
 }
 
 multilib_src_install_all() {
+       dobin setup_dxvk.sh
        dodoc README.md dxvk.conf
 
        find "${ED}" -type f -name '*.a' -delete || die
@@ -128,15 +134,15 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-       # 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
+       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."
+               elog "Note: setup_dxvk.sh is unofficially temporarily provided 
as it was"
+               elog "removed upstream, handling may change in the future."
+       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"