Mesa (master): freedreno/decode: move dependencies up a level

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: caa107cb8db930bc59cd557a325a6a0bc4a86565
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=caa107cb8db930bc59cd557a325a6a0bc4a86565

Author: Rob Clark <robdclark at chromium.org>
Date:   Sun Aug  2 12:17:28 2020 -0700

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 at chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6154>

---

 src/freedreno/decode/meson.build | 10 ----------
 src/freedreno/meson.build        |  9 +++++++++
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/freedreno/decode/meson.build b/src/freedreno/decode/meson.build
index 9435fc8c04c..b02f795234c 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 6ecf2e196aa..64108c57756 100644
--- a/src/freedreno/meson.build
+++ b/src/freedreno/meson.build
@@ -25,6 +25,15 @@ 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)
+endif
+
+dep_libarchive = dependency('libarchive', required: false)
 dep_libxml2 = dependency('libxml-2.0', required: false)
 prog_gzip = find_program('gzip', required: false)