Skip to content

Add opt-in native macOS arm64 GL3 dependency profile - #90

Open
slavazhulanov wants to merge 4 commits into
RigsOfRods:masterfrom
slavazhulanov:feat/macos-arm64-gl3
Open

slavazhulanov wants to merge 4 commits into
RigsOfRods:masterfrom
slavazhulanov:feat/macos-arm64-gl3

Conversation

@slavazhulanov

@slavazhulanov slavazhulanov commented Oct 16, 2026 •

Copy link
Copy Markdown

Upstream merge and verification — 2026-10-19

AI-assisted technical update; checks below are automated/headless.

Merged current upstream master (53a0b224) into this branch at f2341e5bced77385f22eb1be28d4c44765d6ad41.

  • Resolved the AngelScript recipe conflict by keeping upstream's load_from_json() and using the profile-aware ror_add_dependency() wrapper. Default builds retain current upstream JSON versions; the opt-in macOS profile retains its pinned sources/options.
  • Preserved upstream's curl/fmt/OpenAL version updates, AngelScript JSON metadata and zlib URL correction. The explicit macOS 16-component inventory is unchanged (SHA256 0c71fece5c4c962d992013129a49590f1d671a187223b94d56f2d3e717ec7533).
  • All six receipt-lifecycle tests passed. Fresh Release/arm64 profile configure/generate passed. Independent automated source review passed.
  • Fresh real all-dependencies and socketw-ssl consumer targets compiled and linked (4/4 Ninja steps) against an existing completed native prefix. Archive URLs/hashes/versions match this branch's 16-component pins, but that prefix also contains two later OGRE/OIS patches. This supports consumer/API compatibility; it is not a fresh source build of this exact recipe revision.

To check the focused tests:

python3 -m unittest tests/test_macos_manifest.py

The native profile can then be configured using the README commands with a fresh build directory and fresh owned output prefix (ROR_MACOS_GL3=ON, Release, arm64). The validation configure did not download/build/install all 16 libraries.

Toolchain: AppleClang 21 / SDK 27 on M2, deployment target 11. The local CLT libc++ include workaround was supplied by the caller for consumer compilation. No GUI/runtime tests were run; existing prefixes, installed game and user data were preserved. Earlier build receipts below describe historical revisions.

Summary

Add an explicit ROR_MACOS_GL3 source-build profile for native macOS arm64. The existing per-component recipes remain the build entry points; the profile supplies shared toolchain arguments and a hash-pinned 16-component graph compatible with RoR dependency contract 30.

  • Enable GL3Plus, STBI, ZIP and the required OGRE components; keep the legacy GL/Cg/FreeImage choices explicit. Install the matching bounded RTShader GLSL library, without bulk sample art.
  • Include OpenAL Soft, OIS, MyGUI, AngelScript, CURL/OpenSSL, SocketW, Discord RPC, Caelum and PagedGeometry. Apple-only AngelScript/fmt versions match the current game requirements.
  • Carry documented legacy OGRE ARM/SDK and Caelum compile backports, the separately proposed OIS modifier correction, SocketW's exported SSL interface, and small OpenSSL/curl build corrections. No Cocoa event pump, Retina policy, gesture ABI, skinning fallback or game renderer/material conversion is hidden in this profile.
  • Record source archive hashes, patch hashes, build options and source notice mappings. This inventory is engineering provenance, not complete binary redistribution clearance.

The default recipe selections outside this explicit profile are retained. See README and cmake/macos-profile-notes.md for the exact commands and profile limitations. Optional third-party CURL/FreeType integrations outside the audited graph are explicitly omitted; this does not silently disable the promised RoR subsystems.

Validation

A fresh native arm64 Release source build completed on MacBook Air M2 with Apple clang 21, SDK 27.0 and selected deployment target 11.0. This CLT installation needed an explicitly supplied SDK libc++ include workaround, documented separately from the recipes. Compilation does not establish runtime support on macOS 11.

Receipt lifecycle and exact revisions

Publication source is f791cfa4ad23bd2a60c0bc5527a4e3487ddf529a. After independent review, the receipt helper binds completion to configured inputs, invalidates success before installation, and uses prefix ownership, an installation generation and a short metadata lock to reject stale foreign refresh/completion. Six focused lifecycle cases cover interrupted and completed replacement, overlapping ownership, stale component generations, lock contention and legitimate refresh.

The actual dependency prefix and combined game build cited above were built with recipe d738cd79009362e70b654e14cc7bd1d9f8c311dc, source inventory SHA256 0c71fece5c4c962d992013129a49590f1d671a187223b94d56f2d3e717ec7533, configuration SHA256 dc362707878c59f0b3e7fa7ae68f68fd3887e469fee067dc4019417e6aa7aff5. The subsequent correction changes metadata ownership guards, documentation and fixtures, not dependency archive pins, patches or compiled library options. That prefix was neither rebuilt nor relabelled as the newer revision; its schema 1 receipt predates the additive installation ID. New helpers cannot certify an old generationless install by metadata refresh alone.

The combined game source is 4379baaa9349354168ce5eb3607fdcbed57dc7ac (platform contribution plus resource ZIP fix); its linked arm64 binary SHA256 is 9ccc2c65bbafa753fac4bbb13394f5f466115fd80c071317d6ff366148c151a5. These are compile/link observations, not runtime qualification.

Boundary

This is a reproducible compile foundation, not a runnable macOS app bundle or a complete GL3 renderer port. Raw output still needs framework/dependency closure packaging, native window/input integration and UI/shader/material work. No game, GPU, window, input or performance tests were run. No installed game or user data was modified.

@slavazhulanov

Copy link
Copy Markdown
Author

AI-assisted technical update: merged current master at f2341e5, resolving AngelScript's JSON/profile-wrapper conflict. Upstream defaults and the opt-in macOS source pins are both preserved. Six receipt tests, a fresh native profile configure and two real consumer compile/link targets passed. The existing prefix was reused; all 16 dependencies were not rebuilt. Exact provenance and reproduction guidance are in the updated PR description.

@slavazhulanov

Copy link
Copy Markdown
Author

Validation update (Apple Silicon / OpenGL):

We combined #90 (f2341e5), this series' RigsOfRods/rigs-of-rods#3476 (6bb679b), RigsOfRods/rigs-of-rods#3477 (7b61c0e) and RigsOfRods/rigs-of-rods#3478 (5e95e63), plus the required macOS/platform/resource/plugin-path/font-notice prerequisites (RigsOfRods/rigs-of-rods#3468 through RigsOfRods/rigs-of-rods#3471), in a private integration branch based on upstream 4310750. The tested integrated revision was a44cde3.

  • Fresh native arm64 Release build completed all 417 Ninja steps with OpenAL Soft, AngelScript, CURL, SocketW, Discord RPC and Caelum enabled; vendored PagedGeometry also compiled.
  • Private installation, CPack ZIP generation, and extraction into a path containing spaces all passed.
  • Static inspection passed for all 28 arm64 Mach-O images and 165 dependency load edges; no build-prefix/Homebrew library references remained. The package includes the expected plugins, 26 resource archives, 3 starter-content archives, 25 RTShaderSystem GLSL files, fonts and notices. Archive integrity, symlinks and codesign --verify --deep --strict passed.
  • The dependency prefix was reused read-only, not rebuilt: its completed receipt is from recipe d738cd7, and its source inventory/options/patch hashes match current Add opt-in native macOS arm64 GL3 dependency profile #90 for all 16 components.

We did not launch the game or exercise graphics, input, sound or performance during this validation. The signature is local ad hoc signing; Developer ID signing/notarization were not tested. The installed working game and user data were not replaced.

No dependency recipe changes were needed for this integration. This confirms compatibility with the reused matching dependency output; it is not evidence of a fresh build of all dependencies from the current recipe. The small source integration fix is in game PR RigsOfRods/rigs-of-rods#3477 (9d954b6).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant