From 526582f66216d6871e516678b492d6916943bb54 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Sat, 5 Jul 2025 05:54:50 +0300
Subject: [PATCH 70/70] Meson: Use lua-5.5

See RM #1568

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 meson.build | 70 ++++++++++++++++++++++++++---------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/meson.build b/meson.build
index 447e2ef86b..12af0bf73c 100644
--- a/meson.build
+++ b/meson.build
@@ -692,7 +692,7 @@ else
   icu_dep = dependency('icu-uc')
   syslua = get_option('syslua')
   if syslua != 'false'
-    lua_dep_tmp = dependency('lua-5.4', 'lua-54', 'lua54', 'lua5.4', required:false)
+    lua_dep_tmp = dependency('lua-5.5', 'lua-55', 'lua55', 'lua5.5', required:false)
   endif
 endif
 
@@ -753,40 +753,40 @@ if syslua != 'false' and lua_dep_tmp.found()
 elif syslua == 'true'
   error('Syslua requested but not found.')
 else
-  lua_inc_path = 'dependencies/lua-5.4/src'
+  lua_inc_path = 'dependencies/lua-5.5/src'
   lua_sources = [
-    'dependencies/lua-5.4/src/lapi.c',
-    'dependencies/lua-5.4/src/lauxlib.c',
-    'dependencies/lua-5.4/src/lbaselib.c',
-    'dependencies/lua-5.4/src/lcode.c',
-    'dependencies/lua-5.4/src/lcorolib.c',
-    'dependencies/lua-5.4/src/lctype.c',
-    'dependencies/lua-5.4/src/ldblib.c',
-    'dependencies/lua-5.4/src/ldebug.c',
-    'dependencies/lua-5.4/src/ldo.c',
-    'dependencies/lua-5.4/src/ldump.c',
-    'dependencies/lua-5.4/src/lfunc.c',
-    'dependencies/lua-5.4/src/lgc.c',
-    'dependencies/lua-5.4/src/linit.c',
-    'dependencies/lua-5.4/src/liolib.c',
-    'dependencies/lua-5.4/src/llex.c',
-    'dependencies/lua-5.4/src/lmathlib.c',
-    'dependencies/lua-5.4/src/lmem.c',
-    'dependencies/lua-5.4/src/loadlib.c',
-    'dependencies/lua-5.4/src/lobject.c',
-    'dependencies/lua-5.4/src/lopcodes.c',
-    'dependencies/lua-5.4/src/loslib.c',
-    'dependencies/lua-5.4/src/lparser.c',
-    'dependencies/lua-5.4/src/lstate.c',
-    'dependencies/lua-5.4/src/lstring.c',
-    'dependencies/lua-5.4/src/lstrlib.c',
-    'dependencies/lua-5.4/src/ltable.c',
-    'dependencies/lua-5.4/src/ltablib.c',
-    'dependencies/lua-5.4/src/ltm.c',
-    'dependencies/lua-5.4/src/lundump.c',
-    'dependencies/lua-5.4/src/lutf8lib.c',
-    'dependencies/lua-5.4/src/lvm.c',
-    'dependencies/lua-5.4/src/lzio.c',
+    'dependencies/lua-5.5/src/lapi.c',
+    'dependencies/lua-5.5/src/lauxlib.c',
+    'dependencies/lua-5.5/src/lbaselib.c',
+    'dependencies/lua-5.5/src/lcode.c',
+    'dependencies/lua-5.5/src/lcorolib.c',
+    'dependencies/lua-5.5/src/lctype.c',
+    'dependencies/lua-5.5/src/ldblib.c',
+    'dependencies/lua-5.5/src/ldebug.c',
+    'dependencies/lua-5.5/src/ldo.c',
+    'dependencies/lua-5.5/src/ldump.c',
+    'dependencies/lua-5.5/src/lfunc.c',
+    'dependencies/lua-5.5/src/lgc.c',
+    'dependencies/lua-5.5/src/linit.c',
+    'dependencies/lua-5.5/src/liolib.c',
+    'dependencies/lua-5.5/src/llex.c',
+    'dependencies/lua-5.5/src/lmathlib.c',
+    'dependencies/lua-5.5/src/lmem.c',
+    'dependencies/lua-5.5/src/loadlib.c',
+    'dependencies/lua-5.5/src/lobject.c',
+    'dependencies/lua-5.5/src/lopcodes.c',
+    'dependencies/lua-5.5/src/loslib.c',
+    'dependencies/lua-5.5/src/lparser.c',
+    'dependencies/lua-5.5/src/lstate.c',
+    'dependencies/lua-5.5/src/lstring.c',
+    'dependencies/lua-5.5/src/lstrlib.c',
+    'dependencies/lua-5.5/src/ltable.c',
+    'dependencies/lua-5.5/src/ltablib.c',
+    'dependencies/lua-5.5/src/ltm.c',
+    'dependencies/lua-5.5/src/lundump.c',
+    'dependencies/lua-5.5/src/lutf8lib.c',
+    'dependencies/lua-5.5/src/lvm.c',
+    'dependencies/lua-5.5/src/lzio.c',
   ]
   lua_dep = dependency('', required:false)
 endif
@@ -1315,7 +1315,7 @@ else
   tolua_cmd = executable('tolua',
     'dependencies/tolua-5.2/src/bin/tolua.c',
     'dependencies/tolua-5.2/src/bin/toluabind.c',
-    include_directories : ['dependencies/lua-5.4/src',
+    include_directories : ['dependencies/lua-5.5/src',
                            'dependencies/tolua-5.2/include'],
     link_with: fc_deps,
     dependencies: m_dep,
-- 
2.47.2