app-emulation/wine-*: drop IUSE=xcomposite in live (enabled with X)

Was already default and feel there is no reason to ever disable this
with USE=X, and disabling seem to have recently been causing issues
with CEF / Steam and similar which may be hard to figure out for users.

Leaving off-by-default IUSE=xinerama alone given it is hardly needed
nowadays and can be considered deprecated, no reason to force users to
newly set USE=abi_x86_32 on an extra library over this.

Will backport the change to other versions probably after wine-11 is
stable (if do not forget) to minimize rebuilds. Likely will not revbump
all wine versions over even though it's a removed->enabled change.

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
Ionen Wolkens 2025-12-15 18:53:39 -05:00
parent 21d8cb726d
commit 8356688c4e
No known key found for this signature in database
GPG Key ID: B24406B0B0AC4334
3 changed files with 6 additions and 9 deletions

View File

@ -31,7 +31,7 @@ SLOT="${PV}"
IUSE="
+X +alsa crossdev-mingw +dbus ffmpeg +fontconfig +gecko +gstreamer
llvm-libunwind +mono nls perl pulseaudio +sdl selinux +ssl udev
+unwind usb v4l wayland video_cards_amdgpu +xcomposite xinerama
+unwind usb v4l wayland video_cards_amdgpu xinerama
"
# headless is not really supported here, and udev needs sdl due to Valve's
# changes (bug #959263), use normal wine instead if need to avoid these
@ -51,13 +51,13 @@ WINE_DLOPEN_DEPEND="
media-libs/libglvnd[X?,${WINE_USEDEP}]
media-libs/vulkan-loader[X?,wayland?,${WINE_USEDEP}]
X? (
x11-libs/libXcomposite[${WINE_USEDEP}]
x11-libs/libXcursor[${WINE_USEDEP}]
x11-libs/libXfixes[${WINE_USEDEP}]
x11-libs/libXi[${WINE_USEDEP}]
x11-libs/libXrandr[${WINE_USEDEP}]
x11-libs/libXrender[${WINE_USEDEP}]
x11-libs/libXxf86vm[${WINE_USEDEP}]
xcomposite? ( x11-libs/libXcomposite[${WINE_USEDEP}] )
xinerama? ( x11-libs/libXinerama[${WINE_USEDEP}] )
)
dbus? ( sys-apps/dbus[${WINE_USEDEP}] )
@ -214,7 +214,6 @@ src_configure() {
$(use_with usb)
$(use_with v4l v4l2)
$(use_with wayland)
$(use_with xcomposite)
$(use_with xinerama)
--without-piper # unpackaged, for tts but unusable without steam

View File

@ -41,7 +41,7 @@ IUSE="
+fontconfig +gecko gphoto2 +gstreamer kerberos +mono netapi
nls odbc opencl +opengl pcap perl pulseaudio samba scanner
+sdl selinux smartcard +ssl +truetype udev +unwind usb v4l
+vulkan wayland +xcomposite xinerama
+vulkan wayland xinerama
"
REQUIRED_USE="
X? ( truetype )
@ -56,13 +56,13 @@ RESTRICT="test"
# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
WINE_DLOPEN_DEPEND="
X? (
x11-libs/libXcomposite[${WINE_USEDEP}]
x11-libs/libXcursor[${WINE_USEDEP}]
x11-libs/libXfixes[${WINE_USEDEP}]
x11-libs/libXi[${WINE_USEDEP}]
x11-libs/libXrandr[${WINE_USEDEP}]
x11-libs/libXrender[${WINE_USEDEP}]
x11-libs/libXxf86vm[${WINE_USEDEP}]
xcomposite? ( x11-libs/libXcomposite[${WINE_USEDEP}] )
xinerama? ( x11-libs/libXinerama[${WINE_USEDEP}] )
)
cups? ( net-print/cups[${WINE_USEDEP}] )
@ -228,7 +228,6 @@ src_configure() {
$(use_with v4l v4l2)
$(use_with vulkan)
$(use_with wayland)
$(use_with xcomposite)
$(use_with xinerama)
$(usev !bluetooth '

View File

@ -35,7 +35,7 @@ IUSE="
+fontconfig +gecko gphoto2 +gstreamer kerberos +mono netapi
nls odbc opencl +opengl pcap perl pulseaudio samba scanner
+sdl selinux smartcard +ssl +truetype udev +unwind usb v4l
+vulkan wayland +xcomposite xinerama
+vulkan wayland xinerama
"
REQUIRED_USE="
X? ( truetype )
@ -50,13 +50,13 @@ RESTRICT="test"
# `grep WINE_CHECK_SONAME configure.ac` + if not directly linked
WINE_DLOPEN_DEPEND="
X? (
x11-libs/libXcomposite[${WINE_USEDEP}]
x11-libs/libXcursor[${WINE_USEDEP}]
x11-libs/libXfixes[${WINE_USEDEP}]
x11-libs/libXi[${WINE_USEDEP}]
x11-libs/libXrandr[${WINE_USEDEP}]
x11-libs/libXrender[${WINE_USEDEP}]
x11-libs/libXxf86vm[${WINE_USEDEP}]
xcomposite? ( x11-libs/libXcomposite[${WINE_USEDEP}] )
xinerama? ( x11-libs/libXinerama[${WINE_USEDEP}] )
)
cups? ( net-print/cups[${WINE_USEDEP}] )
@ -189,7 +189,6 @@ src_configure() {
$(use_with v4l v4l2)
$(use_with vulkan)
$(use_with wayland)
$(use_with xcomposite)
$(use_with xinerama)
$(usev !bluetooth '