pkgs/by-name/ae/aegisub/000-remove-bundled-luajit.patch

   1 diff --git a/CMakeLists.test.txt b/CMakeLists.test.txt
   2 index 4d1a03177..62fab05c9 100644
   3 --- a/CMakeLists.test.txt
   4 +++ b/CMakeLists.test.txt
   5 @@ -2,7 +2,7 @@ if(UNIX)
   6      add_executable(aegisub-lua EXCLUDE_FROM_ALL
   7          automation/tests/aegisub.cpp
   8      )
   9 -    target_link_libraries(aegisub-lua PRIVATE libaegisub luabins luajit "Boost::locale" "ICU::in")
  10 +    target_link_libraries(aegisub-lua PRIVATE libaegisub luabins luajit-5.1 "Boost::locale" "ICU::in")
  11      add_custom_target(test-automation
  12          COMMAND sh -c "$(luarocks path); ${PROJECT_BINARY_DIR}/aegisub-lua tests/busted.lua -p moon tests/modules"
  13          VERBATIM
  14 diff --git a/CMakeLists.txt b/CMakeLists.txt
  15 index ce2e355ff..4d4396451 100644
  16 --- a/CMakeLists.txt
  17 +++ b/CMakeLists.txt
  18 @@ -13,210 +13,6 @@ if(NOT CMAKE_BUILD_TYPE)
  19      set(CMAKE_BUILD_TYPE Release)
  20  endif()
  21
  22 -## Build bundled LuaJIT with aegisub specific patches
  23 -add_executable(luajit-minilua vendor/luajit/src/host/minilua.c)
  24 -if(NOT WIN32)
  25 -    target_link_libraries(luajit-minilua m)
  26 -endif()
  27 -if(WIN32)
  28 -    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
  29 -        add_custom_command(
  30 -            OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h"
  31 -            COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen"
  32 -            COMMAND luajit-minilua ../dynasm/dynasm.lua -LN -D WIN -D JIT -D FFI -D P64 -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x86.dasc
  33 -            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
  34 -        )
  35 -    else()
  36 -        add_custom_command(
  37 -            OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h"
  38 -            COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen"
  39 -            COMMAND luajit-minilua ../dynasm/dynasm.lua -LN -D WIN -D JIT -D FFI -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x86.dasc
  40 -            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
  41 -        )
  42 -    endif()
  43 -elseif(APPLE)
  44 -    if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
  45 -        add_custom_command(
  46 -            OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h"
  47 -            COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen"
  48 -            COMMAND luajit-minilua ../dynasm/dynasm.lua -D ENDIAN_LE -D P64 -D FFI -D DUALNUM -D FPU -D HFABI -D NO_UNWIND -D VER=80 -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_arm64.dasc
  49 -            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
  50 -        )
  51 -    else()
  52 -        add_custom_command(
  53 -            OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h"
  54 -            COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen"
  55 -            COMMAND luajit-minilua ../dynasm/dynasm.lua -D P64 -D JIT -D FFI -D FPU -D HFABI -D VER= -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x64.dasc
  56 -            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
  57 -        )
  58 -    endif()
  59 -else()
  60 -    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
  61 -        add_custom_command(
  62 -            OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h"
  63 -            COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen"
  64 -            COMMAND luajit-minilua ../dynasm/dynasm.lua -D P64 -D JIT -D FFI -D FPU -D HFABI -D VER= -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x86.dasc
  65 -            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
  66 -        )
  67 -    else()
  68 -        add_custom_command(
  69 -            OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h"
  70 -            COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen"
  71 -            COMMAND luajit-minilua ../dynasm/dynasm.lua -D JIT -D FFI -D FPU -D HFABI -D VER= -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x86.dasc
  72 -            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
  73 -        )
  74 -    endif()
  75 -endif()
  76 -
  77 -add_executable(luajit-buildvm
  78 -    vendor/luajit/src/host/buildvm.c
  79 -    vendor/luajit/src/host/buildvm_asm.c
  80 -    vendor/luajit/src/host/buildvm_peobj.c
  81 -    vendor/luajit/src/host/buildvm_lib.c
  82 -    vendor/luajit/src/host/buildvm_fold.c
  83 -
  84 -    "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h"
  85 -)
  86 -target_compile_definitions(luajit-buildvm PRIVATE LUAJIT_ENABLE_LUA52COMPAT)
  87 -target_include_directories(luajit-buildvm PRIVATE vendor/luajit/src "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen")
  88 -
  89 -if(APPLE)
  90 -    add_custom_command(
  91 -        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
  92 -        COMMAND luajit-buildvm -m machasm -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
  93 -    )
  94 -elseif(UNIX)
  95 -    add_custom_command(
  96 -        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
  97 -        COMMAND luajit-buildvm -m elfasm -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
  98 -    )
  99 -elseif(MSVC)
 100 -    add_custom_command(
 101 -        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.obj"
 102 -        COMMAND luajit-buildvm -m peobj -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.obj"
 103 -    )
 104 -endif()
 105 -add_custom_command(
 106 -    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_ffdef.h"
 107 -    COMMAND luajit-buildvm -m ffdef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_ffdef.h" lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c
 108 -    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
 109 -)
 110 -add_custom_command(
 111 -    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_bcdef.h"
 112 -    COMMAND luajit-buildvm -m bcdef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_bcdef.h" lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c
 113 -    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
 114 -)
 115 -add_custom_command(
 116 -    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_folddef.h"
 117 -    COMMAND luajit-buildvm -m folddef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_folddef.h" lj_opt_fold.c
 118 -    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
 119 -)
 120 -add_custom_command(
 121 -    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_recdef.h"
 122 -    COMMAND luajit-buildvm -m recdef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_recdef.h" lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c
 123 -    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
 124 -)
 125 -add_custom_command(
 126 -    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_libdef.h"
 127 -    COMMAND luajit-buildvm -m libdef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_libdef.h" lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c
 128 -    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
 129 -)
 130 -add_custom_command(
 131 -    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/jit/vmdef.lua"
 132 -    COMMAND luajit-buildvm -m vmdef -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/jit/vmdef.lua" lib_base.c lib_math.c lib_bit.c lib_string.c lib_table.c lib_io.c lib_os.c lib_package.c lib_debug.c lib_jit.c lib_ffi.c
 133 -    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
 134 -)
 135 -
 136 -add_library(luajit STATIC
 137 -    vendor/luajit/src/lib_base.c
 138 -    vendor/luajit/src/lib_math.c
 139 -    vendor/luajit/src/lib_bit.c
 140 -    vendor/luajit/src/lib_string.c
 141 -    vendor/luajit/src/lib_table.c
 142 -    vendor/luajit/src/lib_io.c
 143 -    vendor/luajit/src/lib_os.c
 144 -    vendor/luajit/src/lib_package.c
 145 -    vendor/luajit/src/lib_debug.c
 146 -    vendor/luajit/src/lib_jit.c
 147 -    vendor/luajit/src/lib_ffi.c
 148 -    vendor/luajit/src/lj_gc.c
 149 -    vendor/luajit/src/lj_err.c
 150 -    vendor/luajit/src/lj_char.c
 151 -    vendor/luajit/src/lj_bc.c
 152 -    vendor/luajit/src/lj_obj.c
 153 -    vendor/luajit/src/lj_buf.c
 154 -    vendor/luajit/src/lj_str.c
 155 -    vendor/luajit/src/lj_tab.c
 156 -    vendor/luajit/src/lj_func.c
 157 -    vendor/luajit/src/lj_udata.c
 158 -    vendor/luajit/src/lj_meta.c
 159 -    vendor/luajit/src/lj_debug.c
 160 -    vendor/luajit/src/lj_state.c
 161 -    vendor/luajit/src/lj_dispatch.c
 162 -    vendor/luajit/src/lj_vmevent.c
 163 -    vendor/luajit/src/lj_vmmath.c
 164 -    vendor/luajit/src/lj_strscan.c
 165 -    vendor/luajit/src/lj_strfmt.c
 166 -    vendor/luajit/src/lj_strfmt_num.c
 167 -    vendor/luajit/src/lj_api.c
 168 -    vendor/luajit/src/lj_profile.c
 169 -    vendor/luajit/src/lj_lex.c
 170 -    vendor/luajit/src/lj_parse.c
 171 -    vendor/luajit/src/lj_bcread.c
 172 -    vendor/luajit/src/lj_bcwrite.c
 173 -    vendor/luajit/src/lj_load.c
 174 -    vendor/luajit/src/lj_ir.c
 175 -    vendor/luajit/src/lj_opt_mem.c
 176 -    vendor/luajit/src/lj_opt_fold.c
 177 -    vendor/luajit/src/lj_opt_narrow.c
 178 -    vendor/luajit/src/lj_opt_dce.c
 179 -    vendor/luajit/src/lj_opt_loop.c
 180 -    vendor/luajit/src/lj_opt_split.c
 181 -    vendor/luajit/src/lj_opt_sink.c
 182 -    vendor/luajit/src/lj_mcode.c
 183 -    vendor/luajit/src/lj_snap.c
 184 -    vendor/luajit/src/lj_record.c
 185 -    vendor/luajit/src/lj_crecord.c
 186 -    vendor/luajit/src/lj_ffrecord.c
 187 -    vendor/luajit/src/lj_asm.c
 188 -    vendor/luajit/src/lj_trace.c
 189 -    vendor/luajit/src/lj_gdbjit.c
 190 -    vendor/luajit/src/lj_ctype.c
 191 -    vendor/luajit/src/lj_cdata.c
 192 -    vendor/luajit/src/lj_cconv.c
 193 -    vendor/luajit/src/lj_ccall.c
 194 -    vendor/luajit/src/lj_ccallback.c
 195 -    vendor/luajit/src/lj_carith.c
 196 -    vendor/luajit/src/lj_clib.c
 197 -    vendor/luajit/src/lj_cparse.c
 198 -    vendor/luajit/src/lj_lib.c
 199 -    vendor/luajit/src/lj_alloc.c
 200 -    vendor/luajit/src/lib_aux.c
 201 -    vendor/luajit/src/lib_init.c
 202 -
 203 -    "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_ffdef.h"
 204 -    "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_bcdef.h"
 205 -    "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_folddef.h"
 206 -    "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_recdef.h"
 207 -    "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/lj_libdef.h"
 208 -    # "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/jit/vmdef.lua"
 209 -)
 210 -target_compile_definitions(luajit PRIVATE LUAJIT_ENABLE_LUA52COMPAT)
 211 -target_include_directories(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen" PUBLIC "vendor/luajit/src")
 212 -if(WIN32)
 213 -    target_sources(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.obj")
 214 -else()
 215 -    enable_language(ASM)
 216 -    target_sources(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s")
 217 -    target_link_libraries(luajit ${CMAKE_DL_LIBS})
 218 -endif()
 219 -if(APPLE)
 220 -    if(NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
 221 -        target_compile_definitions(luajit-buildvm PRIVATE LUAJIT_ENABLE_GC64)
 222 -        target_compile_definitions(luajit PRIVATE LUAJIT_ENABLE_GC64)
 223 -    endif()
 224 -endif()
 225 -
 226  add_subdirectory(vendor/luabins)
 227
 228  ## libaegisub
 229 @@ -310,18 +106,18 @@ if(APPLE)
 230  else()
 231      target_precompile_headers(libaegisub PRIVATE "libaegisub/lagi_pre.h")
 232  endif()
 233 -target_link_libraries(libaegisub PRIVATE luajit luabins)
 234 +target_link_libraries(libaegisub PRIVATE luajit-5.1 luabins)
 235
 236  add_custom_command(
 237      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/default_config.cpp" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/default_config.h"
 238      DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/default_config_platform.json"
 239 -    COMMAND luajit-minilua "${PROJECT_SOURCE_DIR}/tools/respack.lua" manifest.respack default_config.cpp default_config.h
 240 +    COMMAND luajit "${PROJECT_SOURCE_DIR}/tools/respack.lua" manifest.respack default_config.cpp default_config.h
 241      WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc"
 242  )
 243
 244  add_custom_command(
 245      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.cpp" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.h"
 246 -    COMMAND luajit-minilua ../../tools/respack.lua manifest.respack "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.cpp" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.h"
 247 +    COMMAND luajit ../../tools/respack.lua manifest.respack "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.cpp" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc/bitmap.h"
 248      WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/src/bitmaps
 249  )
 250
 251 @@ -496,7 +292,7 @@ add_executable(Aegisub WIN32
 252      src/video_slider.cpp
 253      src/visual_feature.cpp
 254  )
 255 -target_link_libraries(Aegisub PRIVATE ${CMAKE_DL_LIBS} libaegisub luajit)
 256 +target_link_libraries(Aegisub PRIVATE ${CMAKE_DL_LIBS} libaegisub luajit-5.1)
 257  target_compile_definitions(Aegisub PRIVATE CMAKE_BUILD)
 258  target_include_directories(Aegisub PRIVATE "src/libresrc" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc")
 259  if(APPLE)
 260 diff --git a/vendor/luabins/CMakeLists.txt b/vendor/luabins/CMakeLists.txt
 261 index 1fe1d2031..e2761527b 100644
 262 --- a/vendor/luabins/CMakeLists.txt
 263 +++ b/vendor/luabins/CMakeLists.txt
 264 @@ -36,4 +36,4 @@ add_library(luabins STATIC
 265      src/savebuffer.c
 266      src/write.c
 267  )
 268 -target_link_libraries(luabins PRIVATE luajit)
 269 \ No newline at end of file
 270 +target_link_libraries(luabins PRIVATE luajit-5.1)
 271 \ No newline at end of file