Skip to content

Port generic Voxtype, Brave Widevine and setup-failure fixes from quattro - #531

Merged
maralcbr merged 4 commits into
quattro-upstreamfrom
mac/63-generic-quattro-fixes
Sep 25, 2026
Merged

maralcbr merged 4 commits into
quattro-upstreamfrom
mac/63-generic-quattro-fixes

Conversation

@maralcbr

Copy link
Copy Markdown
Member

Ticket 63 of the Apple Silicon convergence plan. Ports three generic fixes that were merged on quattro but never reached quattro-upstream or omacom/omarchy quattro (found by the merged-work audit, #522). Each is its own commit so it can go upstream as is; upstream quattro has the same bugs in the same code.

  • Voxtype Vulkan backend (from voxtype: require the Vulkan backend binary before enabling GPU #483): setup only runs voxtype setup gpu --enable when the Vulkan runtime and /usr/lib/voxtype/voxtype-vulkan are both present. aarch64 voxtype-bin ships no Vulkan backend, so any aarch64 machine with a Vulkan driver printed "Vulkan backend not installed" during setup. x86_64 voxtype-bin always ships that binary, so x86 still gets the GPU backend.
  • Widevine for Brave (from Register the Widevine CDM for Brave #474): installing Brave or Brave Origin links /opt/WidevineCdm/chromium (from the widevine package) into the browser's install directory, and a migration repairs existing installs. It does nothing without the widevine package or when the browser already has a CDM, which is the x86 case. Brave Origin is new here; its /opt/brave-origin-bin path comes from the AUR package and has not been tried on hardware.
  • Setup failure message (logging part of Require Snapper for Mac installs and report setup failures #389): with file logging, a failed setup step now prints its script, exit status and the log path on stderr instead of stopping silently. Stdout logging mode is unchanged.

Original authors are credited in the commits.

Tests: new voxtype-install-test.sh and brave-widevine-test.sh, extended logging-test.sh; each fails on the unfixed code. The full test/shell.d suite ran as non-root in an x86_64 Arch container on this branch and on quattro-upstream, and again with the same commits on upstream quattro: results match the base apart from the two new tests passing (quattro-upstream 263 pass / 27 fail vs 260 / 28; upstream 223 / 31 vs 222 / 30). The remaining failures are the same on base and branch and come from tools missing in the container (lua, gum, ssh-keygen and so on). Two timing-sensitive tests, sleep-lock and system-sleep-ownership-migration, flipped between runs; rerun three times on every tree, they are as flaky on the base as on the branch. The three focused tests also pass as root (nothing written outside the scratch dirs) and on aarch64 Arch.

Second review: first round found test gaps (stderr not separated, no non-executable backend case, migration test not asserting link state or idempotence, test touching /etc when run as root); all fixed. It agreed that replacing a dangling WidevineCdm link is a repair, not a bug.

Upstream submission (not opened yet): the same three commits on top of omacom/omarchy quattro are on mac/63-generic-quattro-fixes-upstream.

maralcbr and others added 4 commits September 25, 2026 19:03
omarchy-hw-vulkan reports a Vulkan runtime, not whether this voxtype build
has a Vulkan backend. The aarch64 voxtype-bin package ships only the CPU and
ONNX binaries, so on any aarch64 machine with a Vulkan driver setup ran
`voxtype setup gpu --enable` and printed "Vulkan backend not installed" in
the middle of an otherwise working install. Require the backend binary too.

x86_64 voxtype-bin always ships /usr/lib/voxtype/voxtype-vulkan, so x86
installs still switch to the GPU backend as before.

Ported from #483.

Co-authored-by: Oliver Lukschander <oliver@lukschander.com>
The widevine package registers its CDM for Chromium and Firefox only.
Brave looks for the CDM in its own install directory, finds nothing, and
DRM sites (Netflix, Apple TV+, Spotify) fail with a blank player and no
useful error. This hits machines where Widevine comes from that package,
such as aarch64 ones, since no Widevine component is published for them.

Link /opt/WidevineCdm/chromium into /opt/brave-bin and /opt/brave-origin-bin
when Brave or Brave Origin is installed, and add a migration that repairs
existing installs. Both do nothing when the widevine package is absent or
the browser already has a CDM, so x86 installs, where Brave fetches its own,
are unchanged.

Ported from #474, extended to Brave Origin.

Co-authored-by: Caleb Marshall <cjmrshl@pm.me>
With file logging, run_logged sends a failing leaf's output and its
"Failed:" marker to the install log only, so the caller sees setup stop
with an exit status and nothing else. A missing command (exit 127) was the
case that made this hard to diagnose.

Print the failed script, its exit status and the log path on stderr. Stdout
logging mode already shows the failure marker and is unchanged, and
successful steps stay quiet.

Ported from #389 (the logging part).

Co-authored-by: Scott Jones <scottajones@gmail.com>
@maralcbr
maralcbr merged commit 94bb6bc into quattro-upstream Sep 25, 2026
5 checks passed
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