refactor(macos): pivot to upstream PR PathOfBuildingCommunity#102 LuaJIT-fix approach

Replace the custom-allocator + module-bisecting workaround stack with the
upstream macOS approach from PathOfBuildingCommunity/PathOfBuilding-SimpleGraphic
PR PathOfBuildingCommunity#102, which fixes the arm64/GC64 allocation problem at the source by
pinning a patched LuaJIT (port 2026-03-30_1, ref 18b087cd) rather than
working around it in the engine.

Removed (no longer needed once LuaJIT is fixed correctly):
- mac_gc64_alloc custom allocator + magic sentinel (ui_main.cpp)
- mac_pload_* / bisect / coroutine module-loading machinery (~1050 lines
  across ui_api.cpp and ui_main.cpp) that worked around Data.lua load
  failures, themselves a symptom of the same GC64 bug
- sys_IMain::launchCwd and the host argv handling in sys_main.cpp
- mac/entry.cpp (win/entry.cpp already compiles on macOS via its
  visibility macros and _WIN32 guards, matching upstream)

Adopted from PR PathOfBuildingCommunity#102:
- Patched LuaJIT vcpkg port (2026-03-30_1) + arm64-osx triplet + version
  files; baseline bumped to 2026-05-22
- AppendLocalLuaSubdir() replacing inline package.path logic
- Retina/HiDPI cursor scaling + GLFW_ANGLE_PLATFORM_TYPE_METAL (sys_video.cpp)
- .app bundle base-path detection (sys_main.cpp)
- Portable std::this_thread::sleep_for and size_t casts (r_main/r_texture)
- VirtualScreenHeight() in r_font; base64/common include + guard fixes
- Lua-cURLv3 luaL_setfuncs patch + CMake patch-application; WIN32-guarded
  lua-utf8/luasocket; ZSTD target selection

Retained (our only divergence, additive and APPLE-guarded):
- pob-host launcher executable (mac/host.cpp -> "Path of Building-PoE2")
  that links the dylib for a runnable dev binary; upstream defers this to
  a separate launcher repo. The host shifts argv itself so the engine
  stays identical to upstream.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01E69xvgJuYgUaR1eHY3Qf3o

Author: claude

.gitattributes

