commit: 8356688c4e9b8dfa1a637c84e35304cac57de954
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 15 23:53:39 2025 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Dec 16 00:05:29 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8356688c
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 <AT> gentoo.org>
app-emulation/wine-proton/wine-proton-9999.ebuild | 5 ++---
app-emulation/wine-staging/wine-staging-9999.ebuild | 5 ++---
app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 5 ++---
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/app-emulation/wine-proton/wine-proton-9999.ebuild
b/app-emulation/wine-proton/wine-proton-9999.ebuild
index 44509dccf3da..63d3efad2137 100644
--- a/app-emulation/wine-proton/wine-proton-9999.ebuild
+++ b/app-emulation/wine-proton/wine-proton-9999.ebuild
@@ -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
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild
b/app-emulation/wine-staging/wine-staging-9999.ebuild
index e2746ef1b3b0..a93ef2a49b5a 100644
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
@@ -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 '
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
index 51b66905e8f9..f19e4ee6943a 100644
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild
@@ -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 '
