enricobuehler
f62a48d4a9
apple / swift (pull_request) Successful in 1m42s
apple / screenshots (pull_request) Skipped
windows / build (x86_64-pc-windows-msvc) (pull_request) Successful in 3m12s
windows / build (aarch64-pc-windows-msvc) (pull_request) Successful in 1m32s
ci / rust-arm64 (pull_request) Successful in 1m52s
ci / web (pull_request) Successful in 1m6s
ci / docs-site (pull_request) Successful in 1m15s
ci / bun-nix (pull_request) Successful in 18s
android / android (pull_request) Successful in 3m56s
ci / rust (pull_request) Successful in 5m40s
A launcher tile (role: "launcher", design D4) shipped no art on purpose:
a launcher's own icon is square, every client cover-crops a 2:3 poster,
and the crop turns a mark into a strip. So the tiles were the launcher's
name on a flat accent face — legible, and the blandest thing in the grid.
Entries now carry an optional `icon`: the NAME of a brand mark, never
image bytes and never a URL. `[a-z][a-z0-9-]{0,31}`, shape-validated by
the host on every lane (a client interpolates the value into a resource
name or an asset lookup, so the guard belongs upstream of all of them,
and each client re-checks rather than trusting the peer).
A token rather than art because the alternative is closed by
construction, and deliberately: the art proxy serves what the bytes ARE
(sniff_image_type) and SVG is not on that list — it is script-capable
XML and the console renders library art in a browser. Widening that
sniff would trade a rendering nicety for a stored-XSS surface. Naming
the mark keeps the refusal intact, keeps the glyph vector at whatever
size a tile happens to be, lets it take the tile's ink, and adds nothing
to a reconcile payload that is already body-limited. The cost is that a
third-party plugin cannot ship a mark no client bundles; its tile falls
back to the launcher's name, exactly as before, and the fix is a PR
adding the master.
assets/launcher-icons/ holds seven monochrome masters with per-mark
provenance and licensing (Simple Icons CC0: lutris, heroic, epic, gog;
Font Awesome CC BY: steam, xbox; Playnite's own logo, MIT). steam is
generated FROM assets/os-icons/steam.svg so the SteamOS host badge and
the Steam launcher tile can never drift.
scripts/gen-launcher-icons.sh bakes the three derivatives that cannot
consume a master (GTK symbolic SVG, Windows PNG, Apple template PDF)
and — unlike gen-os-icons.sh, which prints path data for a human to
paste — GENERATES the three inline registries (web console, Android
ImageVector, pf-console-ui Skia). Three clients x seven paths of up to
3 kB is a transcription error waiting to happen, and a mangled character
is a silently wrong logo rather than a build failure. The generated Rust
goes through rustfmt, since `cargo fmt --all --check` is a CI gate and a
generated file that fails it would fail every regeneration.
All six renderers draw the mark CONTAINED, never cover-cropped: the
masters' viewports are not square (steam 496x512, playnite 1024x1024)
and filling a 2:3 frame would reproduce the strip this exists to avoid.
Every one keeps its old fallback for a token it has no art for.
Epic, GOG and Xbox marks ship dormant. Those plugins' launcher switches
are off by default and emit nothing, because the host has no verified
launcher_ui activation for them yet — shipping the art now keeps turning
one on the one-line plugin change those plugins promise, instead of also
needing a release of all six clients.
api/openapi.json and the SDK are regenerated (the spec's version field
was stale at 0.25.0 and now reads 0.26.0, which is the crate's actual
version — an unrelated line that regeneration necessarily corrects).
Verified: host cargo check, clippy -D warnings across pf-client-core /
pf-console-ui / punktfunk-client-session / punktfunk-client-linux, plain
build, pf-console-ui tests (77, including a new one asserting all seven
masters parse under Skia and one asserting the letterbox stays inside
its box), pf-client-core tests (188), cargo fmt --all --check, Apple
swift build, Android compileDebugKotlin, web tsc + vite build,
plugin-kit tsc, biome. The Windows client is NOT compile-verified — it
cannot be built from a Mac (scripts/xcheck.sh covers only the capture
stack by design) and CI does not build it either; its tile change needs
a real box before it ships.
88 lines
4.9 KiB
Swift
88 lines
4.9 KiB
Swift
// swift-tools-version: 5.9
|
|
// PunktfunkKit — Swift wrapper around the punktfunk-core C ABI (punktfunk/1 client connector) plus the
|
|
// SwiftUI/VideoToolbox presentation layer. Build PunktfunkCore.xcframework first:
|
|
// bash ../../scripts/build-xcframework.sh (on a Mac; see README.md)
|
|
import PackageDescription
|
|
|
|
let package = Package(
|
|
name: "PunktfunkKit",
|
|
platforms: [.macOS(.v14), .iOS(.v17), .tvOS(.v17)],
|
|
products: [
|
|
.library(name: "PunktfunkKit", targets: ["PunktfunkKit"]),
|
|
// Dependency-free foundation (stored-host model + JSON codec, settings keys, App-Group
|
|
// constant, deep-link grammar, Live Activity attributes). A separate PRODUCT so the widget
|
|
// extension — which must never link PunktfunkKit (Rust staticlib + presentation layer) —
|
|
// can link this and nothing else. PunktfunkKit re-exports it (see SharedReexport.swift).
|
|
.library(name: "PunktfunkShared", targets: ["PunktfunkShared"]),
|
|
.executable(name: "PunktfunkClient", targets: ["PunktfunkClient"]),
|
|
],
|
|
dependencies: [
|
|
// Progressive (gradient) backdrop blur for the form screens' trays — a real blur with no
|
|
// material tint stage (see GamepadTrayBlur). Pinned by REVISION, not `from:`: the
|
|
// GlurBackdrop product exists only on main — no release carries it (the newest tag,
|
|
// `1.1`, predates it, and is not three-component semver anyway, so version-based
|
|
// resolution stops at 1.0.4). The revision is main's head at adoption time; a revision
|
|
// pin stays reproducible when the branch moves.
|
|
.package(
|
|
url: "https://github.com/joogps/Glur.git",
|
|
revision: "ba4f05d3c9a608ec773b9305f2af6089390de68a"),
|
|
],
|
|
targets: [
|
|
.binaryTarget(name: "PunktfunkCore", path: "PunktfunkCore.xcframework"),
|
|
// No dependencies by design — an extension process links this alone.
|
|
.target(name: "PunktfunkShared"),
|
|
.target(
|
|
name: "PunktfunkKit",
|
|
dependencies: ["PunktfunkCore", "PunktfunkShared"],
|
|
// OSS attribution shown by the app's Acknowledgements screen. Bundled here (not in the
|
|
// app target) so it rides along via Bundle.module in both `swift build` and the Xcode
|
|
// app, which links the PunktfunkKit product. Refresh with
|
|
// scripts/gen-third-party-notices.sh (it copies the generated file into Resources/).
|
|
resources: [
|
|
.copy("Resources/THIRD-PARTY-NOTICES.txt"),
|
|
.copy("Resources/LICENSE-MIT.txt"),
|
|
.copy("Resources/LICENSE-APACHE.txt"),
|
|
// Geist (SIL OFL 1.1) — the brand typeface, shared with punktfunk-website.
|
|
// Registered with Core Text at first use; see BrandFont.swift.
|
|
.copy("Resources/Fonts"),
|
|
// The host cards' OS marks (template vector imagesets generated from the
|
|
// assets/os-icons masters by scripts/gen-os-icons.sh — per-mark provenance and
|
|
// licensing in that README). `.process` compiles the catalog; loaded via
|
|
// OsIcon.swift.
|
|
.process("Resources/OsIcons.xcassets"),
|
|
// The launcher tiles' brand marks (template vector imagesets generated from the
|
|
// assets/launcher-icons masters by scripts/gen-launcher-icons.sh — per-mark
|
|
// provenance and licensing in that README). Loaded via LauncherIcon.swift.
|
|
.process("Resources/LauncherIcons.xcassets"),
|
|
],
|
|
linkerSettings: [
|
|
// Rust staticlib system deps.
|
|
.linkedFramework("Security"),
|
|
.linkedFramework("SystemConfiguration"),
|
|
.linkedLibrary("resolv"),
|
|
]
|
|
),
|
|
// Development app shell (swift run PunktfunkClient): connect form → stream + input.
|
|
// (The tvOS slide-transition package is referenced by the Xcode PROJECT only —
|
|
// its manifest breaks SwiftPM whole-graph validation on macOS, and only the
|
|
// Punktfunk-tvOS target links it; the #if os(tvOS) import never compiles here.)
|
|
.executableTarget(
|
|
name: "PunktfunkClient",
|
|
dependencies: [
|
|
"PunktfunkKit",
|
|
.product(name: "GlurBackdrop", package: "Glur"),
|
|
]),
|
|
// PunktfunkCore is a direct dep too so the wire tests can name the C ABI's
|
|
// `PunktfunkInputEvent` / `PUNKTFUNK_INPUT_KIND_*` when asserting the gamepad byte layout.
|
|
.testTarget(
|
|
name: "PunktfunkKitTests",
|
|
dependencies: ["PunktfunkKit", "PunktfunkShared", "PunktfunkCore"],
|
|
resources: [
|
|
// PyroWave golden fixtures: host-encoded AUs + upstream-decoded reference
|
|
// planes (regenerate with punktfunk-host's `pyrowave_dump_golden` on a
|
|
// Vulkan box — see PyroWaveDecoderTests.swift).
|
|
.copy("PyroWaveFixtures")
|
|
]),
|
|
]
|
|
)
|