commit: 6a0b608659841f6cf5f825328678fca657b49d49
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 15 19:51:22 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Aug 15 20:14:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a0b6086
app-emulation/dxvk: drop 2.0, 2.1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-emulation/dxvk/Manifest | 2 -
app-emulation/dxvk/dxvk-2.0.ebuild | 171 -----------------------------------
app-emulation/dxvk/dxvk-2.1.ebuild | 181 -------------------------------------
3 files changed, 354 deletions(-)
diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest
index 020ee9e0699f..f3968536f4d4 100644
--- a/app-emulation/dxvk/Manifest
+++ b/app-emulation/dxvk/Manifest
@@ -1,6 +1,4 @@
DIST dxvk-1.10.3.tar.gz 1204407 BLAKE2B
3507ffe4abf9c45f2a138b05e7cf706322a6bf3d2e9ae86a9d6216b206c09f79eac696ee7dfe33d0bef55e727f51301c36eb89bfa3b3f429d7d5fafc1eebdcb4
SHA512
8995b231b3f3650beda04c01f30186d10a373075a4774b4ecbfb3bbeb4de99c57555f1db0611e5c61c6a411a7215e0faf228f9861f6b7adae6fc365e8056f7e3
-DIST dxvk-2.0.tar.gz 943397 BLAKE2B
7d59050e8ac3f9be311d11323cc0057d84c3b730360fe9e064ff4a5e2db5bffea5bae3214da366c60295ec5f1577ab08e2776274c9aaff7a7de1b9f2cefa836a
SHA512
98537bdec2b5e4f2ead5b93ab49db717e0706fe771a82a6ef1e5b5792c1bdd3f417cd6b6b2deadb1397b8a0740445fa88b9fb6c1f73510cc5c0e7ae35d65bcac
-DIST dxvk-2.1.tar.gz 960078 BLAKE2B
ad8ea7eb000237914d9116a8fbfde13fde3dc00d428ebfe41aacb9373c6509112545ef1942b4cbc96a18338c3d07c2c494d0454236721e220ee5f5731a5c27b9
SHA512
10d919ba2612f665a20f7c72605967adeea94d8414bee45878f9df42ad263fa5ebfc7a76319173dce054ffe9b9cdc919ff7a136042f3f4e64142844c943bdef7
DIST dxvk-2.2.tar.gz 976671 BLAKE2B
537fb8d8adb69562f8e759c6f68e5ed38a62e6ebcf05d7ed1ea32fef518af30cd53d3ffec0e3dba175d449d80de980585f91bfcf8c3904a08385b17b55b9b63b
SHA512
02d066093855c3ecae7123fcaeaa32212e03fcda9556c5b70ff23eadc07240199003b8e4673f5b492487fa6e240d70a36f5b4e60b0f389f422cf4474b7197e2f
DIST dxvk-libdisplay-info-d39344f466.tar.bz2 81232 BLAKE2B
af76ccd3c40bc953008bc30d222c72f90bdc77f47f767b6e7423efaa0ec89d746396a755160b5470e219a15a0aa392be6066aab12921b45a1adb35d88132cd97
SHA512
79b4bf325cefc39bc587233bd82ff64c927ca5f829b8172d213c3d47af725c8dc7fe33576a8e96a869075ee2a8f00d165f3aa9e6c472e862a47e5c800b2b3315
DIST dxvk-spirv-headers-0bcc624926.tar.gz 437771 BLAKE2B
08815e36ad99b84777e38ad0c5616b6608a552f993e7f67433f2b8e20de81e9bce41420ac5998f5b67bca70a92ce70aed91b238990bd431c7b97070dfb0c5a60
SHA512
5995cf75d5605d41e9643bca81c195ef5aaa17d596e0282807f6fa8f8c494f7b63a41d611c535ae43dc3d609436aabef1e0d89626f37e6f20bad17b5e122e32c
diff --git a/app-emulation/dxvk/dxvk-2.0.ebuild
b/app-emulation/dxvk/dxvk-2.0.ebuild
deleted file mode 100644
index 1790de09e942..000000000000
--- a/app-emulation/dxvk/dxvk-2.0.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 2022-2023 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
-
-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}
- )
-else
- HASH_SPIRV=0bcc624926a25a2a273d07877fd25a6ff5ba1cfb
- HASH_VULKAN=98f440ce6868c94f5ec6e198cc1adda4760e8849
- 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
- -> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz
-
https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
- -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz"
- KEYWORDS="-* amd64 x86"
-fi
-
-DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux /
Wine"
-HOMEPAGE="https://github.com/doitsujin/dxvk/";
-
-LICENSE="ZLIB Apache-2.0 MIT"
-SLOT="0"
-IUSE="+abi_x86_32 crossdev-mingw +d3d9 +d3d10 +d3d11 debug +dxgi"
-REQUIRED_USE="
- || ( d3d9 d3d10 d3d11 dxgi )
- d3d10? ( d3d11 )
- d3d11? ( dxgi )
- dxgi? ( d3d11 )"
-
-BDEPEND="
- dev-util/glslang
- !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.10.3-gcc13.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} || die
- mv ../SPIRV-Headers-${HASH_SPIRV} include/spirv || die
- mv ../Vulkan-Headers-${HASH_VULKAN} include/vulkan || die
- fi
-
- 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}
-
- # -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
- 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 RC
STRIP
-
- local emesonargs=(
- --prefix="${EPREFIX}"/usr/lib/${PN}
- --{bin,lib}dir=x${MULTILIB_ABI_FLAG: -2}
- $(meson_use {,enable_}d3d9)
- $(meson_use {,enable_}d3d10)
- $(meson_use {,enable_}d3d11)
- $(meson_use {,enable_}dxgi)
- $(usev !debug --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_preinst() {
- [[ -e ${EROOT}/usr/$(get_libdir)/dxvk/d3d11.dll ]] && DXVK_HAD_OVERLAY=
-}
-
-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."
- elif [[ -v DXVK_HAD_OVERLAY ]]; then
- # temporary warning until this version is more widely used
- elog "Gentoo's main repo ebuild for ${PN} uses different paths
than most overlays."
- elog "If you were using symbolic links in wine prefixes it may
be necessary to"
- elog "refresh them by re-running the command:"
- elog
- elog " WINEPREFIX=/path/to/prefix setup_dxvk.sh install
--symlink"
- elog
- elog "Also, if you were using /etc/${PN}.conf, ${PN} is no
longer patched to load"
- elog "it. See ${EROOT}/usr/share/doc/${PF}/README.md* for
handling configs."
- fi
-
- if [[ ! ${REPLACING_VERSIONS##* } ]] ||
- ver_test ${REPLACING_VERSIONS##* } -lt 2.0
- then
- elog
- elog ">=${PN}-2.0 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)"
- elog "For details, see:
https://github.com/doitsujin/dxvk/wiki/Driver-support";
- fi
-}
diff --git a/app-emulation/dxvk/dxvk-2.1.ebuild
b/app-emulation/dxvk/dxvk-2.1.ebuild
deleted file mode 100644
index b39f6fe9f3c9..000000000000
--- a/app-emulation/dxvk/dxvk-2.1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-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=0bcc624926a25a2a273d07877fd25a6ff5ba1cfb
- HASH_VULKAN=98f440ce6868c94f5ec6e198cc1adda4760e8849
- HASH_DISPLAYINFO=d39344f466caae0495ebac4d49b03a886d83ba3a
- 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
- -> ${PN}-spirv-headers-${HASH_SPIRV::10}.tar.gz
-
https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz
- -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
-
https://gitlab.freedesktop.org/JoshuaAshton/libdisplay-info/-/archive/${HASH_DISPLAYINFO}/${PN}-libdisplay-info-${HASH_DISPLAYINFO::10}.tar.bz2";
- KEYWORDS="-* amd64 x86"
-fi
-# 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";
-
-DESCRIPTION="Vulkan-based implementation of D3D9, D3D10 and D3D11 for Linux /
Wine"
-HOMEPAGE="https://github.com/doitsujin/dxvk/";
-
-LICENSE="ZLIB Apache-2.0 MIT"
-SLOT="0"
-IUSE="+abi_x86_32 crossdev-mingw +d3d9 +d3d10 +d3d11 debug +dxgi"
-REQUIRED_USE="
- || ( d3d9 d3d10 d3d11 dxgi )
- d3d10? ( d3d11 )
- d3d11? ( dxgi )"
-
-BDEPEND="
- ${PYTHON_DEPS}
- dev-util/glslang
- !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.10.3-gcc13.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
-
- default
-
- sed "/^basedir=/s|=.*|=${EPREFIX}/usr/lib/${PN}|" \
- "${DISTDIR}"/setup_dxvk.sh > setup_dxvk.sh || die
-}
-
-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
- 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 RC
STRIP
-
- local emesonargs=(
- --prefix="${EPREFIX}"/usr/lib/${PN}
- --{bin,lib}dir=x${MULTILIB_ABI_FLAG: -2}
- $(meson_use {,enable_}d3d9)
- $(meson_use {,enable_}d3d10)
- $(meson_use {,enable_}d3d11)
- $(meson_use {,enable_}dxgi)
- $(usev !debug --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_preinst() {
- [[ -e ${EROOT}/usr/$(get_libdir)/dxvk/d3d11.dll ]] && DXVK_HAD_OVERLAY=
-}
-
-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."
- elif [[ -v DXVK_HAD_OVERLAY ]]; then
- # temporary warning until this version is more widely used
- elog "Gentoo's main repo ebuild for ${PN} uses different paths
than most overlays."
- elog "If you were using symbolic links in wine prefixes it may
be necessary to"
- elog "refresh them by re-running the command:"
- elog
- elog " WINEPREFIX=/path/to/prefix setup_dxvk.sh install
--symlink"
- elog
- elog "Also, if you were using /etc/${PN}.conf, ${PN} is no
longer patched to load"
- elog "it. See ${EROOT}/usr/share/doc/${PF}/README.md* for
handling configs."
- fi
-
- if [[ ! ${REPLACING_VERSIONS##* } ]] ||
- ver_test ${REPLACING_VERSIONS##* } -lt 2.0
- then
- elog
- elog ">=${PN}-2.0 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)"
- elog "For details, see:
https://github.com/doitsujin/dxvk/wiki/Driver-support";
- fi
-}
