diff options
Diffstat (limited to 'app-emulation')
-rw-r--r-- | app-emulation/Manifest.gz | bin | 15484 -> 15486 bytes | |||
-rw-r--r-- | app-emulation/cloud-init/Manifest | 6 | ||||
-rw-r--r-- | app-emulation/cloud-init/cloud-init-23.4.ebuild | 2 | ||||
-rw-r--r-- | app-emulation/cloud-init/cloud-init-24.2.ebuild | 2 | ||||
-rw-r--r-- | app-emulation/cloud-init/cloud-init-9999.ebuild | 2 | ||||
-rw-r--r-- | app-emulation/dxvk/Manifest | 4 | ||||
-rw-r--r-- | app-emulation/dxvk/dxvk-2.5.ebuild | 181 | ||||
-rw-r--r-- | app-emulation/dxvk/dxvk-9999.ebuild | 1 |
8 files changed, 190 insertions, 8 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz Binary files differindex b76ed2729589..4b2a20d24cac 100644 --- a/app-emulation/Manifest.gz +++ b/app-emulation/Manifest.gz diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest index e761a12eb4f7..e223de7b4d96 100644 --- a/app-emulation/cloud-init/Manifest +++ b/app-emulation/cloud-init/Manifest @@ -1,6 +1,6 @@ DIST cloud-init-23.4.tar.gz 1648908 BLAKE2B 0acec9c437c7a5a86ed9cd8718830a7311c257ae9f223a68959b8d1eccc693b35f6a716de5c04112d848c1e2e54f6461a3919fd733debba18989145f6669d359 SHA512 34966b173571764bf83779bef0e89a86971310ff0fa62feceef4fbe17c9fa6d1b69f11f57caaa32cc4ae4a74f598f157dfb3ce356221044666401230cfb1ad13 DIST cloud-init-24.2.tar.gz 1786275 BLAKE2B 21f5209a77ef401d12271f6ea695d84065b22f40b7273dd8709dee5fadc7038a0f59a9a3dd53b73812a44a603b5cdc7fb36b71fcdb1f2d4295d87d2cc6069fcd SHA512 72de351b3e978e01a4695b58987d942cc1b2faee749ac0df2024a839e0e1539c9b1f0a9e5cf1930e33c36344d152b7580cfe2dd55f95ad4f669df9b4dda4648d -EBUILD cloud-init-23.4.ebuild 2361 BLAKE2B b47b60fbe5091c053e066276edbc3757d1f205f9f1faed0e2d84ad5bf6840228cd8bd1347295e4fe112df637e13d346da2f8eb48a92c8dae7f5e7f97722413d1 SHA512 97817f130f6a0a70a37bba32ef6ee140e03a20b32553557294b12fe2cc0dc5cb794fe362bb31ea7c7c868a9ede49fa9e8394d3789fe9abe4fe34f08141d0e463 -EBUILD cloud-init-24.2.ebuild 2500 BLAKE2B 58933411544e9ea1abc86c81093f65849db7c148ac8599df9fcd6097e938a7b33ba2c5e74d364b6e78ea9a05afb9d5369b43eaac2f7c27727e2e74be60153843 SHA512 7d106c6c0314683695f2b3595a2e48ed3ce2ca0b1efcbb726a68fbf70b25a04ec1f8a360770e2f8817954aed7c0531664b42977221f4b98d6e8ec14eabc61b70 -EBUILD cloud-init-9999.ebuild 2504 BLAKE2B 4e5cba9d0afd93b1d1c526d976733275409c9df98d45b90b8cc45d128b4d09446fc45504a1d971b95da3f8f96ca47254d16c127d0e648d5e68f1118131f7894d SHA512 b38da5863da360dd75e94c7e058323dbc1f263a4c71db74a94c662294fb2baa85fcaa1a418aaa9e5d005b0c261f1350d7362c2869fa42018de8cfc35a32b4c95 +EBUILD cloud-init-23.4.ebuild 2362 BLAKE2B 0ad4cd3a7ff10f1eb4c8ba8a904f8b1c26a65019c01419a8154a3e15069ae7d52e0228246a13d26d134f359fac0b72b7205b17042a20e43a410fa1a6c2d94713 SHA512 a9aaddc3e11e999e4be33c312d42bd117f2ac99883695959e58dec174c3dfec435c5e722e5384c48d1baf6934dbecb498f142adc9404c7d482aa4c9c111dc1db +EBUILD cloud-init-24.2.ebuild 2501 BLAKE2B f54a3b02b334e2470ca858065c0ec484c69845db2361e888523e3d45685d3999f4f2e682f9e1eb9f5efe1b666ba813e949ac07aacf08a78442090fc0ae4f8b8f SHA512 bcecb78eefe8e70b93f2915501306a5f98129d43a7550ed15378bf0243e378ebbf72bbb6fcdd6b98d1c5d3fc675c5b417d9bdbf4e00bfa07c387343f3afddb22 +EBUILD cloud-init-9999.ebuild 2505 BLAKE2B e375f990cd74e143a0189a8d07bf872e730d1cd70d2ccf0c39a049a61457c15f05a9f820dc413d92ebf94634cf99b7e1d826fdfe832d1c9c0c6bed063437cb46 SHA512 41d723eea3539e1428b33571b0b9b7c88779a87f8614f0c8bd303cc240e19d12032dcbbcbaa576f6cf7a60d7b668f2aec556435d7a282e258691a2e9e86df6f1 MISC metadata.xml 714 BLAKE2B 22888016216cea9e471f7cef63e94022c344961263a3319508d5b23db64eeaaeb34a470fc51482bf7a0a4cb658dd814f5655393ee4498a7212ccec28caee5256 SHA512 3bd7be60f29d5a1e4a830577c0afc8c5925123f1258a78b82dbc36c8f76f096149db8bcebfaf3b6db5feeab0bc82ccb65d7d71ec12feb4f56027f05eeb930401 diff --git a/app-emulation/cloud-init/cloud-init-23.4.ebuild b/app-emulation/cloud-init/cloud-init-23.4.ebuild index 2e3478cac607..7c57b58c388c 100644 --- a/app-emulation/cloud-init/cloud-init-23.4.ebuild +++ b/app-emulation/cloud-init/cloud-init-23.4.ebuild @@ -27,7 +27,7 @@ IUSE="selinux test" RESTRICT="!test? ( test )" CDEPEND=" - dev-python/jinja[${PYTHON_USEDEP}] + dev-python/jinja2[${PYTHON_USEDEP}] dev-python/oauthlib[${PYTHON_USEDEP}] dev-python/pyserial[${PYTHON_USEDEP}] >=dev-python/configobj-5.0.2[${PYTHON_USEDEP}] diff --git a/app-emulation/cloud-init/cloud-init-24.2.ebuild b/app-emulation/cloud-init/cloud-init-24.2.ebuild index 19c1f231b500..8af6d1682ee4 100644 --- a/app-emulation/cloud-init/cloud-init-24.2.ebuild +++ b/app-emulation/cloud-init/cloud-init-24.2.ebuild @@ -26,7 +26,7 @@ SLOT="0" IUSE="selinux" CDEPEND=" - dev-python/jinja[${PYTHON_USEDEP}] + dev-python/jinja2[${PYTHON_USEDEP}] dev-python/oauthlib[${PYTHON_USEDEP}] dev-python/pyserial[${PYTHON_USEDEP}] >=dev-python/configobj-5.0.2[${PYTHON_USEDEP}] diff --git a/app-emulation/cloud-init/cloud-init-9999.ebuild b/app-emulation/cloud-init/cloud-init-9999.ebuild index d7382c6e463e..b03da2ebc190 100644 --- a/app-emulation/cloud-init/cloud-init-9999.ebuild +++ b/app-emulation/cloud-init/cloud-init-9999.ebuild @@ -26,7 +26,7 @@ SLOT="0" IUSE="selinux" CDEPEND=" - dev-python/jinja[${PYTHON_USEDEP}] + dev-python/jinja2[${PYTHON_USEDEP}] dev-python/oauthlib[${PYTHON_USEDEP}] dev-python/pyserial[${PYTHON_USEDEP}] >=dev-python/configobj-5.0.2[${PYTHON_USEDEP}] diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest index e004f51017e0..504caba587f2 100644 --- a/app-emulation/dxvk/Manifest +++ b/app-emulation/dxvk/Manifest @@ -5,6 +5,7 @@ AUX dxvk-2.4-d3d8-setup.patch 220 BLAKE2B 7f21542907d02e2924595aaff3270988214913 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.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 @@ -12,5 +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-9999.ebuild 5986 BLAKE2B c34bad89ec8e21732e8f618821ef25ca3dc454eaa5ae4f4e173052ad422c82258883ffa1e3d4ff5a6ff3630eb52eced2fef6e577ccb9ea2fa6793ac31e99f5f6 SHA512 674a028571ed3ea6fdd49d0fa2775ebd40e3d9f42a1ba369911f8fed252bebd40d73e3ea98670fab8801c88b3addcb5bcd9910f02d1be60f07af91d12e89d1ee +EBUILD dxvk-2.5.ebuild 6067 BLAKE2B 825fee4c6315f0341c220c14fed9d241e45d8dca5177ece87ba1369c3893fb20ab28da587603c72e20cb52ff1c1b0072162b0f24170e6632054f9cd9bddb2064 SHA512 2b1185990a72d895d7f7600078a70b8905d856ba34a851ca687764deb2b583c86da96b3035ba6e0c185a0f832135d79afcd5f3c779284795e427165c9128b62a +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.ebuild b/app-emulation/dxvk/dxvk-2.5.ebuild new file mode 100644 index 000000000000..56cafa91a05c --- /dev/null +++ b/app-emulation/dxvk/dxvk-2.5.ebuild @@ -0,0 +1,181 @@ +# 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 +} diff --git a/app-emulation/dxvk/dxvk-9999.ebuild b/app-emulation/dxvk/dxvk-9999.ebuild index 9fe577d2f13b..94500fcb99b0 100644 --- a/app-emulation/dxvk/dxvk-9999.ebuild +++ b/app-emulation/dxvk/dxvk-9999.ebuild @@ -56,7 +56,6 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-1.10.3-wow64-setup.patch - "${FILESDIR}"/${PN}-2.3.1-gcc14.patch "${FILESDIR}"/${PN}-2.4-d3d8-setup.patch ) |