aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Romain Naour <romain.naour@smile.fr>2019-09-20 18:38:39 +0200
committerGravatar Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2019-09-21 16:56:13 +0200
commitc16f3e4758c0fef46cad53a6f8a7eb439439cafb (patch)
tree46e2b8f9c37ce2d9ed9f7c4284d9f87068ac2ea0
parent4622153797150079866ef18493e31f48fc0cdab7 (diff)
downloadbuildroot-c16f3e4758c0fef46cad53a6f8a7eb439439cafb.tar.gz
buildroot-c16f3e4758c0fef46cad53a6f8a7eb439439cafb.tar.bz2
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>
-rw-r--r--Config.in.legacy2
-rw-r--r--package/mesa3d/Config.in4
2 files changed, 5 insertions, 1 deletions
diff --git a/Config.in.legacy b/Config.in.legacy
index 3fd92ade21..b9ee443667 100644
--- 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 13739f54c5..77ac0469e9 100644
--- 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"