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: "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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Yann E. MORIN 2014-04-17 18:04:15 +02:00 committed by Thomas Petazzoni
parent 0ecf3f78dd
commit 50af49ed64
11 changed files with 45 additions and 11 deletions

View File

@ -1,8 +1,8 @@
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

View File

@ -1,7 +1,7 @@
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

View File

@ -1,5 +1,7 @@
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

View File

@ -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

View File

@ -1,7 +1,7 @@
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

View File

@ -1,7 +1,7 @@
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_OPENCHROME
bool "xf86-video-openchrome"
depends on BR2_PACKAGE_MESA3D
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXCOMPOSITE
select BR2_PACKAGE_XLIB_LIBXVMC
@ -14,3 +14,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_OPENCHROME
help
Openchrome, A free and Open Source video driver for the VIA/S3G
UniChrome and UniChrome Pro graphics chipsets.
comment "xf86-video-openchrome needs mesa3d"
depends on !BR2_PACKAGE_MESA3D

View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_R128
bool "xf86-video-r128"
select BR2_PACKAGE_MESA3D
depends on BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO
select BR2_PACKAGE_XPROTO_RENDERPROTO
@ -8,3 +8,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_R128
select BR2_PACKAGE_XPROTO_XPROTO
help
R128 video driver
comment "xf86-video-r128 needs mesa3d"
depends on !BR2_PACKAGE_MESA3D

View File

@ -1,7 +1,7 @@
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SAVAGE
bool "xf86-video-savage"
depends on BR2_PACKAGE_MESA3D
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO
select BR2_PACKAGE_XPROTO_RENDERPROTO
@ -11,3 +11,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SAVAGE
select BR2_PACKAGE_XPROTO_XPROTO
help
S3 Savage video driver
comment "xf86-video-savage needs mesa3d"
depends on !BR2_PACKAGE_MESA3D

View File

@ -1,7 +1,7 @@
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SIS
bool "xf86-video-sis"
depends on BR2_PACKAGE_MESA3D
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO
select BR2_PACKAGE_XPROTO_RENDERPROTO
@ -13,3 +13,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SIS
select BR2_PACKAGE_XPROTO_XPROTO
help
SiS and XGI video driver
comment "xf86-video-sis needs mesa3d"
depends on !BR2_PACKAGE_MESA3D

View File

@ -1,7 +1,7 @@
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX
bool "xf86-video-tdfx"
depends on BR2_PACKAGE_MESA3D
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO
select BR2_PACKAGE_XPROTO_RENDERPROTO
@ -11,3 +11,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX
select BR2_PACKAGE_XPROTO_XPROTO
help
3Dfx video driver
comment "xf86-video-tdfx needs mesa3d"
depends on !BR2_PACKAGE_MESA3D

View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VMWARE
bool "xf86-video-vmware"
select BR2_PACKAGE_MESA3D
depends on BR2_PACKAGE_MESA3D
select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO
@ -10,3 +10,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VMWARE
select BR2_PACKAGE_XPROTO_XPROTO
help
VMware SVGA video driver
comment "xf86-video-vmware needs mesa3d"
depends on !BR2_PACKAGE_MESA3D