Commit 69a8991b authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

xserver-xorg: enable glx support if mesa3d is enabled 



Closes #2533

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 70fb5d46

CHANGES

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ 
	#2389: Generate a Makefile wrapper in $(O)

	#2461: wireless_tools: install shared library if needed

	#2521: Can't compile sdl_mixer, mikmod.h can't be found

	#2533: xserver_xorg-server: Enable glx, if mesa3d is built

	#2563: [PATCH] cairo: Expose the configure option to disable some...

	#2581: libmms: Update to 0.6, and patch to work on architectures...

	#2707: Can't compile linux kernel using buildroot + crosstool-ng

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

+6 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \ 
		--with-fontdir=/usr/share/fonts/X11/



ifeq ($(BR2_PACKAGE_XSERVER_xorg),y)

XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg --disable-glx

XSERVER_XORG_SERVER_CONF_OPT += --enable-xorg

XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libpciaccess libdrm

else

XSERVER_XORG_SERVER_CONF_OPT += --disable-xorg
@@ -147,5 +147,10 @@ ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y) 
XSERVER_XORG_SERVER_CONF_OPT += --disable-dmx

endif



ifeq ($(BR2_PACKAGE_MESA3D),y)

XSERVER_XORG_SERVER_CONF_OPT += --enable-glx

else

XSERVER_XORG_SERVER_CONF_OPT += --disable-glx

endif



$(eval $(call AUTOTARGETS,package/x11r7,xserver_xorg-server))