summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Dirson <yann@blade-group.com>2020-05-28 15:08:52 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-06-02 12:32:50 (GMT)
commitca9dd4b8eab400f736a4f522b1383c21bf47351a (patch)
tree4a710441656536a8d9d5882db4d25f5cdcf3cd02
parenta6ee553b428d657deaca9daf752f3fc52ee8f35a (diff)
downloadpoky-ca9dd4b8eab400f736a4f522b1383c21bf47351a.tar.gz
mesa: fix meson configure fix when 'dri' is excluded from PACKAGECONFIG
(From OE-Core rev: ee95a399285abbde84e0148ca957b59d65bcad0a) Signed-off-by: Yann Dirson <yann@blade-group.com> Signed-off-by: Ross Burton <ross.burton@intel.com> (cherry picked from commit 78efff8741f869647790810a3dd41459b9d9d8a6) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch b/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
index 3458c19..346b217 100644
--- a/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
+++ b/meta/recipes-graphics/mesa/files/0003-Allow-enable-DRI-without-DRI-drivers.patch
@@ -23,7 +23,7 @@ index 0e50bb26c0a..de065c290d6 100644
23 with_dri_swrast = dri_drivers.contains('swrast') 23 with_dri_swrast = dri_drivers.contains('swrast')
24 24
25-with_dri = dri_drivers.length() != 0 and dri_drivers != [''] 25-with_dri = dri_drivers.length() != 0 and dri_drivers != ['']
26+with_dri = get_option('dri') or (_drivers.length() != 0 and _drivers != ['']) 26+with_dri = get_option('dri') or (dri_drivers.length() != 0 and dri_drivers != [''])
27 27
28 gallium_drivers = get_option('gallium-drivers') 28 gallium_drivers = get_option('gallium-drivers')
29 if gallium_drivers.contains('auto') 29 if gallium_drivers.contains('auto')