gentoo auto-resync : 11:12:2024 - 02:01:11

3 files changed, 2 insertions, 185 deletions

diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index afbac485b36d..7d6c55a7b261 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -6,7 +6,6 @@ DIST dxvk-1.10.3.tar.gz 1204407 BLAKE2B 3507ffe4abf9c45f2a138b05e7cf706322a6bf3d
 DIST dxvk-2.3.1.tar.gz 1005669 BLAKE2B d78448fcde9d600f7206dfa606fca4069e7563bb8b181fbc172691d6c45586904ae529550926a03612ed3cc1f2a2dff00990638125c1d7ce6179d3cd3ba8df04 SHA512 085567ac263872eb93d776ce7cf982690603e240a977dbb51ad69344af387fd745536ca62819afd4a809732a6f2d22b36c3df9538decf37dec527973d41e392f
 DIST dxvk-2.4.1.tar.gz 1060662 BLAKE2B 43294af5829fe306acdb72c07b94c28d34eb798a2eaf6d2e42c2b80900e9b6f4f323569dfd51d565c836237fddce26b843f69e4ff57fc2a5838382993a9dd6ed SHA512 629e45bbdaddf83cd8a394877289781e8f54330b4c865b2d453ba3068a6054511a3697ca115497b64df0ce9ee36748a7fdb01fdc5f49a7dc44c4a3d3e47bf6de
 DIST dxvk-2.5.1.tar.gz 1130762 BLAKE2B 2941f3702d0f478d140d8f39a97e29f24e8ce6a3f22160fe26a8cfb70a132fc39b43960f34ea3be8786e7ccdbbf4ff2ddc961d2cc93956e63422579cb934b2fb SHA512 44b200e2d468f9280444b888c8326becca123e1c8a50fbfa544165d24fb2a51478e00a8ab93d0777cab47be85ca67f63bb3627ea75757a4e0ab85209f93b1053
-DIST dxvk-2.5.tar.gz 1130334 BLAKE2B d8485d7ed8256676f2138d6c917ef8875da7604f304e3c2adba8204b15264ee8fb77fd86b67c7cda16220348288f40d2e736cdfd973d3e91d0141e1522860559 SHA512 2610d9a9e546635e5476278ec30c699fbefe32fb418335fada25e941d9bca705e02dbd9eb8b5f6a9afb0ec194f2002857ad00cbe27d1a90222f5e28a496da125
 DIST libdisplay-info-275e6459c7ab1ddd4b125f28d0440716e4888078.tar.bz2 81172 BLAKE2B 7a1e9e2feeb95e06e9d3f49ad9d14a8a152cca525085e819cda0b69c238fb79dddd6d547cd0f0a4b51dfc1ec74ac4c006345b9fc48563807bc8ab3bab58ea5ff SHA512 794e94e8c16d65901a7b705d1ba3361817b4e9e19e520b1004bcab232d0347f5713594d67f3c2b79d4f86b3012e710c648975547d27a63de043fcbe9e6b7e66d
 DIST setup_dxvk.sh 4631 BLAKE2B 25270e1f6dfd446b1d124eac3bd19da8bc770527d02d987949fc3ae0bead07866dafa25f77a90b9a408413a724354a29a4a156ff5c9dc75e26b66e079824ec86 SHA512 257fd84e29a7037f04a1a2a506502c71d527af58f8c84d8c3dfb64597ebdc41c3dca362eaf20ab4bc1982b76428c1f843815d56a6e1369d072e0009e270cb121
 DIST spirv-headers-8b246ff75c6615ba4532fe4fde20f1be090c3764.tar.gz 472513 BLAKE2B f1ad7e11c306c62509655eb41d74efc5fb88688780d006c6944844e964b339baa000f70e115c4df2947e882c9ac33186e301b31138c38fe5f997f7af7260f521 SHA512 fe1d9d70b217b194c92dd397bca386ce8452bc5ec3967d64a257b3a531386fe6a6ecb5e9ed8ab5bc5a2707c5378f02f05809d6d197dcfb3f87cd33304c3b1959
@@ -14,7 +13,6 @@ DIST vulkan-headers-46dc0f6e514f5730784bb2cac2a7c731636839e8.tar.gz 2255426 BLAK
 EBUILD dxvk-1.10.3-r1.ebuild 4988 BLAKE2B c1a07a25db7117285e6d0ba5bddcc5b9690b9171bf1c887547f6a9e9804bc3366b325859ac4f4d439b702ea38e96c51b5067cc21c354bd98a324430a2166b527 SHA512 8566dad60c3a8cc4e996bd8d1430ad7a62db5eae2860b635a998ea7c87c7f8a9fd2f268b1f736d27addbb3c408dac6ffb7f3993a02fb16d42b9c238f2692a945
 EBUILD dxvk-2.3.1-r1.ebuild 6667 BLAKE2B ac8620ba4b92cfa33c88db128f98304df7060dcdbaddcff8a570ebe9b2a5e9e6a5ab559088b2d2c30254160bfdc91f414a942421bddf387330f72721eedced08 SHA512 ce8129e47bd4a1a8431e052fc60e831ef6fd692d970d430fc4b111d71b4130915967679d8a96d4ba9c4647826dc34c924b585e3b07db67abb78c6b5e1b458de5
 EBUILD dxvk-2.4.1.ebuild 6104 BLAKE2B 74a6bd12561ec92336b95aa9b8aa1c7167fa5ce984f5d8104e0e3d76140a337891a70215d907929bd7d06c8ef7c5e35a24572aff615ab1479357f0e712d8e999 SHA512 042a6473b19dd1d1a735a8092f944944f0c94e40124e6c96f118de08f2bd83a3a1c6e02767f2cb8a475ca40a540b0d264414e956ecc77a939cf89775ec727d65
-EBUILD dxvk-2.5.1.ebuild 6067 BLAKE2B 825fee4c6315f0341c220c14fed9d241e45d8dca5177ece87ba1369c3893fb20ab28da587603c72e20cb52ff1c1b0072162b0f24170e6632054f9cd9bddb2064 SHA512 2b1185990a72d895d7f7600078a70b8905d856ba34a851ca687764deb2b583c86da96b3035ba6e0c185a0f832135d79afcd5f3c779284795e427165c9128b62a
-EBUILD dxvk-2.5.ebuild 6067 BLAKE2B 825fee4c6315f0341c220c14fed9d241e45d8dca5177ece87ba1369c3893fb20ab28da587603c72e20cb52ff1c1b0072162b0f24170e6632054f9cd9bddb2064 SHA512 2b1185990a72d895d7f7600078a70b8905d856ba34a851ca687764deb2b583c86da96b3035ba6e0c185a0f832135d79afcd5f3c779284795e427165c9128b62a
+EBUILD dxvk-2.5.1.ebuild 6065 BLAKE2B e93f18c43646759f9220da686e014f71fc2f65d22e0edb80456f1ac53334b78599289edc700a97402564285719d75ded9aa3bbd8b0c9c4b908f65afed0b89a37 SHA512 a067fc8c3b09cc67d6aa6c265488e78732b48deb601c3d2a6a26610f391f0c41c9a5bdbddccf8cf7d7688ce933e5e17f4d0bd5f2f47e10f2ba3f99406f8ad44a
 EBUILD dxvk-9999.ebuild 5947 BLAKE2B 3a86082b1890360375d0dba2b037da7b9e6c05440c2f2057283ebe109e22ded34d0c55263c96b1ae28f319a2e5a0a5063111ea38aaca9c74ae6ea7a488dfc770 SHA512 439f121ae0dac4b3f7f0de3bb6ad8ca39dd5fb71d82b7f2544562db4832edb5eccd2a61fb3cb66301f6fd81f40868af3b6a8d8115f5d9ea545ffd2a93b815aa7
 MISC metadata.xml 885 BLAKE2B c21b9383a626cfea8b758d171ebbe7180d7a0dc09da611ad5f05b3e877f4051e33544e29c9c5e58fa20143bf724d8d27da9279bcf49e3465a7aa6cb7eeca4eb1 SHA512 3ad1138cbe63473b6da56d73214913e9a3e68d270e1df01fa4202e76a6efe35c6971595660724e30b16db31fba404441bc36b075e2197944a699c436ed60ebb8
diff --git a/app-emulation/dxvk/dxvk-2.5.1.ebuild b/app-emulation/dxvk/dxvk-2.5.1.ebuild
index 56cafa91a05c..ae26f5d047a0 100644
--- a/app-emulation/dxvk/dxvk-2.5.1.ebuild
+++ b/app-emulation/dxvk/dxvk-2.5.1.ebuild
@@ -29,7 +29,7 @@ else
 			-> vulkan-headers-${HASH_VULKAN}.tar.gz
 		https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/${HASH_DISPLAYINFO}/libdisplay-info-${HASH_DISPLAYINFO}.tar.bz2
 	"
-	KEYWORDS="-* ~amd64 ~x86"
+	KEYWORDS="-* amd64 x86"
 fi
 
 DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine"
