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.
83 lines
5.0 KiB
Docker
83 lines
5.0 KiB
Docker
# Cross-compiling CI builder: amd64 host toolchain + an arm64 multiarch sysroot, for the
|
|
# aarch64 Linux CLIENT artifacts (punktfunk-client + punktfunk-session).
|
|
#
|
|
# docker build -f ci/rust-ci-arm64cross.Dockerfile -t punktfunk-rust-ci-arm64cross .
|
|
#
|
|
# Derived from punktfunk-rust-ci so the Rust toolchain, clang, and CMake are byte-identical
|
|
# to the amd64 legs — this image only adds the target side. Kept as a SEPARATE image rather
|
|
# than folded into the base because the :arm64 dev libs are ~1 GB that every other CI job
|
|
# would otherwise pull for nothing.
|
|
#
|
|
# Client only: the Linux HOST stays amd64 (its encode stack is NVENC/QSV/AMF), so none of the
|
|
# host's CUDA/GBM link deps are mirrored here.
|
|
#
|
|
# Ubuntu splits archives by architecture: amd64 lives on archive.ubuntu.com, every port
|
|
# (arm64 included) on ports.ubuntu.com. Both stanzas therefore have to be pinned with an
|
|
# explicit `Architectures:` or apt tries to fetch arm64 from the amd64 mirror and 404s.
|
|
#
|
|
# Built from the REPO ROOT context (not ci/) — see the rust-toolchain.toml copy below.
|
|
FROM 192.168.1.58:5010/punktfunk-rust-ci:latest
|
|
|
|
ENV DEBIAN_FRONTEND=noninteractive
|
|
|
|
# 1. Pin the stock sources to amd64, add ports.ubuntu.com for arm64.
|
|
RUN sed -i 's|^Types: deb$|Types: deb\nArchitectures: amd64|' /etc/apt/sources.list.d/ubuntu.sources \
|
|
&& . /etc/os-release \
|
|
&& printf 'Types: deb\nArchitectures: arm64\nURIs: http://ports.ubuntu.com/ubuntu-ports/\nSuites: %s %s-updates %s-backports %s-security\nComponents: main universe restricted multiverse\nSigned-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg\n' \
|
|
"$VERSION_CODENAME" "$VERSION_CODENAME" "$VERSION_CODENAME" "$VERSION_CODENAME" \
|
|
> /etc/apt/sources.list.d/ubuntu-ports-arm64.sources \
|
|
&& dpkg --add-architecture arm64
|
|
|
|
# 2. The cross toolchain + every arm64 dev lib the client links. Mirrors the client half of
|
|
# rust-ci.Dockerfile's list (FFmpeg, PipeWire, Opus, SDL3, GTK4/libadwaita, xkbcommon). No
|
|
# Vulkan dev package: nothing compiles or links against Vulkan — ash dlopens the loader, and
|
|
# pyrowave-sys bindgens its own vendored headers.
|
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
|
crossbuild-essential-arm64 \
|
|
libavcodec-dev:arm64 libavformat-dev:arm64 libavutil-dev:arm64 libswscale-dev:arm64 \
|
|
libavfilter-dev:arm64 libavdevice-dev:arm64 \
|
|
libpipewire-0.3-dev:arm64 libopus-dev:arm64 \
|
|
libsdl3-dev:arm64 libgtk-4-dev:arm64 libadwaita-1-dev:arm64 \
|
|
libwayland-dev:arm64 libxkbcommon-dev:arm64 \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
# 3. The Rust target — installed against the toolchain the WORKSPACE pins, not the image's
|
|
# default. The base image bakes whatever `stable` was at its build time, while every build
|
|
# in the repo switches to the exact channel in rust-toolchain.toml; adding the target to
|
|
# the default toolchain instead leaves the pinned one without an aarch64 std, and the build
|
|
# dies on `can't find crate for core` a few hundred crates in. Running rustup from a
|
|
# directory that contains the pin file resolves the right toolchain (and pre-downloads it,
|
|
# which every workspace job would otherwise pay for on first use).
|
|
COPY rust-toolchain.toml /opt/pf-toolchain/
|
|
WORKDIR /opt/pf-toolchain
|
|
RUN rustup target add aarch64-unknown-linux-gnu && rustup show
|
|
WORKDIR /
|
|
|
|
# 4. Cross wiring. Everything in this image is a cross build, so the plain (un-suffixed)
|
|
# variables are safe and cover the crates that roll their own pkg-config/bindgen calls
|
|
# instead of going through the target-scoped lookups.
|
|
# * PKG_CONFIG uses Debian's multiarch wrapper, which resolves the arm64 .pc files and
|
|
# rewrites -I/-L into the sysroot without per-crate cooperation.
|
|
# * BINDGEN_EXTRA_CLANG_ARGS: clang defaults to the host triple, so bindgen would parse
|
|
# arm64 headers with amd64 type layouts (silently wrong, not a build error) — the
|
|
# explicit --target plus the multiarch include dir is what keeps the layouts honest.
|
|
# * CC_x86_64_unknown_linux_gnu routes HOST-targeted compiles through a wrapper that
|
|
# strips the arm64 include dirs — see ci/pf-host-cc for the ffmpeg-sys-next probe it
|
|
# exists for.
|
|
COPY ci/pf-host-cc /usr/local/bin/pf-host-cc
|
|
RUN chmod 0755 /usr/local/bin/pf-host-cc
|
|
|
|
ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
|
|
CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc \
|
|
CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++ \
|
|
AR_aarch64_unknown_linux_gnu=aarch64-linux-gnu-ar \
|
|
CC_x86_64_unknown_linux_gnu=/usr/local/bin/pf-host-cc \
|
|
PKG_CONFIG=aarch64-linux-gnu-pkg-config \
|
|
PKG_CONFIG_ALLOW_CROSS=1 \
|
|
BINDGEN_EXTRA_CLANG_ARGS="--target=aarch64-unknown-linux-gnu -I/usr/include/aarch64-linux-gnu"
|
|
|
|
# Fail the BUILD, not some later CI job, if the wrapper or a sysroot .pc is missing.
|
|
RUN command -v aarch64-linux-gnu-pkg-config \
|
|
&& aarch64-linux-gnu-pkg-config --cflags libavcodec sdl3 gtk4 libpipewire-0.3 \
|
|
&& aarch64-linux-gnu-gcc -dumpmachine | grep -q aarch64
|