| 1 |
commit: e2f4a3f59827dbb84f7935ddbe170e7ed5947462 |
| 2 |
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 29 12:01:46 2022 +0000 |
| 4 |
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Nov 29 12:13:18 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2f4a3f5 |
| 7 |
|
| 8 |
app-emulation/dxvk: update live |
| 9 |
|
| 10 |
Roughly anyway, this will need more attention. |
| 11 |
|
| 12 |
Ideally hoping upstream will provide some better options than raw |
| 13 |
instructions to the removed setup_dxvk.sh, or may have to make our |
| 14 |
own one given this is rather annoying to handle manually. |
| 15 |
|
| 16 |
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> |
| 17 |
|
| 18 |
app-emulation/dxvk/dxvk-9999.ebuild | 29 ++++++++++++++++------------- |
| 19 |
1 file changed, 16 insertions(+), 13 deletions(-) |
| 20 |
|
| 21 |
diff --git a/app-emulation/dxvk/dxvk-9999.ebuild b/app-emulation/dxvk/dxvk-9999.ebuild |
| 22 |
index 19174e20a451..167b7c5d6901 100644 |
| 23 |
--- a/app-emulation/dxvk/dxvk-9999.ebuild |
| 24 |
+++ b/app-emulation/dxvk/dxvk-9999.ebuild |
| 25 |
@@ -12,14 +12,18 @@ if [[ ${PV} == 9999 ]]; then |
| 26 |
EGIT_SUBMODULES=( |
| 27 |
# picky about headers and is cross-compiled making -I/usr/include troublesome |
| 28 |
include/{spirv,vulkan} |
| 29 |
+ subprojects/libdisplay-info |
| 30 |
) |
| 31 |
else |
| 32 |
HASH_SPIRV=0bcc624926a25a2a273d07877fd25a6ff5ba1cfb |
| 33 |
HASH_VULKAN=98f440ce6868c94f5ec6e198cc1adda4760e8849 |
| 34 |
SRC_URI=" |
| 35 |
- https://github.com/doitsujin/dxvk/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz |
| 36 |
- https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz -> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz |
| 37 |
- https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz" |
| 38 |
+ https://github.com/doitsujin/dxvk/archive/refs/tags/v${PV}.tar.gz |
| 39 |
+ -> ${P}.tar.gz |
| 40 |
+ https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz |
| 41 |
+ -> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz |
| 42 |
+ https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz |
| 43 |
+ -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz" |
| 44 |
KEYWORDS="-* ~amd64 ~x86" |
| 45 |
fi |
| 46 |
|
| 47 |
@@ -67,8 +71,6 @@ src_prepare() { |
| 48 |
fi |
| 49 |
|
| 50 |
default |
| 51 |
- |
| 52 |
- sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_dxvk.sh || die |
| 53 |
} |
| 54 |
|
| 55 |
src_configure() { |
| 56 |
@@ -116,7 +118,6 @@ multilib_src_configure() { |
| 57 |
} |
| 58 |
|
| 59 |
multilib_src_install_all() { |
| 60 |
- dobin setup_dxvk.sh |
| 61 |
dodoc README.md dxvk.conf |
| 62 |
|
| 63 |
find "${ED}" -type f -name '*.a' -delete || die |
| 64 |
@@ -127,13 +128,15 @@ pkg_preinst() { |
| 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 |
- elog |
| 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 |
+ # TODO: setup_dxvk.sh script was removed, need to figure out a new way to |
| 76 |
+ # explain/handle (leaving this alone for now in live in case gets restored) |
| 77 |
+# if [[ ! ${REPLACING_VERSIONS} ]]; then |
| 78 |
+# elog "To enable ${PN} on a wine prefix, you can run the following command:" |
| 79 |
+# elog |
| 80 |
+# elog " WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink" |
| 81 |
+# elog |
| 82 |
+# elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details." |
| 83 |
+ if [[ -v DXVK_HAD_OVERLAY ]]; then |
| 84 |
# temporary warning until this version is more widely used |
| 85 |
elog "Gentoo's main repo ebuild for ${PN} uses different paths than most overlays." |
| 86 |
elog "If you were using symbolic links in wine prefixes it may be necessary to" |
Archives