commit: 3dac204259227f5b102cba399cc2306508ad74b3
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri May 31 06:03:03 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri May 31 06:19:47 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dac2042
app-emulation/wine-vanilla: extend 32bit hwaccel warning for mesa
Hard to tell what's actually needed, nvidia users do not need
it on mesa (or need mesa at all), mesa users do not need it on
nvidia, and multi-card users likely need it on both.
If do this through dependencies, *could* always depend on
mesa[abi_x86_32] even if it may be wrong, and depend on nvidia's
if USE=video_cards_nvidia -- but for now sticking to a warning.
Ultimately it's also kind of an optfeature, only needed if
running 32bit hardware accelerated applications and not needed
at build time.
Non-issue for users doing abi_x86_32 globally.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild | 20 ++++++++++++++------
app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild | 20 ++++++++++++++------
app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild | 20 ++++++++++++++------
app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild | 20 ++++++++++++++------
app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild | 20 ++++++++++++++------
app-emulation/wine-vanilla/wine-vanilla-9.9.ebuild | 20 ++++++++++++++------
app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 20 ++++++++++++++------
7 files changed, 98 insertions(+), 42 deletions(-)
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 262638ea8d31..bb1d6d125649 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild
@@ -367,12 +367,20 @@ 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."
+ if use abi_x86_32 && { use opengl || use vulkan; }; then
+ # difficult to tell what is needed from here, but try to warn
+ if has_version 'x11-drivers/nvidia-drivers'; then
+ if 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."
+ ewarn "Multi-card setups may need this on
media-libs/mesa as well."
+ fi
+ elif has_version 'media-libs/mesa[-abi_x86_32]'; then
+ ewarn "media-libs/mesa seems to be in use 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
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 800c33d6ae95..3402577a7c2d 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild
@@ -373,12 +373,20 @@ 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."
+ if use abi_x86_32 && { use opengl || use vulkan; }; then
+ # difficult to tell what is needed from here, but try to warn
+ if has_version 'x11-drivers/nvidia-drivers'; then
+ if 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."
+ ewarn "Multi-card setups may need this on
media-libs/mesa as well."
+ fi
+ elif has_version 'media-libs/mesa[-abi_x86_32]'; then
+ ewarn "media-libs/mesa seems to be in use 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
fi
eselect wine update --if-unset || die
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
index 0c9ff2f4151d..c8cced499644 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild
@@ -412,12 +412,20 @@ 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."
+ elif use abi_x86_32 && { use opengl || use vulkan; }; then
+ # difficult to tell what is needed from here, but try to warn
+ if has_version 'x11-drivers/nvidia-drivers'; then
+ if 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."
+ ewarn "Multi-card setups may need this on
media-libs/mesa as well."
+ fi
+ elif has_version 'media-libs/mesa[-abi_x86_32]'; then
+ ewarn "media-libs/mesa seems to be in use 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
fi
eselect wine update --if-unset || die
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
b/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
index 868d1a000777..0f7e43a70482 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.7.ebuild
@@ -412,12 +412,20 @@ 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."
+ elif use abi_x86_32 && { use opengl || use vulkan; }; then
+ # difficult to tell what is needed from here, but try to warn
+ if has_version 'x11-drivers/nvidia-drivers'; then
+ if 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."
+ ewarn "Multi-card setups may need this on
media-libs/mesa as well."
+ fi
+ elif has_version 'media-libs/mesa[-abi_x86_32]'; then
+ ewarn "media-libs/mesa seems to be in use 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
fi
optfeature "/dev/hidraw* access used for *some* controllers (e.g.
DualShock4)" \
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild
b/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild
index 9b130d772adf..aae655db4877 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.8.ebuild
@@ -413,12 +413,20 @@ 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."
+ elif use abi_x86_32 && { use opengl || use vulkan; }; then
+ # difficult to tell what is needed from here, but try to warn
+ if has_version 'x11-drivers/nvidia-drivers'; then
+ if 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."
+ ewarn "Multi-card setups may need this on
media-libs/mesa as well."
+ fi
+ elif has_version 'media-libs/mesa[-abi_x86_32]'; then
+ ewarn "media-libs/mesa seems to be in use 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
fi
optfeature "/dev/hidraw* access used for *some* controllers (e.g.
DualShock4)" \
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.9.ebuild
b/app-emulation/wine-vanilla/wine-vanilla-9.9.ebuild
index 2685dfbc9d27..ea264050fc99 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9.9.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9.9.ebuild
@@ -412,12 +412,20 @@ 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."
+ elif use abi_x86_32 && { use opengl || use vulkan; }; then
+ # difficult to tell what is needed from here, but try to warn
+ if has_version 'x11-drivers/nvidia-drivers'; then
+ if 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."
+ ewarn "Multi-card setups may need this on
media-libs/mesa as well."
+ fi
+ elif has_version 'media-libs/mesa[-abi_x86_32]'; then
+ ewarn "media-libs/mesa seems to be in use 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
fi
optfeature "/dev/hidraw* access used for *some* controllers (e.g.
DualShock4)" \
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 2685dfbc9d27..ea264050fc99 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -412,12 +412,20 @@ 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."
+ elif use abi_x86_32 && { use opengl || use vulkan; }; then
+ # difficult to tell what is needed from here, but try to warn
+ if has_version 'x11-drivers/nvidia-drivers'; then
+ if 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."
+ ewarn "Multi-card setups may need this on
media-libs/mesa as well."
+ fi
+ elif has_version 'media-libs/mesa[-abi_x86_32]'; then
+ ewarn "media-libs/mesa seems to be in use 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
fi
optfeature "/dev/hidraw* access used for *some* controllers (e.g.
DualShock4)" \
