feat(linux): Portal capture fallback support, misc fixes - #5774
Merged
Merged
Conversation
21 tasks
psyke83
force-pushed
the
portalgrab_fallback
branch
4 times, most recently
from
September 22, 2026 23:06
5362d4e to
335dfd3
Compare
|
Hi Dude, appreciate your work! Do you think this could fix my issue? 5750 |
Contributor
Author
This PR will change the behaviour (as a stale token will be detected, deleted and trigger a Sunshine restart, vs the current behaviour of a stale token hanging Sunshine), but will most likely not fix the issue itself. When I have some free time I'll check and see if I can reproduce your issue. |
2 tasks
psyke83
marked this pull request as ready for review
September 24, 2026 06:48
Contributor
|
LGTM, also I've not found any issues so far after applying this to my usual test system. |
psyke83
force-pushed
the
portalgrab_fallback
branch
3 times, most recently
from
September 25, 2026 02:25
079996e to
44a5ce9
Compare
Add support for fallback capture when Portal capture is selected but a restore token is stale or not yet created. New flow: * User config sets capture = portal. * Check for a Portal restore token on disk. If it exists, first verify that Portal capture works by negotiating the existing restore token with a 10 second timeout. * If negotiation succeeds, start Portal capture as normal. * If negotiation fails within 10 seconds, treat the token as stale, delete and restart Sunshine. * If no restore token exists, queue a non-blocking TaskPool task to trigger token negotiation via the XDG dialog that can run concurrently with any other capture method. * If Portal cannot be used yet, disregard the 'capture = portal' config and continue probing for other working capture methods. * If a fallback capture method succeeded, the user can connect to the session; the WebUI will echo a fatal error to indicate that this is temporary. The user can then confirm the XDG permission dialog, which immediately triggers a Sunshine restart, and subsequent sessions will use actual Portal capture directly. Minor changes: * Increase TaskPool thread count to 2, as the XDG negotiation task can be long-running and blocks input when the pool is single threaded. * Promote KWin capture autodetection above Portal, as it is less complicated to set up on supported systems. * When Portal capture is selected but a restore token is stale, Sunshine startup can potentially be delayed by ~12 seconds (2 second ping, 10 second timeout for negotiation) until the token is re-negotiated. Bugfixes: * Avoid blocking DBus calls which causes Sunshine to terminate uncleanly if an XDG Remote Desktop dialog is still open during restart/shutdown. * Clean up CAP_SYS_ADMIN log spam caused by recent DRM worker thread changes. * Clean up legacy CAP_SYS_ADMIN workarounds in Portal and Kwin capture code. * Fix KWin autodetection false positives on GNOME.
ReenigneArcher
force-pushed
the
portalgrab_fallback
branch
from
September 25, 2026 17:36
44a5ce9 to
9fe9950
Compare
Bundle ReportBundle size has no change ✅ |
|
Screenshot ComparisonPR #5774 screenshots vs Matrix:
|
| Image | Baseline | PR |
|---|---|---|
sunshine_tray_initial.png |
 |
 |
sunshine_tray_menu.png |
 |
 |
sunshine_tray_pairing_request.png |
 |
 |
sunshine_tray_paused.png |
 |
 |
sunshine_tray_stopped.png |
 |
 |
sunshine_tray_streaming.png |
 |
 |
sunshine_tray_tooltip.png |
 |
 |
Matrix: AppImage-x86_64
| Image | Baseline | PR |
|---|---|---|
sunshine_tray_initial.png |
 |
 |
sunshine_tray_menu.png |
 |
 |
sunshine_tray_pairing_request.png |
 |
 |
sunshine_tray_paused.png |
 |
 |
sunshine_tray_stopped.png |
 |
 |
sunshine_tray_streaming.png |
 |
 |
sunshine_tray_tooltip.png |
 |
 |
Matrix: Windows-AMD64
| Image | Baseline | PR |
|---|---|---|
sunshine_tray_initial.png |
 |
 |
sunshine_tray_menu.png |
 |
 |
sunshine_tray_pairing_request.png |
 |
 |
sunshine_tray_paused.png |
 |
 |
sunshine_tray_stopped.png |
 |
 |
sunshine_tray_streaming.png |
 |
 |
sunshine_tray_tooltip.png |
 |
 |
Matrix: Windows-ARM64
| Image | Baseline | PR |
|---|---|---|
sunshine_tray_initial.png |
 |
 |
sunshine_tray_menu.png |
 |
 |
sunshine_tray_pairing_request.png |
 |
 |
sunshine_tray_paused.png |
 |
 |
sunshine_tray_stopped.png |
 |
 |
sunshine_tray_streaming.png |
 |
 |
sunshine_tray_tooltip.png |
 |
 |
Matrix: macOS-arm64
| Image | Baseline | PR |
|---|---|---|
sunshine_tray_initial.png |
 |
 |
sunshine_tray_menu.png |
 |
 |
sunshine_tray_pairing_request.png |
 |
 |
sunshine_tray_paused.png |
 |
 |
sunshine_tray_stopped.png |
 |
 |
sunshine_tray_streaming.png |
 |
 |
sunshine_tray_tooltip.png |
 |
 |
Matrix: macOS-x86_64
| Image | Baseline | PR |
|---|---|---|
sunshine_tray_initial.png |
 |
 |
sunshine_tray_menu.png |
 |
 |
sunshine_tray_pairing_request.png |
 |
 |
sunshine_tray_paused.png |
 |
 |
sunshine_tray_stopped.png |
 |
 |
sunshine_tray_streaming.png |
 |
 |
sunshine_tray_tooltip.png |
 |
 |
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## master #5774 +/- ##
==========================================
- Coverage 38.91% 38.43% -0.49%
==========================================
Files 113 113
Lines 25972 26056 +84
Branches 11488 11539 +51
==========================================
- Hits 10108 10014 -94
+ Misses 14916 13280 -1636
- Partials 948 2762 +1814
Flags with carried forward coverage won't be shown. Click here to find out more.
... and 47 files with indirect coverage changes Continue to review full report in Codecov by Harness.
|
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
4 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.
Description
Add support for fallback capture when Portal capture is selected but a restore token is stale or not yet created.
New flow:
Minor changes:
Bugfixes:
Screenshot
Issues Fixed or Closed
Roadmap Issues
Type of Change
Checklist
AI Usage
See our AI usage policy.