commit: 1fceb5bf0198e0446e938e51644a93ad28aca90b
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 3 04:12:37 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 3 04:34:38 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fceb5bf
app-emulation/dxvk: update live
Also tentative changes in preparation for release with snapshots
but entirely untested at the moment (may be typos).
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-emulation/dxvk/dxvk-9999.ebuild | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/app-emulation/dxvk/dxvk-9999.ebuild
b/app-emulation/dxvk/dxvk-9999.ebuild
index ae8ce5b65df4..5456189529f8 100644
--- a/app-emulation/dxvk/dxvk-9999.ebuild
+++ b/app-emulation/dxvk/dxvk-9999.ebuild
@@ -13,12 +13,17 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/doitsujin/dxvk.git";
EGIT_SUBMODULES=(
# picky about headers and is cross-compiled making
-I/usr/include troublesome
- include/{spirv,vulkan}
+ include/spirv
+ include/vulkan
+ subprojects/dxbc-spirv
+ subprojects/dxbc-spirv/submodules/spirv_headers
subprojects/libdisplay-info
)
else
HASH_SPIRV=
HASH_VULKAN=
+ HASH_DXBCSPIRV=
+ HASH_DXBCSPIRV_SPIRV=
HASH_DISPLAYINFO=
SRC_URI="
https://github.com/doitsujin/dxvk/archive/refs/tags/v${PV}.tar.gz
@@ -27,6 +32,10 @@ else
-> spirv-headers-${HASH_SPIRV}.tar.gz
https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
-> vulkan-headers-${HASH_VULKAN}.tar.gz
+
https://github.com/doitsujin/dxbc-spirv/archive/${HASH_DXBCSPIRV}.tar.gz
+ -> dxbc-spirv-${HASH_DXBCSPIRV}.tar.gz
+
https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_DXBCSPIRV_SPIRV}.tar.gz
+ -> spirv-headers-${HASH_DXBCSPIRV_SPIRV}.tar.gz
https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/${HASH_DISPLAYINFO}/libdisplay-info-${HASH_DISPLAYINFO}.tar.bz2
"
KEYWORDS="-* ~amd64 ~x86"
@@ -82,10 +91,22 @@ pkg_pretend() {
src_prepare() {
if [[ ${PV} != 9999 ]]; then
- rmdir include/{spirv,vulkan} subprojects/libdisplay-info || die
+ # TODO?: may need to consider making our tarballs if this keeps
up
+ # (if do this, also drop EGIT_SUBMODULES and leave it default)
+ rmdir include/{spirv,vulkan}
subprojects/{dxbc-spirv,libdisplay-info} || die
mv ../SPIRV-Headers-${HASH_SPIRV} include/spirv || die
mv ../Vulkan-Headers-${HASH_VULKAN} include/vulkan || die
+ mv ../dxbc-spirv-${HASH_DXBCSPIRV} subprojects/dxbc-spirv || die
mv ../libdisplay-info-${HASH_DISPLAYINFO}
subprojects/libdisplay-info || die
+
+ rmdir subprojects/dxbc-spirv/submodules/spirv_headers || die
+ if [[ ${HASH_SPIRV} == ${HASH_DXBCSPIRV_SPIRV} ]]; then
+ ln -s ../../../include/spirv \
+ subprojects/dxbc-spirv/submodules/spirv_headers
|| die
+ else
+ mv ../SPIRV-Headers-${HASH_DXBCSPIRV_SPIRV} \
+ subprojects/dxbc-spirv/submodules/spirv_headers
|| die
+ fi
fi
cp -- "${DISTDIR}"/setup_dxvk.sh . || die
