diff mbox series

[v4,3/9] package/mesa3d: add OSMesa classic needs dri swrast

Message ID 20190629172532.26231-3-bernd.kuhls@t-online.de
State Superseded
Headers show
Series [v4,1/9] package/python3-mako: new package | expand

Commit Message

Bernd Kuhls June 29, 2019, 5:25 p.m. UTC
From: Romain Naour <romain.naour@smile.fr>

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>
---
v4: rebased (Bernd)

 Config.in.legacy         | 1 +
 package/mesa3d/Config.in | 4 ++++
 2 files changed, 5 insertions(+)
diff mbox series

Patch

diff --git a/Config.in.legacy b/Config.in.legacy
index 44933ba45d..754a08ee73 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -148,6 +148,7 @@  comment "Legacy options removed in 2019.08"
 
 config BR2_PACKAGE_MESA3D_OSMESA
 	bool "mesa OSMesa option renamed"
+	depends on BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST
 	select BR2_PACKAGE_MESA3D_OSMESA_CLASSIC
 	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 bd05116aca..9bb95c3fd6 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"