From f6e7d1dca2f87db7f3f83e9613d60ce68686ad88 Mon Sep 17 00:00:00 2001 From: Caio Oliveira Date: Fri, 12 Jul 2024 15:15:11 -0700 Subject: [PATCH] meson: Update Lua dependency version to 5.3 Lua is used for unittests in Freedreno. When this was added, 5.3 was too new, now this version is available in debian stable (and oldstable). A notable improvement in Lua 5.3 is better handling for integers. Note the wrap provided in subprojects/ already uses 5.4. Also move the dependency up so other tools/tests can use it. Reviewed-by: Dylan Baker Acked-by: Rob Clark Part-of: --- meson.build | 5 +++++ src/freedreno/meson.build | 6 ------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index 38edec61dd0..10e8fb0244b 100644 --- a/meson.build +++ b/meson.build @@ -1943,6 +1943,11 @@ if with_clc endif endif +dep_lua = dependency('lua54', 'lua5.4', 'lua-5.4', + 'lua53', 'lua5.3', 'lua-5.3', + 'lua', required: false, + allow_fallback: true, version: '>=5.3') + # Be explicit about only using this lib on Windows, to avoid picking # up random libs with the generic name 'libversion' dep_version = null_dep diff --git a/src/freedreno/meson.build b/src/freedreno/meson.build index b455cd68b9e..29e1bc42400 100644 --- a/src/freedreno/meson.build +++ b/src/freedreno/meson.build @@ -8,12 +8,6 @@ rnn_src_path = dir_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('lua54', 'lua5.4', 'lua-5.4', - 'lua53', 'lua5.3', 'lua-5.3', - 'lua52', 'lua5.2', 'lua-5.2', - 'lua', required: false, - allow_fallback: true, version: '>=5.2') - dep_libarchive = dependency('libarchive', allow_fallback: true, required: false) dep_libxml2 = dependency('libxml-2.0', allow_fallback: true, required: false) prog_gzip = find_program('gzip', required: false)