enricobuehler
2718b7d4bd
One commit because splitting them accomplishes nothing: mdns-sd 0.20 ALREADY
depends on if-addrs 0.15, so while our own five crates declared 0.13 the tree
carried both copies no matter which of the two moved first. Moving them together
is what collapses it:
$ cargo tree -d | grep '^if-addrs'
(no output)
Neither needed a source change. mdns-sd 0.21's public API is purely additive
over 0.20.3 — the sole new item is `ServiceDaemon::set_max_packet_size`, and
`ServiceInfo`'s surface is byte-identical — so `ServiceDaemon`/`ServiceInfo`/
`ServiceEvent`/`ResolvedService` behave as before at all six call sites
(host discovery + gamestream mdns, pf-client-core, and the Android, Windows and
probe clients). if-addrs 0.15 keeps 0.13's `Interface`/`IfAddr` shape, and we
only ever read those.
The one real change is a FEATURE, not a version. if-addrs has `link-local`, and
mdns-sd declares if-addrs with it on. Once our crates share that single copy,
unification turns it on for our calls too — meaning `get_if_addrs()` now also
reports fe80:: interfaces (and, on Windows, 169.254.x.x). Rather than inherit
that silently, punktfunk-core and punktfunk-host now NAME the feature. Two
reasons: it is what every real build gets anyway, so a standalone `cargo test -p
punktfunk-core` should not enumerate a different set of NICs than the host does;
and for the consumer here — Wake-on-LAN — it is the behaviour we want, since a
NIC is wake-capable whether or not it currently holds a routable address.
Verified on CachyOS (rustc 1.96.0):
cargo clippy --workspace --all-targets --locked -- -D warnings OK
cargo test --workspace --locked OK, 0 failed
cargo test -p punktfunk-host --bins --locked 501 passed, 0 failed, 2 ignored
cargo test ... gamestream::cert 3 passed
cargo fmt --all --check clean
(One `cargo test --workspace` attempt failed with E0463 "can't find crate for
pf_frame" in a doc-test. That is the target dir having only clippy's .rmeta for
a crate a doc-test wants to LINK, not anything in this change; a plain re-run
after cargo test built the rlibs was green.)
116 lines
6.7 KiB
TOML
116 lines
6.7 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.85): 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 — that is what makes the `IDXGISwapChain1` handed to reactor
|
|
# satisfy reactor's own `windows_core::Interface`.
|
|
# ⚠ This is NOT "the workspace builds ONE windows-rs", which an earlier version of this note
|
|
# claimed. `wasapi` (via pf-client-core) pulls the crates.io `windows 0.62.2` alongside this git
|
|
# copy, so both are in the lock and both compile. That costs build time and binary size, not
|
|
# correctness. ⛔ Do NOT try to collapse it with a blanket `[patch.crates-io] windows`: this rev
|
|
# uses header-named features (`dxgi`, `combaseapi`) while a dozen other manifests still use the
|
|
# old `Win32_*` namespace features, and the patch would break every one of them.
|
|
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.21"
|
|
async-channel = "2"
|
|
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
|