Skip to content

Commit

Permalink
app-emulation/vkd3d-proton: add 2.12
Browse files Browse the repository at this point in the history
Signed-off-by: Ionen Wolkens <[email protected]>
  • Loading branch information
ionenwks committed Mar 15, 2024
1 parent c0ec9b6 commit d0b624d
Show file tree
Hide file tree
Showing 2 changed files with 207 additions and 0 deletions.
4 changes: 4 additions & 0 deletions app-emulation/vkd3d-proton/Manifest
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
DIST dxil-spirv-b03d68d6ed30e87a3bcef9a861fa3c6b4429e5cc.tar.gz 915224 BLAKE2B 137f4b187300261d922ecc66542c5b38e6fa825cbb4e9adb43a7ca15ea9b968e24111bcaf9142782a44a6a7abb342a4ccfbd863af3c01287936e47b6162b7139 SHA512 890c0a0e638b9bffc9ce2cee871c60a2a552d691e60ad6ffa087dfae988e559151b7025e025e4346d1389b7d8f39f8b9bf93e43c7427c883662c1d6c86ff9b1a
DIST spirv-headers-8b246ff75c6615ba4532fe4fde20f1be090c3764.tar.gz 472513 BLAKE2B f1ad7e11c306c62509655eb41d74efc5fb88688780d006c6944844e964b339baa000f70e115c4df2947e882c9ac33186e301b31138c38fe5f997f7af7260f521 SHA512 fe1d9d70b217b194c92dd397bca386ce8452bc5ec3967d64a257b3a531386fe6a6ecb5e9ed8ab5bc5a2707c5378f02f05809d6d197dcfb3f87cd33304c3b1959
DIST vkd3d-proton-2.10.tar.gz 1839493 BLAKE2B 0dd3716bd986a78d8616fdfbe80833379bc93778a8cd599b8874b4bd620a3d5fa2d7ac342305db6acf3bb6025ac7b4ff138b49a30f34fa86f7af3ebb09903100 SHA512 84e9ebf84ac5294baf6d03e1291d7f3c4a004d6dd9da0450319e785827a635b70377855092d750b6c26492d369018585d7ec3cf46ebefc603751e13578bfe333
DIST vkd3d-proton-2.11.1.tar.gz 1978301 BLAKE2B ede48d1895d2e8bc7f6e5971e6f7c95cc0403a3dad0dc3bdc6e19ecf6f282cd02c8c81371af8499e40d6ef9c055acabd90c8e65cd8b1360bded223864ccc0502 SHA512 91abd9bb854fe701db6e0d8c0a28e630ca23829676e2f74fa1bcd52801c1afef91456355e30a1c8fe27ee282ddf45dab40f28134be1e07f2cb07557112d3fee6
DIST vkd3d-proton-2.12.tar.gz 2109289 BLAKE2B 805298efa2f49a82dcc4b989856fb24469a1de9a1d175d5844be3e72187d14f3454ced52bcd65f557ec6776fda00112f4b9849dd48679e10aadf277d82b928ca SHA512 fbd4102fc9917a8e7c28edcaa500c26352a0652a008da453108cd21325ef2c757b5c0842a50e2e5ea6efcacdabe86b2ce570647313d0036967a135b01850fbe8
DIST vkd3d-proton-2.6.tar.gz 1271948 BLAKE2B 02d2574a66614613748fe3471a6fd5aac2650fdae15a17b17ea2ed028fa53a0579b866e7240036a26108afc343395826474bb99e015b9299c2abec811bb872ab SHA512 6f27d213652e2380a9ba4534ac9ffe4b752b4608fbc2e8acd273fa151ab19ad0b132e3436384d2b8591cd1a59f0b69d342c893dc3a64be85188b5e3274bcf3f1
DIST vkd3d-proton-dxil-spirv-9044a31d22.tar.gz 876292 BLAKE2B dd55bc2b8125c3ec4639dcb4daa1b17e64824e6abb1e7ca102b2332535a9e5ad5a5af8959cc89cfd11f839ba90ded4614eb22dd5bdbd9b60abd7340d633c1287 SHA512 26a51c9bf7d55e77191d72642d20e98ceee0ffcf359646771cd20de093c670eeff082b80dc868a3e60de0ffb2ec0e0cd1276a39c13238a18282d5cb5a2059602
DIST vkd3d-proton-dxil-spirv-b537bbb91b.tar.gz 631130 BLAKE2B 99f40c5efde87d0af86542b427e5b0429be68ca69ba0c2b6d10a821811756d8dadff4449f268ae404f8ace09a91b3e8aaa135e534a77c0239e58c1a970a044cc SHA512 3c20090b7a1b53c30fd4967622fc7384e1bcc504c30d8075068b87dad1bd2c6f4a12459bf42e61bf76b9dd454ec17a9d529f74ab0d5583627e966d94bb341dc3
Expand All @@ -9,3 +12,4 @@ DIST vkd3d-proton-spirv-headers-aa331ab0ff.tar.gz 448200 BLAKE2B 435e3ce169f44a0
DIST vkd3d-proton-spirv-headers-ae217c1780.tar.gz 415130 BLAKE2B 0c6444c4c1cb43b9c69757d7c2257ce2fe1bc6be308341f3189766f120994e4920bc738b737d9eefc299359dab568fb8809782e3663dd589c0e4d13aecb8873a SHA512 02cf1d63b29e48ef0efe489eb32237ba2f9f4bf58a182b00dc96aab18faba94de79283398e9e945cd81130f83fff228c59b04e496716ea9ccc148a5f4465282c
DIST vkd3d-proton-vulkan-headers-83e1a9ed8c.tar.gz 1299014 BLAKE2B 0b1e635aaa6eebec3525b13698a064e0e5b8a78829a772cbe9e1890148059bf396bc5c830e8d6ee3070a3343775991642565283994c65acfa0d82a91590b7d84 SHA512 ecb2158cad55edb4ba069383668f3b311a2f6aa6777b5b7ed94795d454622426ee34fee52b13c97d2f07b5b2f965815ee61a0203b76a0b0d2c708a4786d06b96
DIST vkd3d-proton-vulkan-headers-a0c76b4ef7.tar.gz 2072604 BLAKE2B 324fe6cc9b803ba5dfa38a3c97d7573cb138f8e0619c0748a096f1a13eb8b608d5a780cb071f3727b0912005a0ab1bc5fd4f1a335ee74d00b44876dfe422f433 SHA512 6f447fef01946849c925634a7caf793e69f3aec52d8de2fa77fe8f5f7675c831fb54a1852cf3326e3909ce43a6f2970dd60c6976ac5d9459ef7bac62583b7ba9
DIST vulkan-headers-f030d9dd8ca297b84b10330cee87f72acc3b0aab.tar.gz 2255357 BLAKE2B 07cfa8ccdd26966116e7c35e0d350be94936469f2b9af77c84b8c61495b6ba76813047b5d26bba1fabd44a8f35396b32b6ad32c3b93b0b1a818ce9ed45f93db2 SHA512 6adf81d16d07710322b7c92a0e0436ee33be94d55116e3c460eabb4196a180f8c7b481c19a84a8bbea4e98dda6cf63ff2876f196348921a0c1d9c8c1005cd521
203 changes: 203 additions & 0 deletions app-emulation/vkd3d-proton/vkd3d-proton-2.12.ebuild
Original file line number Diff line number Diff line change
@@ -0,0 +1,203 @@
# Copyright 2022-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/
MULTILIB_COMPAT=( abi_x86_{32,64} )
inherit flag-o-matic meson-multilib toolchain-funcs

