Skip to contentSkip to conversation

xserver_xorg-server: Fix DRI detection

PATCH New Bernd Kuhls 3 participants 3 messages Apr 30, 2014 – May 3, 2014

lore
Share & tools
lore

Bernd Kuhls

author
#0 lore raw

PATCH 1/1 xserver_xorg-server: Fix DRI detection

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

Signed-off-by Bernd Kuhls <[email protected]>
---
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk |   12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +3 -9
index ba6c503..4f2eff2 100644
@@ -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
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 1/1 xserver_xorg-server: Fix DRI detection

Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

"Peter" == Peter Korsgaard <[email protected]> writes:

"Bernd" == Bernd Kuhls <[email protected]> writes:

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

Signed-off-by Bernd Kuhls <[email protected]>

344052344052

Ehh, make that 'Committed, thanks' ;)

Signature · 1 line
Bye, Peter Korsgaard