diff mbox

[RFC,4/4] xorg-server: Depends on libgl to enable DRI/GLX

Message ID 1421839408-15839-5-git-send-email-jezz@sysmic.org
State Changes Requested
Headers show

Commit Message

Jérôme Pouiller Jan. 21, 2015, 11:23 a.m. UTC 
xorg-server should be able to compile DRI/GLX interface using any libGL
provider (not only mesa3d). If a libGL provider break xorg-server DRI/GLX
interface, it should be fixed.

Signed-off-by: Jérôme Pouiller <jezz@sysmic.org>
---
 package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 5baa515..3240284 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -105,9 +105,12 @@  else # modular
 XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive --disable-xfbdev
 endif
 
-ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y)
+
+ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
+# Note: --enable-glx use DRI interface (provided by GL/internal/dri_interface.h)
+# in any case. So enable GLX without DRI just fail.
 XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri --enable-glx
-XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d xproto_xf86driproto
+XSERVER_XORG_SERVER_DEPENDENCIES += libgl xproto_xf86driproto
 else
 XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri --disable-glx
 endif