summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Danilo Spinella <danyspin97@protonmail.com> 2018-12-19 14:00:29 +0100
committerAvatar Heiko Becker <heirecka@exherbo.org> 2019-01-12 18:13:01 +0000
commit0988d99d3d31bf534061c6a91287eb25e982f8a3 (patch)
treed85cd5b25eeb528b521e17096aa55e06aa4dadf8
parentfd6cac006525ac74d37b4951da1654177985fdaa (diff)
downloaddesktop-0988d99d3d31bf534061c6a91287eb25e982f8a3.tar.gz
desktop-0988d99d3d31bf534061c6a91287eb25e982f8a3.tar.xz
wlroots: Split X and xwayland options
-rw-r--r--packages/sys-libs/wlroots/wlroots.exlib15
1 files changed, 8 insertions, 7 deletions
diff --git a/packages/sys-libs/wlroots/wlroots.exlib b/packages/sys-libs/wlroots/wlroots.exlib
index 27ae397..c7ea029 100644
--- a/packages/sys-libs/wlroots/wlroots.exlib
+++ b/packages/sys-libs/wlroots/wlroots.exlib
@@ -11,7 +11,10 @@ SLOT="0"
MYOPTIONS="
caps [[ description = [ for capability support ] ]]
- X [[ description = [ Enable X11 backend and XWayland ] ]]
+ X [[ description = [ Enable X11 backend ] ]]
+ xwayland [[
+ description = [ Enable XWayland (X11 compatibility layer) ]
+ requires = [ X ] ]]
( providers: eudev systemd ) [[ number-selected = exactly-one ]]
( providers: elogind systemd-logind ) [[
*description = [ Logind support ]
@@ -34,6 +37,7 @@ DEPENDENCIES="
x11-proto/xcb-proto
x11-utils/xcb-util-image
x11-utils/xcb-util-renderutil
+ x11-utils/xcb-util-wm
)
providers:elogind? ( sys-auth/elogind )
providers:eudev? ( sys-apps/eudev )
@@ -41,11 +45,7 @@ DEPENDENCIES="
providers:systemd-logind? ( sys-apps/systemd )
run:
X? (
- x11-server/xorg-server[xwayland]
- )
- suggestion:
- X? (
- x11-utils/xcb-util-wm
+ x11-server/xorg-server[xwayland?]
)
"
@@ -58,7 +58,8 @@ MESON_SRC_CONFIGURE_PARAMS=(
MESON_SRC_CONFIGURE_OPTION_SWITCHES=(
'caps libcap enabled disabled'
'X x11-backend enabled disabled'
- 'X xwayland enabled disabled'
+ 'X xcb-icccm enabled disabled'
+ 'xwayland xwayland enabled disabled'
)
MESON_SRC_CONFIGURE_OPTIONS=(