if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/HansKristian-Work/vkd3d-proton.git"
EGIT_SUBMODULES=(
# uses hacks / recent features and easily breaks, keep bundled headers
# (also cross-compiled and -I/usr/include is troublesome)
khronos/{SPIRV,Vulkan}-Headers
subprojects/dxil-spirv
subprojects/dxil-spirv/third_party/spirv-headers # skip cross/tools
)
else
HASH_VKD3D=7460c70de0dff08de2f4a78a7ac7c71fd7f0ea6e # match tag on bumps
HASH_DXIL=b03d68d6ed30e87a3bcef9a861fa3c6b4429e5cc
HASH_SPIRV=8b246ff75c6615ba4532fe4fde20f1be090c3764
HASH_SPIRV_DXIL=8b246ff75c6615ba4532fe4fde20f1be090c3764
HASH_VULKAN=f030d9dd8ca297b84b10330cee87f72acc3b0aab
SRC_URI="
https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz
https://github.com/HansKristian-Work/dxil-spirv/archive/${HASH_DXIL}.tar.gz
-> dxil-spirv-${HASH_DXIL}.tar.gz
https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
-> spirv-headers-${HASH_SPIRV}.tar.gz
https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV_DXIL}.tar.gz
-> spirv-headers-${HASH_SPIRV_DXIL}.tar.gz
https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
-> vulkan-headers-${HASH_VULKAN}.tar.gz
"
KEYWORDS="-* ~amd64 ~x86"
fi