@@ -0,0 +1 @@
+patches/* -text

CMakeLists.txt

@@ -62,6 +62,7 @@ set(SIMPLEGRAPHIC_SOURCES
     "engine/system/sys_main.h"
     "engine/system/sys_opengl.h"
     "engine/system/sys_video.h"
+    "win/entry.cpp"
     "ui.h"
     "ui_api.cpp"
     "ui_console.cpp"
@@ -75,14 +76,6 @@ set(SIMPLEGRAPHIC_SOURCES
     "ui_subscript.h"
 )
 
-if (APPLE)
-    list(APPEND SIMPLEGRAPHIC_SOURCES "mac/entry.cpp")
-elseif (WIN32)
-    list(APPEND SIMPLEGRAPHIC_SOURCES "win/entry.cpp")
-else ()
-    list(APPEND SIMPLEGRAPHIC_SOURCES "win/entry.cpp")
-endif ()
-
 set (SIMPLEGRAPHIC_PLATFORM_SOURCES)
 if (APPLE)
     list (APPEND SIMPLEGRAPHIC_PLATFORM_SOURCES
@@ -135,14 +128,15 @@ find_package(re2 CONFIG REQUIRED)
 find_package(sol2 CONFIG REQUIRED)
 find_package(Threads REQUIRED)
 find_package(zstd REQUIRED)
-if(TARGET zstd::libzstd_shared)
-    set(ZSTD_TARGET zstd::libzstd_shared)
-else()
-    set(ZSTD_TARGET zstd::libzstd_static)
-endif()
 find_package(ZLIB REQUIRED)
 find_package(WebP)
 
+if (TARGET zstd::libzstd_shared)
+    set(ZSTD_LIBRARY zstd::libzstd_shared)
+else ()
+    set(ZSTD_LIBRARY zstd::libzstd_static)
+endif ()
+
 add_library(cmp_core STATIC
     dep/compressonator/cmp_core/source/cmp_core.cpp
     dep/compressonator/cmp_core/source/cmp_core.h
@@ -229,12 +223,10 @@ endif ()
 if (APPLE)
     find_library(CORE_FOUNDATION_LIBRARY CoreFoundation)
     find_library(APPLICATION_SERVICES_LIBRARY ApplicationServices)
-    find_library(FOUNDATION_FRAMEWORK Foundation)
     target_link_libraries(SimpleGraphic
         PRIVATE
         ${CORE_FOUNDATION_LIBRARY}
         ${APPLICATION_SERVICES_LIBRARY}
-        ${FOUNDATION_FRAMEWORK}
     )
 endif ()
 
@@ -254,10 +246,13 @@ target_link_libraries(SimpleGraphic
     Threads::Threads
     WebP::webpdecoder
     ZLIB::ZLIB
-    ${ZSTD_TARGET}
+    ${ZSTD_LIBRARY}
 )
 
 if (APPLE)
+    # Native launcher executable. Upstream defers packaging to a separate
+    # launcher repo; this gives us a runnable binary alongside the dylib,
+    # mirroring "Path of Building-PoE2.exe" + "SimpleGraphic.dll" on Windows.
     set(PoB_HOST_TARGET pob-host)
     add_executable(${PoB_HOST_TARGET} mac/host.cpp)
     set_target_properties(${PoB_HOST_TARGET} PROPERTIES
@@ -309,6 +304,35 @@ if (WIN32)
 endif ()
 
 
+find_package(Git QUIET)
+if (NOT GIT_EXECUTABLE)
+    set(GIT_EXECUTABLE git)
+endif ()
+
+function(apply_submodule_patch SUBMODULE_DIR PATCH_FILE)
+    execute_process(
+        COMMAND ${GIT_EXECUTABLE} -C ${SUBMODULE_DIR} apply --ignore-whitespace --reverse --check ${PATCH_FILE}
+        RESULT_VARIABLE _patch_in_place
+        OUTPUT_QUIET ERROR_QUIET
+    )
+    if (NOT _patch_in_place EQUAL 0)
+        execute_process(
+            COMMAND ${GIT_EXECUTABLE} -C ${SUBMODULE_DIR} apply --ignore-whitespace ${PATCH_FILE}
+            RESULT_VARIABLE _patch_result
+        )
+        if (NOT _patch_result EQUAL 0)
+            message(FATAL_ERROR "Failed to apply ${PATCH_FILE}")
+        endif ()
+        message(STATUS "Applied patch: ${PATCH_FILE}")
+    endif ()
+endfunction()
+
+apply_submodule_patch(
+    ${CMAKE_CURRENT_SOURCE_DIR}/libs/Lua-cURLv3
+    ${CMAKE_CURRENT_SOURCE_DIR}/patches/Lua-cURLv3-skip-luaL_setfuncs-on-luajit.patch
+)
+
+
 # lcurl module
 
 set(LCURL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libs/Lua-cURLv3)
@@ -323,57 +347,37 @@ target_include_directories(lcurl
 target_link_libraries(lcurl
     PRIVATE
     CURL::libcurl
-    $<$<NOT:$<BOOL:${APPLE}>>:LuaJIT::LuaJIT>
+    LuaJIT::LuaJIT
 )
 
-if(APPLE)
-    target_include_directories(lcurl PRIVATE $<TARGET_PROPERTY:LuaJIT::LuaJIT,INTERFACE_INCLUDE_DIRECTORIES>)
-    target_link_options(lcurl PRIVATE -undefined dynamic_lookup)
-endif()
-
 install(TARGETS lcurl RUNTIME DESTINATION ".")
 install(FILES $<TARGET_RUNTIME_DLLS:lcurl> DESTINATION ".")
 
 # luautf8 module
 
 add_library(lua-utf8 SHARED libs/luautf8/lutf8lib.c)
 
-target_compile_definitions(lua-utf8
-    PRIVATE
-    $<$<BOOL:${WIN32}>:LUA_BUILD_AS_DLL>
-)
-
-if(NOT WIN32)
-    target_compile_options(lua-utf8 PRIVATE -include limits.h)
-endif()
+if (WIN32)
+    target_compile_definitions(lua-utf8
+        PRIVATE
+        LUA_BUILD_AS_DLL
+    )
+endif ()
 
 target_include_directories(lua-utf8
     PRIVATE
 )
 
 target_link_libraries(lua-utf8
     PRIVATE
-    $<$<NOT:$<BOOL:${APPLE}>>:LuaJIT::LuaJIT>
+    LuaJIT::LuaJIT
 )
 
-if(APPLE)
-    target_include_directories(lua-utf8 PRIVATE $<TARGET_PROPERTY:LuaJIT::LuaJIT,INTERFACE_INCLUDE_DIRECTORIES>)
-    target_link_options(lua-utf8 PRIVATE -undefined dynamic_lookup)
-endif()
-
 install(TARGETS lua-utf8 RUNTIME DESTINATION ".")
 install(FILES $<TARGET_RUNTIME_DLLS:lua-utf8> DESTINATION ".")
 
 # luasocket module
 
-if(WIN32)
-    set(LUASOCKET_PLATFORM_SRC "libs/luasocket/src/wsocket.c")
-    set(LUASOCKET_PLATFORM_LIBS wsock32 ws2_32)
-else()
-    set(LUASOCKET_PLATFORM_SRC "libs/luasocket/src/usocket.c")
-    set(LUASOCKET_PLATFORM_LIBS "")
-endif()
-
 add_library(luasocket SHARED
    "libs/luasocket/src/auxiliar.c"
    "libs/luasocket/src/buffer.c"
@@ -387,26 +391,29 @@ add_library(luasocket SHARED
    "libs/luasocket/src/tcp.c"
    "libs/luasocket/src/timeout.c"
    "libs/luasocket/src/udp.c"
-   ${LUASOCKET_PLATFORM_SRC}
 )
 
+if (WIN32)
+    target_sources(luasocket PRIVATE "libs/luasocket/src/wsocket.c")
+else ()
+    target_sources(luasocket PRIVATE "libs/luasocket/src/usocket.c")
+endif ()
+
 target_include_directories(luasocket
     PRIVATE
     ${LSOCKET_SOURCE_DIR}/src
 )
 
 target_link_libraries(luasocket
     PRIVATE
-    $<$<NOT:$<BOOL:${APPLE}>>:LuaJIT::LuaJIT>
-    ${LUASOCKET_PLATFORM_LIBS}
+    LuaJIT::LuaJIT
 )
 
-if(APPLE)
-    target_include_directories(luasocket PRIVATE $<TARGET_PROPERTY:LuaJIT::LuaJIT,INTERFACE_INCLUDE_DIRECTORIES>)
-    target_link_options(luasocket PRIVATE -undefined dynamic_lookup)
-endif()
+if (WIN32)
+    target_link_libraries(luasocket PRIVATE wsock32 ws2_32)
+endif ()
 
-set_target_properties( luasocket PROPERTIES OUTPUT_NAME "socket" )
+set_target_properties( luasocket PROPERTIES OUTPUT_NAME "socket" ) 
 install(TARGETS luasocket RUNTIME DESTINATION ".")
 install(FILES $<TARGET_RUNTIME_DLLS:luasocket> DESTINATION ".")
 
@@ -420,14 +427,9 @@ target_include_directories(lzip
 
 target_link_libraries(lzip
     PRIVATE
-    $<$<NOT:$<BOOL:${APPLE}>>:LuaJIT::LuaJIT>
+    LuaJIT::LuaJIT
     ZLIB::ZLIB
 )
 
-if(APPLE)
-    target_include_directories(lzip PRIVATE $<TARGET_PROPERTY:LuaJIT::LuaJIT,INTERFACE_INCLUDE_DIRECTORIES>)
-    target_link_options(lzip PRIVATE -undefined dynamic_lookup)
-endif()
-
 install(TARGETS lzip RUNTIME DESTINATION ".")
 install(FILES $<TARGET_RUNTIME_DLLS:lzip> DESTINATION ".")

cmake/FindLuaJIT.cmake

@@ -9,7 +9,7 @@ if (DEFINED VCPKG_INSTALLED_DIR AND DEFINED VCPKG_TARGET_TRIPLET)
 
     find_path(LuaJIT_INCLUDE_DIR luajit.h
         PATHS ${LuaJIT_SEARCH_ROOT}/include
-        PATH_SUFFIXES luajit luajit-2.1 luajit-2.0
+        PATH_SUFFIXES luajit luajit-2.0 luajit-2.1
         NO_DEFAULT_PATH)
 
     find_library(LuaJIT_LIBRARY_RELEASE NAMES lua51 luajit-5.1

engine/common/base64.c

@@ -26,12 +26,11 @@
 
  /* Base64 encoding/decoding */
 
