From 4e6af75db40e5828d8a06420b32ba0504eacbd7d Mon Sep 17 00:00:00 2001 From: arch1t3cht Date: Thu, 12 Oct 2023 23:04:22 +0200 Subject: [PATCH 1/3] Add proper endianness flag for dasm in luajit wrap Fixes luajit almost completely breaking on aarch64 and probably other non-x86 architectures. --- subprojects/packagefiles/luajit/src/host/meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/subprojects/packagefiles/luajit/src/host/meson.build b/subprojects/packagefiles/luajit/src/host/meson.build index b3e963ef4..2cde6b005 100644 --- a/subprojects/packagefiles/luajit/src/host/meson.build +++ b/subprojects/packagefiles/luajit/src/host/meson.build @@ -21,6 +21,7 @@ else hpre = '#include "@0@/../lj_arch.h"'.format(meson.current_source_dir()) checkdefs = [ + ['LJ_LE', '1', ['-D', 'ENDIAN_LE']], ['LJ_ARCH_BITS', '64', ['-D', 'P64']], ['LJ_HASJIT', '1', ['-D', 'JIT']], ['LJ_HASFFI', '1', ['-D', 'FFI']], From ad92ccf01a166ee2aa6cc0da3a92573e907ee082 Mon Sep 17 00:00:00 2001 From: arch1t3cht Date: Fri, 13 Oct 2023 00:26:26 +0200 Subject: [PATCH 2/3] Fix cleantags with \k tags with noninteger durations Fixes arch1t3cht/Aegisub#92 . --- automation/include/cleantags.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/automation/include/cleantags.lua b/automation/include/cleantags.lua index 0ca65daa9..8247d89ca 100644 --- a/automation/include/cleantags.lua +++ b/automation/include/cleantags.lua @@ -23,10 +23,10 @@ OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ]] -cleantags_version = "1.301" -cleantags_modified = "13 November 2009" +cleantags_version = "1.302" +cleantags_modified = "12 October 2023" -ktag = "\\[kK][fo]?%d+" +ktag = "\\[kK][fo]?[%d.]+" --[[ The main function that performs the cleaning up Takes: text From a631bf192c78cb64e37972287e619fbe3adc90df Mon Sep 17 00:00:00 2001 From: arch1t3cht Date: Fri, 13 Oct 2023 00:32:36 +0200 Subject: [PATCH 3/3] lua: Fix dialog dropdowns that are empty by default on Mac --- src/auto4_lua_dialog.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/auto4_lua_dialog.cpp b/src/auto4_lua_dialog.cpp index 7b4b5fa0c..36bc35723 100644 --- a/src/auto4_lua_dialog.cpp +++ b/src/auto4_lua_dialog.cpp @@ -326,6 +326,12 @@ namespace Automation4 { { lua_getfield(L, -1, "items"); read_string_array(L, items); + +#ifdef __WXMAC__ + if (std::find(items.begin(), items.end(), value) == items.end()) { + items.insert(items.begin(), value); + } +#endif } bool CanSerialiseValue() const override { return true; }