commit: 8fd8356428493b8150e5df5e0559d762d674370f
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 4 15:21:25 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Nov 4 16:13:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fd83564
app-emulation/dxvk: drop 2.4
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-emulation/dxvk/Manifest | 1 -
app-emulation/dxvk/dxvk-2.4.ebuild | 182 -------------------------------------
2 files changed, 183 deletions(-)
diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index 9a3acfc9e0d4..d3baba27762b 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -1,7 +1,6 @@
DIST dxvk-1.10.3.tar.gz 1204407 BLAKE2B
3507ffe4abf9c45f2a138b05e7cf706322a6bf3d2e9ae86a9d6216b206c09f79eac696ee7dfe33d0bef55e727f51301c36eb89bfa3b3f429d7d5fafc1eebdcb4
SHA512
8995b231b3f3650beda04c01f30186d10a373075a4774b4ecbfb3bbeb4de99c57555f1db0611e5c61c6a411a7215e0faf228f9861f6b7adae6fc365e8056f7e3
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.4.tar.gz 1052380 BLAKE2B
d27795747c313dd93a399b82a78bb8349efcac91df9b138f1349ad9e030450980f1ce57f2b912cb13913a9b52f380967e05aab05c92071c0ceea5ab850aba479
SHA512
2db5a9a0c0a47e1db33cc938ecae40f1f24b60cfa1cc381ebab96aa0a2b4d9574947ed0c90a28fda15fe6fa1cbb560559f11b2f5c116e579fe7b9ff41c2f0f78
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
diff --git a/app-emulation/dxvk/dxvk-2.4.ebuild
b/app-emulation/dxvk/dxvk-2.4.ebuild
deleted file mode 100644
index c9d781e59ece..000000000000
--- a/app-emulation/dxvk/dxvk-2.4.ebuild
+++ /dev/null
@@ -1,182 +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.3.1-gcc14.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
-}
