From 1bc9c3b9d5a8c51b67f6ea2f57bdd76ff5073097 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 28 Sep 2022 03:11:19 +0100 Subject: gentoo auto-resync : 28:09:2022 - 03:11:19 --- app-emulation/Manifest.gz | Bin 15122 -> 15123 bytes app-emulation/diskimage-builder/Manifest | 2 +- .../diskimage-builder-3.24.0.ebuild | 2 +- app-emulation/dxvk/Manifest | 4 - app-emulation/dxvk/dxvk-1.10.1.ebuild | 138 --------------------- app-emulation/dxvk/dxvk-1.10.2.ebuild | 138 --------------------- 6 files changed, 2 insertions(+), 282 deletions(-) delete mode 100644 app-emulation/dxvk/dxvk-1.10.1.ebuild delete mode 100644 app-emulation/dxvk/dxvk-1.10.2.ebuild (limited to 'app-emulation') diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz index 5c3c5a73d022..30b6c47e3e1a 100644 Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest index b70089f770f9..b70928d42a58 100644 --- a/app-emulation/diskimage-builder/Manifest +++ b/app-emulation/diskimage-builder/Manifest @@ -6,7 +6,7 @@ DIST diskimage-builder-3.25.0.tar.gz 512950 BLAKE2B 3a0c5658df5bc2498d4656b77c15 EBUILD diskimage-builder-3.22.0.ebuild 1125 BLAKE2B b5b02482c52973b097fdf950698eb378b83611f492984a74279cbbb98813609e35a5e12b40097edd4b6cc1c4a1897dd4a98fc6a7711d6a99f53929c7d9b0b367 SHA512 4c3f1304f9a46751225ad7a52972b8ddd7fc14cdc3db144401efc682e18f38a46f3df7d009181a2663525d3d37019323b6367bee1efaf53e8afa64791dbcae2c EBUILD diskimage-builder-3.23.0.ebuild 1125 BLAKE2B b5b02482c52973b097fdf950698eb378b83611f492984a74279cbbb98813609e35a5e12b40097edd4b6cc1c4a1897dd4a98fc6a7711d6a99f53929c7d9b0b367 SHA512 4c3f1304f9a46751225ad7a52972b8ddd7fc14cdc3db144401efc682e18f38a46f3df7d009181a2663525d3d37019323b6367bee1efaf53e8afa64791dbcae2c EBUILD diskimage-builder-3.23.1.ebuild 1125 BLAKE2B b5b02482c52973b097fdf950698eb378b83611f492984a74279cbbb98813609e35a5e12b40097edd4b6cc1c4a1897dd4a98fc6a7711d6a99f53929c7d9b0b367 SHA512 4c3f1304f9a46751225ad7a52972b8ddd7fc14cdc3db144401efc682e18f38a46f3df7d009181a2663525d3d37019323b6367bee1efaf53e8afa64791dbcae2c -EBUILD diskimage-builder-3.24.0.ebuild 1127 BLAKE2B 2e88a8f48768c430230b9c77ff27d9c02d76e899d898f37b74d2eff07e7ff2e32f588eb030194cd014f7aa13649d0c333d3f0a717bfbe781da71667410327b66 SHA512 32e9efc9f35f3a3c72075a24332f93596fbf6ca9b924cc857bd3d5b6e6001a1a44ff06f00fb0e32ba2c9fa81caa174c11b37f27296dd279631fc58ecb63913d4 +EBUILD diskimage-builder-3.24.0.ebuild 1125 BLAKE2B b5b02482c52973b097fdf950698eb378b83611f492984a74279cbbb98813609e35a5e12b40097edd4b6cc1c4a1897dd4a98fc6a7711d6a99f53929c7d9b0b367 SHA512 4c3f1304f9a46751225ad7a52972b8ddd7fc14cdc3db144401efc682e18f38a46f3df7d009181a2663525d3d37019323b6367bee1efaf53e8afa64791dbcae2c EBUILD diskimage-builder-3.25.0.ebuild 1127 BLAKE2B 2e88a8f48768c430230b9c77ff27d9c02d76e899d898f37b74d2eff07e7ff2e32f588eb030194cd014f7aa13649d0c333d3f0a717bfbe781da71667410327b66 SHA512 32e9efc9f35f3a3c72075a24332f93596fbf6ca9b924cc857bd3d5b6e6001a1a44ff06f00fb0e32ba2c9fa81caa174c11b37f27296dd279631fc58ecb63913d4 EBUILD diskimage-builder-9999.ebuild 1127 BLAKE2B 2e88a8f48768c430230b9c77ff27d9c02d76e899d898f37b74d2eff07e7ff2e32f588eb030194cd014f7aa13649d0c333d3f0a717bfbe781da71667410327b66 SHA512 32e9efc9f35f3a3c72075a24332f93596fbf6ca9b924cc857bd3d5b6e6001a1a44ff06f00fb0e32ba2c9fa81caa174c11b37f27296dd279631fc58ecb63913d4 MISC metadata.xml 719 BLAKE2B 872a4d37e8ddb2a28eb85d18cd88990934327bc23194f3be9e5dea03627a6169987b246a93b50754cbe5e331f8c854a808bf307b70521c481d83b846f7385606 SHA512 d151fd95659211b2057ef0a61a6020e2f9efebebf3d7c5e1392ddb9954e3627e1040f2a9fe84ea4caeb65a745411fefebf2d896bbddbe0ddbb56acf42d2fedc3 diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.24.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.24.0.ebuild index bbd75fbe73fb..cfd2e2377172 100644 --- a/app-emulation/diskimage-builder/diskimage-builder-3.24.0.ebuild +++ b/app-emulation/diskimage-builder/diskimage-builder-3.24.0.ebuild @@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git" else SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux" fi LICENSE="Apache-2.0" diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest index 172760ca13f4..92b7d74e798e 100644 --- a/app-emulation/dxvk/Manifest +++ b/app-emulation/dxvk/Manifest @@ -1,8 +1,4 @@ -DIST dxvk-1.10.1.tar.gz 1188138 BLAKE2B e4c5c5052de3f0976581317b9e6de148735198d2545e961ed4540be8660fbba0bcd30f81a1b55f032a1e00e226993d1ab3e4017b104f2829bf37d2ee4fc4420a SHA512 8fd34d9f14a7013cdc1957f63bf60feb19748fddc1cd6ec40cf271005f636de62965efb42ddf2598dad3e37a4f59a870bf769387b2534db93451d1ea6aa65410 -DIST dxvk-1.10.2.tar.gz 1199562 BLAKE2B 8605d80de3640845589727999da8d19f235eafd52dc693ddfc6a6c54da4525ab5a1418694767395e37cfd84ab55bfd33867cd8608ff2e34965759f68832f55ee SHA512 2a68ececd405e38b6a463637f98c871e53f83c0b232bbf45f08b6b2cac01637eecea90f9337d8ebc600e174a65fe2b10236b1b29afdbd0ad0a9d970a050678a4 DIST dxvk-1.10.3.tar.gz 1204407 BLAKE2B 3507ffe4abf9c45f2a138b05e7cf706322a6bf3d2e9ae86a9d6216b206c09f79eac696ee7dfe33d0bef55e727f51301c36eb89bfa3b3f429d7d5fafc1eebdcb4 SHA512 8995b231b3f3650beda04c01f30186d10a373075a4774b4ecbfb3bbeb4de99c57555f1db0611e5c61c6a411a7215e0faf228f9861f6b7adae6fc365e8056f7e3 -EBUILD dxvk-1.10.1.ebuild 4450 BLAKE2B d59f8e161ac302acf26507b78c072fdf16b08dc2784dca0c56a3a5fc2bfbf4fd27916da647465201522c984ce817779f7826f298a5bce89474f9283272771eaa SHA512 e5d017f0d31577c0865ee2dcebbd1508e696662b9b6c70c94bfd685ce3adbee45e5222f9f0ac19c7c45bf85a8772c60f94e64605215ab674db9accf27594c7df -EBUILD dxvk-1.10.2.ebuild 4450 BLAKE2B d59f8e161ac302acf26507b78c072fdf16b08dc2784dca0c56a3a5fc2bfbf4fd27916da647465201522c984ce817779f7826f298a5bce89474f9283272771eaa SHA512 e5d017f0d31577c0865ee2dcebbd1508e696662b9b6c70c94bfd685ce3adbee45e5222f9f0ac19c7c45bf85a8772c60f94e64605215ab674db9accf27594c7df EBUILD dxvk-1.10.3.ebuild 4450 BLAKE2B d59f8e161ac302acf26507b78c072fdf16b08dc2784dca0c56a3a5fc2bfbf4fd27916da647465201522c984ce817779f7826f298a5bce89474f9283272771eaa SHA512 e5d017f0d31577c0865ee2dcebbd1508e696662b9b6c70c94bfd685ce3adbee45e5222f9f0ac19c7c45bf85a8772c60f94e64605215ab674db9accf27594c7df EBUILD dxvk-9999.ebuild 4376 BLAKE2B 214c7da950a61ecfa8d16b8949fa52e45f7fa75bc1a51084baa860d9351ae8d0b6aa61d8f143ab1796c50f9db1783184d89e7779bb4b1e19e5910c38ca6e1a48 SHA512 871c3c6ee2c11ff3180808d844628e16e9b1b346be30e79be5de985cb18ca258f91912e17c0552f3fdb5dc53274bc2ea20afc3db79df6eb1c68d9fb7f6314c78 MISC metadata.xml 818 BLAKE2B 88081c074b99329c925174de4b7ff9b2c220ffc67eb64a5324f4eaf2a35f98f06c9978ddc0e929ba76b341a389a8eff025b7aa0a2414e3f7ae496c44a023c65c SHA512 90d76ac3df3abe003371cd25b9cf0e6570a53b371349fb2e048cae1818e51f0482e17b3d5490eb82c57d891bb43c4a7cd41530101b888591719c33c566788e3b diff --git a/app-emulation/dxvk/dxvk-1.10.1.ebuild b/app-emulation/dxvk/dxvk-1.10.1.ebuild deleted file mode 100644 index 396ea6f4c2e6..000000000000 --- a/app-emulation/dxvk/dxvk-1.10.1.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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" -else - SRC_URI="https://github.com/doitsujin/dxvk/archive/refs/tags/v${PV}.tar.gz -> ${P}.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" -SLOT="0" -IUSE="+abi_x86_32 crossdev-mingw +d3d9 +d3d10 +d3d11 debug +dxgi" -REQUIRED_USE=" - || ( d3d9 d3d10 d3d11 dxgi ) - d3d10? ( d3d11 ) - dxgi? ( d3d11 )" - -BDEPEND=" - dev-util/glslang - !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )" - -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() { - 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} - - # AVX has a history of causing issues with this package, disable for safety - # https://github.com/Tk-Glitch/PKGBUILDS/issues/515 - append-flags -mno-avx - - if [[ ${CHOST} != *-mingw* ]]; then - if [[ ! -v MINGW_BYPASS ]]; then - unset AR CC CXX RC STRIP - filter-flags '-fstack-protector*' #870136 - filter-flags '-fuse-ld=*' - 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 - -Denable_tests=false # needs wine/vulkan and is intended for manual use - ) - - 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 - - # don't try to keep wine-*[vulkan] in RDEPEND, but still give a warning - local wine - for wine in app-emulation/wine-{vanilla,staging}; do - has_version ${wine} && ! has_version ${wine}[vulkan] && - ewarn "${wine} was not built with USE=vulkan, ${PN} will not be usable with it" - done -} diff --git a/app-emulation/dxvk/dxvk-1.10.2.ebuild b/app-emulation/dxvk/dxvk-1.10.2.ebuild deleted file mode 100644 index 396ea6f4c2e6..000000000000 --- a/app-emulation/dxvk/dxvk-1.10.2.ebuild +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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" -else - SRC_URI="https://github.com/doitsujin/dxvk/archive/refs/tags/v${PV}.tar.gz -> ${P}.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" -SLOT="0" -IUSE="+abi_x86_32 crossdev-mingw +d3d9 +d3d10 +d3d11 debug +dxgi" -REQUIRED_USE=" - || ( d3d9 d3d10 d3d11 dxgi ) - d3d10? ( d3d11 ) - dxgi? ( d3d11 )" - -BDEPEND=" - dev-util/glslang - !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] )" - -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() { - 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} - - # AVX has a history of causing issues with this package, disable for safety - # https://github.com/Tk-Glitch/PKGBUILDS/issues/515 - append-flags -mno-avx - - if [[ ${CHOST} != *-mingw* ]]; then - if [[ ! -v MINGW_BYPASS ]]; then - unset AR CC CXX RC STRIP - filter-flags '-fstack-protector*' #870136 - filter-flags '-fuse-ld=*' - 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 - -Denable_tests=false # needs wine/vulkan and is intended for manual use - ) - - 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 - - # don't try to keep wine-*[vulkan] in RDEPEND, but still give a warning - local wine - for wine in app-emulation/wine-{vanilla,staging}; do - has_version ${wine} && ! has_version ${wine}[vulkan] && - ewarn "${wine} was not built with USE=vulkan, ${PN} will not be usable with it" - done -} -- cgit v1.2.3