From 77b218ce5903f7cdcdf7853127ed6452f6336a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Tue, 23 Dec 2025 22:14:41 +0100 Subject: [PATCH 1/3] lua: remove version from project name The project name is an arbitrary string, since it has no effect on functionality, remove the version number so that fewer places need to be changed when updating. --- subprojects/packagefiles/lua/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/packagefiles/lua/meson.build b/subprojects/packagefiles/lua/meson.build index 7dbc2e2a6..1022007d2 100644 --- a/subprojects/packagefiles/lua/meson.build +++ b/subprojects/packagefiles/lua/meson.build @@ -1,5 +1,5 @@ project( - 'lua-5.4', + 'lua', 'c', license: 'MIT', meson_version: '>=0.49.2', From ec1fbd31d1cb14826328b6129e89d18d29cdf8cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Tue, 23 Dec 2025 22:16:26 +0100 Subject: [PATCH 2/3] lua: fix sanity check errors Among others: * 0.56.0: oldest version supported by WrapDB * 0.63.0: c_std in subproject default_options * using `dependency_names` in wrap file and overriding dependencies --- subprojects/lua.wrap | 3 +-- subprojects/packagefiles/lua/meson.build | 23 +++++++++++------------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/subprojects/lua.wrap b/subprojects/lua.wrap index 46dac8c0d..7492e113d 100644 --- a/subprojects/lua.wrap +++ b/subprojects/lua.wrap @@ -6,5 +6,4 @@ source_hash = 4f18ddae154e793e46eeab727c59ef1c0c0c2b744e7b94219710d76f530629ae patch_directory = lua [provide] -lua-5.4 = lua_dep -lua = lua_dep +dependency_names = lua, lua-5.4 diff --git a/subprojects/packagefiles/lua/meson.build b/subprojects/packagefiles/lua/meson.build index 1022007d2..77d045950 100644 --- a/subprojects/packagefiles/lua/meson.build +++ b/subprojects/packagefiles/lua/meson.build @@ -2,7 +2,7 @@ project( 'lua', 'c', license: 'MIT', - meson_version: '>=0.49.2', + meson_version: '>=0.63.0', version: '5.4.8', 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', From 47d5d106d12360f4d176532f71722d90808a221e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Tue, 23 Dec 2025 22:10:26 +0100 Subject: [PATCH 3/3] lua: update to 5.5.0 Lua 5.5.0 was released on 2025-12-22[0]; update the wrap to use that version, no major changes are needed. [0]: https://lua.org/versions.html#5.5 --- releases.json | 3 ++- subprojects/lua.wrap | 10 +++++----- subprojects/packagefiles/lua/meson.build | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) 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 7492e113d..90b3164c7 100644 --- a/subprojects/lua.wrap +++ b/subprojects/lua.wrap @@ -1,9 +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] -dependency_names = lua, lua-5.4 +dependency_names = lua, lua-5.5 diff --git a/subprojects/packagefiles/lua/meson.build b/subprojects/packagefiles/lua/meson.build index 77d045950..64d27fea0 100644 --- a/subprojects/packagefiles/lua/meson.build +++ b/subprojects/packagefiles/lua/meson.build @@ -3,7 +3,7 @@ project( 'c', license: 'MIT', meson_version: '>=0.63.0', - version: '5.4.8', + version: '5.5.0', default_options: ['c_std=c99', 'warning_level=2'], )