From e3e322a766756b14837996067f6c104087566bc1 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 30 Apr 2014 06:44:22 +0200 Subject: [PATCH] xserver_xorg-server: Fix DRI detection Fixes http://autobuild.buildroot.net/results/b8a/b8a905b864b01aa09940668130a62d9d90ef5f9a/ Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- .../x11r7/xserver_xorg-server/xserver_xorg-server.mk | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index ba6c5032bc..4f2eff20fd 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -99,11 +99,11 @@ else # modular XSERVER_XORG_SERVER_CONF_OPT += --disable-kdrive --disable-xfbdev endif -ifeq ($(BR2_PACKAGE_MESA3D_DRIVER),y) -XSERVER_XORG_SERVER_CONF_OPT += --enable-dri +ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y) +XSERVER_XORG_SERVER_CONF_OPT += --enable-dri --enable-glx XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d xproto_xf86driproto else -XSERVER_XORG_SERVER_CONF_OPT += --disable-dri +XSERVER_XORG_SERVER_CONF_OPT += --disable-dri --disable-glx endif ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_NULL_CURSOR),y) @@ -179,12 +179,6 @@ ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y) XSERVER_XORG_SERVER_CONF_OPT += --disable-dmx endif -ifeq ($(BR2_PACKAGE_MESA3D_DRIVER),y) -XSERVER_XORG_SERVER_CONF_OPT += --enable-glx -else -XSERVER_XORG_SERVER_CONF_OPT += --disable-glx -endif - ifeq ($(BR2_PACKAGE_OPENSSL),y) XSERVER_XORG_SERVER_CONF_OPT += --with-sha1=libcrypto XSERVER_XORG_SERVER_DEPENDENCIES += openssl