From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B50CB15813A for ; Mon, 20 Jan 2025 08:28:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6BF7BE07D4; Mon, 20 Jan 2025 08:28:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BFB52E07D8 for ; Mon, 20 Jan 2025 08:28:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 77E3134120D for ; Mon, 20 Jan 2025 08:28:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB6E82532 for ; Mon, 20 Jan 2025 08:28:49 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1737361669.807710c480fc77ca494fc0166915521e7ded35c5.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/dxvk/, app-emulation/dxvk/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/dxvk/Manifest app-emulation/dxvk/dxvk-1.10.3-r1.ebuild app-emulation/dxvk/files/dxvk-1.10.3-gcc13.patch X-VCS-Directories: app-emulation/dxvk/files/ app-emulation/dxvk/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 807710c480fc77ca494fc0166915521e7ded35c5 X-VCS-Branch: master Date: Mon, 20 Jan 2025 08:28:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 70741028-4481-4aa4-af58-15f196199512 X-Archives-Hash: f2ba8c8165e16c504b0ef6f2114e6a30 commit: 807710c480fc77ca494fc0166915521e7ded35c5 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Jan 20 08:21:52 2025 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Mon Jan 20 08:27:49 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=807710c4 app-emulation/dxvk: drop 1.10.3-r1 Kept this version for longer due to being the last version to support legacy nvidia-drivers and older wine (plus being the last of the 1.x in case 2.x introduced regressions), but if it fails to build then that's about as far as it goes given won't patch this further. If really need it, I'd suggest using winetricks to install prebuilts. Closes: https://bugs.gentoo.org/948435 Signed-off-by: Ionen Wolkens gentoo.org> app-emulation/dxvk/Manifest | 1 - app-emulation/dxvk/dxvk-1.10.3-r1.ebuild | 152 ----------------------- app-emulation/dxvk/files/dxvk-1.10.3-gcc13.patch | 17 --- 3 files changed, 170 deletions(-) diff --git a/app-emulation/dxvk/Manifest b/app-emulation/dxvk/Manifest index 22d48b9c16df..4ebecac30979 100644 --- a/app-emulation/dxvk/Manifest +++ b/app-emulation/dxvk/Manifest @@ -1,4 +1,3 @@ -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.2.tar.gz 1135676 BLAKE2B 4f0f030867365e75ec4fdc56fcbbaba26393ed4beb2fb34c351457fe4a23c2e1d9c50f96370112ac4eb98af86e833788f9b075ca399915e37b87a27591d9847a SHA512 b7ee35911c777e27a56aa3b43c26acec14a03531a39f9c465460011d0f2f0c3ee43d09095fbaa8890beae37dcb48520fe232def79279d6a11d0295224b60ce5f diff --git a/app-emulation/dxvk/dxvk-1.10.3-r1.ebuild b/app-emulation/dxvk/dxvk-1.10.3-r1.ebuild deleted file mode 100644 index 701ccb453a83..000000000000 --- a/app-emulation/dxvk/dxvk-1.10.3-r1.ebuild +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 2022-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# note: version <2.0 should be kept for longer given it's the -# last version to support /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} - - # 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} - $(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 -} diff --git a/app-emulation/dxvk/files/dxvk-1.10.3-gcc13.patch b/app-emulation/dxvk/files/dxvk-1.10.3-gcc13.patch deleted file mode 100644 index 580e412fcd6e..000000000000 --- a/app-emulation/dxvk/files/dxvk-1.10.3-gcc13.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://github.com/doitsujin/dxvk/commit/1a5afc77b1859e6c7e31b55e11ece899e3b5295a ---- a/src/util/config/config.h -+++ b/src/util/config/config.h -@@ -1,4 +1,5 @@ - #pragma once - -+#include - #include - #include ---- a/src/util/util_bit.h -+++ b/src/util/util_bit.h -@@ -17,4 +17,5 @@ - #include "util_math.h" - -+#include - #include - #include