commit: 4a9e7bad40eaf1a83fa14d1918971ebd841da786 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Mon Aug 28 11:56:46 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Mon Aug 28 12:13:36 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a9e7bad
app-emulation/wine-vanilla: warn if nvidia[abi_x86_32] is missing Hard to know for sure if it's really used or not, but do not want to introduce a kinda no-op VIDEO_CARDS on wine to actually depend on it over a warning. Less of an issue with mesa given other dependencies end up requiring it (technically the dep is wrong given e.g. nvidia would not need mesa[abi_x86_32], but well). (not needed with USE="wow64 -abi_x86_32" for 32bit) Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild | 8 ++++++++ app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild | 8 ++++++++ app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild | 8 ++++++++ app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild | 8 ++++++++ app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild | 8 ++++++++ app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild | 6 ++++++ app-emulation/wine-vanilla/wine-vanilla-8.14.ebuild | 6 ++++++ app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 6 ++++++ 8 files changed, 58 insertions(+) diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild index d8a883dc6e14..a4d883c1152c 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild @@ -346,6 +346,14 @@ src_install() { } pkg_postinst() { + if use abi_x86_32 && { use opengl || use vulkan; } && + has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]' + then + ewarn "x11-drivers/nvidia-drivers is installed but is built without" + ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit" + ewarn "applications under ${PN} will likely not be usable." + fi + eselect wine update --if-unset || die } diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild index ed19030553fe..34e3dca8b9ab 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.1.ebuild @@ -349,6 +349,14 @@ src_install() { } pkg_postinst() { + if use abi_x86_32 && { use opengl || use vulkan; } && + has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]' + then + ewarn "x11-drivers/nvidia-drivers is installed but is built without" + ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit" + ewarn "applications under ${PN} will likely not be usable." + fi + eselect wine update --if-unset || die } diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild index 47bb63ce2f1b..2a0d7605ca0a 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild @@ -353,6 +353,14 @@ src_install() { } pkg_postinst() { + if use abi_x86_32 && { use opengl || use vulkan; } && + has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]' + then + ewarn "x11-drivers/nvidia-drivers is installed but is built without" + ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit" + ewarn "applications under ${PN} will likely not be usable." + fi + eselect wine update --if-unset || die } diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild index 51ab700e53b0..f503ac709925 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.11-r1.ebuild @@ -356,6 +356,14 @@ src_install() { } pkg_postinst() { + if use abi_x86_32 && { use opengl || use vulkan; } && + has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]' + then + ewarn "x11-drivers/nvidia-drivers is installed but is built without" + ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit" + ewarn "applications under ${PN} will likely not be usable." + fi + eselect wine update --if-unset || die } diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild index 51ab700e53b0..f503ac709925 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.12.ebuild @@ -356,6 +356,14 @@ src_install() { } pkg_postinst() { + if use abi_x86_32 && { use opengl || use vulkan; } && + has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]' + then + ewarn "x11-drivers/nvidia-drivers is installed but is built without" + ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit" + ewarn "applications under ${PN} will likely not be usable." + fi + eselect wine update --if-unset || die } diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild index 1aaebe5aa269..a3fad03a1c4d 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.13.ebuild @@ -402,6 +402,12 @@ pkg_postinst() { ewarn "work, be warned that it is not unusual that installers or other helpers" ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32," ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib." + elif use abi_x86_32 && { use opengl || use vulkan; } && + has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]' + then + ewarn "x11-drivers/nvidia-drivers is installed but is built without" + ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit" + ewarn "applications under ${PN} will likely not be usable." fi eselect wine update --if-unset || die diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.14.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.14.ebuild index 1aaebe5aa269..a3fad03a1c4d 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.14.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.14.ebuild @@ -402,6 +402,12 @@ pkg_postinst() { ewarn "work, be warned that it is not unusual that installers or other helpers" ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32," ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib." + elif use abi_x86_32 && { use opengl || use vulkan; } && + has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]' + then + ewarn "x11-drivers/nvidia-drivers is installed but is built without" + ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit" + ewarn "applications under ${PN} will likely not be usable." fi eselect wine update --if-unset || die diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index 1aaebe5aa269..a3fad03a1c4d 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -402,6 +402,12 @@ pkg_postinst() { ewarn "work, be warned that it is not unusual that installers or other helpers" ewarn "will attempt to use 32bit and fail. If do not want full USE=abi_x86_32," ewarn "note the experimental/WIP USE=wow64 can allow 32bit without multilib." + elif use abi_x86_32 && { use opengl || use vulkan; } && + has_version 'x11-drivers/nvidia-drivers[-abi_x86_32]' + then + ewarn "x11-drivers/nvidia-drivers is installed but is built without" + ewarn "USE=abi_x86_32 (ABI_X86=32), hardware acceleration with 32bit" + ewarn "applications under ${PN} will likely not be usable." fi eselect wine update --if-unset || die