freedreno/decode: move dependencies up a level
This is mainly for the benefit of automated syncing of changes from mesa
back to envytools, where the same subdir meson.build's are used, but the
toplevel meson.build is different. In the envytools case, we want these
depenendencies to be required.
Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6154>
diff --git a/src/freedreno/decode/meson.build b/src/freedreno/decode/meson.build
index 9435fc8..b02f795 100644
--- a/src/freedreno/decode/meson.build
+++ b/src/freedreno/decode/meson.build
@@ -18,16 +18,6 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
-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)
-endif
-
-dep_libarchive = dependency('libarchive', required: false)
-
# Shared cmdstream decoding:
libfreedreno_cffdec = static_library(
'freedreno_cffdec',
diff --git a/src/freedreno/meson.build b/src/freedreno/meson.build
index 6ecf2e1..64108c5 100644
--- a/src/freedreno/meson.build
+++ b/src/freedreno/meson.build
@@ -25,6 +25,15 @@
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)
+endif
+
+dep_libarchive = dependency('libarchive', required: false)
dep_libxml2 = dependency('libxml-2.0', required: false)
prog_gzip = find_program('gzip', required: false)
