diff options
| -rw-r--r-- | package/x11r7/xserver_xorg-server/Config.in | 1 | ||||
| -rw-r--r-- | package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 79184955ea..db8a54d81e 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER bool "xorg-server" - select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR select BR2_PACKAGE_LIBPCIACCESS if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR # We need a SHA1 implementation. If either openssl or # libgcrypt are already part of the build, we'll use one of diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index b5a0df0b41..472c0bc671 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -66,7 +66,7 @@ XSERVER_XORG_SERVER_CONF_OPTS = \ ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y) XSERVER_XORG_SERVER_CONF_OPTS += --enable-xorg -XSERVER_XORG_SERVER_DEPENDENCIES += libpciaccess libdrm +XSERVER_XORG_SERVER_DEPENDENCIES += libpciaccess else XSERVER_XORG_SERVER_CONF_OPTS += --disable-xorg endif @@ -106,10 +106,10 @@ XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive --disable-xfbdev endif ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y) -XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri --enable-glx -XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d xproto_xf86driproto +XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri --enable-libdrm --enable-glx +XSERVER_XORG_SERVER_DEPENDENCIES += libdrm mesa3d xproto_xf86driproto else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri --disable-glx +XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri --disable-libdrm --disable-glx endif ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX),y) |
