commit: c449dce620c0140f4350f1e5daee5b7dd2736ccd Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue Mar 4 13:08:01 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Tue Mar 4 13:28:37 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c449dce6
app-emulation/wine-*: drop IUSE=osmesa It's not in a released version yet, but upstream mesa is dropping support for this[1]. We *could* keep support here for as long as a version in the tree can give the library, but I'm not convinced that it's worth the headaches, do not believe this USE has much relevance nowadays (it also always been off by default). Could revisit if there is some good arguments but, before requesting that, please make sure that you really *do* need it and it wasn't just enabled because you thought you did. If we need to keep it long-term, then best option may(?) be to add a USE=osmesa to mesa-amber. [1] https://gitlab.freedesktop.org/mesa/mesa/-/commit/027ccd96 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> app-emulation/wine-proton/metadata.xml | 1 - app-emulation/wine-proton/wine-proton-8.0.5c.ebuild | 7 +++---- app-emulation/wine-proton/wine-proton-9.0.4.ebuild | 7 +++---- app-emulation/wine-proton/wine-proton-9999.ebuild | 7 +++---- app-emulation/wine-staging/metadata.xml | 1 - app-emulation/wine-staging/wine-staging-10.0.ebuild | 11 ++++------- app-emulation/wine-staging/wine-staging-10.1.ebuild | 11 ++++------- app-emulation/wine-staging/wine-staging-10.2.ebuild | 11 ++++------- app-emulation/wine-staging/wine-staging-9.0.ebuild | 9 +++------ app-emulation/wine-staging/wine-staging-9999.ebuild | 11 ++++------- app-emulation/wine-vanilla/metadata.xml | 1 - app-emulation/wine-vanilla/wine-vanilla-10.0.ebuild | 11 ++++------- app-emulation/wine-vanilla/wine-vanilla-10.1.ebuild | 11 ++++------- app-emulation/wine-vanilla/wine-vanilla-10.2.ebuild | 11 ++++------- app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild | 13 +++++-------- app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild | 11 ++++------- app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 11 ++++------- 17 files changed, 53 insertions(+), 92 deletions(-) diff --git a/app-emulation/wine-proton/metadata.xml b/app-emulation/wine-proton/metadata.xml index 4e53c42efe00..330e8b084f6d 100644 --- a/app-emulation/wine-proton/metadata.xml +++ b/app-emulation/wine-proton/metadata.xml @@ -17,7 +17,6 @@ </flag> <flag name="gecko">Enable mshtml support using <pkg>app-emulation/wine-gecko</pkg></flag> <flag name="mono">Enable .NET support using <pkg>app-emulation/wine-mono</pkg></flag> - <flag name="osmesa">Enable off-screen rendering (OpenGL in bitmaps) support</flag> <flag name="perl">Install helpers that require perl (winedump/winemaker)</flag> <flag name="sdl">Enable gamepad support using <pkg>media-libs/libsdl2</pkg></flag> <flag name="wow64"> diff --git a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild index 6843554f7424..b340c0774c60 100644 --- a/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild +++ b/app-emulation/wine-proton/wine-proton-8.0.5c.ebuild @@ -29,8 +29,8 @@ LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff" SLOT="${PV}" IUSE=" +abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags +dbus - +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa - perl pulseaudio +sdl selinux +ssl +strip udev +unwind usb v4l + +fontconfig +gecko +gstreamer llvm-libunwind +mono nls perl + pulseaudio +sdl selinux +ssl +strip udev +unwind usb v4l video_cards_amdgpu +xcomposite xinerama " @@ -52,7 +52,6 @@ WINE_DLOPEN_DEPEND=" x11-libs/libXxf86vm[${MULTILIB_USEDEP}] dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] ) - osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] ) sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] ) ssl? ( dev-libs/gmp:=[${MULTILIB_USEDEP}] @@ -241,7 +240,7 @@ src_configure() { $(use_with fontconfig) $(use_with gstreamer) $(use_with nls gettext) - $(use_with osmesa) + --without-osmesa # media-libs/mesa no longer supports this --without-oss # media-sound/oss is not packaged (OSSv4) $(use_with pulseaudio pulse) $(use_with sdl) diff --git a/app-emulation/wine-proton/wine-proton-9.0.4.ebuild b/app-emulation/wine-proton/wine-proton-9.0.4.ebuild index 440bd3ad68dd..b793da353866 100644 --- a/app-emulation/wine-proton/wine-proton-9.0.4.ebuild +++ b/app-emulation/wine-proton/wine-proton-9.0.4.ebuild @@ -29,8 +29,8 @@ LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff" SLOT="${PV}" IUSE=" +abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags +dbus - +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa - perl pulseaudio +sdl selinux +ssl +strip udev +unwind usb v4l + +fontconfig +gecko +gstreamer llvm-libunwind +mono nls perl + pulseaudio +sdl selinux +ssl +strip udev +unwind usb v4l video_cards_amdgpu wow64 +xcomposite xinerama " REQUIRED_USE="wow64? ( abi_x86_64 !abi_x86_32 )" @@ -53,7 +53,6 @@ WINE_DLOPEN_DEPEND=" x11-libs/libXxf86vm[${MULTILIB_USEDEP}] dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] ) - osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] ) sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] ) ssl? ( dev-libs/gmp:=[${MULTILIB_USEDEP}] @@ -263,7 +262,7 @@ src_configure() { $(use_with fontconfig) $(use_with gstreamer) $(use_with nls gettext) - $(use_with osmesa) + --without-osmesa # media-libs/mesa no longer supports this --without-oss # media-sound/oss is not packaged (OSSv4) $(use_with pulseaudio pulse) $(use_with sdl) diff --git a/app-emulation/wine-proton/wine-proton-9999.ebuild b/app-emulation/wine-proton/wine-proton-9999.ebuild index 8e09199023e6..09a70c2435d6 100644 --- a/app-emulation/wine-proton/wine-proton-9999.ebuild +++ b/app-emulation/wine-proton/wine-proton-9999.ebuild @@ -29,8 +29,8 @@ LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff" SLOT="${PV}" IUSE=" +abi_x86_32 +abi_x86_64 +alsa crossdev-mingw custom-cflags +dbus - +fontconfig +gecko +gstreamer llvm-libunwind +mono nls osmesa - perl pulseaudio +sdl selinux +ssl +strip udev +unwind usb v4l + +fontconfig +gecko +gstreamer llvm-libunwind +mono nls perl + pulseaudio +sdl selinux +ssl +strip udev +unwind usb v4l video_cards_amdgpu wow64 +xcomposite xinerama " REQUIRED_USE="wow64? ( abi_x86_64 !abi_x86_32 )" @@ -53,7 +53,6 @@ WINE_DLOPEN_DEPEND=" x11-libs/libXxf86vm[${MULTILIB_USEDEP}] dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) fontconfig? ( media-libs/fontconfig[${MULTILIB_USEDEP}] ) - osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] ) sdl? ( media-libs/libsdl2[haptic,joystick,${MULTILIB_USEDEP}] ) ssl? ( dev-libs/gmp:=[${MULTILIB_USEDEP}] @@ -263,7 +262,7 @@ src_configure() { $(use_with fontconfig) $(use_with gstreamer) $(use_with nls gettext) - $(use_with osmesa) + --without-osmesa # media-libs/mesa no longer supports this --without-oss # media-sound/oss is not packaged (OSSv4) $(use_with pulseaudio pulse) $(use_with sdl) diff --git a/app-emulation/wine-staging/metadata.xml b/app-emulation/wine-staging/metadata.xml index 814d877adcbe..8cbdba795852 100644 --- a/app-emulation/wine-staging/metadata.xml +++ b/app-emulation/wine-staging/metadata.xml @@ -24,7 +24,6 @@ This variant of the Wine packaging includes the Wine-Staging patchset. <flag name="mingw">Build PE files using a MinGW toolchain for better compatibility</flag> <flag name="mono">Enable .NET support using <pkg>app-emulation/wine-mono</pkg></flag> <flag name="netapi">Enable support for configuring remote shares using <pkg>net-fs/samba</pkg></flag> - <flag name="osmesa">Enable off-screen rendering (OpenGL in bitmaps) support</flag> <flag name="pcap">Support packet capture software (e.g. wireshark)</flag> <flag name="perl">Install helpers that require perl (winedump/winemaker)</flag> <flag name="samba">Pull in <pkg>net-fs/samba</pkg> with winbind for NTLM auth support</flag> diff --git a/app-emulation/wine-staging/wine-staging-10.0.ebuild b/app-emulation/wine-staging/wine-staging-10.0.ebuild index 308ff1a0162b..f39be8491538 100644 --- a/app-emulation/wine-staging/wine-staging-10.0.ebuild +++ b/app-emulation/wine-staging/wine-staging-10.0.ebuild @@ -38,8 +38,8 @@ IUSE=" +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl - osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard - +ssl +strip +truetype udev +unwind usb v4l +vulkan wayland wow64 + pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl + +strip +truetype udev +unwind usb v4l +vulkan wayland wow64 +xcomposite xinerama " # bug #551124 for truetype @@ -63,10 +63,7 @@ WINE_DLOPEN_DEPEND=" x11-libs/libXrandr[${MULTILIB_USEDEP}] x11-libs/libXrender[${MULTILIB_USEDEP}] x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - opengl? ( - media-libs/libglvnd[X,${MULTILIB_USEDEP}] - osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] ) - ) + opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) ) @@ -297,7 +294,7 @@ src_configure() { $(use_with nls gettext) $(use_with opencl) $(use_with opengl) - $(use_with osmesa) + --without-osmesa # media-libs/mesa no longer supports this --without-oss # media-sound/oss is not packaged (OSSv4) $(use_with pcap) $(use_with pulseaudio pulse) diff --git a/app-emulation/wine-staging/wine-staging-10.1.ebuild b/app-emulation/wine-staging/wine-staging-10.1.ebuild index 308ff1a0162b..f39be8491538 100644 --- a/app-emulation/wine-staging/wine-staging-10.1.ebuild +++ b/app-emulation/wine-staging/wine-staging-10.1.ebuild @@ -38,8 +38,8 @@ IUSE=" +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl - osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard - +ssl +strip +truetype udev +unwind usb v4l +vulkan wayland wow64 + pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl + +strip +truetype udev +unwind usb v4l +vulkan wayland wow64 +xcomposite xinerama " # bug #551124 for truetype @@ -63,10 +63,7 @@ WINE_DLOPEN_DEPEND=" x11-libs/libXrandr[${MULTILIB_USEDEP}] x11-libs/libXrender[${MULTILIB_USEDEP}] x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - opengl? ( - media-libs/libglvnd[X,${MULTILIB_USEDEP}] - osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] ) - ) + opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) ) @@ -297,7 +294,7 @@ src_configure() { $(use_with nls gettext) $(use_with opencl) $(use_with opengl) - $(use_with osmesa) + --without-osmesa # media-libs/mesa no longer supports this --without-oss # media-sound/oss is not packaged (OSSv4) $(use_with pcap) $(use_with pulseaudio pulse) diff --git a/app-emulation/wine-staging/wine-staging-10.2.ebuild b/app-emulation/wine-staging/wine-staging-10.2.ebuild index abce0fb8e199..5a4db8f22225 100644 --- a/app-emulation/wine-staging/wine-staging-10.2.ebuild +++ b/app-emulation/wine-staging/wine-staging-10.2.ebuild @@ -38,8 +38,8 @@ IUSE=" +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl - osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard - +ssl +strip +truetype udev +unwind usb v4l +vulkan wayland wow64 + pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl + +strip +truetype udev +unwind usb v4l +vulkan wayland wow64 +xcomposite xinerama " # bug #551124 for truetype @@ -63,10 +63,7 @@ WINE_DLOPEN_DEPEND=" x11-libs/libXrandr[${MULTILIB_USEDEP}] x11-libs/libXrender[${MULTILIB_USEDEP}] x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - opengl? ( - media-libs/libglvnd[X,${MULTILIB_USEDEP}] - osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] ) - ) + opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) ) @@ -296,7 +293,7 @@ src_configure() { $(use_with nls gettext) $(use_with opencl) $(use_with opengl) - $(use_with osmesa) + --without-osmesa # media-libs/mesa no longer supports this --without-oss # media-sound/oss is not packaged (OSSv4) $(use_with pcap) $(use_with pulseaudio pulse) diff --git a/app-emulation/wine-staging/wine-staging-9.0.ebuild b/app-emulation/wine-staging/wine-staging-9.0.ebuild index fa7cc2f0f157..49959cf9bbcd 100644 --- a/app-emulation/wine-staging/wine-staging-9.0.ebuild +++ b/app-emulation/wine-staging/wine-staging-9.0.ebuild @@ -37,7 +37,7 @@ SLOT="${PV}" IUSE=" +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer - kerberos +mingw +mono netapi nls opencl +opengl osmesa pcap perl + kerberos +mingw +mono netapi nls opencl +opengl pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip +truetype udev +unwind usb v4l +vulkan wayland wow64 +xcomposite xinerama @@ -63,10 +63,7 @@ WINE_DLOPEN_DEPEND=" x11-libs/libXrandr[${MULTILIB_USEDEP}] x11-libs/libXrender[${MULTILIB_USEDEP}] x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - opengl? ( - media-libs/libglvnd[X,${MULTILIB_USEDEP}] - osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] ) - ) + opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) ) @@ -305,7 +302,7 @@ src_configure() { $(use_with nls gettext) $(use_with opencl) $(use_with opengl) - $(use_with osmesa) + --without-osmesa # media-libs/mesa no longer supports this --without-oss # media-sound/oss is not packaged (OSSv4) $(use_with pcap) $(use_with pulseaudio pulse) diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 9839169937b5..6a55fe4a74ce 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -42,8 +42,8 @@ IUSE=" +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl - osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard - +ssl +strip +truetype udev +unwind usb v4l +vulkan wayland wow64 + pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl + +strip +truetype udev +unwind usb v4l +vulkan wayland wow64 +xcomposite xinerama " # bug #551124 for truetype @@ -67,10 +67,7 @@ WINE_DLOPEN_DEPEND=" x11-libs/libXrandr[${MULTILIB_USEDEP}] x11-libs/libXrender[${MULTILIB_USEDEP}] x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - opengl? ( - media-libs/libglvnd[X,${MULTILIB_USEDEP}] - osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] ) - ) + opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) ) @@ -300,7 +297,7 @@ src_configure() { $(use_with nls gettext) $(use_with opencl) $(use_with opengl) - $(use_with osmesa) + --without-osmesa # media-libs/mesa no longer supports this --without-oss # media-sound/oss is not packaged (OSSv4) $(use_with pcap) $(use_with pulseaudio pulse) diff --git a/app-emulation/wine-vanilla/metadata.xml b/app-emulation/wine-vanilla/metadata.xml index dd7a4eda1c35..8356618ad2f1 100644 --- a/app-emulation/wine-vanilla/metadata.xml +++ b/app-emulation/wine-vanilla/metadata.xml @@ -24,7 +24,6 @@ This variant of the Wine packaging does not include external patchsets <flag name="mingw">Build PE files using a MinGW toolchain for better compatibility</flag> <flag name="mono">Enable .NET support using <pkg>app-emulation/wine-mono</pkg></flag> <flag name="netapi">Enable support for configuring remote shares using <pkg>net-fs/samba</pkg></flag> - <flag name="osmesa">Enable off-screen rendering (OpenGL in bitmaps) support</flag> <flag name="pcap">Support packet capture software (e.g. wireshark)</flag> <flag name="perl">Install helpers that require perl (winedump/winemaker)</flag> <flag name="samba">Pull in <pkg>net-fs/samba</pkg> with winbind for NTLM auth support</flag> diff --git a/app-emulation/wine-vanilla/wine-vanilla-10.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-10.0.ebuild index d402e8142ed6..0f4edbb98e62 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-10.0.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-10.0.ebuild @@ -32,8 +32,8 @@ IUSE=" +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl - osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard - +ssl +strip +truetype udev +unwind usb v4l +vulkan wayland wow64 + pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl + +strip +truetype udev +unwind usb v4l +vulkan wayland wow64 +xcomposite xinerama " # bug #551124 for truetype @@ -57,10 +57,7 @@ WINE_DLOPEN_DEPEND=" x11-libs/libXrandr[${MULTILIB_USEDEP}] x11-libs/libXrender[${MULTILIB_USEDEP}] x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - opengl? ( - media-libs/libglvnd[X,${MULTILIB_USEDEP}] - osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] ) - ) + opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) ) @@ -260,7 +257,7 @@ src_configure() { $(use_with nls gettext) $(use_with opencl) $(use_with opengl) - $(use_with osmesa) + --without-osmesa # media-libs/mesa no longer supports this --without-oss # media-sound/oss is not packaged (OSSv4) $(use_with pcap) $(use_with pulseaudio pulse) diff --git a/app-emulation/wine-vanilla/wine-vanilla-10.1.ebuild b/app-emulation/wine-vanilla/wine-vanilla-10.1.ebuild index fb43916272f3..15cbd19b2310 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-10.1.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-10.1.ebuild @@ -32,8 +32,8 @@ IUSE=" +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl - osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard - +ssl +strip +truetype udev +unwind usb v4l +vulkan wayland wow64 + pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl + +strip +truetype udev +unwind usb v4l +vulkan wayland wow64 +xcomposite xinerama " # bug #551124 for truetype @@ -57,10 +57,7 @@ WINE_DLOPEN_DEPEND=" x11-libs/libXrandr[${MULTILIB_USEDEP}] x11-libs/libXrender[${MULTILIB_USEDEP}] x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - opengl? ( - media-libs/libglvnd[X,${MULTILIB_USEDEP}] - osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] ) - ) + opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) ) @@ -260,7 +257,7 @@ src_configure() { $(use_with nls gettext) $(use_with opencl) $(use_with opengl) - $(use_with osmesa) + --without-osmesa # media-libs/mesa no longer supports this --without-oss # media-sound/oss is not packaged (OSSv4) $(use_with pcap) $(use_with pulseaudio pulse) diff --git a/app-emulation/wine-vanilla/wine-vanilla-10.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-10.2.ebuild index 51e759a24b10..339938d64acc 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-10.2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-10.2.ebuild @@ -32,8 +32,8 @@ IUSE=" +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl - osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard - +ssl +strip +truetype udev +unwind usb v4l +vulkan wayland wow64 + pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl + +strip +truetype udev +unwind usb v4l +vulkan wayland wow64 +xcomposite xinerama " # bug #551124 for truetype @@ -57,10 +57,7 @@ WINE_DLOPEN_DEPEND=" x11-libs/libXrandr[${MULTILIB_USEDEP}] x11-libs/libXrender[${MULTILIB_USEDEP}] x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - opengl? ( - media-libs/libglvnd[X,${MULTILIB_USEDEP}] - osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] ) - ) + opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) ) @@ -259,7 +256,7 @@ src_configure() { $(use_with nls gettext) $(use_with opencl) $(use_with opengl) - $(use_with osmesa) + --without-osmesa # media-libs/mesa no longer supports this --without-oss # media-sound/oss is not packaged (OSSv4) $(use_with pcap) $(use_with pulseaudio pulse) 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 997fc15550b4..ff774423182b 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild @@ -30,9 +30,9 @@ SLOT="${PV}" IUSE=" +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer - kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap - perl pulseaudio samba scanner +sdl selinux +ssl +strip +truetype - udev +unwind usb v4l +vulkan +xcomposite xinerama + kerberos +mingw +mono netapi nls odbc opencl +opengl pcap perl + pulseaudio samba scanner +sdl selinux +ssl +strip +truetype udev + +unwind usb v4l +vulkan +xcomposite xinerama " # bug #551124 for truetype REQUIRED_USE=" @@ -53,10 +53,7 @@ WINE_DLOPEN_DEPEND=" x11-libs/libXrandr[${MULTILIB_USEDEP}] x11-libs/libXrender[${MULTILIB_USEDEP}] x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - opengl? ( - media-libs/libglvnd[X,${MULTILIB_USEDEP}] - osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] ) - ) + opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) ) @@ -231,7 +228,7 @@ src_configure() { $(use_with nls gettext) $(use_with opencl) $(use_with opengl) - $(use_with osmesa) + --without-osmesa # media-libs/mesa no longer supports this --without-oss # media-sound/oss is not packaged (OSSv4) $(use_with pcap) $(use_with pulseaudio pulse) diff --git a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild index d1e8119eee1c..2479d9296621 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9.0.ebuild @@ -31,8 +31,8 @@ SLOT="${PV}" IUSE=" +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer - kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap - perl pulseaudio samba scanner +sdl selinux smartcard +ssl +strip + kerberos +mingw +mono netapi nls odbc opencl +opengl pcap perl + pulseaudio samba scanner +sdl selinux smartcard +ssl +strip +truetype udev +unwind usb v4l +vulkan wayland wow64 +xcomposite xinerama " @@ -57,10 +57,7 @@ WINE_DLOPEN_DEPEND=" x11-libs/libXrandr[${MULTILIB_USEDEP}] x11-libs/libXrender[${MULTILIB_USEDEP}] x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - opengl? ( - media-libs/libglvnd[X,${MULTILIB_USEDEP}] - osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] ) - ) + opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) ) @@ -258,7 +255,7 @@ src_configure() { $(use_with nls gettext) $(use_with opencl) $(use_with opengl) - $(use_with osmesa) + --without-osmesa # media-libs/mesa no longer supports this --without-oss # media-sound/oss is not packaged (OSSv4) $(use_with pcap) $(use_with pulseaudio pulse) diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index 872bc955f08e..8ee0f458d65c 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -36,8 +36,8 @@ IUSE=" +X +abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups +dbus dos llvm-libunwind custom-cflags ffmpeg +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl - osmesa pcap perl pulseaudio samba scanner +sdl selinux smartcard - +ssl +strip +truetype udev +unwind usb v4l +vulkan wayland wow64 + pcap perl pulseaudio samba scanner +sdl selinux smartcard +ssl + +strip +truetype udev +unwind usb v4l +vulkan wayland wow64 +xcomposite xinerama " # bug #551124 for truetype @@ -61,10 +61,7 @@ WINE_DLOPEN_DEPEND=" x11-libs/libXrandr[${MULTILIB_USEDEP}] x11-libs/libXrender[${MULTILIB_USEDEP}] x11-libs/libXxf86vm[${MULTILIB_USEDEP}] - opengl? ( - media-libs/libglvnd[X,${MULTILIB_USEDEP}] - osmesa? ( media-libs/mesa[osmesa,${MULTILIB_USEDEP}] ) - ) + opengl? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) ) @@ -263,7 +260,7 @@ src_configure() { $(use_with nls gettext) $(use_with opencl) $(use_with opengl) - $(use_with osmesa) + --without-osmesa # media-libs/mesa no longer supports this --without-oss # media-sound/oss is not packaged (OSSv4) $(use_with pcap) $(use_with pulseaudio pulse)
