Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/dxvk/
Date: Tue, 17 May 2022 04:21:45
Message-Id: 1652760953.3f6a6d4b239cef61e4a839a377e2ce67bef5471f.ionen@gentoo
1 commit: 3f6a6d4b239cef61e4a839a377e2ce67bef5471f
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 17 03:46:00 2022 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Tue May 17 04:15:53 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f6a6d4b
7
8 app-emulation/dxvk: give note about overlay differences
9
10 Just a courtesy until this version settles in, been in overlays for
11 a long time and switching back & forth can give a poor experience.
12
13 Similar applies to vkd3d-proton but it's less known and overlays
14 only had live ebuilds.
15
16 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
17
18 app-emulation/dxvk/dxvk-1.10.1.ebuild | 14 ++++++++++++++
19 app-emulation/dxvk/dxvk-9999.ebuild | 14 ++++++++++++++
20 2 files changed, 28 insertions(+)
21
22 diff --git a/app-emulation/dxvk/dxvk-1.10.1.ebuild b/app-emulation/dxvk/dxvk-1.10.1.ebuild
23 index 7d293dd8f8ea..d0bfdb15b8ca 100644
24 --- a/app-emulation/dxvk/dxvk-1.10.1.ebuild
25 +++ b/app-emulation/dxvk/dxvk-1.10.1.ebuild
26 @@ -102,6 +102,10 @@ multilib_src_install_all() {
27 find "${ED}" -type f -name '*.a' -delete || die
28 }
29
30 +pkg_preinst() {
31 + [[ -e /usr/$(get_libdir)/dxvk/d3d11.dll ]] && DXVK_HAD_OVERLAY=
32 +}
33 +
34 pkg_postinst() {
35 if [[ ! ${REPLACING_VERSIONS} ]]; then
36 elog "To enable ${PN} on a wine prefix, you can run the following command:"
37 @@ -109,6 +113,16 @@ pkg_postinst() {
38 elog " WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
39 elog
40 elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details."
41 + elif [[ -v DXVK_HAD_OVERLAY ]]; then
42 + # temporary warning until this version is more widely used
43 + elog "Gentoo's main repo ebuild for ${PN} uses different paths than most overlays."
44 + elog "If you were using symbolic links in wine prefixes it may be necessary to"
45 + elog "refresh them by re-running the command:"
46 + elog
47 + elog " WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
48 + elog
49 + elog "Also, if you were using /etc/${PN}.conf, ${PN} is no longer patched to load"
50 + elog "it. See ${EROOT}/usr/share/doc/${PF}/README.md* for handling configs."
51 fi
52
53 # don't try to keep wine-*[vulkan] in RDEPEND, but still give a warning
54
55 diff --git a/app-emulation/dxvk/dxvk-9999.ebuild b/app-emulation/dxvk/dxvk-9999.ebuild
56 index 7d293dd8f8ea..d0bfdb15b8ca 100644
57 --- a/app-emulation/dxvk/dxvk-9999.ebuild
58 +++ b/app-emulation/dxvk/dxvk-9999.ebuild
59 @@ -102,6 +102,10 @@ multilib_src_install_all() {
60 find "${ED}" -type f -name '*.a' -delete || die
61 }
62
63 +pkg_preinst() {
64 + [[ -e /usr/$(get_libdir)/dxvk/d3d11.dll ]] && DXVK_HAD_OVERLAY=
65 +}
66 +
67 pkg_postinst() {
68 if [[ ! ${REPLACING_VERSIONS} ]]; then
69 elog "To enable ${PN} on a wine prefix, you can run the following command:"
70 @@ -109,6 +113,16 @@ pkg_postinst() {
71 elog " WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
72 elog
73 elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details."
74 + elif [[ -v DXVK_HAD_OVERLAY ]]; then
75 + # temporary warning until this version is more widely used
76 + elog "Gentoo's main repo ebuild for ${PN} uses different paths than most overlays."
77 + elog "If you were using symbolic links in wine prefixes it may be necessary to"
78 + elog "refresh them by re-running the command:"
79 + elog
80 + elog " WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
81 + elog
82 + elog "Also, if you were using /etc/${PN}.conf, ${PN} is no longer patched to load"
83 + elog "it. See ${EROOT}/usr/share/doc/${PF}/README.md* for handling configs."
84 fi
85
86 # don't try to keep wine-*[vulkan] in RDEPEND, but still give a warning