Repository navigation
merge: upstream moonlight-qt (1080p default, MSI signing, Qt 6.12 CI, dependency updates) - #18
Merged
Merged
Conversation
Check the result of elf_aux_info() on FreeBSD and OpenBSD ARM and fall back to no AES support if the call fails, rather than relying on the output variable being left untouched.
macOS remains on Qt 6.11.2 for v6.x to retain Ventura support
…26-10-06 # Conflicts: # .github/workflows/build-win-mac.yml # app/version.txt
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges 9 upstream commits from
moonlight-stream/moonlight-qt:018c851eChange the default streaming resolution to 1080pde2467e4/b7e0deb1/afcd08ccMSI signing fixes (don't requireSIGNTOOL_PARAMSto containsign; require it set externally)6e699e4dUpdatelibplacebo,sdl2-compat, andSDL332c6ab6eUpdate Windows CI to Qt 6.127927da33Fix matching colon-separatedXDG_CURRENT_DESKTOPvalues (Linux)a2486eafCheckelf_aux_info()return value inhasFastAes()(Linux)e8fefc8cPrepare for their v6.2.0 (version-bump bookkeeping, no functional change for us)Two conflicts, both resolved by keeping our own:
.github/workflows/build-win-mac.yml— we deliberately deleted this (1c5f5395) in favor of our own split Windows/macOS workflows. Kept deleted.app/version.txt— kept ours (bumped to 6.3.9 for this sync), not upstream's 6.2.0.Verified our features survived, not just assumed: diffed the merge result against our pre-merge state (only upstream's actual changes present) and against
upstream/master(all our own features — microphone capture, computer-model extensions, stream-settings additions, gamepad quit combo — still fully intact).Checked with real builds, not by landing on master: manually dispatched both the Windows and macOS workflows against this branch. Both completed successfully, and the release step was confirmed
skippedon both (this wasworkflow_dispatch, not a push or tag — nothing published).macOS specifically re-verified against the recent #13 fix, since that's just been through two rounds of getting burned by trusting a green build: confirmed in the actual log that the
macdeployqtbundle-binary/rpath errors are still absent (0 occurrences), the linker and codesign both correctly referenceContents/MacOS/MoonlightVibe, a real framework gets signed, and the uploaded artifact is 78.7MB — matching the known-good fixed build almost exactly, not a silently-broken bundle.Not runtime-tested on a real client — this host is headless Windows, this is a Qt desktop client.
Merge with Merge commit (never squash — that would destroy upstream ancestry and re-trigger every one of these conflicts on the next sync).
🤖 Generated with Claude Code