Commit d23c4d4f authored by Bernd Kuhls's avatar Bernd Kuhls Committed by Thomas Petazzoni
Browse files

package/x11r7/xserver_xorg-server: Fix libdrm dependency handling 

Fixes
http://autobuild.buildroot.net/results/2e1/2e12f1a91812f027d89fcceeb41d6c88ef7b9d32/



Signed-off-by: default avatarBernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Tested-by: default avatarVicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 9519516a

package/x11r7/xserver_xorg-server/xserver_xorg-server.mk

+10 −5
Original line number Diff line number Diff line
@@ -86,6 +86,12 @@ endif 
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)

XSERVER_XORG_SERVER_CONF_OPTS += --enable-xorg

XSERVER_XORG_SERVER_DEPENDENCIES += libpciaccess

ifeq ($(BR2_PACKAGE_LIBDRM),y)

XSERVER_XORG_SERVER_DEPENDENCIES += libdrm

XSERVER_XORG_SERVER_CONF_OPTS += --enable-libdrm

else

XSERVER_XORG_SERVER_CONF_OPTS += --disable-libdrm

endif

else

XSERVER_XORG_SERVER_CONF_OPTS += --disable-xorg

endif
@@ -125,10 +131,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-libdrm --enable-glx

XSERVER_XORG_SERVER_DEPENDENCIES += libdrm mesa3d xproto_xf86driproto

XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri --enable-glx

XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d xproto_xf86driproto

else

XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri --disable-libdrm --disable-glx

XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri --disable-glx

endif



ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX),y)
@@ -148,8 +154,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES += udev 
XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev

# udev kms support depends on libdrm and dri2

ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_XPROTO_DRI2PROTO),yy)

XSERVER_XORG_SERVER_DEPENDENCIES += libdrm

XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev-kms --enable-libdrm

XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev-kms

else

XSERVER_XORG_SERVER_CONF_OPTS += --disable-config-udev-kms

endif