Mesa (staging/20.2): meson/freedreno: Fix lua requirement

[GitLab Mirror]

Module: Mesa
Branch: staging/20.2
Commit: d4d36010a82b3ce9722e686d391993ca31e0b0cd
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d4d36010a82b3ce9722e686d391993ca31e0b0cd

Author: Dylan Baker <dylan.c.baker at intel.com>
Date:   Fri Aug  7 09:14:03 2020 -0700

meson/freedreno: Fix lua requirement

Freedreno needs at least Lua 5.2, but the current code will report found
for 5.1, which doesn't actually work.

Fixes: caa107cb8db930bc59cd557a325a6a0bc4a86565
       ("freedreno/decode: move dependencies up a level")

Reviewed-by: Rob Clark <robclark at freedesktop.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6229>
(cherry picked from commit 1e28745bc0d3528c1dfc25459456849feb58d407)

---

 .pick_status.json         | 2 +-
 src/freedreno/meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 0066fb903f1..e31f9148dbe 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -4,7 +4,7 @@
         "description": "meson/freedreno: Fix lua requirement",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "caa107cb8db930bc59cd557a325a6a0bc4a86565"
     },
diff --git a/src/freedreno/meson.build b/src/freedreno/meson.build
index 64108c57756..f6219502886 100644
--- a/src/freedreno/meson.build
+++ b/src/freedreno/meson.build
@@ -30,7 +30,7 @@ if not dep_lua.found()
   dep_lua = dependency('lua52', required: false)
 endif
 if not dep_lua.found()
-  dep_lua = dependency('lua', required: false)
+  dep_lua = dependency('lua', required: false, version : '>=5.2')
 endif
 
 dep_libarchive = dependency('libarchive', required: false)