diff options
| -rw-r--r-- | package/mesa3d/Config.in | 9 | ||||
| -rw-r--r-- | package/mesa3d/mesa3d.mk | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index a7aa297624..8f6ab75c6b 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -28,13 +28,14 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER config BR2_PACKAGE_MESA3D_DRI_DRIVER select BR2_PACKAGE_MESA3D_DRIVER - select BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_HAS_LIBGL if BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XPROTO_DRI3PROTO select BR2_PACKAGE_XPROTO_PRESENTPROTO if BR2_PACKAGE_XPROTO_DRI3PROTO bool config BR2_PACKAGE_PROVIDES_LIBGL - default "mesa3d" if BR2_PACKAGE_MESA3D_DRI_DRIVER + default "mesa3d" if BR2_PACKAGE_MESA3D_DRI_DRIVER && \ + BR2_PACKAGE_XORG7 config BR2_PACKAGE_MESA3D_DRIVER bool @@ -89,8 +90,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL comment "DRI drivers need X.Org" depends on !BR2_PACKAGE_XORG7 -if BR2_PACKAGE_XORG7 - comment "DRI drivers" config BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST @@ -130,8 +129,6 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON help Legacy Radeon driver for R100 series GPUs. -endif # BR2_PACKAGE_XORG7 - comment "Off-screen Rendering" config BR2_PACKAGE_MESA3D_OSMESA diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index ff2f932823..b8ccd1f9d6 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -102,7 +102,10 @@ endif ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) MESA3D_DEPENDENCIES += xlib_libXxf86vm endif +# libGL is only provided for a full xorg stack +ifeq ($(BR2_PACKAGE_XORG7),y) MESA3D_PROVIDES += libgl +endif MESA3D_CONF_OPTS += \ --enable-shared-glapi \ --enable-driglx-direct \ |
