Mesa (main): freedreno: support lua54

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 6c614947714460f5517b1fa9e602368eaecbaecb
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6c614947714460f5517b1fa9e602368eaecbaecb

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Sun Oct 24 20:05:40 2021 -0400

freedreno: support lua54

This is the default version in gentoo, and it apparently uses the lua54
variant rather than lua.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Emma Anholt <emma at anholt.net>
Acked-by: Rob Clark <robdclark at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13510>

---

 src/freedreno/meson.build | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/freedreno/meson.build b/src/freedreno/meson.build
index 8d1f12b63cf..f24221e7355 100644
--- a/src/freedreno/meson.build
+++ b/src/freedreno/meson.build
@@ -25,13 +25,13 @@ rnn_src_path = meson.source_root() + '/src/freedreno/registers'
 rnn_install_path = get_option('datadir') + '/freedreno/registers'
 rnn_path = rnn_src_path + ':' + get_option('prefix') + '/' + rnn_install_path
 
-dep_lua = dependency('lua53', required: false)
-if not dep_lua.found()
-  dep_lua = dependency('lua52', required: false)
-endif
-if not dep_lua.found()
-  dep_lua = dependency('lua', required: false, version : '>=5.2')
-endif
+# TODO: use multi-argument dependency() in meson 0.60
+foreach lua : ['lua54', 'lua53', 'lua52', 'lua']
+    dep_lua = dependency(lua, required: false, version: '>=5.2')
+    if dep_lua.found()
+        break
+    endif
+endforeach
 
 dep_libarchive = dependency('libarchive', required: false)
 dep_libxml2 = dependency('libxml-2.0', required: false)