Commit 50af49ed authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Thomas Petazzoni
Browse files

package/x11-video-drivers: do not select, but depends on mesa3d 



Currently, X.Org drivers that need mesa3d forcibly select it.

We'll soon switch mesa3d to being a provider of the full OpenGL virtual
package, to come in a later patch.

It is bad practice to select a provider, as it can generate configuration
inconsistencies.

So, switch all X.Org video driver that need mesa3d to actually depend on
it, rather than forcibly select it.

To be noted: xf86-video-mach64 already used a 'depends on' rather
than a 'select'.

At the same time, move the intel drivers dependencies to the top.

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Cc: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 0ecf3f78

package/x11r7/xdriver_xf86-video-ati/Config.in

+4 −1
Original line number Diff line number Diff line 
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI

	bool "xf86-video-ati"

	depends on BR2_PACKAGE_MESA3D

	select BR2_PACKAGE_LIBDRM        if BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON

	select BR2_PACKAGE_LIBDRM_RADEON if BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON

	select BR2_PACKAGE_MESA3D

	select BR2_PACKAGE_XPROTO_FONTSPROTO

	select BR2_PACKAGE_XPROTO_GLPROTO

	select BR2_PACKAGE_XPROTO_RANDRPROTO
@@ -13,3 +13,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI 
	select BR2_PACKAGE_XPROTO_XPROTO

	help

	  ATI video driver



comment "xf86-video-ati needs mesa3d"

	depends on !BR2_PACKAGE_MESA3D

package/x11r7/xdriver_xf86-video-glint/Config.in

+4 −1
Original line number Diff line number Diff line 
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT

	bool "xf86-video-glint"

	depends on BR2_PACKAGE_MESA3D

	select BR2_PACKAGE_LIBDRM

	select BR2_PACKAGE_MESA3D

	select BR2_PACKAGE_XPROTO_FONTSPROTO

	select BR2_PACKAGE_XPROTO_GLPROTO

	select BR2_PACKAGE_XPROTO_RANDRPROTO
@@ -13,3 +13,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT 
	select BR2_PACKAGE_XPROTO_XPROTO

	help

	  GLINT/Permedia video driver



comment "xf86-video-glint needs mesa3d"

	depends on !BR2_PACKAGE_MESA3D

package/x11r7/xdriver_xf86-video-intel/Config.in

+6 −2
Original line number Diff line number Diff line 
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL

	bool "xf86-video-intel"

	depends on (BR2_i386 || BR2_x86_64)

	depends on BR2_PACKAGE_MESA3D

	select BR2_PACKAGE_XPROTO_FONTSPROTO

	select BR2_PACKAGE_XPROTO_RANDRPROTO

	select BR2_PACKAGE_XPROTO_RENDERPROTO
@@ -7,7 +9,9 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL 
	select BR2_PACKAGE_XLIB_LIBPCIACCESS

	select BR2_PACKAGE_LIBDRM

	select BR2_PACKAGE_LIBDRM_INTEL

	select BR2_PACKAGE_MESA3D

	depends on (BR2_i386 || BR2_x86_64)

	help

	  Intel video driver



comment "xf86-video-intel needs mesa3d"

	depends on (BR2_i386 || BR2_x86_64)

	depends on !BR2_PACKAGE_MESA3D

package/x11r7/xdriver_xf86-video-mach64/Config.in

+3 −0
Original line number Diff line number Diff line
@@ -9,3 +9,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MACH64 
	select BR2_PACKAGE_XPROTO_XPROTO

	help

	  mach64 video driver



comment "xf86-video-mach64 needs mesa3d"

	depends on !BR2_PACKAGE_MESA3D

package/x11r7/xdriver_xf86-video-mga/Config.in

+4 −1
Original line number Diff line number Diff line 
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA

	bool "xf86-video-mga"

	depends on BR2_PACKAGE_MESA3D

	select BR2_PACKAGE_LIBDRM

	select BR2_PACKAGE_MESA3D

	select BR2_PACKAGE_XPROTO_FONTSPROTO

	select BR2_PACKAGE_XPROTO_GLPROTO

	select BR2_PACKAGE_XPROTO_RANDRPROTO
@@ -12,3 +12,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA 
	select BR2_PACKAGE_XPROTO_XPROTO

	help

	  Matrox video driver



comment "xf86-video-mga needs mesa3d"

	depends on !BR2_PACKAGE_MESA3D