diff options
Diffstat (limited to 'app-emulation/wine-vanilla/wine-vanilla-9999.ebuild')
| -rw-r--r-- | app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index 162e8b9a993c..ea264050fc99 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -8,7 +8,7 @@ inherit autotools flag-o-matic multilib multilib-build optfeature inherit prefix toolchain-funcs wrapper WINE_GECKO=2.47.4 -WINE_MONO=9.0.0 +WINE_MONO=9.1.0 if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -67,13 +67,12 @@ WINE_DLOPEN_DEPEND=" fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] ) kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) netapi? ( net-fs/samba[${MULTILIB_USEDEP}] ) - odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] ) sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] ) ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] ) udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) + vulkan? ( media-libs/vulkan-loader[X?,wayland?,${MULTILIB_USEDEP}] ) " WINE_COMMON_DEPEND=" ${WINE_DLOPEN_DEPEND} @@ -89,6 +88,7 @@ WINE_COMMON_DEPEND=" media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] ) + odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] ) opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) @@ -254,6 +254,7 @@ src_configure() { $(use_with mingw) $(use_with netapi) $(use_with nls gettext) + $(use_with odbc) $(use_with opencl) $(use_with opengl) $(use_with osmesa) @@ -274,10 +275,10 @@ src_configure() { $(use_with wayland) $(use_with xcomposite) $(use_with xinerama) - $(usev !odbc ac_cv_lib_soname_odbc=) ) filter-lto # build failure + filter-flags -Wl,--gc-sections # runtime issues (bug #931329) use custom-cflags || strip-flags # can break in obscure ways at runtime # wine uses linker tricks unlikely to work with non-bfd/lld (bug #867097) @@ -411,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)" \ |