DESCRIPTION="Fork of VKD3D, development branches for Proton's Direct3D 12 implementation"
HOMEPAGE="https://github.com/HansKristian-Work/vkd3d-proton/"

LICENSE="LGPL-2.1+ Apache-2.0 MIT"
SLOT="0"
IUSE="+abi_x86_32 crossdev-mingw debug extras +strip"

BDEPEND="
dev-util/glslang
!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"

PATCHES=(
"${FILESDIR}"/${PN}-2.6-wow64-setup.patch
)

pkg_pretend() {
[[ ${MERGE_TYPE} == binary ]] && return

if use crossdev-mingw && [[ ! -v MINGW_BYPASS ]]; then
local tool=-w64-mingw32-g++
for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do
if ! type -P ${tool} >/dev/null; then
eerror "With USE=crossdev-mingw, it is necessary to setup the mingw toolchain."
eerror "For instructions, please see: https://wiki.gentoo.org/wiki/Mingw"
use abi_x86_32 && use abi_x86_64 &&
eerror "Also, with USE=abi_x86_32, will need both i686 and x86_64 toolchains."
die "USE=crossdev-mingw is enabled, but ${tool} was not found"
elif [[ ! $(LC_ALL=C ${tool} -v 2>&1) =~ "Thread model: posix" ]]; then
eerror "${PN} requires GCC to be built with --enable-threads=posix"
eerror "Please see: https://wiki.gentoo.org/wiki/Mingw#POSIX_threads_for_Windows"
die "USE=crossdev-mingw is enabled, but ${tool} does not use POSIX threads"
fi
done
tool=-w64-mingw32-widl
for tool in $(usev abi_x86_64 x86_64${tool}) $(usev abi_x86_32 i686${tool}); do
if ! type -P widl >/dev/null && ! type -P ${tool} >/dev/null; then
eerror "With USE=crossdev-mingw, you need to provide the widl compiler by either"
eerror "building crossdev mingw64-runtime with USE=tools or installing wine."
die "USE=crossdev-mingw is set but neither widl nor ${tool} were found"
fi
done
fi
}

src_prepare() {
if [[ ${PV} != 9999 ]]; then
rmdir khronos/{SPIRV,Vulkan}-Headers subprojects/dxil-spirv || die
mv ../dxil-spirv-${HASH_DXIL} subprojects/dxil-spirv || die
mv ../SPIRV-Headers-${HASH_SPIRV} khronos/SPIRV-Headers || die
mv ../Vulkan-Headers-${HASH_VULKAN} khronos/Vulkan-Headers || die

rmdir subprojects/dxil-spirv/third_party/spirv-headers || die
# dxil and vkd3d's spirv headers sometime mismatch and are incompatible
if [[ ${HASH_SPIRV} == "${HASH_SPIRV_DXIL}" ]]; then
ln -s ../../../khronos/SPIRV-Headers \
subprojects/dxil-spirv/third_party/spirv-headers || die
else
mv ../SPIRV-Headers-${HASH_SPIRV_DXIL} \
subprojects/dxil-spirv/third_party/spirv-headers || die
fi
fi

default

sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_vkd3d_proton.sh || die

if [[ ${PV} != 9999 ]]; then
# without .git, meson sets vkd3d_build as 0x${PV} leading to failure
sed -i "s/@VCS_TAG@/${HASH_VKD3D::15}/" vkd3d_build.h.in || die
sed -i "s/@VCS_TAG@/${HASH_VKD3D::7}/" vkd3d_version.h.in || die
fi
}

