diff --git a/releases.json b/releases.json index 00241a48b..6c1cf781c 100644 --- a/releases.json +++ b/releases.json @@ -2846,10 +2846,11 @@ }, "lua": { "dependency_names": [ - "lua-5.4", + "lua-5.5", "lua" ], "versions": [ + "5.5.0-1", "5.4.8-1", "5.4.6-5", "5.4.6-4", diff --git a/subprojects/lua.wrap b/subprojects/lua.wrap index 46dac8c0d..90b3164c7 100644 --- a/subprojects/lua.wrap +++ b/subprojects/lua.wrap @@ -1,10 +1,9 @@ [wrap-file] -directory = lua-5.4.8 -source_url = https://www.lua.org/ftp/lua-5.4.8.tar.gz -source_filename = lua-5.4.8.tar.gz -source_hash = 4f18ddae154e793e46eeab727c59ef1c0c0c2b744e7b94219710d76f530629ae +directory = lua-5.5.0 +source_url = https://www.lua.org/ftp/lua-5.5.0.tar.gz +source_filename = lua-5.5.0.tar.gz +source_hash = 57ccc32bbbd005cab75bcc52444052535af691789dba2b9016d5c50640d68b3d patch_directory = lua [provide] -lua-5.4 = lua_dep -lua = lua_dep +dependency_names = lua, lua-5.5 diff --git a/subprojects/packagefiles/lua/meson.build b/subprojects/packagefiles/lua/meson.build index 7dbc2e2a6..64d27fea0 100644 --- a/subprojects/packagefiles/lua/meson.build +++ b/subprojects/packagefiles/lua/meson.build @@ -1,9 +1,9 @@ project( - 'lua-5.4', + 'lua', 'c', license: 'MIT', - meson_version: '>=0.49.2', - version: '5.4.8', + meson_version: '>=0.63.0', + version: '5.5.0', default_options: ['c_std=c99', 'warning_level=2'], ) @@ -49,17 +49,10 @@ lua_lib_deps = [ ), ] -if meson.version().version_compare('>= 0.62') - dl_dep = dependency( - 'dl', - required: get_option('loadlib'), - ) -else - dl_dep = cc.find_library( - 'dl', - required: get_option('loadlib'), - ) -endif +dl_dep = dependency( + 'dl', + required: get_option('loadlib'), +) if dl_dep.found() lua_lib_deps += dl_dep @@ -135,6 +128,12 @@ lua_dep = declare_dependency( include_directories: inc, ) +meson.override_dependency('lua', lua_dep) +meson.override_dependency( + 'lua-' + lua_versions[0] + '.' + lua_versions[1], + lua_dep, +) + if get_option('interpreter') lua_exe = executable( 'lua',