Diff vkd3d-proton-2.6-r1 with a vkd3d-proton-2.9-r1

/usr/portage/app-emulation/vkd3d-proton/vkd3d-proton-2.9-r1.ebuild 2023-10-09 14:52:28.740368331 +0300
3 3

  
4 4
EAPI=8
5 5

  
6
# note: version 2.6 should be kept for longer given it's the
7
# last version to support <wine-7.1 and <nvidia-drivers-510
8

  
9 6
MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/
10 7
MULTILIB_COMPAT=( abi_x86_{32,64} )
11 8
inherit flag-o-matic meson-multilib toolchain-funcs
......
21 18
		subprojects/dxil-spirv/third_party/spirv-headers # skip cross/tools
22 19
	)
23 20
else
24
	HASH_VKD3D=3e5aab6fb3e18f81a71b339be4cb5cdf55140980 # match tag on bumps
25
	HASH_DXIL=b537bbb91bccdbc695cb7e5211d608f8d1c205bd
26
	HASH_SPIRV=ae217c17809fadb232ec94b29304b4afcd417bb4
27
	HASH_VULKAN=83e1a9ed8ce289cebb1c02c8167d663dc1befb24
21
	HASH_VKD3D=6365efeba253807beecaed0eaa963295522c6b70 # match tag on bumps
22
	HASH_DXIL=f20a0fb4e984a83743baa9d863eb7b26228bcca3
23
	HASH_SPIRV=1d31a100405cf8783ca7a31e31cdd727c9fc54c3
24
	HASH_SPIRV_DXIL=aa331ab0ffcb3a67021caa1a0c1c9017712f2f31
25
	HASH_VULKAN=bd6443d28f2ebecedfb839b52d612011ba623d14
28 26
	SRC_URI="
29 27
		https://github.com/HansKristian-Work/vkd3d-proton/archive/refs/tags/v${PV}.tar.gz
30 28
			-> ${P}.tar.gz
......
32 30
			-> ${PN}-dxil-spirv-${HASH_DXIL::10}.tar.gz
33 31
		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
34 32
			-> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz
33
		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV_DXIL}.tar.gz
34
			-> ${PN}-spirv-headers-${HASH_SPIRV_DXIL::10}.tar.gz
35 35
		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
36 36
			-> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz"
37 37
	KEYWORDS="-* amd64 x86"
......
87 87
		mv ../dxil-spirv-${HASH_DXIL} subprojects/dxil-spirv || die
88 88
		mv ../SPIRV-Headers-${HASH_SPIRV} subprojects/SPIRV-Headers || die
89 89
		mv ../Vulkan-Headers-${HASH_VULKAN} subprojects/Vulkan-Headers || die
90
		ln -s ../../../SPIRV-Headers/include \
90

  
91
		# dxil and vkd3d's spirv headers currently mismatch and incompatible
92
		rmdir subprojects/dxil-spirv/third_party/spirv-headers || die
93
		mv ../SPIRV-Headers-${HASH_SPIRV_DXIL} \
91 94
			subprojects/dxil-spirv/third_party/spirv-headers || die
95
#		ln -s ../../../SPIRV-Headers/include \
96
#			subprojects/dxil-spirv/third_party/spirv-headers || die
92 97
	fi
93 98

  
94 99
	default
......
166 171
	dobin setup_vkd3d_proton.sh
167 172
	einstalldocs
168 173

  
169
	# unnecesasry files, see package-release.sh
170
	rm "${ED}"/usr/lib/${PN}/x*/libvkd3d-proton-utils-3.dll || die
171 174
	find "${ED}" -type f -name '*.a' -delete || die
172 175
}
173 176

  
......
177 180
		elog
178 181
		elog "	WINEPREFIX=/path/to/prefix setup_vkd3d_proton.sh install --symlink"
179 182
		elog
183
		elog "Should also ensure that >=app-emulation/dxvk-2.1's dxgi.dll is available"
184
		elog "on it, not meant to function independently even if only using d3d12."
185
		elog
180 186
		elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details."
187
	elif [[ ${REPLACING_VERSIONS##* } ]]; then
188
		if ver_test ${REPLACING_VERSIONS##* } -lt 2.7; then
189
			elog
190
			elog ">=${PN}-2.7 requires drivers and Wine to support vulkan-1.3, meaning:"
191
			elog ">=wine-*-7.1 (or >=wine-proton-7.0), and >=mesa-22.0 (or >=nvidia-drivers-510)"
192
		fi
193

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