src_configure() {
use crossdev-mingw || PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}

# -mavx with mingw-gcc has a history of obscure issues and
# disabling is seen as safer, e.g. `WINEARCH=win32 winecfg`
# crashes with -march=skylake >=wine-8.10, similar issues with
# znver4: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110273
append-flags -mno-avx

if [[ ${CHOST} != *-mingw* ]]; then
if [[ ! -v MINGW_BYPASS ]]; then
unset AR CC CXX RC STRIP WIDL
filter-flags '-fuse-ld=*'
filter-flags '-mfunction-return=thunk*' #878849
if has_version '<dev-util/mingw64-toolchain-11' ||
{ use crossdev-mingw &&
has_version "<cross-$(usex x86 i686 x86_64)-w64-mingw32/mingw64-runtime-11"; }
then
filter-flags '-fstack-protector*' #870136
fi
fi

CHOST_amd64=x86_64-w64-mingw32
CHOST_x86=i686-w64-mingw32
CHOST=$(usex x86 ${CHOST_x86} ${CHOST_amd64})

strip-unsupported-flags
fi

multilib-minimal_src_configure
}

multilib_src_configure() {
# multilib's ${CHOST_amd64}-gcc -m32 is unusable with crossdev,
# unset again so meson eclass will set ${CHOST}-gcc + others
use crossdev-mingw && [[ ! -v MINGW_BYPASS ]] && unset AR CC CXX STRIP WIDL

# prefer ${CHOST}'s widl (mingw) over wine's as used by upstream if
# possible, but eclasses don't handle that so setup machine files
local widl=$(tc-getPROG WIDL widl)
use amd64 && [[ ${widl} == widl && ${ABI} == x86 ]] && widl="widl','-m32"
printf "[binaries]\nwidl = ['${widl}']\n" > "${T}"/widl.${ABI}.ini || die

local emesonargs=(
--prefix="${EPREFIX}"/usr/lib/${PN}
--{bin,lib}dir=x${ABI: -2}
--{cross,native}-file="${T}"/widl.${ABI}.ini
$(meson_use {,enable_}extras)
$(meson_use debug enable_trace)
$(usev strip --strip) # portage won't strip .dll, so allow it here
-Denable_tests=false # needs wine/vulkan and is intended for manual use
)

meson_src_configure
}

multilib_src_install_all() {
dobin setup_vkd3d_proton.sh
einstalldocs

find "${ED}" -type f -name '*.a' -delete || die
}

pkg_postinst() {
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_vkd3d_proton.sh install --symlink"
elog
elog "Should also ensure that >=app-emulation/dxvk-2.1's dxgi.dll is available"
elog "on it, not meant to function independently even if only using d3d12."
elog
elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details."
elif [[ ${REPLACING_VERSIONS##* } ]]; then
if ver_test ${REPLACING_VERSIONS##* } -lt 2.7; then
elog
elog ">=${PN}-2.7 requires drivers and Wine to support vulkan-1.3, meaning:"
elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)"
fi

if ver_test ${REPLACING_VERSIONS##* } -lt 2.9; then
elog
elog ">=${PN}-2.9 has a new file to install (d3d12core.dll), old Wine prefixes that"
elog "relied on '--symlink' may need updates by using the setup_vkd3d_proton.sh."
elog
elog "Furthermore, it may not function properly if >=app-emulation/dxvk-2.1's"
elog "dxgi.dll is not available on that prefix (even if only using d3d12)."
fi
fi
}

0 comments on commit d0b624d

Please sign in to comment.