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

package/mesa3d: Depend on xorg meta package instead of xserver_xorg-server 



mesa3d does not depend on the xorg server as such, only on X libraries.

Signed-off-by: default avatarBernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 1fcc621f

package/mesa3d/Config.in

+11 −11
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ menuconfig BR2_PACKAGE_MESA3D 
	select BR2_PACKAGE_LIBDRM

	select BR2_PACKAGE_EXPAT

	select BR2_PACKAGE_HOST_LIBXML2_PYTHON

	select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_XSERVER_XORG_SERVER

	select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_XSERVER_XORG_SERVER

	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XSERVER_XORG_SERVER

	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XSERVER_XORG_SERVER

	select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XSERVER_XORG_SERVER

	select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XSERVER_XORG_SERVER

	select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XSERVER_XORG_SERVER

	select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_XORG7

	select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_XORG7

	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7

	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7

	select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XORG7

	select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XORG7

	select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XORG7

	depends on BR2_PACKAGE_HAS_UDEV

	depends on BR2_INSTALL_LIBSTDCPP

	depends on BR2_LARGEFILE
@@ -62,10 +62,10 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST 
	  This is a software opengl implementation using the Gallium3D

	  infrastructure.



comment "DRI drivers needs an X.Org server and a toolchain w/ dynamic library"

	depends on BR2_PREFER_STATIC_LIB || !BR2_PACKAGE_XSERVER_XORG_SERVER

comment "DRI drivers needs X.Org and a toolchain w/ dynamic library"

	depends on BR2_PREFER_STATIC_LIB || !BR2_PACKAGE_XORG7



if !BR2_PREFER_STATIC_LIB && BR2_PACKAGE_XSERVER_XORG_SERVER

if !BR2_PREFER_STATIC_LIB && BR2_PACKAGE_XORG7



comment "DRI drivers"
@@ -92,7 +92,7 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON 
	help

	  Legacy Radeon driver for R100 series GPUs.



endif # !BR2_PREFER_STATIC_LIB && BR2_PACKAGE_XSERVER_XORG_SERVER

endif # !BR2_PREFER_STATIC_LIB && BR2_PACKAGE_XORG7



if BR2_PACKAGE_MESA3D_DRIVER

package/mesa3d/mesa3d.mk

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ MESA3D_DEPENDENCIES = \ 
	host-xutil_makedepend \

	libdrm



ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER),y)

ifeq ($(BR2_PACKAGE_XORG7),y)

MESA3D_DEPENDENCIES += \

	xproto_xf86driproto \

	xproto_dri2proto \
@@ -106,7 +106,7 @@ ifeq ($(BR2_PACKAGE_WAYLAND),y) 
MESA3D_DEPENDENCIES += wayland

MESA3D_EGL_PLATFORMS += wayland

endif

ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER),y)

ifeq ($(BR2_PACKAGE_XORG7),y)

MESA3D_EGL_PLATFORMS += x11

endif

MESA3D_CONF_OPT += \