summaryrefslogtreecommitdiffstats
path: root/rules/xorg-server.in
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2015-05-16 14:35:07 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2015-05-17 08:21:03 +0200
commitb41dd5b753a46f064697ba0e6b014b1a0512956f (patch)
treefa9ca1eeaef1e84c22a7110bd3cec2a353501ee4 /rules/xorg-server.in
parentc3954e03cbdf09c9d76aeb85b9c26cd729ea3b93 (diff)
downloadptxdist-b41dd5b753a46f064697ba0e6b014b1a0512956f.tar.gz
ptxdist-b41dd5b753a46f064697ba0e6b014b1a0512956f.tar.xz
xorg-server: fix various option combinations
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/xorg-server.in')
-rw-r--r--rules/xorg-server.in11
1 files changed, 4 insertions, 7 deletions
diff --git a/rules/xorg-server.in b/rules/xorg-server.in
index 46902f5ff..d6cb39df9 100644
--- a/rules/xorg-server.in
+++ b/rules/xorg-server.in
@@ -159,6 +159,7 @@ if XORG_SERVER
# ----------------------------------------------------------------------------
config XORG_SERVER_LIBDRM
+ select XORG_SERVER_EXT_DPMS
bool
menu "xorg servers "
@@ -203,6 +204,8 @@ config XORG_SERVER_XNEST
config XORG_SERVER_XWAYLAND
bool
+ select XORG_SERVER_EXT_COMPOSITE
+ select XORG_SERVER_EXT_DRI3
prompt "Xwayland server"
help
@@ -262,10 +265,6 @@ config XORG_SERVER_OPT_AIGLX
depends on BROKEN
prompt "aiglx"
-config XORG_SERVER_STRING_REGISTRY
- bool
- prompt "string registry"
-
config XORG_SERVER_OPT_INSTALL_SETUID
bool
prompt "install server suid root"
@@ -280,6 +279,7 @@ config XORG_SERVER_OPT_SECURE_RPC
config XORG_SERVER_UDEV
bool
+ select XORG_SERVER_LIBDRM
prompt "detect input devices via udev"
help
FIXME
@@ -497,9 +497,6 @@ config XORG_SERVER_EXT_DBE
config XORG_SERVER_EXT_DPMS
bool
- depends on BROKEN
- # If enabled, I get this:
- # sysroot-target/usr/include/X11/extensions/dpms.h:40: error: expected ')' before '*' token
prompt "dpms"
help
FIXME