summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Dirson <yann@blade-group.com>2019-10-30 10:32:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-04 13:39:05 +0000
commitfca7712bf45de005d6adc1256bfab816210c650b (patch)
tree60e90a420d5579300a708ec1eacc681f2003bc41
parent79018ee8d93cbc11d9206caa7138773b83124cf6 (diff)
downloadpoky-fca7712bf45de005d6adc1256bfab816210c650b.tar.gz
mesa: fix meson configure fix when 'dri' is excluded from PACKAGECONFIG
(From OE-Core rev: 78efff8741f869647790810a3dd41459b9d9d8a6) Signed-off-by: Yann Dirson <yann@blade-group.com> Signed-off-by: Ross Burton <ross.burton@intel.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 3458c19199..346b217585 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')