mirror of
https://github.com/Droid-Deck/DroidDeck.git
synced 2026-11-11 02:51:10 +00:00
Conflicts resolved: - build.yml: main's proot pack pin check and the Venus component fetch both kept. - compositor.c: main's unpaced release goes through send_buffer_release (DMA-BUF quarantine). - PulseAudioComponent: the AAudio retry loop stays; both sinks get main's control_dir. - SessionService: main's add-on pack and proot checks, then the PowerVR driver setup and staging. - droiddeck-session: main's stretch and refresh arguments with the selectable backend. - droiddeck-gpu: main's desktop window mode on the wayland backend; PowerVR's sdl backend stays full screen. - gamescope/release.env: the non-Adreno build stays pinned until the next one is published. - FrontEndActivity/FrontEndScreen/SessionActivity/SessionFiles/SessionPrefs/LinuxRuntime/strings: both sides kept. - test_gamescope_backend: the desktop backend test turns window mode off.