package/mesa3d: add OSMesa classic needs dri swrast

The meson build system now check if dri swrast is enabled
when OSMesa classic is enabled.

See:
https://cgit.freedesktop.org/mesa/mesa/commit/?id=cbbd5bb889a2c271a504c379f36a7cb717a85af4

Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

diff --git a/Config.in.legacy b/Config.in.legacy
index 3fd92ade21ebc91ac7a124b7cec4b6e2e02bfcf8..b9ee4436672577ef10a3e37d9b88eef51de886cd 100644 (file)
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -148,7 +148,7 @@ comment "Legacy options removed in 2019.11"
 
 config BR2_PACKAGE_MESA3D_OSMESA
        bool "mesa OSMesa option renamed"
-       select BR2_PACKAGE_MESA3D_OSMESA_CLASSIC
+       select BR2_PACKAGE_MESA3D_OSMESA_CLASSIC if BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST
        select BR2_LEGACY
        help
          The option was renamed in order to match the naming used

diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 13739f54c5d61d1b021e703baa9f00f14730bc98..77ac0469e9b9fc5b92a92d130d42cd0180c06bc2 100644 (file)
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -267,10 +267,14 @@ comment "Off-screen Rendering"
 
 config BR2_PACKAGE_MESA3D_OSMESA_CLASSIC
        bool "OSMesa (classic) library"
+       depends on BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST
        help
          The OSMesa classic API provides functions for
          making off-screen renderings.
 
+comment "OSMesa classic requires dri (classic) swrast"
+       depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST
+
 if BR2_PACKAGE_MESA3D_DRIVER
 
 comment "Additional API Support"