enricobuehler
bf8a974e8b
ci / rust (push) Has been cancelled
The clients/apple scaffold is now a working macOS client, validated live against this repo's host across the LAN: gamescope virtual output → NVENC HEVC → lumen/1 (GF(2¹⁶) FEC + AES-GCM over UDP, QUIC control) → VideoToolbox → AVSampleBufferDisplayLayer at 720p60, mouse/keyboard flowing back as QUIC datagrams into the host's gamescope EIS injector (~3.7k events injected in one session). LumenKit: - LumenConnection: the predicted cbindgen compile fixes (C17 header spells the typedefs as integers while the enum constants import as a distinct Swift type — bridge by rawValue); close() is now safe from any thread (a close flag + pumpLock held across the blocking poll enforce the C contract "never close with a next_au in flight"; flag prevents lock-starvation by back-to-back polls). - StreamView: per-pump cancellation token (reconnects can't double-pump), flush + re-gate on the next in-band parameter sets when the layer fails, no stale enqueue after restart. - InputCapture: fractional-delta accumulation (sub-pixel motion isn't truncated away), pressed-state tracking with release-all on focus loss and stop() (nothing sticks down host-side), global-singleton ownership guard (GC has one handler slot per process), X1/X2 buttons, horizontal scroll, full keypad/CapsLock/ISO-102nd/PrintScreen/Menu VKs. - LumenClient app shell (swift run LumenClient): connect form, fps/Mb-s HUD, LUMEN_AUTOCONNECT/LUMEN_MODE for scripted first-light runs. - Tests: Annex-B byte-level units; real-codec round trip (VTCompressionSession-encoded HEVC rebuilt as the host's wire shape → AnnexB → VTDecompressionSession → pixels); test-loopback.sh (Swift client vs a real local m3-host over loopback — the Swift twin of c_abi_connection_roundtrip); RemoteFirstLightTests (full pipeline over the LAN). Host/build fixes that fell out: - The workspace builds on non-Linux again: gamestream audio (opus) and sendmmsg batching are now platform-gated with stubs/fallback, per the crate's "compiles everywhere" rule. - Horizontal scroll was inverted end-to-end: the injectors negated BOTH axes onto the ei/wl axes, but GameStream's horizontal convention is positive = right (moonlight-qt/Sunshine pass it through unnegated) — only vertical flips now. This also un-inverts real Moonlight clients. - AnnexB drops all zeros preceding a start code (trailing_zero_8bits padding), ffmpeg's policy, instead of leaking them into the preceding NAL. - build-xcframework.sh: deployment targets pinned to the package floor + an otool guard — cargo does not fingerprint MACOSX_DEPLOYMENT_TARGET, so warm caches can silently ship too-new minos objects. Adversarially reviewed (5-dimension multi-agent pass, every finding refutation-verified): 14 confirmed findings, all fixed above; the send-while-polling core-contract gap flagged here is closed by the lumen/1 session-planes work (&self pulls + per-plane borrow slots). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
69 lines
2.8 KiB
Bash
69 lines
2.8 KiB
Bash
#!/usr/bin/env bash
|
|
# Build LumenCore.xcframework for the Apple clients — run ON A MAC with Xcode + rustup.
|
|
#
|
|
# rustup target add aarch64-apple-darwin x86_64-apple-darwin # + aarch64-apple-ios for iOS
|
|
# bash scripts/build-xcframework.sh
|
|
#
|
|
# Output: clients/apple/LumenCore.xcframework (consumed by clients/apple/Package.swift).
|
|
# The library is built WITH the `quic` feature (the lumen/1 connection API), so the bundled
|
|
# header gets LUMEN_FEATURE_QUIC pre-defined — Swift sees lumen_connect & co. unconditionally.
|
|
set -euo pipefail
|
|
cd "$(dirname "$0")/.."
|
|
|
|
TARGETS_MAC=(aarch64-apple-darwin x86_64-apple-darwin)
|
|
BUILD_IOS="${BUILD_IOS:-0}" # BUILD_IOS=1 adds an iOS slice (requires the ios target installed)
|
|
|
|
# Deployment targets must match Package.swift's platforms, or every consumer link emits
|
|
# "object file was built for newer macOS version" warnings.
|
|
for t in "${TARGETS_MAC[@]}"; do
|
|
MACOSX_DEPLOYMENT_TARGET=14.0 cargo build --release -p lumen-core --features quic --target "$t"
|
|
done
|
|
if [[ "$BUILD_IOS" == "1" ]]; then
|
|
IPHONEOS_DEPLOYMENT_TARGET=17.0 cargo build --release -p lumen-core --features quic --target aarch64-apple-ios
|
|
fi
|
|
|
|
STAGE="$(mktemp -d)"
|
|
trap 'rm -rf "$STAGE"' EXIT
|
|
|
|
# Universal macOS static lib.
|
|
mkdir -p "$STAGE/macos"
|
|
lipo -create \
|
|
target/aarch64-apple-darwin/release/liblumen_core.a \
|
|
target/x86_64-apple-darwin/release/liblumen_core.a \
|
|
-output "$STAGE/macos/liblumen_core.a"
|
|
|
|
# Headers dir: the generated C header (with the quic API force-enabled) + a modulemap so
|
|
# Swift can `import LumenCore`.
|
|
mkdir -p "$STAGE/include"
|
|
{
|
|
echo "#define LUMEN_FEATURE_QUIC 1"
|
|
cat include/lumen_core.h
|
|
} > "$STAGE/include/lumen_core.h"
|
|
cat > "$STAGE/include/module.modulemap" <<'EOF'
|
|
module LumenCore {
|
|
header "lumen_core.h"
|
|
export *
|
|
}
|
|
EOF
|
|
|
|
ARGS=(-library "$STAGE/macos/liblumen_core.a" -headers "$STAGE/include")
|
|
if [[ "$BUILD_IOS" == "1" ]]; then
|
|
ARGS+=(-library target/aarch64-apple-ios/release/liblumen_core.a -headers "$STAGE/include")
|
|
fi
|
|
|
|
# Cargo does NOT fingerprint MACOSX_DEPLOYMENT_TARGET — units cached from a build without
|
|
# it keep their old minos forever. Refuse to ship anything newer than the package floor
|
|
# (objects BELOW it, e.g. rustup's precompiled std at 11.0, are fine and unavoidable).
|
|
for obj in "$STAGE"/macos/liblumen_core.a; do
|
|
bad=$(otool -l "$obj" 2>/dev/null | awk '/minos/ {print $2}' | sort -uV | awk -F. '$1 > 14' | head -1)
|
|
if [[ -n "$bad" ]]; then
|
|
echo "ERROR: $obj contains objects built for macOS $bad (> 14.0)." >&2
|
|
echo "Stale cache — rm -rf target/{aarch64,x86_64}-apple-darwin and rebuild." >&2
|
|
exit 1
|
|
fi
|
|
done
|
|
|
|
rm -rf clients/apple/LumenCore.xcframework
|
|
xcodebuild -create-xcframework "${ARGS[@]}" -output clients/apple/LumenCore.xcframework
|
|
echo "OK: clients/apple/LumenCore.xcframework"
|