-#include <stddef.h>
+#include "base64.h"
+
 #include <stdlib.h>
 #include <string.h>
 
-#include "base64.h"
-
 /* ---- Base64 Encoding/Decoding Table --- */
 /* Padding character string starts at offset 64. */
 static const char base64encdec[] =
@@ -49,7 +48,7 @@ static const unsigned char decodetable[] =
   29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
   48, 49, 50, 51 };
 /*
- * Base64Decode() n�e Curl_base64_decode()
+ * Base64Decode() née Curl_base64_decode()
  *
  * Given a base64 NUL-terminated string at src, decode it and return a
  * pointer in *outptr to a newly allocated memory area holding decoded
@@ -237,7 +236,7 @@ static bool base64_encode(const char* table64,
 }
 
 /*
- * Base64Encode() n�e Curl_base64_encode()
+ * Base64Encode() née Curl_base64_encode()
  *
  * Given a pointer to an input buffer and an input size, encode it and
  * return a pointer in *outptr to a newly allocated memory area holding
@@ -258,7 +257,7 @@ bool Base64Encode(const char* inputbuff, size_t insize,
 }
 
 /*
- * Base64UrlEncode() n�e Curl_base64url_encode()
+ * Base64UrlEncode() née Curl_base64url_encode()
  *
  * Given a pointer to an input buffer and an input size, encode it and
  * return a pointer in *outptr to a newly allocated memory area holding

engine/render/r_font.cpp

@@ -321,7 +321,7 @@ r_font_c::FontHeightEntry r_font_c::FindFontHeight(int height) {
 void r_font_c::DrawTextLine(scp_t pos, int align, int height, col4_t col, std::u32string_view str)
 {
 	// Check if the line is visible
-	if (pos[Y] >= renderer->sys->video->vid.size[1] || pos[Y] <= -height) {
+	if (pos[Y] >= renderer->VirtualScreenHeight() || pos[Y] <= -height) {
 		// Just process the colour codes
 		while (!str.empty()) {
 			// Check for escape character

engine/render/r_main.cpp

@@ -13,14 +13,14 @@
 #include <algorithm>
 #include <array>
 #include <chrono>
+#include <thread>
 #include <filesystem>
 #include <fmt/chrono.h>
 #include <future>
 #include <map>
 #include <numeric>
 #include <random>
 #include <sstream>
-#include <thread>
 #include <vector>
 
 #include <imgui_impl_glfw.h>
@@ -1642,11 +1642,7 @@ void r_renderer_c::GetShaderImageSize(r_shaderHnd_c* hnd, int& width, int& heigh
 	if (hnd)
 	{
 		while (hnd->sh->tex->status < r_tex_c::SIZE_KNOWN) {
-#ifdef _WIN32
-			Sleep(1);
-#else
 			std::this_thread::sleep_for(std::chrono::milliseconds(1));
-#endif
 		}
 		width = hnd->sh->tex->fileWidth;
 		height = hnd->sh->tex->fileHeight;

engine/render/r_texture.cpp

@@ -4,11 +4,10 @@
 // Module: Render Texture
 //
 
-#include <algorithm>
 #include <mutex>
-#include <thread>
 #include <vector>
 #include <atomic>
+#include <thread>
 #include "r_local.h"
 
 #include "cmp_core.h"
@@ -506,7 +505,7 @@ static gli::texture2d_array TranscodeTexture(gli::texture2d_array src, gli::form
 
 			for (size_t blockRow = 0; blockRow < srcBlocksPerRow; ++blockRow) {
 				const size_t rowBase = blockRow * srcBlockSize.y;
-				const size_t rowsLeft = (std::min)(size_t{4}, size_t(dstExtent.y) - rowBase);
+				const size_t rowsLeft = (std::min)(size_t(4),dstExtent.y - rowBase);
 
 				for (size_t blockCol = 0; blockCol < srcBlocksPerColumn; ++blockCol) {
 					// Read source 4x4 texel block, no branching needed.
@@ -526,7 +525,7 @@ static gli::texture2d_array TranscodeTexture(gli::texture2d_array src, gli::form
 
 						// Here we work off that dstData points at the top left pixel of the block row in the destination.
 						const size_t colBase = blockCol * srcBlockSize.x;
-						const size_t colsLeft = (std::min)(size_t{4}, size_t(dstExtent.x) - colBase);
+						const size_t colsLeft = (std::min)(size_t(4),dstExtent.x - colBase);
 						const size_t colBytesLeft = colsLeft * 4;
 						for (size_t innerRow = 0; innerRow < rowsLeft; ++innerRow) {
 							auto* dstPtr = dstData + dstRowStride * innerRow + colBase * 4;

engine/system/sys_main.h

@@ -68,7 +68,6 @@ class sys_IMain {
 	bool		debuggerRunning = false;
 	int			processorCount = 0;
 	std::filesystem::path basePath;
-	std::filesystem::path launchCwd;
 	std::optional<std::filesystem::path> userPath;
 	std::optional<std::string> userPathReason;