diff --git a/app-emulation/dxvk/dxvk-2.5.ebuild b/app-emulation/dxvk/dxvk-2.5.ebuild
deleted file mode 100644
index 56cafa91a05c..000000000000
--- a/app-emulation/dxvk/dxvk-2.5.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-MULTILIB_ABIS="amd64 x86" # allow usage on /no-multilib/
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit flag-o-matic meson-multilib python-any-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	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}
-		subprojects/libdisplay-info
-	)
-else
-	HASH_SPIRV=8b246ff75c6615ba4532fe4fde20f1be090c3764
-	HASH_VULKAN=46dc0f6e514f5730784bb2cac2a7c731636839e8
-	HASH_DISPLAYINFO=275e6459c7ab1ddd4b125f28d0440716e4888078
-	SRC_URI="
-		https://github.com/doitsujin/dxvk/archive/refs/tags/v${PV}.tar.gz
-			-> ${P}.tar.gz
-		https://github.com/KhronosGroup/SPIRV-Headers/archive/${HASH_SPIRV}.tar.gz
-			-> spirv-headers-${HASH_SPIRV}.tar.gz
-		https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
-			-> vulkan-headers-${HASH_VULKAN}.tar.gz
-		https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/${HASH_DISPLAYINFO}/libdisplay-info-${HASH_DISPLAYINFO}.tar.bz2
-	"
-	KEYWORDS="-* ~amd64 ~x86"
-fi
-
-DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux / Wine"
-HOMEPAGE="https://github.com/doitsujin/dxvk/"
-
-# setup_dxvk.sh is no longer provided, fetch old until a better solution
-SRC_URI+=" https://raw.githubusercontent.com/doitsujin/dxvk/cd21cd7fa3b0df3e0819e21ca700b7627a838d69/setup_dxvk.sh"
-
-LICENSE="ZLIB Apache-2.0 MIT"
-SLOT="0"
-IUSE="+abi_x86_32 crossdev-mingw +d3d8 +d3d9 +d3d10 +d3d11 +dxgi +strip"
-REQUIRED_USE="
-	|| ( d3d8 d3d9 d3d10 d3d11 dxgi )
-	d3d8? ( d3d9 )
-	d3d10? ( d3d11 )
-	d3d11? ( dxgi )
-"
-
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-util/glslang
-	!crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.10.3-wow64-setup.patch
-	"${FILESDIR}"/${PN}-2.4-d3d8-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 set 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 set but ${tool} does not use POSIX threads"
-			fi
-		done
-	fi
-}
-
-src_prepare() {
-	if [[ ${PV} != 9999 ]]; then
-		rmdir include/{spirv,vulkan} subprojects/libdisplay-info || die
-		mv ../SPIRV-Headers-${HASH_SPIRV} include/spirv || die
-		mv ../Vulkan-Headers-${HASH_VULKAN} include/vulkan || die
-		mv ../libdisplay-info-${HASH_DISPLAYINFO} subprojects/libdisplay-info || die
-	fi
-	cp -- "${DISTDIR}"/setup_dxvk.sh . || die
-
-	default
-
-	sed -i "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" setup_dxvk.sh || die
-}
-
-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 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
-			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 RC STRIP
-
-	local emesonargs=(
-		--prefix="${EPREFIX}"/usr/lib/${PN}
-		--{bin,lib}dir=x${MULTILIB_ABI_FLAG: -2}
-		--force-fallback-for=libdisplay-info # system's is ELF (unusable)
-		$(meson_use {,enable_}d3d8)
-		$(meson_use {,enable_}d3d9)
-		$(meson_use {,enable_}d3d10)
-		$(meson_use {,enable_}d3d11)
-		$(meson_use {,enable_}dxgi)
-		$(usev strip --strip) # portage won't strip .dll, so allow it here
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install_all() {
-	dobin setup_dxvk.sh
-	dodoc README.md dxvk.conf
-
-	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_dxvk.sh install --symlink"
-		elog
-		elog "See ${EROOT}/usr/share/doc/${PF}/README.md* for details."
-		elog "Note: setup_dxvk.sh is unofficially temporarily provided as it was"
-		elog "removed upstream, handling may change in the future."
-	fi
-
-	if use d3d8 && [[ ${REPLACING_VERSIONS##* } ]] &&
-		ver_test ${REPLACING_VERSIONS##* } -lt 2.4
-	then
-		elog
-		elog ">=${PN}-2.4 now provides d3d8.dll, to make use of it will need to"
-		elog "update old wine prefixes which is typically done by re-running:"
-		elog
-		elog "	WINEPREFIX=/path/to/prefix setup_dxvk.sh install --symlink"
-		elog
-	fi
-}