summaryrefslogtreecommitdiffstats
path: root/rules/xorg-server.in
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2012-06-12 17:12:21 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2012-06-13 00:24:14 +0200
commit313bc759d1bf37ffb712cbfc077e2269b75b55ac (patch)
tree0b4b72f9937f6070128fade9996b42c8330d786f /rules/xorg-server.in
parentdc51536bfa776b12fe95b7f6f97637a7dfb0242a (diff)
downloadptxdist-313bc759d1bf37ffb712cbfc077e2269b75b55ac.tar.gz
ptxdist-313bc759d1bf37ffb712cbfc077e2269b75b55ac.tar.xz
xorg-server: version bump 1.9.3 -> 1.12.2
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/xorg-server.in')
-rw-r--r--rules/xorg-server.in16
1 files changed, 7 insertions, 9 deletions
diff --git a/rules/xorg-server.in b/rules/xorg-server.in
index 3a99813c0..845efceb0 100644
--- a/rules/xorg-server.in
+++ b/rules/xorg-server.in
@@ -42,6 +42,8 @@ menuconfig XORG_SERVER
select OPENSSL
select XORG_LIB_XKBFILE
+ select LIBDRM if XORG_SERVER_LIBDRM
+
# input hotplug with udev
select UDEV if XORG_SERVER_UDEV
select UDEV_LIBUDEV if XORG_SERVER_UDEV
@@ -139,6 +141,9 @@ if XORG_SERVER
# ----------------------------------------------------------------------------
+config XORG_SERVER_LIBDRM
+ bool
+
menu "xorg servers "
config XORG_SERVER_XORG
@@ -391,6 +396,7 @@ config XORG_SERVER_OPT_GLX_TLS
config XORG_SERVER_EXT_DRI
bool
+ select XORG_SERVER_LIBDRM
prompt "dri extension"
help
Enable support for the Direct Rendering Infrastructure to get 3D
@@ -401,6 +407,7 @@ config XORG_SERVER_EXT_DRI
config XORG_SERVER_EXT_DRI2
bool
+ select XORG_SERVER_LIBDRM
prompt "dri2 extension"
help
Enable support for the Direct Rendering Infrastructure 2 to get 3D
@@ -441,15 +448,6 @@ config XORG_SERVER_EXT_XCSECURITY
help
FIXME
-config XORG_SERVER_EXT_CALIBRATE
- bool
- depends on BROKEN
- # seems to need xcalibrate proto, but there is no release of
- # http://cgit.freedesktop.org/xorg/lib/libXCalibrate/ available
- prompt "calibrate"
- help
- FIXME
-
config XORG_SERVER_EXT_DBE
bool
prompt "dbe"