daedalus-v4l2: 3bc0da1 -> 6e6dfa1 — dlopen Kwiboo soname 62 (#16)

This commit is contained in:
2026-05-21 21:24:03 +02:00
parent a2daab1b28
commit 27617e4cb0
4 changed files with 55 additions and 27 deletions
+12 -9
View File
@@ -11,14 +11,17 @@
# Upstream repo: https://git.reauktion.de/reauktion/daedalus-v4l2
set -euo pipefail
# 3bc0da1 = picks up daedalus-v4l2 PR #15per-frame `decode_us=N`
# in the `decoder: OK` log line + a periodic `decoder stats` summary
# every 60 frames (codec, fps, avg decode_us, MBs/s, B/MB). Pure
# observability — no behaviour change. Baseline metrics for the
# substitution work in daedalus-v4l2#11 step 2.
UPSTREAM_COMMIT=3bc0da168cc0aa2271bfb6bc2864b49c48291185
PKGVER=0.1.0+r39+g3bc0da1
PKGREL=1 # reset for new upstream pin (3bc0da1 — decode_us + stats)
# 6e6dfa1 = picks up daedalus-v4l2 PR #16daemon now dlopens
# the Kwiboo fourier fork's libavcodec.so.62 / libavformat.so.62 /
# libavutil.so.60 at /opt/fourier instead of Debian-stock soname
# 61/61/59. First step on the daedalus-fourier substitution arc
# (daedalus-v4l2#11): routes the daemon through the libavcodec
# source tree we own in marfrit-packages. Headers + .pc files
# come from ffmpeg-v4l2-request-fourier (installed by the CI
# workflow before this script runs; see PKG_CONFIG_PATH below).
UPSTREAM_COMMIT=6e6dfa144da7bc7fa8be50c8da91d7d1c6132a2c
PKGVER=0.1.0+r41+g6e6dfa1
PKGREL=1 # reset for new upstream pin (6e6dfa1 — soname 62 via /opt/fourier)
# daedalus-fourier pin. d87239d = marfrit/daedalus-fourier PR #1 merge
# (install rules + pkg-config, enables this consumer to find_package
@@ -64,7 +67,7 @@ SRCDIR=daedalus-v4l2
# Build daemon (CMake) — point pkg-config at the daedalus-fourier
# temp prefix so pkg_check_modules(DAEDALUS_FOURIER …) resolves to it.
cd "$SRCDIR/daemon"
PKG_CONFIG_PATH="$FOURIER_PREFIX/lib/pkgconfig" \
PKG_CONFIG_PATH="$FOURIER_PREFIX/lib/pkgconfig:/opt/fourier/lib/pkgconfig" \
cmake -B build -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr