[Buildroot] [git commit] xserver_xorg-server: Fix DRI detection

Peter Korsgaard peter at korsgaard.com
Sat May 3 20:37:10 UTC 2014


commit: http://git.buildroot.net/buildroot/commit/?id=e3e322a766756b14837996067f6c104087566bc1
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Fixes http://autobuild.buildroot.net/results/b8a/b8a905b864b01aa09940668130a62d9d90ef5f9a/

Signed-off-by: Bernd Kuhls <bernd.kuhls at t-online.de>
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
---
 .../xserver_xorg-server/xserver_xorg-server.mk     |   12 +++---------
 1 files 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 ba6c503..4f2eff2 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


More information about the buildroot mailing list