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.
59 lines
3.2 KiB
Bash
Executable File
59 lines
3.2 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
# Regenerate THIRD-PARTY-NOTICES.txt for the Rust workspace.
|
|
#
|
|
# Prefers `cargo about` (full, network-augmented license harvest; see about.toml) and falls back to
|
|
# the dependency-free offline generator (scripts/gen-third-party-notices.py, reads the cargo registry
|
|
# cache). Run this when the dependency tree changes; CI also runs it before packaging.
|
|
#
|
|
# Usage: scripts/gen-third-party-notices.sh [output-file]
|
|
set -euo pipefail
|
|
cd "$(dirname "$0")/.."
|
|
OUT="${1:-THIRD-PARTY-NOTICES.txt}"
|
|
|
|
if command -v cargo-about >/dev/null 2>&1; then
|
|
echo "==> cargo about generate -> $OUT" >&2
|
|
cargo about generate about.hbs --output-file "$OUT"
|
|
else
|
|
echo "==> cargo-about not installed; using offline fallback" >&2
|
|
echo " (install the full generator with: cargo install cargo-about)" >&2
|
|
python3 scripts/gen-third-party-notices.py --out "$OUT"
|
|
fi
|
|
echo "==> wrote $OUT" >&2
|
|
|
|
# Regenerate the per-client in-tree copies. EVERY client has one now, because every client SHOWS
|
|
# it: the mobile apps bundle theirs as a resource/asset for their Acknowledgements screen, and the
|
|
# two desktop shells `include_str!` theirs onto their Licenses page (the MSIX and the client .deb
|
|
# ship the file as well).
|
|
#
|
|
# These are GENERATED, not copied. They used to be the workspace-wide file, which attributed to
|
|
# every client every crate anything in this repo links: FFmpeg, the NVENC SDK, GTK4, windows-rs.
|
|
# The Apple app links ONE Rust crate (punktfunk-core, through PunktfunkCore.xcframework — see
|
|
# scripts/build-xcframework.sh) and Android links the JNI bridge over it; everything else in those
|
|
# apps is Swift/Kotlin and platform frameworks.
|
|
#
|
|
# M10 — the client's FFmpeg excision — is what turned the same untidiness on the DESKTOP copies
|
|
# into a false statement a user can see: the shells print an `ffmpeg-next 8.1.0 — WTFPL` line and
|
|
# the full FFmpeg licence text three screens under a card saying no FFmpeg is bundled. So they are
|
|
# scoped too, each to the binaries its package actually installs — the shell, the session streamer,
|
|
# the headless CLI, and on Linux the update helper (`pf-update` ships as pf-update-client).
|
|
#
|
|
# The ROOT file stays workspace-wide on purpose: the HOST ships out of it, and the host does still
|
|
# link FFmpeg.
|
|
#
|
|
# Only the offline generator can scope a file (cargo-about renders the whole workspace), so these
|
|
# always go through it — the root file above still prefers cargo-about when installed.
|
|
if [ "$OUT" = "THIRD-PARTY-NOTICES.txt" ]; then
|
|
# <in-tree path> <workspace members whose closure it must state>
|
|
while read -r dest packages; do
|
|
[ -n "$dest" ] || continue
|
|
[ -d "$(dirname "$dest")" ] || continue
|
|
python3 scripts/gen-third-party-notices.py --packages "$packages" --out "$dest"
|
|
echo "==> generated $dest ($packages closure)" >&2
|
|
done <<'CLIENTS'
|
|
clients/apple/Sources/PunktfunkKit/Resources/THIRD-PARTY-NOTICES.txt punktfunk-core
|
|
clients/android/app/src/main/assets/THIRD-PARTY-NOTICES.txt punktfunk-client-android
|
|
clients/linux/THIRD-PARTY-NOTICES.txt punktfunk-client-linux,punktfunk-client-session,punktfunk-cli,pf-update
|
|
clients/windows/THIRD-PARTY-NOTICES.txt punktfunk-client-windows,punktfunk-client-session,punktfunk-cli
|
|
CLIENTS
|
|
fi
|