fix(packaging): vulkan-headers build dep + ship punktfunk-session across desktop packages
windows-msix / package (x64, C:\Users\Public\ffmpeg, x86_64-pc-windows-msvc, C:\t) (push) Failing after 13s
windows / build (x86_64-pc-windows-msvc) (push) Failing after 8s
apple / swift (push) Successful in 1m13s
apple / screenshots (push) Successful in 5m57s
android / android (push) Successful in 3m58s
ci / rust (push) Successful in 4m10s
ci / web (push) Successful in 51s
ci / docs-site (push) Successful in 1m0s
arch / build-publish (push) Successful in 9m35s
deb / build-publish (push) Successful in 3m59s
decky / build-publish (push) Successful in 15s
ci / bench (push) Successful in 4m51s
docker / build-push (., web/Dockerfile, punktfunk-web) (push) Successful in 4s
docker / build-push (--build-arg FEDORA_VERSION=44, ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora44-rpm) (push) Successful in 2m38s
docker / build-push (ci, ci/rust-ci.Dockerfile, punktfunk-rust-ci) (push) Successful in 5s
docker / build-push (docs-site, docs-site/Dockerfile, punktfunk-docs) (push) Successful in 5s
docker / build-push (ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora-rpm) (push) Successful in 2m31s
flatpak / build-publish (push) Successful in 4m24s
rpm / build-publish (43, bazzite, punktfunk-fedora-rpm) (push) Failing after 9m13s
docker / deploy-docs (push) Successful in 6s
rpm / build-publish (44, fedora-44, punktfunk-fedora44-rpm) (push) Has been cancelled
windows-host / package (push) Successful in 23m50s
windows-msix / package (arm64, C:\Users\Public\ffmpeg-arm64, aarch64-pc-windows-msvc, C:\t-a64) (push) Successful in 1m15s
windows / build (aarch64-pc-windows-msvc) (push) Successful in 4m56s
windows-msix / package (x64, C:\Users\Public\ffmpeg, x86_64-pc-windows-msvc, C:\t) (push) Failing after 13s
windows / build (x86_64-pc-windows-msvc) (push) Failing after 8s
apple / swift (push) Successful in 1m13s
apple / screenshots (push) Successful in 5m57s
android / android (push) Successful in 3m58s
ci / rust (push) Successful in 4m10s
ci / web (push) Successful in 51s
ci / docs-site (push) Successful in 1m0s
arch / build-publish (push) Successful in 9m35s
deb / build-publish (push) Successful in 3m59s
decky / build-publish (push) Successful in 15s
ci / bench (push) Successful in 4m51s
docker / build-push (., web/Dockerfile, punktfunk-web) (push) Successful in 4s
docker / build-push (--build-arg FEDORA_VERSION=44, ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora44-rpm) (push) Successful in 2m38s
docker / build-push (ci, ci/rust-ci.Dockerfile, punktfunk-rust-ci) (push) Successful in 5s
docker / build-push (docs-site, docs-site/Dockerfile, punktfunk-docs) (push) Successful in 5s
docker / build-push (ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora-rpm) (push) Successful in 2m31s
flatpak / build-publish (push) Successful in 4m24s
rpm / build-publish (43, bazzite, punktfunk-fedora-rpm) (push) Failing after 9m13s
docker / deploy-docs (push) Successful in 6s
rpm / build-publish (44, fedora-44, punktfunk-fedora44-rpm) (push) Has been cancelled
windows-host / package (push) Successful in 23m50s
windows-msix / package (arm64, C:\Users\Public\ffmpeg-arm64, aarch64-pc-windows-msvc, C:\t-a64) (push) Successful in 1m15s
windows / build (aarch64-pc-windows-msvc) (push) Successful in 4m56s
The re-architecture split the Linux client into two binaries (shell + Vulkan session streamer) and added the pf-ffvk crate, whose build.rs runs bindgen over FFmpeg's libavutil/hwcontext_vulkan.h (#include <vulkan/vulkan.h>). Two release regressions fell out of that on the desktop-package legs: 1. Missing build dep. The Arch build (archlinux:base-devel + its own pacman list) fatal-errored at `vulkan/vulkan.h file not found`. Add the Vulkan dev headers wherever the client compiles from a self-managed dep set: arch (PKGBUILD makedepends + arch.yml), rpm (spec BuildRequires + rpm.yml + fedora image), deb.yml (belt-and-suspenders; the rust-ci image already bakes libvulkan-dev), and the screenshots job. The flatpak builds offline against the GNOME SDK, so install Vulkan-Headers into /app as a pinned module and point pf-ffvk's bindgen at it via PF_FFVK_VULKAN_INCLUDE. 2. Only the shell shipped. arch/deb/rpm built and installed just punktfunk-client; the shell execs its sibling punktfunk-session for a connect, so desktop streaming would break exactly as Decky's did. Build and install BOTH binaries in all three, and declare the runtime Vulkan loader the session binary dlopens (vulkan-icd-loader / vulkan-loader / libvulkan1 — not a DT_NEEDED, so shlibdeps/auto-requires can't see it). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
+16
-6
@@ -34,8 +34,9 @@ license=('MIT OR Apache-2.0')
|
||||
options=('!lto' '!debug')
|
||||
|
||||
# All build deps for both crates (Arch runtime packages ship their own headers, so these cover
|
||||
# build + link). aws-lc/ring need clang+cmake; nasm is for asm.
|
||||
makedepends=('rust' 'cargo' 'clang' 'cmake' 'nasm' 'pkgconf' 'git'
|
||||
# build + link). aws-lc/ring need clang+cmake; nasm is for asm. vulkan-headers: the client's
|
||||
# pf-ffvk crate runs bindgen over FFmpeg's libavutil/hwcontext_vulkan.h (#include <vulkan/vulkan.h>).
|
||||
makedepends=('rust' 'cargo' 'clang' 'cmake' 'nasm' 'pkgconf' 'git' 'vulkan-headers'
|
||||
'gtk4' 'libadwaita' 'sdl3' 'ffmpeg' 'pipewire' 'wayland' 'libxkbcommon' 'opus' 'libei')
|
||||
|
||||
# Opt-in punktfunk-web: only then is bun (the build tool AND the vendored runtime) required.
|
||||
@@ -64,7 +65,10 @@ build() {
|
||||
# The host's zero-copy FFI link-needs libcuda at build time; nvidia-utils provides it on an
|
||||
# NVIDIA builder. On a GPU-less builder symlink the CUDA stub into the link path first (same
|
||||
# caveat the RPM documents): ln -s "$(find / -name libcuda.so -path '*stubs*'|head -1)" /usr/lib/
|
||||
cargo build --release --locked -p punktfunk-host -p punktfunk-client-linux -p punktfunk-tray
|
||||
# punktfunk-client-session is the Vulkan/Skia streamer the shell (punktfunk-client) execs for
|
||||
# a connect — both binaries must ship or streaming from the desktop client breaks.
|
||||
cargo build --release --locked \
|
||||
-p punktfunk-host -p punktfunk-client-linux -p punktfunk-client-session -p punktfunk-tray
|
||||
# Management web console (opt-in): the Nitro `bun`-preset .output bundle (Bun.serve TLS),
|
||||
# built AND run with bun.
|
||||
if [ "${PF_WITH_WEB:-0}" = 1 ]; then
|
||||
@@ -157,16 +161,22 @@ package_punktfunk-host() {
|
||||
|
||||
package_punktfunk-client() {
|
||||
pkgdesc="Low-latency desktop/game streaming CLIENT — native GTK4/libadwaita Linux app"
|
||||
# The GTK4/libadwaita client: SDL3 gamepads, FFmpeg (VAAPI) decode, PipeWire audio/mic.
|
||||
# The GTK4/libadwaita shell + its Vulkan session streamer: SDL3 gamepads, FFmpeg (VAAPI +
|
||||
# Vulkan Video) decode, PipeWire audio/mic. vulkan-icd-loader: the session binary loads
|
||||
# libvulkan at runtime (ash) for its ash/Skia presenter.
|
||||
depends=('gtk4' 'libadwaita' 'sdl3' 'ffmpeg' 'pipewire' 'wireplumber' 'pipewire-pulse'
|
||||
'opus' 'libglvnd')
|
||||
'opus' 'libglvnd' 'vulkan-icd-loader')
|
||||
optdepends=('libva-mesa-driver: VAAPI hardware decode on AMD (incl. Steam Deck); software fallback otherwise'
|
||||
'intel-media-driver: VAAPI hardware decode on Intel'
|
||||
'vulkan-radeon: Vulkan Video decode + presenter on AMD'
|
||||
'vulkan-nouveau: Vulkan Video decode + presenter on NVIDIA (nvidia-utils for the proprietary ICD)'
|
||||
'gamescope: run the client fullscreen in a Gaming-Mode session')
|
||||
install=punktfunk-client.install
|
||||
local R; R="$(_repo)"; local T="$srcdir/target/release"
|
||||
|
||||
install -Dm0755 "$T/punktfunk-client" "$pkgdir/usr/bin/punktfunk-client"
|
||||
install -Dm0755 "$T/punktfunk-client" "$pkgdir/usr/bin/punktfunk-client"
|
||||
# The session streamer the shell execs for a connect (resolved as its sibling in /usr/bin).
|
||||
install -Dm0755 "$T/punktfunk-session" "$pkgdir/usr/bin/punktfunk-session"
|
||||
install -Dm0644 "$R/packaging/linux/io.unom.Punktfunk.desktop" \
|
||||
"$pkgdir/usr/share/applications/io.unom.Punktfunk.desktop"
|
||||
# DualSense hidraw access (full pad fidelity through SDL's HIDAPI driver).
|
||||
|
||||
@@ -19,9 +19,12 @@ ROOTDIR="$(cd "$(dirname "$0")/../.." && pwd)"
|
||||
cd "$ROOTDIR"
|
||||
|
||||
BIN="target/release/$PKG"
|
||||
if [ ! -x "$BIN" ]; then
|
||||
echo "==> building $CRATE (release)"
|
||||
cargo build --release -p "$CRATE" --locked
|
||||
# The Vulkan/Skia session streamer the shell execs for a connect — shipped alongside the shell
|
||||
# (the shell resolves it as its /usr/bin sibling), or desktop streaming breaks.
|
||||
SESSION_BIN="target/release/punktfunk-session"
|
||||
if [ ! -x "$BIN" ] || [ ! -x "$SESSION_BIN" ]; then
|
||||
echo "==> building $CRATE + punktfunk-client-session (release)"
|
||||
cargo build --release --locked -p "$CRATE" -p punktfunk-client-session
|
||||
fi
|
||||
|
||||
STAGE="$(mktemp -d)"
|
||||
@@ -30,6 +33,7 @@ DOCDIR="$STAGE/usr/share/doc/$PKG"
|
||||
|
||||
# --- file layout --------------------------------------------------------------
|
||||
install -Dm0755 "$BIN" "$STAGE/usr/bin/$PKG"
|
||||
install -Dm0755 "$SESSION_BIN" "$STAGE/usr/bin/punktfunk-session"
|
||||
install -Dm0644 packaging/linux/io.unom.Punktfunk.desktop \
|
||||
"$STAGE/usr/share/applications/io.unom.Punktfunk.desktop"
|
||||
# DualSense hidraw access (full pad fidelity through SDL's HIDAPI driver).
|
||||
@@ -73,11 +77,17 @@ Package: $PKG
|
||||
Architecture: any
|
||||
Depends: \${shlibs:Depends}
|
||||
EOF
|
||||
SHDEPS="$(cd "$SHLIB_TMP" && dpkg-shlibdeps -O --ignore-missing-info "$ROOTDIR/$BIN" 2>/dev/null \
|
||||
# Resolve DT_NEEDED for BOTH the shell and the session streamer (dpkg-shlibdeps merges).
|
||||
SHDEPS="$(cd "$SHLIB_TMP" && dpkg-shlibdeps -O --ignore-missing-info \
|
||||
"$ROOTDIR/$BIN" "$ROOTDIR/$SESSION_BIN" 2>/dev/null \
|
||||
| sed -n 's/^shlibs:Depends=//p')"
|
||||
rm -rf "$SHLIB_TMP"
|
||||
[ -n "$SHDEPS" ] || { echo "dpkg-shlibdeps produced no deps — is dpkg-dev installed?" >&2; exit 1; }
|
||||
|
||||
# Manual addition shlibdeps can't see: the session streamer loads libvulkan at runtime (ash,
|
||||
# dlopen — not a DT_NEEDED), and streaming can't start without it, so it's a hard Depends.
|
||||
SHDEPS="$SHDEPS, libvulkan1"
|
||||
|
||||
# Manual additions shlibdeps can't see: the PipeWire daemon + session manager are runtime
|
||||
# services (audio playback / mic capture degrade gracefully without them — Recommends).
|
||||
RECOMMENDS="pipewire, wireplumber, pipewire-pulse"
|
||||
|
||||
@@ -131,6 +131,23 @@ modules:
|
||||
- /lib/cmake
|
||||
- /lib/pkgconfig
|
||||
|
||||
# ---------------------------------------------------------------------------------------
|
||||
# Vulkan-Headers — the SESSION binary's pf-ffvk crate runs bindgen over FFmpeg's
|
||||
# libavutil/hwcontext_vulkan.h, which `#include <vulkan/vulkan.h>`. The GNOME SDK is not
|
||||
# guaranteed to ship those dev headers, so install them into /app ourselves (headers only,
|
||||
# no compile) and point pf-ffvk's bindgen at them via PF_FFVK_VULKAN_INCLUDE below. Kept in
|
||||
# cleanup — headers aren't needed at runtime (the Vulkan LOADER comes from the GL runtime).
|
||||
# ---------------------------------------------------------------------------------------
|
||||
- name: vulkan-headers
|
||||
buildsystem: cmake-ninja
|
||||
sources:
|
||||
- type: archive
|
||||
url: https://github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/vulkan-sdk-1.4.313.0.tar.gz
|
||||
# `sha256sum vulkan-sdk-1.4.313.0.tar.gz` (verified 2026-07-07). Bump url + sha together.
|
||||
sha256: 20743c99a96c07290f24377360e7a12bdd2c465ba202e0c7ef2ec25d446cf61d
|
||||
cleanup:
|
||||
- '*'
|
||||
|
||||
# ---------------------------------------------------------------------------------------
|
||||
# The client. cargo-sources.json is the GENERATED offline crate cache:
|
||||
# python3 flatpak-cargo-generator.py Cargo.lock -o packaging/flatpak/cargo-sources.json
|
||||
@@ -151,6 +168,9 @@ modules:
|
||||
# flatpak-builder pre-downloaded as a pinned source below. No {tag}/{key}
|
||||
# placeholders needed: a template without them is used verbatim.
|
||||
SKIA_BINARIES_URL: file:///run/build/punktfunk-client/skia-binaries.tar.gz
|
||||
# Point pf-ffvk's bindgen at the Vulkan-Headers installed into /app above (its clang
|
||||
# invocation doesn't inherit the SDK's default include search, so pass it explicitly).
|
||||
PF_FFVK_VULKAN_INCLUDE: /app/include
|
||||
build-commands:
|
||||
# Drop the Windows client from the workspace before building. It pins windows-rs as a
|
||||
# git dependency (cfg(windows)-gated, but cargo resolves it for the whole workspace
|
||||
|
||||
@@ -75,10 +75,13 @@ BuildRequires: pkgconfig(libavutil)
|
||||
# Zero-copy GPU path: src/zerocopy/ links libGL + libgbm (mesa) via hand-rolled FFI.
|
||||
BuildRequires: pkgconfig(gl)
|
||||
BuildRequires: pkgconfig(gbm)
|
||||
# The client subpackage (GTK4 shell + SDL3 gamepads).
|
||||
# The client subpackage (GTK4 shell + SDL3 gamepads + the Vulkan session streamer).
|
||||
BuildRequires: pkgconfig(gtk4)
|
||||
BuildRequires: pkgconfig(libadwaita-1)
|
||||
BuildRequires: pkgconfig(sdl3)
|
||||
# The client's pf-ffvk crate runs bindgen over FFmpeg's libavutil/hwcontext_vulkan.h, which
|
||||
# #include <vulkan/vulkan.h> — provided by vulkan-headers (Fedora).
|
||||
BuildRequires: vulkan-headers
|
||||
# It ALSO links the NVIDIA CUDA driver lib (-lcuda) via FFI, so libcuda.so must be present
|
||||
# at LINK time. A normal NVIDIA host (or Bazzite -nvidia) has it; a headless COPR/koji builder
|
||||
# without a GPU does NOT — point %build at the CUDA toolkit stub (…/stubs/libcuda.so) there,
|
||||
@@ -124,6 +127,9 @@ Summary: Low-latency desktop/game streaming client (punktfunk/1, GTK4)
|
||||
# Audio playback / mic capture want the PipeWire daemon; degrade gracefully without it.
|
||||
Recommends: pipewire
|
||||
Recommends: wireplumber
|
||||
# The session streamer loads libvulkan at runtime (ash) for its ash/Skia presenter + Vulkan
|
||||
# Video decode. vulkan-loader provides libvulkan.so.1; the ICD is the GPU's mesa/NVIDIA driver.
|
||||
Requires: vulkan-loader
|
||||
|
||||
%description client
|
||||
The native Linux client for punktfunk. Discovers hosts on the LAN (mDNS), trusts
|
||||
@@ -167,7 +173,10 @@ export RUSTUP_TOOLCHAIN=stable
|
||||
# Stamp the exact NVR into the binary for --version / mgmt /health provenance (build.rs reads it).
|
||||
export PUNKTFUNK_BUILD_VERSION="%{version}-%{release}"
|
||||
# --locked: reproducible from (commit + Cargo.lock), matching the .deb build path.
|
||||
cargo build --release --locked -p punktfunk-host -p punktfunk-client-linux -p punktfunk-tray
|
||||
# punktfunk-client-session is the Vulkan/Skia streamer the shell execs for a connect — both
|
||||
# client binaries must ship or streaming from the desktop client breaks.
|
||||
cargo build --release --locked \
|
||||
-p punktfunk-host -p punktfunk-client-linux -p punktfunk-client-session -p punktfunk-tray
|
||||
|
||||
%if %{with web}
|
||||
# Management web console: build the Nitro SSR bundle with bun (the `bun` preset + our Bun.serve
|
||||
@@ -224,6 +233,8 @@ done
|
||||
|
||||
# --- client subpackage ---
|
||||
install -Dm0755 target/release/punktfunk-client %{buildroot}%{_bindir}/punktfunk-client
|
||||
# The session streamer the shell execs for a connect (resolved as its sibling in %{_bindir}).
|
||||
install -Dm0755 target/release/punktfunk-session %{buildroot}%{_bindir}/punktfunk-session
|
||||
install -Dm0644 packaging/linux/io.unom.Punktfunk.desktop \
|
||||
%{buildroot}%{_datadir}/applications/io.unom.Punktfunk.desktop
|
||||
# DualSense hidraw access (full pad fidelity through SDL's HIDAPI driver).
|
||||
@@ -316,6 +327,7 @@ install -Dm0644 web/web.env.example %{buildroot}%{_datadir}/punkt
|
||||
%files client
|
||||
%license LICENSE-MIT LICENSE-APACHE THIRD-PARTY-NOTICES.txt
|
||||
%{_bindir}/punktfunk-client
|
||||
%{_bindir}/punktfunk-session
|
||||
%{_datadir}/applications/io.unom.Punktfunk.desktop
|
||||
%{_udevrulesdir}/70-punktfunk-client.rules
|
||||
%{_prefix}/lib/sysctl.d/99-punktfunk-client-net.conf
|
||||
|
||||
Reference in New Issue
Block a user