enricobuehler
5c05246098
cargo tree -p punktfunk-client-session finds no ffmpeg. The host still does, which is the whole point: pf-encode keeps libavcodec unconditionally and no host workflow, packaging script or licence file was touched. Deleted: crates/pf-ffvk, video_vulkan.rs, video_vaapi.rs, video_libav.rs, the libavcodec half of video_d3d11.rs, the av_log machinery, ffmpeg::codec::Id as the decoder's vocabulary (the quic CODEC_* wire constants now serve, which is why the evidence table was keyed on them), DecodedImage::VkFrame and ::Dmabuf, the presenter's AVVkFrame lane, and the ffmpeg-fallback feature with everything behind it. DrmFrameGuard collapses from an enum to a newtype, which removes an unsafe impl Send. Roughly 25,000 lines. Then the CI, packaging, licensing and docs work the plan's §6 lists: the Windows workflows lose FFMPEG_DIR, PF_FFVK_VULKAN_INCLUDE and their PATH prepend; the MSIX loses its DLL wildcard; the client .deb stops emitting libav sonames on its own because depends come from dpkg-shlibdeps; arch, flatpak and nix drop the dependency; and the README's "FFmpeg 7 or 8" contract narrows to the host. Three defects reached users' machines in the first cut, and none was in the deletion itself. All three desktop Settings UIs offer vulkan, vaapi and d3d11va as stored decoder values, so those strings sit in shipped settings files today. Refusing them by name — which is the correct rule for a stale pin — would have bricked every upgraded client whose owner ever touched that dropdown. They now migrate onto the native rung for the same hardware family, at decoder construction AND at each dialog's lookup, because a legacy value that matches no preset displays as "Automatic" and silently rewrites the user's preference on the next save. M9's evidence filter was deleted on the argument that with no libavcodec twin below, barring an unproven rung removes hardware decode rather than moving down one rung. That is true on Windows and false on Linux for Intel and every unknown vendor id, where prefer_vulkan_first is false and the order is native-vaapi → native-vk: a rung that has decoded nothing anywhere sitting above one that is 250/250 on three drivers. Every Intel Linux desktop would have moved from libavcodec VAAPI, shipping for years, onto pf-vaadec by default — and a rung that constructs and then produces wrong pixels leaves only by the error-streak demotion, which this codebase already documents as not tripping on the B580's strobing. The filter is restored as a narrow, pure, testable rule: an unproven rung yields to a proven one, and to nothing else. Windows deliberately passes no rung below, because that vendor family is the one with a measured wrong-pixel report against Vulkan decode, and trading no evidence for evidence of corruption is the wrong direction. And the notices still said FFmpeg was bundled. The root file is what both desktop clients include_str! and what the MSIX ships, three lines under the new card saying no FFmpeg is bundled; Apple's Acknowledgements said it too, on iOS, tvOS and macOS. The generator now emits four per-client files scoped by transitive closure — 0 FFmpeg mentions in each, verified — while the root file keeps it for the host. That also ends the standing false attribution of ffmpeg-next, GTK4, windows-rs and the NVENC SDK to an iPhone. Windows has no reachable box, so it was compiled instead: a cross clippy at -D warnings on x86_64 and aarch64-pc-windows-msvc with the C toolchain stubbed so build scripts run without linking. That gate immediately caught an include_str! path one directory too deep, which nothing else could have. Gates: container clippy -D warnings, 160 tests, workspace check, both Windows targets clean, client ffmpeg count 0 and host 2. The four decode crates are untouched, so the hardware rungs' 250/250 stands. ⚠ Owed and unrun: no GPU has executed any of this milestone. M8's on-glass software check, M7's D3D11 and VAAPI AV1 hardware legs, and M9's field bake all still want hardware, and the bake window and criteria remain the user's.
110 lines
6.2 KiB
TOML
110 lines
6.2 KiB
TOML
[package]
|
|
name = "punktfunk-client-windows"
|
|
description = "Native Windows punktfunk/1 client — WinUI 3 (windows-reactor) shell, SDL3 gamepads; streaming runs in the spawned punktfunk-session binary"
|
|
version.workspace = true
|
|
edition.workspace = true
|
|
# Not workspace-inherited (1.82): windows-reactor at the pinned rev declares rust-version 1.95+
|
|
# and edition 2024. rust-toolchain.toml pins 1.96, so this records reality rather than raising it.
|
|
rust-version = "1.96"
|
|
license.workspace = true
|
|
authors.workspace = true
|
|
repository.workspace = true
|
|
|
|
[[bin]]
|
|
name = "punktfunk-client"
|
|
path = "src/main.rs"
|
|
|
|
# The couch/HTPC Start-menu entry. Its own executable because an MSIX <Application> cannot
|
|
# pass arguments to a full-trust exe — see the binary's own docs.
|
|
[[bin]]
|
|
name = "punktfunk-console"
|
|
path = "src/bin/punktfunk-console.rs"
|
|
|
|
# Everything is Windows-gated so `cargo build --workspace` stays green on Linux/macOS (the
|
|
# other native clients live in clients/linux and clients/apple); on other
|
|
# platforms this builds as a stub binary. Mirrors the Linux client's cfg(target_os="linux")
|
|
# gating exactly.
|
|
[target.'cfg(windows)'.dependencies]
|
|
# The protocol core, linked directly (no C ABI) — same as the GTK Linux client. NativeClient
|
|
# is Sync (mutexed plane receivers), so it drops into a UI app cleanly.
|
|
punktfunk-core = { path = "../../crates/punktfunk-core", features = ["quic"] }
|
|
# The shared client service layer: the trust/settings stores (ONE `Settings` struct for the
|
|
# shell and the spawned session binary — src/trust.rs re-exports it) and the game-library
|
|
# data model (fetch + art pipeline) behind the library page.
|
|
#
|
|
# `default-features = false` drops pf-client-core's default `pyrowave`, which would otherwise
|
|
# build the vendored PyroWave C++ INTO THE SHELL — dead weight here (the shell never decodes;
|
|
# it only offers "pyrowave" as a codec preference string the session binary acts on) and fatal
|
|
# on ARM64, where Granite's math falls back to x86 SSE intrinsics and stops at
|
|
# `simd.hpp: #error "Implement me."`. This does NOT drop PyroWave from the Windows client:
|
|
# decode lives in the spawned punktfunk-session binary, whose own default enables the feature,
|
|
# and cargo's feature unification turns it back on for the shared pf-client-core whenever that
|
|
# binary is in the same build (x64). On the ARM64 leg both are built --no-default-features, so
|
|
# nothing enables it and the C++ is never compiled.
|
|
pf-client-core = { path = "../../crates/pf-client-core", default-features = false }
|
|
|
|
# WinUI 3 UI via windows-reactor (a declarative React-like framework backed by WinUI).
|
|
# Unpublished (version 0.0.0) and fast-moving, so pinned to a verified commit. Pin bumped
|
|
# 2026-07-29 (from the 2026-07-01 rev) for: reconciler keyed-child-order fix (#4728), widget
|
|
# validation (#4727), DPI collision fix (#4751), icon elements (#4736), multi-window (#4730),
|
|
# scroll virtualization (#4710). All three windows-rs deps here MUST share this rev, and it
|
|
# must match pf-client-core's `windows` pin, so the workspace builds ONE windows-rs.
|
|
windows-reactor = { git = "https://github.com/microsoft/windows-rs", rev = "acb5a1a7441033d9312b16842af02eb0c2b403dc" }
|
|
# Win32 / DXGI for the GPU picker and the shell's window plumbing. Pulled from the SAME
|
|
# windows-rs commit as windows-reactor so their `windows-core` unifies — the `IDXGISwapChain1`
|
|
# we hand to `SwapChainPanelHandle::set_swap_chain` must satisfy reactor's `windows_core::Interface`.
|
|
# Features are header-named since the in-house-metadata rework (#4689) — one feature per SDK
|
|
# header, replacing the old `Win32_*` namespace features.
|
|
windows = { git = "https://github.com/microsoft/windows-rs", rev = "acb5a1a7441033d9312b16842af02eb0c2b403dc", features = [
|
|
# GetCurrentPackageFullName — the packaged-run probe guarding the explicit
|
|
# AppUserModelID (main.rs; MSIX identity must win over the dev-run tag).
|
|
"appmodel",
|
|
# CoCreateInstance/CoInitializeEx (+ objbase/objidl/wtypesbase below) for the
|
|
# "Create shortcut" writer (deeplink.rs).
|
|
"combaseapi",
|
|
# SetWindowSubclass/DefSubclassProc — the deep-link WM_COPYDATA subclass hook.
|
|
"commctrl",
|
|
"consoleapi",
|
|
"dxgi",
|
|
"errhandlingapi",
|
|
"libloaderapi",
|
|
"objbase",
|
|
"objidl",
|
|
# SetCurrentProcessExplicitAppUserModelID + ShellLink/IShellLinkW.
|
|
"shobjidl_core",
|
|
"synchapi",
|
|
"winerror",
|
|
# Windowing, messages, icons — and COPYDATASTRUCT, which lives in winuser now too.
|
|
"winuser",
|
|
] }
|
|
|
|
# Gamepad enumeration + pin persistence for Settings runs on pf-client-core's shared SDL service
|
|
# (see the `gamepad` field in app/); the spawned punktfunk-session does the actual forwarding. SDL3
|
|
# itself (built from source via the bundled CMake on Windows) is pulled transitively by
|
|
# pf-client-core with the same `build-from-source,hidapi` features, so it is not a direct dep here.
|
|
mdns-sd = "0.20"
|
|
async-channel = "2"
|
|
serde = { version = "1", features = ["derive"] }
|
|
serde_json = "1"
|
|
tracing = "0.1"
|
|
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
|
|
|
# The reactor's own headless test harness, at the SAME pinned rev: the `test` feature gates
|
|
# `RenderCx::for_test`/`ChannelDispatcher`; `test_reactor` is the upstream repo's
|
|
# RecordingBackend crate (cargo resolves a git dep's workspace member by package name).
|
|
# These power tests/reactor_semantics.rs — the characterization suite for the re-render
|
|
# semantics this client's architecture depends on. Re-run it on every future SHA bump.
|
|
[target.'cfg(windows)'.dev-dependencies]
|
|
windows-reactor = { git = "https://github.com/microsoft/windows-rs", rev = "acb5a1a7441033d9312b16842af02eb0c2b403dc", features = ["test"] }
|
|
test_reactor = { git = "https://github.com/microsoft/windows-rs", rev = "acb5a1a7441033d9312b16842af02eb0c2b403dc" }
|
|
|
|
# Embeds the app icon as an exe resource (build.rs) — Windows hosts only (rc.exe from the SDK).
|
|
# windows-reactor-setup stages the Windows App SDK runtime bootstrap (framework-dependent) next
|
|
# to the exe — the new-model replacement for the old windows-reactor build.rs; same pinned rev.
|
|
[target.'cfg(windows)'.build-dependencies]
|
|
winresource = "0.1"
|
|
windows-reactor-setup = { git = "https://github.com/microsoft/windows-rs", rev = "acb5a1a7441033d9312b16842af02eb0c2b403dc" }
|
|
|
|
[lints]
|
|
workspace = true
|