commit:     eadf423edfee2f7e141123e8eaec23b534ddcf33
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 18 17:31:48 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 19 01:36:38 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eadf423e

app-emulation/vkd3d-proton: add 3.0a

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

 app-emulation/vkd3d-proton/Manifest                |   1 +
 .../vkd3d-proton/vkd3d-proton-3.0a.ebuild          | 171 +++++++++++++++++++++
 2 files changed, 172 insertions(+)

diff --git a/app-emulation/vkd3d-proton/Manifest 
b/app-emulation/vkd3d-proton/Manifest
index 9b2f760bd767..91abe349170c 100644
--- a/app-emulation/vkd3d-proton/Manifest
+++ b/app-emulation/vkd3d-proton/Manifest
@@ -9,6 +9,7 @@ DIST vkd3d-proton-2.13.tar.gz 2210823 BLAKE2B 
106d7c204b3761c119001af9cda7bd3244
 DIST vkd3d-proton-2.14.1.tar.gz 2271935 BLAKE2B 
c136ba61511bcf8c3202bfd3ab63c663739c2bb6085f04c43227f270e2314e66ba0eb1dcb0e44e0a7aa9d04b24397a7e5b3684530ffe7165997aaaa014d5d4e1
 SHA512 
7c401a5b100d85b5f674488ff2591034b974eae2ed02e878a21959e23a7682d090e377d5caa8d5508ceeb35f5750fedea36d2fdb3cf0997d5bc171410171ff82
 DIST vkd3d-proton-2.6.tar.gz 1271948 BLAKE2B 
02d2574a66614613748fe3471a6fd5aac2650fdae15a17b17ea2ed028fa53a0579b866e7240036a26108afc343395826474bb99e015b9299c2abec811bb872ab
 SHA512 
6f27d213652e2380a9ba4534ac9ffe4b752b4608fbc2e8acd273fa151ab19ad0b132e3436384d2b8591cd1a59f0b69d342c893dc3a64be85188b5e3274bcf3f1
 DIST vkd3d-proton-3.0.tar.xz 22431928 BLAKE2B 
5af9adbf0f1bd4fde9d02a6c32544edf91940271d3943bbeb2cb6fb1f71f028a630380e096ff7837e25e7b1b8da74d6786d38da1de73a5f1651f6cba95ad3b9c
 SHA512 
578d18319b99013365631c3c97f97e3589ea0ad10012d11d891c7cbb7d0556f7200d34742b6171ae28a2cb2c256dd18befbb8cba6b74ea98875fbe7f9a1779ca
+DIST vkd3d-proton-3.0a.tar.xz 22437880 BLAKE2B 
d5772e852a5dc9047f7da615bd529055f8fb192d814d2e592a18cda6500000b57353cd21efb3714b23fcaa637d4f4a2eed57fa097fa52dbfac4591fa91ba4f81
 SHA512 
ae373483ed88feaf35059d2e839adfc2a98628d84c2ae669ef10e9bcce3cd5bd1592d01f1d48d9d410b455ca16c4919d565468376541dc10fb8827fdc6e85ab9
 DIST vkd3d-proton-dxil-spirv-b537bbb91b.tar.gz 631130 BLAKE2B 
99f40c5efde87d0af86542b427e5b0429be68ca69ba0c2b6d10a821811756d8dadff4449f268ae404f8ace09a91b3e8aaa135e534a77c0239e58c1a970a044cc
 SHA512 
3c20090b7a1b53c30fd4967622fc7384e1bcc504c30d8075068b87dad1bd2c6f4a12459bf42e61bf76b9dd454ec17a9d529f74ab0d5583627e966d94bb341dc3
 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

diff --git a/app-emulation/vkd3d-proton/vkd3d-proton-3.0a.ebuild 
b/app-emulation/vkd3d-proton/vkd3d-proton-3.0a.ebuild
new file mode 100644
index 000000000000..f76844d26162
--- /dev/null
+++ b/app-emulation/vkd3d-proton/vkd3d-proton-3.0a.ebuild
@@ -0,0 +1,171 @@
+# Copyright 2022-2025 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 eapi9-ver 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";
+else
+       # tarball is same as upstream except for including git submodules
+       SRC_URI="https://dev.gentoo.org/~ionen/distfiles/${P}.tar.xz";
+       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() {
+       default
+
+       sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" 
setup_vkd3d_proton.sh || die
+
+       if [[ ${PV} != 9999 ]]; then
+               # update to match version+hash of release tag on bump
+               local tag_ver=3.0a
+               local tag_hash=c01c8b46ec4f8e2c9b035f8bd3fae0b3c0676aca
+               [[ ${PV} == ${tag_ver} ]] || die "hash has not been updated"
+
+               # without .git, meson sets vkd3d_build as 0x${PV} leading to 
failure
+               sed -i "s/@VCS_TAG@/${tag_hash::15}/" vkd3d_build.h.in || die
+               sed -i "s/@VCS_TAG@/${tag_hash::7}/" vkd3d_version.h.in || die
+       fi
+}
+
+src_configure() {
+       use crossdev-mingw || 
PATH=${BROOT}/usr/lib/mingw64-toolchain/bin:${PATH}
+
+       # random segfaults been reported with LTO in some games, filter as
+       # a safety (note that optimizing this further won't really help
+       # performance, GPU does the actual work)
+       filter-lto
+
+       # -mavx and mingw-gcc do not mix safely here
+       # https://github.com/doitsujin/dxvk/issues/4746#issuecomment-2708869202
+       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
+
+                       # some bashrc-mv users tend to do CFLAGS="${LDFLAGS}" 
and then
+                       # strip-unsupported-flags miss these during 
compile-only tests
+                       # (primarily done for 23.0 profiles' -z, not full 
coverage)
+                       filter-flags '-Wl,-z,*' #928038
+               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."
+       fi
+
+       if ver_replacing -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_replacing -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
+}

Reply via email to