forked from marfrit/marfrit-packages
Compare commits
49 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ce2fff1a4f | |||
| 9301894997 | |||
| f21c1ff80a | |||
| e15b887d8d | |||
| b69db65037 | |||
| adcc824bf7 | |||
| 7213b23861 | |||
| 2cd3acd680 | |||
| 22ac3c9845 | |||
| 3275d06728 | |||
| 33b91cf7dc | |||
| a640633ea7 | |||
| 5f21a71770 | |||
| de3c2c6744 | |||
| e7e79e5a76 | |||
| 130a259c69 | |||
| 9580f33cb6 | |||
| eab66cfab8 | |||
| d2cecbcd05 | |||
| 2028eccc3c | |||
| 70c8c2b417 | |||
| 793187ff9e | |||
| 42bf6b1633 | |||
| 40719efc43 | |||
| e540384f50 | |||
| 9ca97374c8 | |||
| 902e855d92 | |||
| 64269d69ee | |||
| e976c88016 | |||
| 29cc145d44 | |||
| b16a3f1a77 | |||
| c2018413aa | |||
| 243e05ca5e | |||
| a29fe71666 | |||
| b0ffd4d74f | |||
| ab60acd9f4 | |||
| 6a417fcc9d | |||
| 1c77b05f68 | |||
| 051da5e8dc | |||
| a1ff6de652 | |||
| b471847b1c | |||
| 3abfdff943 | |||
| fce33b02a2 | |||
| da60fa7c49 | |||
| 20161d231f | |||
| c7bb14f369 | |||
| f8d1257d35 | |||
| f3b1087ac7 | |||
| 489d6e3862 |
Executable
+230
@@ -0,0 +1,230 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# check-already-published.sh <recipe-dir>
|
||||||
|
#
|
||||||
|
# Decide whether a given recipe (arch/<name> or debian/<name>) is already
|
||||||
|
# present in https://packages.reauktion.de/. Emits exactly one line to
|
||||||
|
# stdout:
|
||||||
|
#
|
||||||
|
# skip=1 — package with this version-pkgrel-arch tuple already lives in
|
||||||
|
# the pool; CI should short-circuit.
|
||||||
|
# skip=0 — file is missing or HEAD failed; CI should build + publish.
|
||||||
|
#
|
||||||
|
# Design notes:
|
||||||
|
# * For Arch recipes we source the PKGBUILD in a clean subshell so
|
||||||
|
# shell expansions (epoch=, ${_pkgver/-/}, pkgname=() arrays) resolve
|
||||||
|
# naturally. Only the first element of pkgname[] is checked — split
|
||||||
|
# packages share one source tarball / one build, so any-one-missing
|
||||||
|
# forces the full rebuild anyway.
|
||||||
|
# * For Debian recipes we extract the bare top-level PKGVER= /
|
||||||
|
# PKGREL= assignments (plus any other top-level VAR=value lines they
|
||||||
|
# reference) via grep and re-evaluate them in an isolated subshell —
|
||||||
|
# sourcing the entire build-deb.sh would run curl/tar/dpkg-deb
|
||||||
|
# against a tempdir we don't want to materialise here.
|
||||||
|
# * Epoch handling differs by ecosystem: Arch keeps `<epoch>:` in the
|
||||||
|
# pool filename, Debian/reprepro strips it.
|
||||||
|
# * curl --head with -f maps non-2xx to non-zero exit, which is what we
|
||||||
|
# want — 404 means "build it". -L follows mirrors. --max-time caps
|
||||||
|
# the worst-case latency per HEAD.
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
REPO_BASE="${REPO_BASE:-https://packages.reauktion.de}"
|
||||||
|
HEAD_TIMEOUT="${HEAD_TIMEOUT:-15}"
|
||||||
|
|
||||||
|
RECIPE_DIR="${1:?usage: $0 <recipe-dir> (e.g. arch/distcc-avahi or debian/lmcp)}"
|
||||||
|
|
||||||
|
# Resolve relative to repo root if a leading path is passed; allow
|
||||||
|
# both `arch/foo` and absolute paths.
|
||||||
|
if [ ! -d "$RECIPE_DIR" ]; then
|
||||||
|
echo "error: recipe dir not found: $RECIPE_DIR" >&2
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
|
||||||
|
ecosystem="${RECIPE_DIR%%/*}"
|
||||||
|
|
||||||
|
http_head() {
|
||||||
|
local url="$1"
|
||||||
|
curl -sS -L --max-time "$HEAD_TIMEOUT" -o /dev/null \
|
||||||
|
-w '%{http_code}' --head "$url" || echo "000"
|
||||||
|
}
|
||||||
|
|
||||||
|
emit() {
|
||||||
|
# one-line GITHUB_OUTPUT-compatible kv
|
||||||
|
echo "skip=$1"
|
||||||
|
exit 0
|
||||||
|
}
|
||||||
|
|
||||||
|
case "$ecosystem" in
|
||||||
|
arch)
|
||||||
|
pkgbuild="$RECIPE_DIR/PKGBUILD"
|
||||||
|
[ -f "$pkgbuild" ] || { echo "error: $pkgbuild missing" >&2; exit 2; }
|
||||||
|
|
||||||
|
# Source in a fresh bash to capture variables. Some PKGBUILDs run
|
||||||
|
# functions or call commands at top level — keep this fast by
|
||||||
|
# restricting PATH and trapping side effects.
|
||||||
|
eval "$(
|
||||||
|
bash --noprofile --norc -c "
|
||||||
|
set +e
|
||||||
|
# Stub out anything that might shell out; we only need variable
|
||||||
|
# assignments to land.
|
||||||
|
cd '$RECIPE_DIR'
|
||||||
|
source ./PKGBUILD >/dev/null 2>&1 || true
|
||||||
|
# pkgname may be array; print first element.
|
||||||
|
if declare -p pkgname 2>/dev/null | grep -q 'declare -a'; then
|
||||||
|
first_name=\"\${pkgname[0]}\"
|
||||||
|
else
|
||||||
|
first_name=\"\$pkgname\"
|
||||||
|
fi
|
||||||
|
if declare -p arch 2>/dev/null | grep -q 'declare -a'; then
|
||||||
|
first_arch=\"\${arch[0]}\"
|
||||||
|
else
|
||||||
|
first_arch=\"\$arch\"
|
||||||
|
fi
|
||||||
|
printf 'PB_NAME=%q\n' \"\$first_name\"
|
||||||
|
printf 'PB_VER=%q\n' \"\$pkgver\"
|
||||||
|
printf 'PB_REL=%q\n' \"\$pkgrel\"
|
||||||
|
printf 'PB_EPOCH=%q\n' \"\${epoch:-}\"
|
||||||
|
printf 'PB_ARCH=%q\n' \"\$first_arch\"
|
||||||
|
"
|
||||||
|
)"
|
||||||
|
|
||||||
|
if [ -z "${PB_NAME:-}" ] || [ -z "${PB_VER:-}" ] || [ -z "${PB_REL:-}" ]; then
|
||||||
|
echo "error: failed to parse PKGBUILD ($RECIPE_DIR)" >&2
|
||||||
|
emit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Pool arch:
|
||||||
|
# arch=('any') → any
|
||||||
|
# arch=('aarch64' 'x86_64') → aarch64 (we publish for both, but the
|
||||||
|
# aarch64 artifact is the canonical CI build)
|
||||||
|
# arch=('aarch64') → aarch64
|
||||||
|
case "$PB_ARCH" in
|
||||||
|
any) pool_arch=any ;;
|
||||||
|
*) pool_arch=aarch64 ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# Version string with optional epoch (epoch:pkgver-pkgrel).
|
||||||
|
if [ -n "${PB_EPOCH:-}" ]; then
|
||||||
|
ver_full="${PB_EPOCH}:${PB_VER}-${PB_REL}"
|
||||||
|
else
|
||||||
|
ver_full="${PB_VER}-${PB_REL}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Pool URL path (arch keeps any/aarch64 split; 'any' lands in the
|
||||||
|
# aarch64 dir per current marfrit layout — both arches share the
|
||||||
|
# blob via the publish-to-both-arches step in build.yml).
|
||||||
|
pool_dir="arch/aarch64"
|
||||||
|
|
||||||
|
base_url="${REPO_BASE}/${pool_dir}/${PB_NAME}-${ver_full}-${pool_arch}.pkg.tar"
|
||||||
|
for ext in zst xz gz; do
|
||||||
|
code=$(http_head "${base_url}.${ext}")
|
||||||
|
if [ "$code" = "200" ]; then
|
||||||
|
emit 1
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
emit 0
|
||||||
|
;;
|
||||||
|
|
||||||
|
debian)
|
||||||
|
bd="$RECIPE_DIR/build-deb.sh"
|
||||||
|
ctrl="$RECIPE_DIR/control"
|
||||||
|
[ -f "$bd" ] || { echo "error: $bd missing" >&2; exit 2; }
|
||||||
|
|
||||||
|
# Pull top-level `VAR=value` lines until we've passed PKGREL, and
|
||||||
|
# only those whose RHS is safe to re-evaluate (no command
|
||||||
|
# substitution `$(...)`, no escaped `\$`, no embedded commands like
|
||||||
|
# `DESTDIR=... meson ...`). This deliberately undershoots: we just
|
||||||
|
# need PKGVER/PKGREL plus any version vars they reference. Anything
|
||||||
|
# else (HERE=$(readlink ...), KERNELVER=\$(uname -r) inside a
|
||||||
|
# HEREDOC, etc.) gets dropped.
|
||||||
|
assigns=$(awk '
|
||||||
|
/^[A-Z_][A-Z0-9_]*=/ {
|
||||||
|
# split into LHS and RHS
|
||||||
|
eq = index($0, "=")
|
||||||
|
lhs = substr($0, 1, eq - 1)
|
||||||
|
rhs = substr($0, eq + 1)
|
||||||
|
# strip inline `# comment`
|
||||||
|
hash = index(rhs, "#")
|
||||||
|
if (hash > 1 && substr(rhs, hash-1, 1) == " ") rhs = substr(rhs, 1, hash - 2)
|
||||||
|
# reject lines with command-subst or escaped-dollar or naked commands
|
||||||
|
if (rhs ~ /\$\(/) next
|
||||||
|
if (rhs ~ /\\\$/) next
|
||||||
|
if (rhs ~ / [a-z]/) next # e.g. `DESTDIR="$ROOT" meson ...`
|
||||||
|
print lhs "=" rhs
|
||||||
|
if (lhs == "PKGREL") exit
|
||||||
|
}
|
||||||
|
' "$bd")
|
||||||
|
|
||||||
|
eval "$(
|
||||||
|
bash --noprofile --norc -c "
|
||||||
|
set +e
|
||||||
|
$assigns
|
||||||
|
printf 'PKGVER=%q\n' \"\${PKGVER:-}\"
|
||||||
|
printf 'PKGREL=%q\n' \"\${PKGREL:-}\"
|
||||||
|
"
|
||||||
|
)"
|
||||||
|
|
||||||
|
if [ -z "${PKGVER:-}" ] || [ -z "${PKGREL:-}" ]; then
|
||||||
|
echo "error: failed to parse PKGVER/PKGREL from $bd" >&2
|
||||||
|
emit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Strip epoch (`N:` prefix) — debian pool filenames omit it.
|
||||||
|
ver_no_epoch="${PKGVER#*:}"
|
||||||
|
# If PKGVER had no colon, ${PKGVER#*:} returns PKGVER unchanged (bash quirk:
|
||||||
|
# the pattern must match for the prefix to be stripped). Guard explicitly.
|
||||||
|
case "$PKGVER" in
|
||||||
|
*:*) : ;;
|
||||||
|
*) ver_no_epoch="$PKGVER" ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
ver_full="${ver_no_epoch}-${PKGREL}"
|
||||||
|
|
||||||
|
# Architecture: parse control's `Architecture:` field.
|
||||||
|
if [ ! -f "$ctrl" ]; then
|
||||||
|
# Some recipes ship debian/control instead of ./control
|
||||||
|
ctrl="$RECIPE_DIR/debian/control"
|
||||||
|
fi
|
||||||
|
ctrl_arch=$(grep -m1 '^Architecture:' "$ctrl" 2>/dev/null | awk '{print $2}')
|
||||||
|
case "$ctrl_arch" in
|
||||||
|
all) file_arch=all ;;
|
||||||
|
arm64|any) file_arch=arm64 ;;
|
||||||
|
amd64) file_arch=amd64 ;;
|
||||||
|
*) file_arch=arm64 ;; # conservative default
|
||||||
|
esac
|
||||||
|
|
||||||
|
pkg_name=$(basename "$RECIPE_DIR")
|
||||||
|
|
||||||
|
# Compare against the canonical Packages index (what apt actually
|
||||||
|
# consults). reprepro refuses lower-version uploads, so checking
|
||||||
|
# only an exact source-pkgrel URL produces an endless-rebuild trap
|
||||||
|
# whenever source PKGREL has rolled back below pool head. We skip
|
||||||
|
# if pools published version >= source version-tuple.
|
||||||
|
source_full="${ver_full}"
|
||||||
|
if [ -n "${PKGVER#*:}" ] && [ "${PKGVER}" != "${PKGVER#*:}" ]; then
|
||||||
|
# PKGVER had an epoch — keep it for dpkg --compare-versions.
|
||||||
|
source_full="${PKGVER}-${PKGREL}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Determine suite: most recipes publish to both bookworm and trixie;
|
||||||
|
# checking trixie is sufficient (changelogs share Distribution).
|
||||||
|
suite="trixie"
|
||||||
|
pkg_arch_label="$file_arch"
|
||||||
|
[ "$file_arch" = "all" ] && pkg_arch_label="all"
|
||||||
|
packages_url="${REPO_BASE}/debian/dists/${suite}/main/binary-arm64/Packages"
|
||||||
|
[ "$file_arch" = "amd64" ] && packages_url="${REPO_BASE}/debian/dists/${suite}/main/binary-amd64/Packages"
|
||||||
|
|
||||||
|
pool_ver=$(set +o pipefail; curl -sS --max-time "$HEAD_TIMEOUT" "$packages_url" 2>/dev/null | awk -v p="$pkg_name" '$1=="Package:" && $2==p {found=1; next} found && $1=="Version:" {print $2; exit}')
|
||||||
|
|
||||||
|
if [ -n "$pool_ver" ] && command -v dpkg >/dev/null && dpkg --compare-versions "$pool_ver" ge "$source_full"; then
|
||||||
|
echo "pool has $pool_ver >= source $source_full" >&2
|
||||||
|
emit 1
|
||||||
|
fi
|
||||||
|
echo "pool has $pool_ver, source wants $source_full — build" >&2
|
||||||
|
emit 0
|
||||||
|
;;
|
||||||
|
|
||||||
|
*)
|
||||||
|
echo "error: unsupported ecosystem '$ecosystem' (recipe-dir=$RECIPE_DIR)" >&2
|
||||||
|
emit 0
|
||||||
|
;;
|
||||||
|
esac
|
||||||
+379
-66
@@ -16,13 +16,23 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: skip if already published
|
||||||
|
id: skip-check
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
result=$(./.gitea/scripts/check-already-published.sh arch/distcc-avahi)
|
||||||
|
echo "$result" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "decision: $result"
|
||||||
|
|
||||||
- name: bootstrap runner (idempotent)
|
- name: bootstrap runner (idempotent)
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
retry pacman -Syu --noconfirm --needed base-devel git rsync gnupg openssh sudo avahi popt python python-setuptools
|
retry pacman -Syu --noconfirm --needed base-devel git rsync gnupg openssh sudo avahi popt python python-setuptools
|
||||||
|
|
||||||
- name: import signing key
|
- name: import signing key
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
env:
|
env:
|
||||||
PRIV: ${{ secrets.MARFRIT_REPO_PRIVATE_KEY }}
|
PRIV: ${{ secrets.MARFRIT_REPO_PRIVATE_KEY }}
|
||||||
PASS: ${{ secrets.MARFRIT_REPO_PASSPHRASE }}
|
PASS: ${{ secrets.MARFRIT_REPO_PASSPHRASE }}
|
||||||
@@ -37,6 +47,7 @@ jobs:
|
|||||||
echo "92D5E96D8F63C75E4116AA1FF5C8C4603D0D250C:6:" | gpg --import-ownertrust
|
echo "92D5E96D8F63C75E4116AA1FF5C8C4603D0D250C:6:" | gpg --import-ownertrust
|
||||||
|
|
||||||
- name: install deploy ssh key
|
- name: install deploy ssh key
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
env:
|
env:
|
||||||
KEY: ${{ secrets.MARFRIT_REPO_DEPLOY_KEY }}
|
KEY: ${{ secrets.MARFRIT_REPO_DEPLOY_KEY }}
|
||||||
run: |
|
run: |
|
||||||
@@ -46,6 +57,7 @@ jobs:
|
|||||||
ssh-keyscan -t ed25519 nc.reauktion.de > /root/.ssh/known_hosts 2>/dev/null
|
ssh-keyscan -t ed25519 nc.reauktion.de > /root/.ssh/known_hosts 2>/dev/null
|
||||||
|
|
||||||
- name: makepkg distcc-avahi
|
- name: makepkg distcc-avahi
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
rm -rf /tmp/build-distcc-avahi
|
rm -rf /tmp/build-distcc-avahi
|
||||||
@@ -56,6 +68,7 @@ jobs:
|
|||||||
ls -la *.pkg.tar.* | grep -v "\.sig$"
|
ls -la *.pkg.tar.* | grep -v "\.sig$"
|
||||||
|
|
||||||
- name: sign distcc-avahi
|
- name: sign distcc-avahi
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
cd /tmp/build-distcc-avahi
|
cd /tmp/build-distcc-avahi
|
||||||
@@ -66,6 +79,7 @@ jobs:
|
|||||||
done
|
done
|
||||||
|
|
||||||
- name: update aarch64 repo db
|
- name: update aarch64 repo db
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
mkdir -p /tmp/arch-stage
|
mkdir -p /tmp/arch-stage
|
||||||
@@ -105,6 +119,7 @@ jobs:
|
|||||||
rm -f marfrit.files.sig
|
rm -f marfrit.files.sig
|
||||||
|
|
||||||
- name: publish to aarch64
|
- name: publish to aarch64
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
@@ -129,13 +144,23 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: skip if already published
|
||||||
|
id: skip-check
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
result=$(./.gitea/scripts/check-already-published.sh debian/lmcp)
|
||||||
|
echo "$result" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "decision: $result"
|
||||||
|
|
||||||
- name: install dpkg
|
- name: install dpkg
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
retry pacman -Syu --noconfirm --needed dpkg openssh rsync curl
|
retry pacman -Syu --noconfirm --needed dpkg openssh rsync curl
|
||||||
|
|
||||||
- name: install hertz deploy ssh key
|
- name: install hertz deploy ssh key
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
env:
|
env:
|
||||||
KEY: ${{ secrets.MARFRIT_REPO_HERTZ_KEY }}
|
KEY: ${{ secrets.MARFRIT_REPO_HERTZ_KEY }}
|
||||||
run: |
|
run: |
|
||||||
@@ -145,6 +170,7 @@ jobs:
|
|||||||
ssh-keyscan -t ed25519 hertz.fritz.box >> /root/.ssh/known_hosts 2>/dev/null
|
ssh-keyscan -t ed25519 hertz.fritz.box >> /root/.ssh/known_hosts 2>/dev/null
|
||||||
|
|
||||||
- name: build lmcp .deb
|
- name: build lmcp .deb
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
cd debian/lmcp
|
cd debian/lmcp
|
||||||
@@ -152,6 +178,7 @@ jobs:
|
|||||||
ls -la *.deb
|
ls -la *.deb
|
||||||
|
|
||||||
- name: upload + publish to suites
|
- name: upload + publish to suites
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
@@ -182,13 +209,23 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: skip if already published
|
||||||
|
id: skip-check
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
result=$(./.gitea/scripts/check-already-published.sh arch/lmcp)
|
||||||
|
echo "$result" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "decision: $result"
|
||||||
|
|
||||||
- name: bootstrap runner (idempotent)
|
- name: bootstrap runner (idempotent)
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
retry pacman -Syu --noconfirm --needed base-devel git rsync gnupg openssh sudo lua lua-socket
|
retry pacman -Syu --noconfirm --needed base-devel git rsync gnupg openssh sudo lua lua-socket
|
||||||
|
|
||||||
- name: import signing key
|
- name: import signing key
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
env:
|
env:
|
||||||
PRIV: ${{ secrets.MARFRIT_REPO_PRIVATE_KEY }}
|
PRIV: ${{ secrets.MARFRIT_REPO_PRIVATE_KEY }}
|
||||||
PASS: ${{ secrets.MARFRIT_REPO_PASSPHRASE }}
|
PASS: ${{ secrets.MARFRIT_REPO_PASSPHRASE }}
|
||||||
@@ -203,6 +240,7 @@ jobs:
|
|||||||
echo "92D5E96D8F63C75E4116AA1FF5C8C4603D0D250C:6:" | gpg --import-ownertrust
|
echo "92D5E96D8F63C75E4116AA1FF5C8C4603D0D250C:6:" | gpg --import-ownertrust
|
||||||
|
|
||||||
- name: install deploy ssh key
|
- name: install deploy ssh key
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
env:
|
env:
|
||||||
KEY: ${{ secrets.MARFRIT_REPO_DEPLOY_KEY }}
|
KEY: ${{ secrets.MARFRIT_REPO_DEPLOY_KEY }}
|
||||||
run: |
|
run: |
|
||||||
@@ -212,6 +250,7 @@ jobs:
|
|||||||
ssh-keyscan -t ed25519 nc.reauktion.de > /root/.ssh/known_hosts 2>/dev/null
|
ssh-keyscan -t ed25519 nc.reauktion.de > /root/.ssh/known_hosts 2>/dev/null
|
||||||
|
|
||||||
- name: makepkg lmcp
|
- name: makepkg lmcp
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
rm -rf /tmp/build-lmcp
|
rm -rf /tmp/build-lmcp
|
||||||
@@ -222,6 +261,7 @@ jobs:
|
|||||||
ls -la *.pkg.tar.* | grep -v "\.sig$"
|
ls -la *.pkg.tar.* | grep -v "\.sig$"
|
||||||
|
|
||||||
- name: sign lmcp
|
- name: sign lmcp
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
cd /tmp/build-lmcp
|
cd /tmp/build-lmcp
|
||||||
@@ -232,6 +272,7 @@ jobs:
|
|||||||
done
|
done
|
||||||
|
|
||||||
- name: publish lmcp to both arches
|
- name: publish lmcp to both arches
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
@@ -283,13 +324,23 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: skip if already published
|
||||||
|
id: skip-check
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
result=$(./.gitea/scripts/check-already-published.sh arch/claude-his-agent)
|
||||||
|
echo "$result" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "decision: $result"
|
||||||
|
|
||||||
- name: bootstrap runner (idempotent)
|
- name: bootstrap runner (idempotent)
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
retry pacman -Syu --noconfirm --needed base-devel git rsync gnupg openssh sudo
|
retry pacman -Syu --noconfirm --needed base-devel git rsync gnupg openssh sudo
|
||||||
|
|
||||||
- name: import signing key
|
- name: import signing key
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
env:
|
env:
|
||||||
PRIV: ${{ secrets.MARFRIT_REPO_PRIVATE_KEY }}
|
PRIV: ${{ secrets.MARFRIT_REPO_PRIVATE_KEY }}
|
||||||
PASS: ${{ secrets.MARFRIT_REPO_PASSPHRASE }}
|
PASS: ${{ secrets.MARFRIT_REPO_PASSPHRASE }}
|
||||||
@@ -304,6 +355,7 @@ jobs:
|
|||||||
echo "92D5E96D8F63C75E4116AA1FF5C8C4603D0D250C:6:" | gpg --import-ownertrust
|
echo "92D5E96D8F63C75E4116AA1FF5C8C4603D0D250C:6:" | gpg --import-ownertrust
|
||||||
|
|
||||||
- name: install deploy ssh key
|
- name: install deploy ssh key
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
env:
|
env:
|
||||||
KEY: ${{ secrets.MARFRIT_REPO_DEPLOY_KEY }}
|
KEY: ${{ secrets.MARFRIT_REPO_DEPLOY_KEY }}
|
||||||
run: |
|
run: |
|
||||||
@@ -313,6 +365,7 @@ jobs:
|
|||||||
ssh-keyscan -t ed25519 nc.reauktion.de > /root/.ssh/known_hosts 2>/dev/null
|
ssh-keyscan -t ed25519 nc.reauktion.de > /root/.ssh/known_hosts 2>/dev/null
|
||||||
|
|
||||||
- name: makepkg claude-his-agent
|
- name: makepkg claude-his-agent
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
rm -rf /tmp/build-his
|
rm -rf /tmp/build-his
|
||||||
@@ -323,6 +376,7 @@ jobs:
|
|||||||
ls -la *.pkg.tar.* | grep -v "\.sig$"
|
ls -la *.pkg.tar.* | grep -v "\.sig$"
|
||||||
|
|
||||||
- name: sign claude-his-agent
|
- name: sign claude-his-agent
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
cd /tmp/build-his
|
cd /tmp/build-his
|
||||||
@@ -333,6 +387,7 @@ jobs:
|
|||||||
done
|
done
|
||||||
|
|
||||||
- name: publish claude-his-agent to both arches
|
- name: publish claude-his-agent to both arches
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
@@ -387,13 +442,23 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: skip if already published
|
||||||
|
id: skip-check
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
result=$(./.gitea/scripts/check-already-published.sh arch/ffmpeg-v4l2-request-fourier)
|
||||||
|
echo "$result" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "decision: $result"
|
||||||
|
|
||||||
- name: bootstrap runner (idempotent)
|
- name: bootstrap runner (idempotent)
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
retry pacman -Syu --noconfirm --needed base-devel git rsync gnupg openssh sudo nasm
|
retry pacman -Syu --noconfirm --needed base-devel git rsync gnupg openssh sudo nasm
|
||||||
|
|
||||||
- name: import signing key
|
- name: import signing key
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
env:
|
env:
|
||||||
PRIV: ${{ secrets.MARFRIT_REPO_PRIVATE_KEY }}
|
PRIV: ${{ secrets.MARFRIT_REPO_PRIVATE_KEY }}
|
||||||
PASS: ${{ secrets.MARFRIT_REPO_PASSPHRASE }}
|
PASS: ${{ secrets.MARFRIT_REPO_PASSPHRASE }}
|
||||||
@@ -408,6 +473,7 @@ jobs:
|
|||||||
echo "92D5E96D8F63C75E4116AA1FF5C8C4603D0D250C:6:" | gpg --import-ownertrust
|
echo "92D5E96D8F63C75E4116AA1FF5C8C4603D0D250C:6:" | gpg --import-ownertrust
|
||||||
|
|
||||||
- name: install deploy ssh key
|
- name: install deploy ssh key
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
env:
|
env:
|
||||||
KEY: ${{ secrets.MARFRIT_REPO_DEPLOY_KEY }}
|
KEY: ${{ secrets.MARFRIT_REPO_DEPLOY_KEY }}
|
||||||
run: |
|
run: |
|
||||||
@@ -417,6 +483,7 @@ jobs:
|
|||||||
ssh-keyscan -t ed25519 nc.reauktion.de > /root/.ssh/known_hosts 2>/dev/null
|
ssh-keyscan -t ed25519 nc.reauktion.de > /root/.ssh/known_hosts 2>/dev/null
|
||||||
|
|
||||||
- name: makepkg ffmpeg-v4l2-request-fourier
|
- name: makepkg ffmpeg-v4l2-request-fourier
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
rm -rf /tmp/build-ffmpeg-v4l2
|
rm -rf /tmp/build-ffmpeg-v4l2
|
||||||
@@ -430,6 +497,7 @@ jobs:
|
|||||||
ls -la *.pkg.tar.* | grep -v "\.sig$"
|
ls -la *.pkg.tar.* | grep -v "\.sig$"
|
||||||
|
|
||||||
- name: sign ffmpeg-v4l2-request-fourier
|
- name: sign ffmpeg-v4l2-request-fourier
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
cd /tmp/build-ffmpeg-v4l2
|
cd /tmp/build-ffmpeg-v4l2
|
||||||
@@ -440,6 +508,7 @@ jobs:
|
|||||||
done
|
done
|
||||||
|
|
||||||
- name: update aarch64 repo db
|
- name: update aarch64 repo db
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
mkdir -p /tmp/arch-stage-ffmpeg
|
mkdir -p /tmp/arch-stage-ffmpeg
|
||||||
@@ -475,6 +544,7 @@ jobs:
|
|||||||
rm -f marfrit.files.sig
|
rm -f marfrit.files.sig
|
||||||
|
|
||||||
- name: publish to aarch64
|
- name: publish to aarch64
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
@@ -500,13 +570,23 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: skip if already published
|
||||||
|
id: skip-check
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
result=$(./.gitea/scripts/check-already-published.sh arch/libva-v4l2-request-fourier)
|
||||||
|
echo "$result" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "decision: $result"
|
||||||
|
|
||||||
- name: bootstrap runner (idempotent)
|
- name: bootstrap runner (idempotent)
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
retry pacman -Syu --noconfirm --needed base-devel git rsync gnupg openssh sudo
|
retry pacman -Syu --noconfirm --needed base-devel git rsync gnupg openssh sudo
|
||||||
|
|
||||||
- name: import signing key
|
- name: import signing key
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
env:
|
env:
|
||||||
PRIV: ${{ secrets.MARFRIT_REPO_PRIVATE_KEY }}
|
PRIV: ${{ secrets.MARFRIT_REPO_PRIVATE_KEY }}
|
||||||
PASS: ${{ secrets.MARFRIT_REPO_PASSPHRASE }}
|
PASS: ${{ secrets.MARFRIT_REPO_PASSPHRASE }}
|
||||||
@@ -521,6 +601,7 @@ jobs:
|
|||||||
echo "92D5E96D8F63C75E4116AA1FF5C8C4603D0D250C:6:" | gpg --import-ownertrust
|
echo "92D5E96D8F63C75E4116AA1FF5C8C4603D0D250C:6:" | gpg --import-ownertrust
|
||||||
|
|
||||||
- name: install deploy ssh key
|
- name: install deploy ssh key
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
env:
|
env:
|
||||||
KEY: ${{ secrets.MARFRIT_REPO_DEPLOY_KEY }}
|
KEY: ${{ secrets.MARFRIT_REPO_DEPLOY_KEY }}
|
||||||
run: |
|
run: |
|
||||||
@@ -530,6 +611,7 @@ jobs:
|
|||||||
ssh-keyscan -t ed25519 nc.reauktion.de > /root/.ssh/known_hosts 2>/dev/null
|
ssh-keyscan -t ed25519 nc.reauktion.de > /root/.ssh/known_hosts 2>/dev/null
|
||||||
|
|
||||||
- name: makepkg libva-v4l2-request-fourier
|
- name: makepkg libva-v4l2-request-fourier
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
rm -rf /tmp/build-libva-v4l2
|
rm -rf /tmp/build-libva-v4l2
|
||||||
@@ -541,6 +623,7 @@ jobs:
|
|||||||
ls -la *.pkg.tar.* | grep -v "\.sig$"
|
ls -la *.pkg.tar.* | grep -v "\.sig$"
|
||||||
|
|
||||||
- name: sign libva-v4l2-request-fourier
|
- name: sign libva-v4l2-request-fourier
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
cd /tmp/build-libva-v4l2
|
cd /tmp/build-libva-v4l2
|
||||||
@@ -551,6 +634,7 @@ jobs:
|
|||||||
done
|
done
|
||||||
|
|
||||||
- name: update aarch64 repo db
|
- name: update aarch64 repo db
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
mkdir -p /tmp/arch-stage-libva
|
mkdir -p /tmp/arch-stage-libva
|
||||||
@@ -586,6 +670,7 @@ jobs:
|
|||||||
rm -f marfrit.files.sig
|
rm -f marfrit.files.sig
|
||||||
|
|
||||||
- name: publish to aarch64
|
- name: publish to aarch64
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
@@ -611,13 +696,23 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: skip if already published
|
||||||
|
id: skip-check
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
result=$(./.gitea/scripts/check-already-published.sh arch/mpv-fourier)
|
||||||
|
echo "$result" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "decision: $result"
|
||||||
|
|
||||||
- name: bootstrap runner (idempotent)
|
- name: bootstrap runner (idempotent)
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
retry pacman -Syu --noconfirm --needed base-devel git rsync gnupg openssh sudo
|
retry pacman -Syu --noconfirm --needed base-devel git rsync gnupg openssh sudo
|
||||||
|
|
||||||
- name: import signing key
|
- name: import signing key
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
env:
|
env:
|
||||||
PRIV: ${{ secrets.MARFRIT_REPO_PRIVATE_KEY }}
|
PRIV: ${{ secrets.MARFRIT_REPO_PRIVATE_KEY }}
|
||||||
PASS: ${{ secrets.MARFRIT_REPO_PASSPHRASE }}
|
PASS: ${{ secrets.MARFRIT_REPO_PASSPHRASE }}
|
||||||
@@ -632,6 +727,7 @@ jobs:
|
|||||||
echo "92D5E96D8F63C75E4116AA1FF5C8C4603D0D250C:6:" | gpg --import-ownertrust
|
echo "92D5E96D8F63C75E4116AA1FF5C8C4603D0D250C:6:" | gpg --import-ownertrust
|
||||||
|
|
||||||
- name: install deploy ssh key
|
- name: install deploy ssh key
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
env:
|
env:
|
||||||
KEY: ${{ secrets.MARFRIT_REPO_DEPLOY_KEY }}
|
KEY: ${{ secrets.MARFRIT_REPO_DEPLOY_KEY }}
|
||||||
run: |
|
run: |
|
||||||
@@ -641,6 +737,7 @@ jobs:
|
|||||||
ssh-keyscan -t ed25519 nc.reauktion.de > /root/.ssh/known_hosts 2>/dev/null
|
ssh-keyscan -t ed25519 nc.reauktion.de > /root/.ssh/known_hosts 2>/dev/null
|
||||||
|
|
||||||
- name: configure [marfrit] repo + pre-install ffmpeg-v4l2-request-fourier
|
- name: configure [marfrit] repo + pre-install ffmpeg-v4l2-request-fourier
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
# mpv-fourier links libavcodec at build time. If the build host pulls
|
# mpv-fourier links libavcodec at build time. If the build host pulls
|
||||||
@@ -668,6 +765,7 @@ jobs:
|
|||||||
printf 'y\ny\ny\n' | pacman -S marfrit/ffmpeg-v4l2-request-fourier
|
printf 'y\ny\ny\n' | pacman -S marfrit/ffmpeg-v4l2-request-fourier
|
||||||
|
|
||||||
- name: makepkg mpv-fourier
|
- name: makepkg mpv-fourier
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
rm -rf /tmp/build-mpv
|
rm -rf /tmp/build-mpv
|
||||||
@@ -679,6 +777,7 @@ jobs:
|
|||||||
ls -la *.pkg.tar.* | grep -v "\.sig$"
|
ls -la *.pkg.tar.* | grep -v "\.sig$"
|
||||||
|
|
||||||
- name: sign mpv-fourier
|
- name: sign mpv-fourier
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
cd /tmp/build-mpv
|
cd /tmp/build-mpv
|
||||||
@@ -689,6 +788,7 @@ jobs:
|
|||||||
done
|
done
|
||||||
|
|
||||||
- name: update aarch64 repo db
|
- name: update aarch64 repo db
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
mkdir -p /tmp/arch-stage-mpv
|
mkdir -p /tmp/arch-stage-mpv
|
||||||
@@ -724,6 +824,7 @@ jobs:
|
|||||||
rm -f marfrit.files.sig
|
rm -f marfrit.files.sig
|
||||||
|
|
||||||
- name: publish to aarch64
|
- name: publish to aarch64
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
@@ -746,13 +847,23 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: skip if already published
|
||||||
|
id: skip-check
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
result=$(./.gitea/scripts/check-already-published.sh debian/claude-his-agent)
|
||||||
|
echo "$result" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "decision: $result"
|
||||||
|
|
||||||
- name: install dpkg
|
- name: install dpkg
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
retry pacman -Syu --noconfirm --needed dpkg openssh rsync curl
|
retry pacman -Syu --noconfirm --needed dpkg openssh rsync curl
|
||||||
|
|
||||||
- name: install hertz deploy ssh key
|
- name: install hertz deploy ssh key
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
env:
|
env:
|
||||||
KEY: ${{ secrets.MARFRIT_REPO_HERTZ_KEY }}
|
KEY: ${{ secrets.MARFRIT_REPO_HERTZ_KEY }}
|
||||||
run: |
|
run: |
|
||||||
@@ -762,6 +873,7 @@ jobs:
|
|||||||
ssh-keyscan -t ed25519 hertz.fritz.box >> /root/.ssh/known_hosts 2>/dev/null
|
ssh-keyscan -t ed25519 hertz.fritz.box >> /root/.ssh/known_hosts 2>/dev/null
|
||||||
|
|
||||||
- name: build claude-his-agent .deb
|
- name: build claude-his-agent .deb
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
cd debian/claude-his-agent
|
cd debian/claude-his-agent
|
||||||
@@ -769,6 +881,7 @@ jobs:
|
|||||||
ls -la *.deb
|
ls -la *.deb
|
||||||
|
|
||||||
- name: upload + publish to suites
|
- name: upload + publish to suites
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
@@ -793,22 +906,41 @@ jobs:
|
|||||||
# -------------------------------------------------------------------------
|
# -------------------------------------------------------------------------
|
||||||
ffmpeg-v4l2-request-debian:
|
ffmpeg-v4l2-request-debian:
|
||||||
needs: ffmpeg-v4l2-request-aarch64
|
needs: ffmpeg-v4l2-request-aarch64
|
||||||
runs-on: arch-aarch64
|
runs-on: debian-aarch64
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: skip if already published
|
||||||
|
id: skip-check
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
result=$(./.gitea/scripts/check-already-published.sh debian/ffmpeg-v4l2-request-fourier)
|
||||||
|
echo "$result" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "decision: $result"
|
||||||
|
|
||||||
- name: install build-deps (Arch pkg names; build-deb.sh links natively)
|
- name: install build-deps (Arch pkg names; build-deb.sh links natively)
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
retry pacman -Syu --noconfirm --needed \
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
dpkg openssh rsync curl base-devel git nasm yasm \
|
retry apt-get update -qq
|
||||||
linux-api-headers mesa alsa-lib bzip2 fontconfig fribidi gmp \
|
# Debian build-deps for the FFmpeg fourier-fork build. These
|
||||||
gnutls lame libass dav1d libdrm freetype2 libpulse libva \
|
# map 1:1 to the previous Arch list; libav*-dev intentionally
|
||||||
libvorbis libvpx libwebp x264 x265 libxml2 opus v4l-utils xz zlib
|
# absent (we are FFmpeg itself, providing those libs).
|
||||||
|
retry apt-get install -y --no-install-recommends \
|
||||||
|
build-essential git pkg-config nasm yasm \
|
||||||
|
linux-libc-dev libgl1-mesa-dev libasound2-dev libbz2-dev \
|
||||||
|
libfontconfig-dev libfribidi-dev libgmp-dev libgnutls28-dev \
|
||||||
|
libmp3lame-dev libass-dev libdav1d-dev libdrm-dev \
|
||||||
|
libfreetype-dev libpulse-dev libva-dev libvorbis-dev libvpx-dev \
|
||||||
|
libwebp-dev libx264-dev libx265-dev libxml2-dev libopus-dev \
|
||||||
|
v4l-utils liblzma-dev zlib1g-dev \
|
||||||
|
curl ca-certificates openssh-client rsync dpkg-dev
|
||||||
|
|
||||||
- name: install hertz deploy ssh key
|
- name: install hertz deploy ssh key
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
env:
|
env:
|
||||||
KEY: ${{ secrets.MARFRIT_REPO_HERTZ_KEY }}
|
KEY: ${{ secrets.MARFRIT_REPO_HERTZ_KEY }}
|
||||||
run: |
|
run: |
|
||||||
@@ -818,6 +950,7 @@ jobs:
|
|||||||
ssh-keyscan -t ed25519 hertz.fritz.box >> /root/.ssh/known_hosts 2>/dev/null
|
ssh-keyscan -t ed25519 hertz.fritz.box >> /root/.ssh/known_hosts 2>/dev/null
|
||||||
|
|
||||||
- name: build ffmpeg-v4l2-request-fourier .deb
|
- name: build ffmpeg-v4l2-request-fourier .deb
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
cd debian/ffmpeg-v4l2-request-fourier
|
cd debian/ffmpeg-v4l2-request-fourier
|
||||||
@@ -825,6 +958,7 @@ jobs:
|
|||||||
ls -la *.deb
|
ls -la *.deb
|
||||||
|
|
||||||
- name: upload + publish to suites
|
- name: upload + publish to suites
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
@@ -846,20 +980,38 @@ jobs:
|
|||||||
# -------------------------------------------------------------------------
|
# -------------------------------------------------------------------------
|
||||||
libva-v4l2-request-fourier-debian:
|
libva-v4l2-request-fourier-debian:
|
||||||
needs: libva-v4l2-request-fourier-aarch64
|
needs: libva-v4l2-request-fourier-aarch64
|
||||||
runs-on: arch-aarch64
|
# Native Debian trixie runner — the driver bakes __vaDriverInit_1_<MINOR>
|
||||||
|
# at compile time from <va/va.h>. Building on Arch (libva 2.23) produced
|
||||||
|
# __vaDriverInit_1_23, which trixie's libva 2.22 runtime cannot bind: the
|
||||||
|
# .deb installed but vaInitialize() returned -1 on every host. A native
|
||||||
|
# trixie runner avoids the cross-distro ABI skew entirely.
|
||||||
|
runs-on: debian-aarch64
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: skip if already published
|
||||||
|
id: skip-check
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
result=$(./.gitea/scripts/check-already-published.sh debian/libva-v4l2-request-fourier)
|
||||||
|
echo "$result" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "decision: $result"
|
||||||
|
|
||||||
- name: install build-deps
|
- name: install build-deps
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
retry pacman -Syu --noconfirm --needed \
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
dpkg openssh rsync curl base-devel git meson ninja pkgconf \
|
retry apt-get update -qq
|
||||||
libva libdrm systemd-libs
|
retry apt-get install -y --no-install-recommends \
|
||||||
|
build-essential meson ninja-build pkg-config \
|
||||||
|
libva-dev libdrm-dev \
|
||||||
|
curl openssh-client rsync ca-certificates git dpkg-dev
|
||||||
|
|
||||||
- name: install hertz deploy ssh key
|
- name: install hertz deploy ssh key
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
env:
|
env:
|
||||||
KEY: ${{ secrets.MARFRIT_REPO_HERTZ_KEY }}
|
KEY: ${{ secrets.MARFRIT_REPO_HERTZ_KEY }}
|
||||||
run: |
|
run: |
|
||||||
@@ -869,6 +1021,7 @@ jobs:
|
|||||||
ssh-keyscan -t ed25519 hertz.fritz.box >> /root/.ssh/known_hosts 2>/dev/null
|
ssh-keyscan -t ed25519 hertz.fritz.box >> /root/.ssh/known_hosts 2>/dev/null
|
||||||
|
|
||||||
- name: build libva-v4l2-request-fourier .deb
|
- name: build libva-v4l2-request-fourier .deb
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
cd debian/libva-v4l2-request-fourier
|
cd debian/libva-v4l2-request-fourier
|
||||||
@@ -876,6 +1029,7 @@ jobs:
|
|||||||
ls -la *.deb
|
ls -la *.deb
|
||||||
|
|
||||||
- name: upload + publish to suites
|
- name: upload + publish to suites
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
@@ -900,41 +1054,51 @@ jobs:
|
|||||||
# -------------------------------------------------------------------------
|
# -------------------------------------------------------------------------
|
||||||
mpv-fourier-debian:
|
mpv-fourier-debian:
|
||||||
needs: mpv-fourier-aarch64
|
needs: mpv-fourier-aarch64
|
||||||
runs-on: arch-aarch64
|
runs-on: debian-aarch64
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: skip if already published
|
||||||
|
id: skip-check
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
result=$(./.gitea/scripts/check-already-published.sh debian/mpv-fourier)
|
||||||
|
echo "$result" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "decision: $result"
|
||||||
|
|
||||||
- name: install build-deps
|
- name: install build-deps
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
retry pacman -Syu --noconfirm --needed \
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
dpkg openssh rsync curl base-devel git meson ninja python-docutils \
|
retry apt-get update -qq
|
||||||
ladspa wayland-protocols vulkan-headers \
|
# Debian libav*-dev is ABI-compatible with the fourier ffmpeg
|
||||||
alsa-lib desktop-file-utils glibc hicolor-icon-theme jack lcms2 \
|
# fork at the header level; mpv link-binds against system
|
||||||
libarchive libass libbluray libcdio libcdio-paranoia libdisplay-info \
|
# libav at build time, runtime dlopen picks up the fourier
|
||||||
libdrm libdvdnav libdvdread libegl libgl libglvnd libjpeg-turbo \
|
# libs if installed. The previous [marfrit] pre-install of
|
||||||
libplacebo libpulse libsixel libva libvdpau libx11 libxext \
|
# ffmpeg-v4l2-request-fourier under pacman is unnecessary
|
||||||
libxkbcommon libxpresent libxrandr libxss libxv luajit mesa mujs \
|
# under apt: stock Debian libav*-dev provides the trixie
|
||||||
libpipewire rubberband sdl2 openal uchardet vapoursynth \
|
# ABI mpv-fourier's binary will encounter.
|
||||||
vulkan-icd-loader wayland zlib
|
retry apt-get install -y --no-install-recommends \
|
||||||
|
build-essential git meson ninja-build pkg-config python3-docutils \
|
||||||
- name: configure [marfrit] repo + pre-install ffmpeg-v4l2-request-fourier
|
ladspa-sdk wayland-protocols libvulkan-dev libwayland-dev \
|
||||||
run: |
|
libasound2-dev desktop-file-utils libc6-dev hicolor-icon-theme \
|
||||||
set -e
|
libjack-jackd2-dev liblcms2-dev libarchive-dev libass-dev \
|
||||||
curl -sLo /tmp/marfrit.gpg https://packages.reauktion.de/marfrit.gpg
|
libbluray-dev libcdio-dev libcdio-paranoia-dev libdisplay-info-dev \
|
||||||
pacman-key --add /tmp/marfrit.gpg
|
libdrm-dev libdvdnav-dev libdvdread-dev libegl-dev libgl-dev \
|
||||||
pacman-key --lsign-key 92D5E96D8F63C75E4116AA1FF5C8C4603D0D250C
|
libglvnd-dev libjpeg-dev libplacebo-dev libpulse-dev libsixel-dev \
|
||||||
rm -f /tmp/marfrit.gpg
|
libva-dev libvdpau-dev libx11-dev libxext-dev libxkbcommon-dev \
|
||||||
if ! grep -q '^\[marfrit\]' /etc/pacman.conf; then
|
libxpresent-dev libxrandr-dev libxss-dev libxv-dev libluajit-5.1-dev \
|
||||||
printf '\n[marfrit]\nServer = https://packages.reauktion.de/arch/$arch\nSigLevel = Required\n' >> /etc/pacman.conf
|
libmujs-dev libpipewire-0.3-dev librubberband-dev libsdl2-dev \
|
||||||
fi
|
libopenal-dev libuchardet-dev libvapoursynth-dev liblzma-dev \
|
||||||
pacman -Sy --noconfirm
|
libavcodec-dev libavformat-dev libavutil-dev libswscale-dev libswresample-dev \
|
||||||
rm -f /var/cache/pacman/pkg/ffmpeg-v4l2-request-fourier-*-aarch64.pkg.tar.*
|
zlib1g-dev \
|
||||||
printf 'y\ny\ny\n' | pacman -S marfrit/ffmpeg-v4l2-request-fourier
|
curl ca-certificates openssh-client rsync dpkg-dev
|
||||||
|
|
||||||
- name: install hertz deploy ssh key
|
- name: install hertz deploy ssh key
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
env:
|
env:
|
||||||
KEY: ${{ secrets.MARFRIT_REPO_HERTZ_KEY }}
|
KEY: ${{ secrets.MARFRIT_REPO_HERTZ_KEY }}
|
||||||
run: |
|
run: |
|
||||||
@@ -944,6 +1108,7 @@ jobs:
|
|||||||
ssh-keyscan -t ed25519 hertz.fritz.box >> /root/.ssh/known_hosts 2>/dev/null
|
ssh-keyscan -t ed25519 hertz.fritz.box >> /root/.ssh/known_hosts 2>/dev/null
|
||||||
|
|
||||||
- name: build mpv-fourier .deb
|
- name: build mpv-fourier .deb
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
cd debian/mpv-fourier
|
cd debian/mpv-fourier
|
||||||
@@ -951,6 +1116,7 @@ jobs:
|
|||||||
ls -la *.deb
|
ls -la *.deb
|
||||||
|
|
||||||
- name: upload + publish to suites
|
- name: upload + publish to suites
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
@@ -973,44 +1139,41 @@ jobs:
|
|||||||
# -------------------------------------------------------------------------
|
# -------------------------------------------------------------------------
|
||||||
daedalus-v4l2-debian:
|
daedalus-v4l2-debian:
|
||||||
needs: claude-his-debian
|
needs: claude-his-debian
|
||||||
runs-on: arch-aarch64
|
runs-on: debian-aarch64
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: install build-deps (sans ffmpeg — see [marfrit] step)
|
- name: skip if already published
|
||||||
|
id: skip-check
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
result=$(./.gitea/scripts/check-already-published.sh debian/daedalus-v4l2)
|
||||||
|
echo "$result" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "decision: $result"
|
||||||
|
|
||||||
|
- name: install build-deps
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
# Do NOT pull stock 'ffmpeg' here: the arch-aarch64 runner has
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
# ffmpeg-v4l2-request-fourier pre-installed from the mpv-aarch64
|
retry apt-get update -qq
|
||||||
# job (configured via [marfrit]), and pacman -S ffmpeg would
|
# libav*-dev provide the headers daedalus daemon dlopens at
|
||||||
# conflict on the libav* drop-in. Daedalus build only needs
|
# runtime — Debian's stock packages match the trixie ABI the
|
||||||
# libavcodec/libavformat headers, which the fourier package
|
# daemon will encounter on Pi 5 hosts (both ship libavcodec
|
||||||
# already supplies. Keep cmake/ninja/pkgconf/libdrm here; the
|
# 61.x). The fourier ffmpeg fork isn't needed here; the
|
||||||
# ffmpeg-dev equivalent comes via the next step.
|
# daemon never link-binds against libav (Option γ — dlopen
|
||||||
retry pacman -Syu --noconfirm --needed \
|
# at runtime), so any header set with the right struct
|
||||||
dpkg openssh rsync curl base-devel git cmake ninja pkgconf \
|
# definitions works.
|
||||||
libdrm
|
retry apt-get install -y --no-install-recommends \
|
||||||
|
build-essential cmake ninja-build pkg-config git \
|
||||||
- name: ensure ffmpeg-v4l2-request-fourier installed (link-time ABI source)
|
libavcodec-dev libavformat-dev libavutil-dev libdrm-dev \
|
||||||
run: |
|
linux-libc-dev \
|
||||||
set -e
|
curl ca-certificates openssh-client rsync dpkg-dev
|
||||||
# Idempotent: pre-install the marfrit fourier ffmpeg so cmake
|
|
||||||
# finds libavcodec / libavformat / libavutil headers + .so's.
|
|
||||||
# Mirrors mpv-fourier-debian's [marfrit] step.
|
|
||||||
curl -sLo /tmp/marfrit.gpg https://packages.reauktion.de/marfrit.gpg
|
|
||||||
pacman-key --add /tmp/marfrit.gpg
|
|
||||||
pacman-key --lsign-key 92D5E96D8F63C75E4116AA1FF5C8C4603D0D250C
|
|
||||||
rm -f /tmp/marfrit.gpg
|
|
||||||
if ! grep -q '^\[marfrit\]' /etc/pacman.conf; then
|
|
||||||
printf '\n[marfrit]\nServer = https://packages.reauktion.de/arch/$arch\nSigLevel = Required\n' >> /etc/pacman.conf
|
|
||||||
fi
|
|
||||||
pacman -Sy --noconfirm
|
|
||||||
rm -f /var/cache/pacman/pkg/ffmpeg-v4l2-request-fourier-*-aarch64.pkg.tar.*
|
|
||||||
printf 'y\ny\ny\n' | pacman -S --needed marfrit/ffmpeg-v4l2-request-fourier
|
|
||||||
|
|
||||||
- name: install hertz deploy ssh key
|
- name: install hertz deploy ssh key
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
env:
|
env:
|
||||||
KEY: ${{ secrets.MARFRIT_REPO_HERTZ_KEY }}
|
KEY: ${{ secrets.MARFRIT_REPO_HERTZ_KEY }}
|
||||||
run: |
|
run: |
|
||||||
@@ -1020,6 +1183,7 @@ jobs:
|
|||||||
ssh-keyscan -t ed25519 hertz.fritz.box >> /root/.ssh/known_hosts 2>/dev/null
|
ssh-keyscan -t ed25519 hertz.fritz.box >> /root/.ssh/known_hosts 2>/dev/null
|
||||||
|
|
||||||
- name: build daedalus-v4l2 .deb
|
- name: build daedalus-v4l2 .deb
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
cd debian/daedalus-v4l2
|
cd debian/daedalus-v4l2
|
||||||
@@ -1027,6 +1191,7 @@ jobs:
|
|||||||
ls -la *.deb
|
ls -la *.deb
|
||||||
|
|
||||||
- name: upload + publish to suites
|
- name: upload + publish to suites
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
@@ -1049,18 +1214,31 @@ jobs:
|
|||||||
# -------------------------------------------------------------------------
|
# -------------------------------------------------------------------------
|
||||||
daedalus-v4l2-dkms-debian:
|
daedalus-v4l2-dkms-debian:
|
||||||
needs: daedalus-v4l2-debian
|
needs: daedalus-v4l2-debian
|
||||||
runs-on: arch-aarch64
|
runs-on: debian-aarch64
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: skip if already published
|
||||||
|
id: skip-check
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
result=$(./.gitea/scripts/check-already-published.sh debian/daedalus-v4l2-dkms)
|
||||||
|
echo "$result" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "decision: $result"
|
||||||
|
|
||||||
- name: install tooling
|
- name: install tooling
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
retry pacman -Syu --noconfirm --needed dpkg openssh rsync curl tar gzip
|
export DEBIAN_FRONTEND=noninteractive
|
||||||
|
retry apt-get update -qq
|
||||||
|
retry apt-get install -y --no-install-recommends \
|
||||||
|
dpkg-dev openssh-client rsync curl ca-certificates tar gzip
|
||||||
|
|
||||||
- name: install hertz deploy ssh key
|
- name: install hertz deploy ssh key
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
env:
|
env:
|
||||||
KEY: ${{ secrets.MARFRIT_REPO_HERTZ_KEY }}
|
KEY: ${{ secrets.MARFRIT_REPO_HERTZ_KEY }}
|
||||||
run: |
|
run: |
|
||||||
@@ -1070,6 +1248,7 @@ jobs:
|
|||||||
ssh-keyscan -t ed25519 hertz.fritz.box >> /root/.ssh/known_hosts 2>/dev/null
|
ssh-keyscan -t ed25519 hertz.fritz.box >> /root/.ssh/known_hosts 2>/dev/null
|
||||||
|
|
||||||
- name: build daedalus-v4l2-dkms .deb
|
- name: build daedalus-v4l2-dkms .deb
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
cd debian/daedalus-v4l2-dkms
|
cd debian/daedalus-v4l2-dkms
|
||||||
@@ -1077,6 +1256,7 @@ jobs:
|
|||||||
ls -la *.deb
|
ls -la *.deb
|
||||||
|
|
||||||
- name: upload + publish to suites
|
- name: upload + publish to suites
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
@@ -1092,3 +1272,136 @@ jobs:
|
|||||||
- name: wipe secrets
|
- name: wipe secrets
|
||||||
if: always()
|
if: always()
|
||||||
run: rm -f /root/.ssh/id_ed25519_hertz
|
run: rm -f /root/.ssh/id_ed25519_hertz
|
||||||
|
|
||||||
|
# -------------------------------------------------------------------------
|
||||||
|
# mesa-panvk-bifrost (aarch64 only) — patched Mesa libvulkan_panfrost.so
|
||||||
|
# for Bifrost-gen Mali (panvk-bifrost campaign iter9). Co-installs at
|
||||||
|
# /usr/lib/panvk-bifrost/ so stock mesa stays intact; opt-in via the
|
||||||
|
# brave-vulkan launcher this package also ships.
|
||||||
|
#
|
||||||
|
# Build is slow (~30-60min on actrunner-aarch64): full Mesa-from-source.
|
||||||
|
# Standalone job — no `needs:` since it doesn't depend on the fourier
|
||||||
|
# codec stack. continue-on-error so a build hiccup doesn't block other
|
||||||
|
# jobs in the same workflow run.
|
||||||
|
# -------------------------------------------------------------------------
|
||||||
|
mesa-panvk-bifrost-aarch64:
|
||||||
|
runs-on: arch-aarch64
|
||||||
|
continue-on-error: true
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: skip if already published
|
||||||
|
id: skip-check
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
result=$(./.gitea/scripts/check-already-published.sh arch/mesa-panvk-bifrost)
|
||||||
|
echo "$result" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "decision: $result"
|
||||||
|
|
||||||
|
- name: bootstrap runner (idempotent)
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
|
retry pacman -Syu --noconfirm --needed base-devel git rsync gnupg openssh sudo
|
||||||
|
|
||||||
|
- name: import signing key
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
|
env:
|
||||||
|
PRIV: ${{ secrets.MARFRIT_REPO_PRIVATE_KEY }}
|
||||||
|
PASS: ${{ secrets.MARFRIT_REPO_PASSPHRASE }}
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
gpgconf --homedir /root/.gnupg --kill all 2>/dev/null || true
|
||||||
|
rm -rf /root/.gnupg /root/repo_pass
|
||||||
|
mkdir -m700 -p /root/.gnupg
|
||||||
|
printf '%s' "$PASS" > /root/repo_pass
|
||||||
|
chmod 600 /root/repo_pass
|
||||||
|
printf '%s\n' "$PRIV" | gpg --batch --import
|
||||||
|
echo "92D5E96D8F63C75E4116AA1FF5C8C4603D0D250C:6:" | gpg --import-ownertrust
|
||||||
|
|
||||||
|
- name: install deploy ssh key
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
|
env:
|
||||||
|
KEY: ${{ secrets.MARFRIT_REPO_DEPLOY_KEY }}
|
||||||
|
run: |
|
||||||
|
mkdir -m700 -p /root/.ssh
|
||||||
|
printf '%s\n' "$KEY" > /root/.ssh/id_ed25519
|
||||||
|
chmod 600 /root/.ssh/id_ed25519
|
||||||
|
ssh-keyscan -t ed25519 nc.reauktion.de > /root/.ssh/known_hosts 2>/dev/null
|
||||||
|
|
||||||
|
- name: makepkg mesa-panvk-bifrost
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
rm -rf /tmp/build-mesa-panvk-bifrost
|
||||||
|
cp -r arch/mesa-panvk-bifrost /tmp/build-mesa-panvk-bifrost
|
||||||
|
chown -R builder:builder /tmp/build-mesa-panvk-bifrost
|
||||||
|
cd /tmp/build-mesa-panvk-bifrost
|
||||||
|
# MAKEFLAGS for parallel build; runner is multi-core.
|
||||||
|
# --skipinteg because sha256sums=SKIP in PKGBUILD (matches the
|
||||||
|
# fourier-fork PKGBUILD convention).
|
||||||
|
sudo -u builder -H env MAKEFLAGS="-j60" \
|
||||||
|
makepkg --nocheck --noconfirm --syncdeps --cleanbuild --skipinteg
|
||||||
|
ls -la *.pkg.tar.* | grep -v "\.sig$"
|
||||||
|
|
||||||
|
- name: sign mesa-panvk-bifrost
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
cd /tmp/build-mesa-panvk-bifrost
|
||||||
|
for f in *.pkg.tar.xz *.pkg.tar.zst *.pkg.tar.gz; do
|
||||||
|
[ -f "$f" ] || continue
|
||||||
|
gpg --batch --pinentry-mode loopback --passphrase-file /root/repo_pass \
|
||||||
|
--detach-sign --yes -u 92D5E96D8F63C75E4116AA1FF5C8C4603D0D250C "$f"
|
||||||
|
done
|
||||||
|
|
||||||
|
- name: update aarch64 repo db
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
mkdir -p /tmp/arch-stage-mesa-panvk
|
||||||
|
cd /tmp/arch-stage-mesa-panvk
|
||||||
|
rm -f *
|
||||||
|
for f in marfrit.db.tar.gz marfrit.db.tar.gz.sig marfrit.files.tar.gz marfrit.files.tar.gz.sig; do
|
||||||
|
curl -sSLf "https://packages.reauktion.de/arch/aarch64/$f" -o "$f" || rm -f "$f"
|
||||||
|
done
|
||||||
|
for ext in xz zst gz; do
|
||||||
|
ls /tmp/build-mesa-panvk-bifrost/*.pkg.tar.$ext 2>/dev/null && \
|
||||||
|
mv /tmp/build-mesa-panvk-bifrost/*.pkg.tar.$ext /tmp/build-mesa-panvk-bifrost/*.pkg.tar.$ext.sig .
|
||||||
|
done || true
|
||||||
|
export GNUPGHOME=/root/.gnupg
|
||||||
|
printf 'pinentry-mode loopback\npassphrase-file /root/repo_pass\n' > /root/.gnupg/gpg.conf
|
||||||
|
printf 'allow-loopback-pinentry\n' > /root/.gnupg/gpg-agent.conf
|
||||||
|
gpg-connect-agent reloadagent /bye
|
||||||
|
pkgs=()
|
||||||
|
for ext in xz zst gz; do
|
||||||
|
for f in *.pkg.tar.$ext; do [ -f "$f" ] && pkgs+=("$f"); done
|
||||||
|
done
|
||||||
|
if [ -f marfrit.db.tar.gz ]; then
|
||||||
|
for f in "${pkgs[@]}"; do
|
||||||
|
name=$(echo "$f" | sed -E 's/-[0-9].*//')
|
||||||
|
repo-remove --sign --key 92D5E96D8F63C75E4116AA1FF5C8C4603D0D250C \
|
||||||
|
marfrit.db.tar.gz "$name" 2>/dev/null || true
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
repo-add --new --sign --key 92D5E96D8F63C75E4116AA1FF5C8C4603D0D250C \
|
||||||
|
--verify marfrit.db.tar.gz "${pkgs[@]}"
|
||||||
|
ln -sf marfrit.db.tar.gz marfrit.db
|
||||||
|
ln -sf marfrit.files.tar.gz marfrit.files
|
||||||
|
ln -sf marfrit.db.tar.gz.sig marfrit.db.sig
|
||||||
|
rm -f marfrit.files.sig
|
||||||
|
|
||||||
|
- name: publish to aarch64
|
||||||
|
if: steps.skip-check.outputs.skip != '1'
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
retry() { for i in 1 2 3; do "$@" && return 0; rc=$?; echo "retry $i (exit=$rc)" >&2; sleep $((i*5)); done; return 1; }
|
||||||
|
cd /tmp/arch-stage-mesa-panvk
|
||||||
|
retry rsync -avL --copy-unsafe-links \
|
||||||
|
-e 'ssh -i /root/.ssh/id_ed25519' \
|
||||||
|
./ mfritsche@nc.reauktion.de:arch/aarch64/
|
||||||
|
|
||||||
|
- name: wipe secrets
|
||||||
|
if: always()
|
||||||
|
run: rm -f /root/repo_pass /root/.ssh/id_ed25519
|
||||||
|
|||||||
@@ -18,10 +18,12 @@ _module=daedalus_v4l2
|
|||||||
|
|
||||||
# Same pin as arch/daedalus-v4l2 — keep kernel module + daemon
|
# Same pin as arch/daedalus-v4l2 — keep kernel module + daemon
|
||||||
# bit-versioned together so the chardev wire protocol stays in sync.
|
# bit-versioned together so the chardev wire protocol stays in sync.
|
||||||
_commit=481279c9bffd19e32c8f3299897e9b63fc5a24aa
|
# PROTO_VERSION 0 → 1 at this pin (H.264 B-frame reorder fix); must
|
||||||
|
# install both packages atomically.
|
||||||
|
_commit=79256dc7ef41f83873ca9c23db20f5888858e65d
|
||||||
|
|
||||||
pkgver=0.1.0.r18.481279c
|
pkgver=0.1.0.r28.79256dc
|
||||||
pkgrel=1 # reset for new upstream pin (481279c — Phase 8.13 close)
|
pkgrel=1 # reset for new upstream pin (79256dc — H.264 B-frame reorder fix)
|
||||||
pkgdesc="V4L2 stateless decoder shim kernel module (DKMS) — Pi 5 / CM5"
|
pkgdesc="V4L2 stateless decoder shim kernel module (DKMS) — Pi 5 / CM5"
|
||||||
arch=('any')
|
arch=('any')
|
||||||
url="https://git.reauktion.de/reauktion/daedalus-v4l2"
|
url="https://git.reauktion.de/reauktion/daedalus-v4l2"
|
||||||
|
|||||||
@@ -16,17 +16,18 @@
|
|||||||
pkgname=daedalus-v4l2
|
pkgname=daedalus-v4l2
|
||||||
_upstreampkg=daedalus-v4l2
|
_upstreampkg=daedalus-v4l2
|
||||||
|
|
||||||
# Pin the daedalus-v4l2 tip. 481279c = "Phase 8.13: byte-exact end-to-
|
# Pin the daedalus-v4l2 tip. 79256dc = "kernel + daemon: H.264 B-frame
|
||||||
# end via libva (consumer target hit)" — first commit where the full
|
# display reorder fix (closes #6)" — adds the wire-protocol src_pts /
|
||||||
# ffmpeg -hwaccel vaapi → libva → /dev/video0 → daemon path lands a
|
# output_src_pts / RESP_FRAME flags split that lets H.264 streams with
|
||||||
# pixel-correct decoded frame back in ffmpeg. Promote to a later pin
|
# B-frames preserve display order through libva → kernel → daemon.
|
||||||
# only after a future phase closes cleanly.
|
# PROTO_VERSION bumps 0 → 1; lock-step userspace + kernel rebuild
|
||||||
_commit=481279c9bffd19e32c8f3299897e9b63fc5a24aa
|
# REQUIRED (daedalus-v4l2-dkms PKGBUILD pinned to the same commit).
|
||||||
|
_commit=79256dc7ef41f83873ca9c23db20f5888858e65d
|
||||||
|
|
||||||
# 0.1.0 (pre-1.0) + commit count + short sha. Bump the .Y on each
|
# 0.1.0 (pre-1.0) + commit count + short sha. Bump the .Y on each
|
||||||
# Phase 8.x close. pkgver() recomputes at build time.
|
# Phase 8.x close. pkgver() recomputes at build time.
|
||||||
pkgver=0.1.0.r18.481279c
|
pkgver=0.1.0.r28.79256dc
|
||||||
pkgrel=1 # reset for new upstream pin (481279c — Phase 8.13 close)
|
pkgrel=1 # reset for new upstream pin (79256dc — H.264 B-frame reorder fix)
|
||||||
pkgdesc="Userspace daemon for the daedalus-v4l2 V4L2 stateless decoder shim (VP9/AV1/H.264 on Pi 5 / CM5)"
|
pkgdesc="Userspace daemon for the daedalus-v4l2 V4L2 stateless decoder shim (VP9/AV1/H.264 on Pi 5 / CM5)"
|
||||||
arch=('aarch64')
|
arch=('aarch64')
|
||||||
url="https://git.reauktion.de/reauktion/daedalus-v4l2"
|
url="https://git.reauktion.de/reauktion/daedalus-v4l2"
|
||||||
|
|||||||
@@ -18,27 +18,30 @@ This patch adds a sibling init path, `InitV4L2RequestDecoder`, that:
|
|||||||
* looks up the codec via two complementary mechanisms libavcodec
|
* looks up the codec via two complementary mechanisms libavcodec
|
||||||
uses for v4l2_request:
|
uses for v4l2_request:
|
||||||
- **named codec** (`h264_v4l2request`, `vp8_v4l2request`, etc.):
|
- **named codec** (`h264_v4l2request`, `vp8_v4l2request`, etc.):
|
||||||
the legacy AVCodec-per-hwaccel registration. ALARM, Debian,
|
the legacy AVCodec-per-hwaccel registration.
|
||||||
and most distros building with --enable-v4l2-request expose
|
- **generic codec + hw_configs walk**: the modern hwaccel
|
||||||
this (avcodec_find_decoder_by_name lookup).
|
registration. Accepts EITHER AV_HWDEVICE_TYPE_DRM (legacy
|
||||||
- **generic codec + AV_HWDEVICE_TYPE_DRM** in `hw_configs`:
|
ffmpeg-v4l2-request-fork output prior to FFmpeg 7.1) OR
|
||||||
the modern hwaccel registration on some upstream-only ffmpeg
|
AV_HWDEVICE_TYPE_V4L2REQUEST (FFmpeg 7.1+ dedicated enum,
|
||||||
builds.
|
value 13 on Kwiboo's no-AMF tree, 14 on upstream-AMF tree).
|
||||||
|
Mozilla's bundled libavutil headers may not have the V4L2REQUEST
|
||||||
|
enumerator, so the test is on the integer value via `(int)cast`.
|
||||||
Probes named-codec first (explicit, portable) and falls back to
|
Probes named-codec first (explicit, portable) and falls back to
|
||||||
walking the generic codec's `hw_configs` for the DRM device type;
|
walking the generic codec's `hw_configs` for either device type;
|
||||||
* creates an `AV_HWDEVICE_TYPE_DRM` hwdevice context bound to
|
* creates an hwdevice context bound to `/dev/dri/renderD128`. Uses
|
||||||
`/dev/dri/renderD128` via the new `av_hwdevice_ctx_create` wrapper
|
integer 13 (V4L2REQUEST as defined by Kwiboo's v4l2-request-n7.1.3
|
||||||
(patch 2/4) and attaches it to the codec context;
|
tree, what our libavcodec61-fourier emits) cast to enum
|
||||||
|
AVHWDeviceType for the av_hwdevice_ctx_create call;
|
||||||
* reuses the existing `ChooseV4L2PixelFormat` get-format callback
|
* reuses the existing `ChooseV4L2PixelFormat` get-format callback
|
||||||
(already returns `AV_PIX_FMT_DRM_PRIME`) and the existing
|
(already returns `AV_PIX_FMT_DRM_PRIME`) and the existing
|
||||||
`apply_cropping = 0` constraint.
|
`apply_cropping = 0` constraint.
|
||||||
|
|
||||||
`InitV4L2RequestDecoder` is invoked **before** `InitV4L2Decoder` in
|
`InitV4L2RequestDecoder` is invoked **before** `InitV4L2Decoder` in
|
||||||
`InitHWDecoderIfAllowed`. On Rockchip mainline it succeeds via either
|
`InitHWDecoderIfAllowed`. On Rockchip mainline it succeeds via either
|
||||||
mechanism (ALARM uses the named codec). On Pi4 / Mediatek /
|
mechanism. On Pi4 / Mediatek / vendor-MPP-stateful boards neither
|
||||||
vendor-MPP-stateful boards neither mechanism is registered for the
|
mechanism is registered for the codec, the function bails out, and the
|
||||||
codec, the function bails out, and the existing stateful
|
existing stateful `InitV4L2Decoder` runs as before. No regression of
|
||||||
`InitV4L2Decoder` runs as before. No regression of stateful boards.
|
stateful boards.
|
||||||
|
|
||||||
`mDRMDeviceContext` is unconditionally `av_buffer_unref`'d in
|
`mDRMDeviceContext` is unconditionally `av_buffer_unref`'d in
|
||||||
`ProcessShutdown` (no-op when null). Gated behind
|
`ProcessShutdown` (no-op when null). Gated behind
|
||||||
@@ -46,9 +49,8 @@ codec, the function bails out, and the existing stateful
|
|||||||
|
|
||||||
Bug 1969297.
|
Bug 1969297.
|
||||||
|
|
||||||
diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h
|
--- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h 2026-05-21 04:57:59.570946601 +0000
|
||||||
--- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h 2026-03-18 19:22:14.000000000 +0000
|
+++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h 2026-05-21 04:57:59.876488776 +0000
|
||||||
+++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h 2026-04-27 20:43:39.347992674 +0000
|
|
||||||
@@ -225,7 +225,12 @@
|
@@ -225,7 +225,12 @@
|
||||||
bool IsLinuxHDR() const;
|
bool IsLinuxHDR() const;
|
||||||
MediaResult InitVAAPIDecoder();
|
MediaResult InitVAAPIDecoder();
|
||||||
@@ -73,9 +75,8 @@ diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.h b/dom/media/platfor
|
|||||||
// If video overlay is used we want to upload SW decoded frames to
|
// If video overlay is used we want to upload SW decoded frames to
|
||||||
// DMABuf and present it as a external texture to rendering pipeline.
|
// DMABuf and present it as a external texture to rendering pipeline.
|
||||||
bool mUploadSWDecodeToDMABuf = false;
|
bool mUploadSWDecodeToDMABuf = false;
|
||||||
diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp
|
--- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp 2026-05-21 04:57:59.566685221 +0000
|
||||||
--- a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp 2026-04-27 16:09:10.000000000 +0200
|
+++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp 2026-05-21 04:58:00.136004159 +0000
|
||||||
+++ b/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp 2026-04-29 00:10:00.098884335 +0200
|
|
||||||
@@ -403,6 +403,129 @@
|
@@ -403,6 +403,129 @@
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
@@ -90,7 +91,7 @@ diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platf
|
|||||||
+ }
|
+ }
|
||||||
+ const char* drmDevice = "/dev/dri/renderD128";
|
+ const char* drmDevice = "/dev/dri/renderD128";
|
||||||
+ if (mLib->av_hwdevice_ctx_create(&mDRMDeviceContext,
|
+ if (mLib->av_hwdevice_ctx_create(&mDRMDeviceContext,
|
||||||
+ AV_HWDEVICE_TYPE_DRM, drmDevice,
|
+ (enum AVHWDeviceType)13, drmDevice,
|
||||||
+ nullptr, 0) < 0) {
|
+ nullptr, 0) < 0) {
|
||||||
+ FFMPEG_LOG(" av_hwdevice_ctx_create(DRM, %s) failed", drmDevice);
|
+ FFMPEG_LOG(" av_hwdevice_ctx_create(DRM, %s) failed", drmDevice);
|
||||||
+ return false;
|
+ return false;
|
||||||
@@ -143,7 +144,7 @@ diff --git a/dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp b/dom/media/platf
|
|||||||
+ for (int i = 0;; i++) {
|
+ for (int i = 0;; i++) {
|
||||||
+ const AVCodecHWConfig* cfg = mLib->avcodec_get_hw_config(generic, i);
|
+ const AVCodecHWConfig* cfg = mLib->avcodec_get_hw_config(generic, i);
|
||||||
+ if (!cfg) break;
|
+ if (!cfg) break;
|
||||||
+ if (cfg->device_type == AV_HWDEVICE_TYPE_DRM) {
|
+ if (cfg->device_type == AV_HWDEVICE_TYPE_DRM || (int)cfg->device_type == 13 || (int)cfg->device_type == 14) {
|
||||||
+ codec = generic;
|
+ codec = generic;
|
||||||
+ FFMPEG_LOG(" using generic codec %s with DRM hwaccel", codec->name);
|
+ FFMPEG_LOG(" using generic codec %s with DRM hwaccel", codec->name);
|
||||||
+ break;
|
+ break;
|
||||||
|
|||||||
@@ -21,27 +21,32 @@
|
|||||||
# Alternative: boltzmann via his subagent + marfrit-publish.
|
# Alternative: boltzmann via his subagent + marfrit-publish.
|
||||||
|
|
||||||
pkgname=libva-v4l2-request-fourier
|
pkgname=libva-v4l2-request-fourier
|
||||||
|
epoch=1
|
||||||
_upstreampkg=libva-v4l2-request
|
_upstreampkg=libva-v4l2-request
|
||||||
|
|
||||||
# Pin the fork tip. de27e95 = "v4l2: log error_idx + failing ctrl id
|
# Pin the fork tip. c454618 = PR #16 merge "picture, request_pool:
|
||||||
# on S_EXT_CTRLS failure" — Phase 8.13 diagnostic that surfaced the
|
# transparent OUTPUT-pool resize on bitstream overrun (#15)" —
|
||||||
# real root cause of the libva→daedalus_v4l2 request-completion
|
# follow-up root-cause fix to #13/#14. On a mid-stream bitstream-
|
||||||
# timeout (turned out the EINVAL libva was logging was a harmless
|
# budget overrun (typical cause: SPS-driven resolution upshift in an
|
||||||
# H264/HEVC probe; actual VP9 stateless control SET worked all along).
|
# adaptive-bitrate stream), codec_store_buffer now snapshots the in-
|
||||||
|
# flight surface's accumulated bytes, releases its OUTPUT pool slot,
|
||||||
|
# calls request_pool_resize (STREAMOFF → REQBUFS(0) → S_FMT with
|
||||||
|
# 2×sizeimage hint, capped at 1 GiB, page-aligned → CREATE_BUFS →
|
||||||
|
# mmap → media_request_alloc → STREAMON), re-acquires a slot, re-
|
||||||
|
# mirrors the surface's source_{data,size,request_fd}, restores the
|
||||||
|
# bytes, and continues. The frame survives instead of being dropped
|
||||||
|
# back to libavcodec for surface recreation. CAPTURE side untouched
|
||||||
|
# (per-queue V4L2 streaming independence).
|
||||||
#
|
#
|
||||||
# Prior pin (7ac934e) was iter38b — fresnel-fourier multi-device probe
|
# Prior pin (2860d75) = PR #14 merge — codec_store_buffer bounds-
|
||||||
# + MAX_PROFILES bounds-check fix. de27e95 adds the daedalus_v4l2
|
# check floor (#13).
|
||||||
# probe slot (b5b3acf), the meson option gate (2146341), and the
|
_commit=c454618ae11addce2e17b560f4deeacbed067d98
|
||||||
# S_EXT_CTRLS diagnostic (de27e95 itself). Backward-compatible on
|
|
||||||
# rkvdec / hantro / cedrus / rpi-hevc-dec hosts — daedalus probe is
|
|
||||||
# off by default unless the kernel module is present.
|
|
||||||
_commit=de27e95571b67ef34619c23a12db4698f9b3454e
|
|
||||||
|
|
||||||
# Project version from meson.build (1.0.0) + commit count + short sha,
|
# Project version from meson.build (1.0.0) + commit count + short sha,
|
||||||
# matching the ffmpeg-v4l2-request-fourier convention. Recomputed at
|
# matching the ffmpeg-v4l2-request-fourier convention. Recomputed at
|
||||||
# build time by pkgver() below; the static value here is a placeholder
|
# build time by pkgver() below; the static value here is a placeholder
|
||||||
# so AUR-style consumers see something coherent before src/ exists.
|
# so AUR-style consumers see something coherent before src/ exists.
|
||||||
pkgver=1.0.0.r376.de27e95
|
pkgver=1.0.0.r390.c454618
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="VA-API backend for V4L2 stateless decoders (multiplanar fork — fourier umbrella)"
|
pkgdesc="VA-API backend for V4L2 stateless decoders (multiplanar fork — fourier umbrella)"
|
||||||
arch=('aarch64')
|
arch=('aarch64')
|
||||||
|
|||||||
@@ -0,0 +1,57 @@
|
|||||||
|
From: claude-noether (on behalf of mfritsche)
|
||||||
|
Date: 2026-05-19
|
||||||
|
Subject: panvk: expose VK_KHR/EXT_robustness2 + nullDescriptor on Bifrost (PAN_ARCH 6/7)
|
||||||
|
|
||||||
|
Without this, Mesa's Zink driver refuses to use PanVk-Bifrost as its Vulkan
|
||||||
|
backend, falling back silently to llvmpipe (software rasterizer) for all
|
||||||
|
GL-via-Zink on Bifrost SBCs. That defeats the entire purpose of having a
|
||||||
|
Vulkan driver on Bifrost — GL acceleration via Zink is the most natural
|
||||||
|
near-term consumer.
|
||||||
|
|
||||||
|
panvk_vX_nir_lower_descriptors.c:1309 and panvk_vX_shader.c:1355 already
|
||||||
|
plumb dev->vk.enabled_features.nullDescriptor arch-agnostically — the gate
|
||||||
|
at panvk_vX_physical_device.c was set conservatively when Bifrost was
|
||||||
|
unmaintained, not because of hardware incapability.
|
||||||
|
|
||||||
|
iter1–7 of the panvk-bifrost campaign proved fundamental driver functions
|
||||||
|
on Mali-G52 r1 MC1 (PAN_ARCH=7). This patch is the iter8 follow-up.
|
||||||
|
|
||||||
|
robustBufferAccess2 and robustImageAccess2 are NOT flipped — they're
|
||||||
|
independent rb2 features Zink doesn't require, gated differently
|
||||||
|
(robustBufferAccess2 = PAN_ARCH >= 11, robustImageAccess2 = false), and
|
||||||
|
out of scope for iter8.
|
||||||
|
|
||||||
|
---
|
||||||
|
src/panfrost/vulkan/panvk_vX_physical_device.c | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/panfrost/vulkan/panvk_vX_physical_device.c b/src/panfrost/vulkan/panvk_vX_physical_device.c
|
||||||
|
--- a/src/panfrost/vulkan/panvk_vX_physical_device.c
|
||||||
|
+++ b/src/panfrost/vulkan/panvk_vX_physical_device.c
|
||||||
|
@@ -91,7 +91,7 @@ get_device_extensions(const struct panvk_physical_device *device,
|
||||||
|
.KHR_pipeline_binary = true,
|
||||||
|
.KHR_pipeline_executable_properties = true,
|
||||||
|
.KHR_pipeline_library = true,
|
||||||
|
- .KHR_robustness2 = PAN_ARCH >= 10,
|
||||||
|
+ .KHR_robustness2 = true,
|
||||||
|
.KHR_sampler_mirror_clamp_to_edge = true,
|
||||||
|
.KHR_sampler_ycbcr_conversion = true,
|
||||||
|
.KHR_separate_depth_stencil_layouts = true,
|
||||||
|
@@ -168,7 +168,7 @@ get_device_extensions(const struct panvk_physical_device *device,
|
||||||
|
.EXT_queue_family_foreign = true,
|
||||||
|
.EXT_robustness = pan_arch(device->kmod.dev->props.gpu_id) >= 9,
|
||||||
|
.EXT_image_robustness = true,
|
||||||
|
- .EXT_robustness2 = PAN_ARCH >= 10,
|
||||||
|
+ .EXT_robustness2 = true,
|
||||||
|
.EXT_sampler_filter_minmax = PAN_ARCH >= 10,
|
||||||
|
.EXT_scalar_block_layout = true,
|
||||||
|
.EXT_separate_stencil_usage = true,
|
||||||
|
@@ -493,7 +493,7 @@ get_device_features(const struct panvk_physical_device *device,
|
||||||
|
/* VK_KHR_robustness2 */
|
||||||
|
.robustBufferAccess2 = PAN_ARCH >= 11,
|
||||||
|
.robustImageAccess2 = false,
|
||||||
|
- .nullDescriptor = PAN_ARCH >= 10,
|
||||||
|
+ .nullDescriptor = true,
|
||||||
|
|
||||||
|
/* VK_KHR_shader_clock */
|
||||||
|
.shaderSubgroupClock = device->kmod.dev->props.gpu_can_query_timestamp,
|
||||||
@@ -0,0 +1,47 @@
|
|||||||
|
From: claude-noether (on behalf of mfritsche)
|
||||||
|
Date: 2026-05-20
|
||||||
|
Subject: panvk: expose Vulkan 1.1 + 1.2 on Bifrost (PAN_ARCH 6/7)
|
||||||
|
|
||||||
|
ANGLE (Chromium's GL stack) requires apiVersion >= 1.1 to initialize. Without
|
||||||
|
this, Brave / Chromium's GPU process fails at GL info collection:
|
||||||
|
|
||||||
|
vk_renderer.cpp:2659 (initialize): ANGLE Requires a minimum Vulkan device
|
||||||
|
version of 1.1
|
||||||
|
Display::initialize error 0: Internal Vulkan error (-9): The requested
|
||||||
|
version of Vulkan is not supported by the driver
|
||||||
|
|
||||||
|
Stack-up with iter8's robustness2 patch enables ANGLE → PanVk-Bifrost →
|
||||||
|
Skia (via --enable-features=Vulkan) on Bifrost SBCs.
|
||||||
|
|
||||||
|
PanVk-Bifrost already supports the bulk of 1.1-promoted features as extensions
|
||||||
|
(multiview, maintenance1-3, descriptor update template, 16-bit storage,
|
||||||
|
descriptor update template, sampler ycbcr, variable pointers, etc. — all
|
||||||
|
visible in iter0 vulkaninfo). The version bump primarily bundles them.
|
||||||
|
|
||||||
|
Risk: Vulkan 1.1 has features beyond what iter1–7 exercised (protected memory,
|
||||||
|
full subgroup ops). Specific app failures will be characterizable.
|
||||||
|
|
||||||
|
1.2 is also flipped — Brave's Vulkan path may want descriptor indexing,
|
||||||
|
buffer device address, etc. (all listed in iter0 vulkaninfo as supported
|
||||||
|
extensions, just gated as 1.0-with-extensions, not 1.2-core).
|
||||||
|
|
||||||
|
---
|
||||||
|
src/panfrost/vulkan/panvk_vX_physical_device.c | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/panfrost/vulkan/panvk_vX_physical_device.c b/src/panfrost/vulkan/panvk_vX_physical_device.c
|
||||||
|
--- a/src/panfrost/vulkan/panvk_vX_physical_device.c
|
||||||
|
+++ b/src/panfrost/vulkan/panvk_vX_physical_device.c
|
||||||
|
@@ -38,8 +38,8 @@ get_device_extensions(const struct panvk_physical_device *device,
|
||||||
|
struct vk_device_extension_table *ext)
|
||||||
|
{
|
||||||
|
*ext = (struct vk_device_extension_table){
|
||||||
|
- .KHR_8bit_storage = true,
|
||||||
|
- .KHR_16bit_storage = true,
|
||||||
|
- bool has_vk1_1 = PAN_ARCH >= 10;
|
||||||
|
- bool has_vk1_2 = PAN_ARCH >= 10;
|
||||||
|
+ .KHR_8bit_storage = true,
|
||||||
|
+ .KHR_16bit_storage = true,
|
||||||
|
+ bool has_vk1_1 = true;
|
||||||
|
+ bool has_vk1_2 = true;
|
||||||
|
*ext = (struct vk_device_extension_table){
|
||||||
@@ -0,0 +1,328 @@
|
|||||||
|
--- a/src/panfrost/vulkan/panvk_shader.h 2026-04-29 22:19:00.000000000 +0200
|
||||||
|
+++ b/src/panfrost/vulkan/panvk_shader.h 2026-05-20 18:52:53.312698258 +0200
|
||||||
|
@@ -150,6 +150,10 @@
|
||||||
|
struct {
|
||||||
|
#if PAN_ARCH < 9
|
||||||
|
int32_t raw_vertex_offset;
|
||||||
|
+ uint32_t num_vertices; /* iter13: XFB needs per-draw vertex count */
|
||||||
|
+ /* aligned_u64 attribute below inserts the 4-byte alignment gap
|
||||||
|
+ * after num_vertices automatically — no explicit pad needed. */
|
||||||
|
+ aligned_u64 xfb_address[4]; /* iter13: 4 transform feedback buffer base addresses */
|
||||||
|
#endif
|
||||||
|
int32_t first_vertex;
|
||||||
|
int32_t base_instance;
|
||||||
|
--- a/src/panfrost/vulkan/panvk_vX_physical_device.c 2026-05-20 19:09:29.711145446 +0200
|
||||||
|
+++ b/src/panfrost/vulkan/panvk_vX_physical_device.c 2026-05-20 18:52:54.832720445 +0200
|
||||||
|
@@ -169,6 +169,7 @@
|
||||||
|
.EXT_provoking_vertex = true,
|
||||||
|
.EXT_queue_family_foreign = true,
|
||||||
|
.EXT_robustness2 = true,
|
||||||
|
+ .EXT_transform_feedback = PAN_ARCH < 9, /* iter13: JM-class only for now */
|
||||||
|
.EXT_sampler_filter_minmax = PAN_ARCH >= 10,
|
||||||
|
.EXT_scalar_block_layout = true,
|
||||||
|
.EXT_separate_stencil_usage = true,
|
||||||
|
@@ -495,6 +496,10 @@
|
||||||
|
.robustImageAccess2 = false,
|
||||||
|
.nullDescriptor = true,
|
||||||
|
|
||||||
|
+ /* VK_EXT_transform_feedback (iter13) */
|
||||||
|
+ .transformFeedback = PAN_ARCH < 9,
|
||||||
|
+ .geometryStreams = false,
|
||||||
|
+
|
||||||
|
/* VK_KHR_shader_clock */
|
||||||
|
.shaderSubgroupClock = device->kmod.dev->props.gpu_can_query_timestamp,
|
||||||
|
.shaderDeviceClock = device->kmod.dev->props.timestamp_device_coherent,
|
||||||
|
@@ -1020,6 +1025,18 @@
|
||||||
|
.robustStorageBufferAccessSizeAlignment = 1,
|
||||||
|
.robustUniformBufferAccessSizeAlignment = 1,
|
||||||
|
|
||||||
|
+ /* VK_EXT_transform_feedback (iter13) */
|
||||||
|
+ .maxTransformFeedbackStreams = 1,
|
||||||
|
+ .maxTransformFeedbackBuffers = 4,
|
||||||
|
+ .maxTransformFeedbackBufferSize = UINT32_MAX,
|
||||||
|
+ .maxTransformFeedbackStreamDataSize = 512,
|
||||||
|
+ .maxTransformFeedbackBufferDataSize = 512,
|
||||||
|
+ .maxTransformFeedbackBufferDataStride = 2048,
|
||||||
|
+ .transformFeedbackQueries = false,
|
||||||
|
+ .transformFeedbackStreamsLinesTriangles = false,
|
||||||
|
+ .transformFeedbackRasterizationStreamSelect = false,
|
||||||
|
+ .transformFeedbackDraw = false,
|
||||||
|
+
|
||||||
|
/* VK_EXT_shader_object */
|
||||||
|
/* We do not currently support VK_EXT_shader_object but this is used
|
||||||
|
* internally by vk_shader
|
||||||
|
--- a/src/panfrost/vulkan/panvk_vX_shader.c 2026-04-29 22:19:00.000000000 +0200
|
||||||
|
+++ b/src/panfrost/vulkan/panvk_vX_shader.c 2026-05-20 18:52:56.556745611 +0200
|
||||||
|
@@ -21,6 +21,7 @@
|
||||||
|
#include "panvk_physical_device.h"
|
||||||
|
#include "panvk_sampler.h"
|
||||||
|
#include "panvk_shader.h"
|
||||||
|
+#include "pan_nir.h" /* iter13: pan_nir_lower_xfb */
|
||||||
|
|
||||||
|
#include "spirv/nir_spirv.h"
|
||||||
|
#include "util/memstream.h"
|
||||||
|
@@ -100,6 +101,20 @@
|
||||||
|
case nir_intrinsic_load_raw_vertex_offset_pan:
|
||||||
|
val = load_sysval(b, graphics, bit_size, vs.raw_vertex_offset);
|
||||||
|
break;
|
||||||
|
+ case nir_intrinsic_load_num_vertices: /* iter13: XFB index calc */
|
||||||
|
+ val = load_sysval(b, graphics, bit_size, vs.num_vertices);
|
||||||
|
+ break;
|
||||||
|
+ case nir_intrinsic_load_xfb_address: { /* iter13: XFB buffer N base address */
|
||||||
|
+ unsigned idx = nir_intrinsic_base(intr);
|
||||||
|
+ switch (idx) {
|
||||||
|
+ case 0: val = load_sysval(b, graphics, bit_size, vs.xfb_address[0]); break;
|
||||||
|
+ case 1: val = load_sysval(b, graphics, bit_size, vs.xfb_address[1]); break;
|
||||||
|
+ case 2: val = load_sysval(b, graphics, bit_size, vs.xfb_address[2]); break;
|
||||||
|
+ case 3: val = load_sysval(b, graphics, bit_size, vs.xfb_address[3]); break;
|
||||||
|
+ default: return false;
|
||||||
|
+ }
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
case nir_intrinsic_load_layer_id:
|
||||||
|
assert(b->shader->info.stage == MESA_SHADER_FRAGMENT);
|
||||||
|
val = load_sysval(b, graphics, bit_size, layer_id);
|
||||||
|
@@ -457,6 +472,7 @@
|
||||||
|
core_max_id);
|
||||||
|
|
||||||
|
pan_preprocess_nir(nir, pdev->kmod.dev->props.gpu_id);
|
||||||
|
+
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
@@ -870,6 +886,18 @@
|
||||||
|
nir_var_shader_in | nir_var_shader_out, UINT32_MAX);
|
||||||
|
NIR_PASS(_, nir, nir_lower_io, nir_var_shader_in | nir_var_shader_out,
|
||||||
|
glsl_type_size, nir_lower_io_use_interpolated_input_intrinsics);
|
||||||
|
+
|
||||||
|
+#if PAN_ARCH < 9
|
||||||
|
+ /* iter13: VK_EXT_transform_feedback — runs AFTER nir_lower_io so that
|
||||||
|
+ * shader outputs are now store_output intrinsics that pan_nir_lower_xfb
|
||||||
|
+ * can rewrite to nir_store_global+nir_load_xfb_address. */
|
||||||
|
+ if (nir->info.stage == MESA_SHADER_VERTEX &&
|
||||||
|
+ nir->info.has_transform_feedback_varyings) {
|
||||||
|
+ NIR_PASS(_, nir, nir_opt_constant_folding);
|
||||||
|
+ NIR_PASS(_, nir, nir_io_add_intrinsic_xfb_info);
|
||||||
|
+ NIR_PASS(_, nir, pan_nir_lower_xfb);
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
static VkResult
|
||||||
|
@@ -1288,6 +1316,9 @@
|
||||||
|
.view_mask = (state && state->rp) ? state->rp->view_mask : 0,
|
||||||
|
.robust2_modes = robust2_modes,
|
||||||
|
.robust_descriptors = dev->vk.enabled_features.nullDescriptor,
|
||||||
|
+ /* iter13: XFB shaders must disable IDVS (matches Panfrost-Gallium). */
|
||||||
|
+ .no_idvs = (info->stage == MESA_SHADER_VERTEX) &&
|
||||||
|
+ info->nir->info.has_transform_feedback_varyings,
|
||||||
|
};
|
||||||
|
|
||||||
|
switch (info->stage) {
|
||||||
|
--- a/src/panfrost/vulkan/panvk_cmd_draw.h 2026-04-29 22:19:00.000000000 +0200
|
||||||
|
+++ b/src/panfrost/vulkan/panvk_cmd_draw.h 2026-05-20 18:52:57.748763011 +0200
|
||||||
|
@@ -135,6 +135,19 @@
|
||||||
|
struct panvk_graphics_sysvals sysvals;
|
||||||
|
|
||||||
|
#if PAN_ARCH < 9
|
||||||
|
+ /* iter13: VK_EXT_transform_feedback state (JM-class only for now). */
|
||||||
|
+ struct {
|
||||||
|
+ bool active;
|
||||||
|
+ uint32_t buffer_count;
|
||||||
|
+ struct {
|
||||||
|
+ uint64_t addr;
|
||||||
|
+ uint64_t offset;
|
||||||
|
+ uint64_t size;
|
||||||
|
+ } buffers[4];
|
||||||
|
+ } xfb;
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#if PAN_ARCH < 9
|
||||||
|
struct panvk_shader_link link;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
--- a/src/panfrost/vulkan/panvk_vX_cmd_draw.c 2026-04-29 22:19:00.000000000 +0200
|
||||||
|
+++ b/src/panfrost/vulkan/panvk_vX_cmd_draw.c 2026-05-20 19:10:23.031919662 +0200
|
||||||
|
@@ -10,6 +10,7 @@
|
||||||
|
#include "panvk_entrypoints.h"
|
||||||
|
|
||||||
|
#include "pan_desc.h"
|
||||||
|
+#include "pan_compiler.h" /* PAN_SHADER_OOB_ADDRESS */
|
||||||
|
#include "pan_util.h"
|
||||||
|
|
||||||
|
static void
|
||||||
|
@@ -722,6 +723,35 @@
|
||||||
|
set_gfx_sysval(cmdbuf, dirty_sysvals, vs.raw_vertex_offset,
|
||||||
|
info->vertex.raw_offset);
|
||||||
|
set_gfx_sysval(cmdbuf, dirty_sysvals, layer_id, info->layer_id);
|
||||||
|
+
|
||||||
|
+ /* iter13: VK_EXT_transform_feedback sysvals — always set (per draw),
|
||||||
|
+ * reflect bound XFB state. set_gfx_sysval is a no-op if value unchanged. */
|
||||||
|
+ set_gfx_sysval(cmdbuf, dirty_sysvals, vs.num_vertices, info->vertex.count);
|
||||||
|
+ {
|
||||||
|
+ const struct panvk_cmd_graphics_state *_gfx = &cmdbuf->state.gfx;
|
||||||
|
+ /* iter13: default each XFB buffer address to PAN_SHADER_OOB_ADDRESS
|
||||||
|
+ * (= 1<<63). This is the Panfrost-Gallium memory-sink idiom — the
|
||||||
|
+ * Bifrost MMU silently discards stores to this address, so a pipeline
|
||||||
|
+ * with XFB outputs used in a non-XFB draw (or in an XFB draw with
|
||||||
|
+ * fewer bound buffers than the shader declares) is safe instead of
|
||||||
|
+ * faulting. See gallium/drivers/panfrost/pan_cmdstream.c PAN_SYSVAL_XFB. */
|
||||||
|
+ uint64_t _xa0 = PAN_SHADER_OOB_ADDRESS, _xa1 = PAN_SHADER_OOB_ADDRESS,
|
||||||
|
+ _xa2 = PAN_SHADER_OOB_ADDRESS, _xa3 = PAN_SHADER_OOB_ADDRESS;
|
||||||
|
+ if (_gfx->xfb.active) {
|
||||||
|
+ if (_gfx->xfb.buffer_count > 0 && _gfx->xfb.buffers[0].addr)
|
||||||
|
+ _xa0 = _gfx->xfb.buffers[0].addr + _gfx->xfb.buffers[0].offset;
|
||||||
|
+ if (_gfx->xfb.buffer_count > 1 && _gfx->xfb.buffers[1].addr)
|
||||||
|
+ _xa1 = _gfx->xfb.buffers[1].addr + _gfx->xfb.buffers[1].offset;
|
||||||
|
+ if (_gfx->xfb.buffer_count > 2 && _gfx->xfb.buffers[2].addr)
|
||||||
|
+ _xa2 = _gfx->xfb.buffers[2].addr + _gfx->xfb.buffers[2].offset;
|
||||||
|
+ if (_gfx->xfb.buffer_count > 3 && _gfx->xfb.buffers[3].addr)
|
||||||
|
+ _xa3 = _gfx->xfb.buffers[3].addr + _gfx->xfb.buffers[3].offset;
|
||||||
|
+ }
|
||||||
|
+ set_gfx_sysval(cmdbuf, dirty_sysvals, vs.xfb_address[0], _xa0);
|
||||||
|
+ set_gfx_sysval(cmdbuf, dirty_sysvals, vs.xfb_address[1], _xa1);
|
||||||
|
+ set_gfx_sysval(cmdbuf, dirty_sysvals, vs.xfb_address[2], _xa2);
|
||||||
|
+ set_gfx_sysval(cmdbuf, dirty_sysvals, vs.xfb_address[3], _xa3);
|
||||||
|
+ }
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (dyn_gfx_state_dirty(cmdbuf, CB_BLEND_CONSTANTS)) {
|
||||||
|
--- a/src/panfrost/vulkan/meson.build 2026-04-29 22:19:00.000000000 +0200
|
||||||
|
+++ b/src/panfrost/vulkan/meson.build 2026-05-20 18:53:04.484861338 +0200
|
||||||
|
@@ -73,6 +73,7 @@
|
||||||
|
jm_inc_dir = ['jm']
|
||||||
|
jm_files = [
|
||||||
|
'jm/panvk_vX_bind_queue.c',
|
||||||
|
+ 'jm/panvk_vX_cmd_xfb.c', # iter13
|
||||||
|
'jm/panvk_vX_cmd_buffer.c',
|
||||||
|
'jm/panvk_vX_cmd_dispatch.c',
|
||||||
|
'jm/panvk_vX_cmd_draw.c',
|
||||||
|
--- a/src/panfrost/vulkan/jm/panvk_vX_cmd_buffer.c 2026-04-29 22:19:00.000000000 +0200
|
||||||
|
+++ b/src/panfrost/vulkan/jm/panvk_vX_cmd_buffer.c 2026-05-20 19:10:26.163965149 +0200
|
||||||
|
@@ -473,5 +473,12 @@
|
||||||
|
|
||||||
|
vk_command_buffer_begin(&cmdbuf->vk, pBeginInfo);
|
||||||
|
|
||||||
|
+#if PAN_ARCH < 9
|
||||||
|
+ /* iter13: clear XFB state on Begin so a reused command buffer does not
|
||||||
|
+ * inherit stale xfb.buffer_count / xfb.active / xfb.buffers[] from a
|
||||||
|
+ * prior recording. */
|
||||||
|
+ memset(&cmdbuf->state.gfx.xfb, 0, sizeof(cmdbuf->state.gfx.xfb));
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
return VK_SUCCESS;
|
||||||
|
}
|
||||||
|
--- a/src/panfrost/vulkan/jm/panvk_vX_cmd_xfb.c 2026-05-18 12:50:53.067999996 +0200
|
||||||
|
+++ b/src/panfrost/vulkan/jm/panvk_vX_cmd_xfb.c 2026-05-20 19:10:27.175979847 +0200
|
||||||
|
@@ -0,0 +1,111 @@
|
||||||
|
+/*
|
||||||
|
+ * Copyright © 2026 mfritsche / claude-noether
|
||||||
|
+ * SPDX-License-Identifier: MIT
|
||||||
|
+ *
|
||||||
|
+ * iter13: VK_EXT_transform_feedback command handlers for the JM
|
||||||
|
+ * architecture path (Bifrost v6/v7 + Valhall-JM v9).
|
||||||
|
+ *
|
||||||
|
+ * The runtime contract:
|
||||||
|
+ * - vkCmdBindTransformFeedbackBuffersEXT: stash (gpu_addr, offset, size)
|
||||||
|
+ * for each slot into cmdbuf->state.gfx.xfb.buffers[].
|
||||||
|
+ * - vkCmdBeginTransformFeedbackEXT: set cmdbuf->state.gfx.xfb.active = true.
|
||||||
|
+ * Mark sysvals dirty so the next draw re-emits vs.xfb_address[].
|
||||||
|
+ * - vkCmdEndTransformFeedbackEXT: set active = false.
|
||||||
|
+ *
|
||||||
|
+ * Counter buffers (firstCounterBuffer/counterBufferCount/pCounterBuffers/
|
||||||
|
+ * pCounterBufferOffsets) are accepted by API but ignored — v1 doesn't
|
||||||
|
+ * support pause/resume. transformFeedbackDraw is advertised as false.
|
||||||
|
+ *
|
||||||
|
+ * Per-draw integration: jm/panvk_vX_cmd_draw.c reads cmdbuf->state.gfx.xfb
|
||||||
|
+ * and populates vs.xfb_address[i] for shader use. The pan_nir_lower_xfb
|
||||||
|
+ * pass in panvk_vX_shader.c emits nir_load_xfb_address(i) which lowers
|
||||||
|
+ * (via panvk_vX_shader.c sysval handler) to a load from the per-draw
|
||||||
|
+ * sysval push area.
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+#include "vk_log.h"
|
||||||
|
+#include "util/log.h"
|
||||||
|
+
|
||||||
|
+#include "panvk_cmd_buffer.h"
|
||||||
|
+#include "panvk_cmd_draw.h"
|
||||||
|
+#include "panvk_buffer.h"
|
||||||
|
+#include "panvk_entrypoints.h"
|
||||||
|
+
|
||||||
|
+VKAPI_ATTR void VKAPI_CALL
|
||||||
|
+panvk_per_arch(CmdBindTransformFeedbackBuffersEXT)(
|
||||||
|
+ VkCommandBuffer commandBuffer,
|
||||||
|
+ uint32_t firstBinding,
|
||||||
|
+ uint32_t bindingCount,
|
||||||
|
+ const VkBuffer *pBuffers,
|
||||||
|
+ const VkDeviceSize *pOffsets,
|
||||||
|
+ const VkDeviceSize *pSizes)
|
||||||
|
+{
|
||||||
|
+ VK_FROM_HANDLE(panvk_cmd_buffer, cmdbuf, commandBuffer);
|
||||||
|
+ struct panvk_cmd_graphics_state *gfx = &cmdbuf->state.gfx;
|
||||||
|
+
|
||||||
|
+ for (uint32_t i = 0; i < bindingCount; i++) {
|
||||||
|
+ uint32_t slot = firstBinding + i;
|
||||||
|
+ if (slot >= 4)
|
||||||
|
+ continue;
|
||||||
|
+
|
||||||
|
+ VK_FROM_HANDLE(panvk_buffer, buf, pBuffers[i]);
|
||||||
|
+ gfx->xfb.buffers[slot].addr = panvk_buffer_gpu_ptr(buf, 0);
|
||||||
|
+ gfx->xfb.buffers[slot].offset = pOffsets[i];
|
||||||
|
+ gfx->xfb.buffers[slot].size =
|
||||||
|
+ (pSizes != NULL && pSizes[i] != VK_WHOLE_SIZE)
|
||||||
|
+ ? pSizes[i]
|
||||||
|
+ : (buf->vk.size - pOffsets[i]);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if (firstBinding + bindingCount > gfx->xfb.buffer_count)
|
||||||
|
+ gfx->xfb.buffer_count = firstBinding + bindingCount;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+VKAPI_ATTR void VKAPI_CALL
|
||||||
|
+panvk_per_arch(CmdBeginTransformFeedbackEXT)(
|
||||||
|
+ VkCommandBuffer commandBuffer,
|
||||||
|
+ uint32_t firstCounterBuffer,
|
||||||
|
+ uint32_t counterBufferCount,
|
||||||
|
+ const VkBuffer *pCounterBuffers,
|
||||||
|
+ const VkDeviceSize *pCounterBufferOffsets)
|
||||||
|
+{
|
||||||
|
+ VK_FROM_HANDLE(panvk_cmd_buffer, cmdbuf, commandBuffer);
|
||||||
|
+ struct panvk_cmd_graphics_state *gfx = &cmdbuf->state.gfx;
|
||||||
|
+
|
||||||
|
+ /* Counter buffers ignored in v1 — see VkPhysicalDeviceTransformFeedback
|
||||||
|
+ * PropertiesEXT.transformFeedbackDraw = false in panvk_vX_physical_device.c.
|
||||||
|
+ * App is spec-compliant if it does not pass counter buffers (which our
|
||||||
|
+ * features advertisement allows), but warn loudly if it does so we do not
|
||||||
|
+ * silently produce wrong capture state. */
|
||||||
|
+ (void)firstCounterBuffer;
|
||||||
|
+ (void)pCounterBufferOffsets;
|
||||||
|
+ if (counterBufferCount > 0 && pCounterBuffers != NULL) {
|
||||||
|
+ mesa_logw("panvk: CmdBeginTransformFeedbackEXT: counter buffers not "
|
||||||
|
+ "implemented (transformFeedbackDraw=false); XFB resume will "
|
||||||
|
+ "restart at buffer offset 0");
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ gfx->xfb.active = true;
|
||||||
|
+ /* Per-draw set_gfx_sysval picks up the change automatically — no
|
||||||
|
+ * explicit dirty marking required (set_gfx_sysval uses memcmp +
|
||||||
|
+ * BITSET to detect state diffs and re-emit sysvals). */
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+VKAPI_ATTR void VKAPI_CALL
|
||||||
|
+panvk_per_arch(CmdEndTransformFeedbackEXT)(
|
||||||
|
+ VkCommandBuffer commandBuffer,
|
||||||
|
+ uint32_t firstCounterBuffer,
|
||||||
|
+ uint32_t counterBufferCount,
|
||||||
|
+ const VkBuffer *pCounterBuffers,
|
||||||
|
+ const VkDeviceSize *pCounterBufferOffsets)
|
||||||
|
+{
|
||||||
|
+ VK_FROM_HANDLE(panvk_cmd_buffer, cmdbuf, commandBuffer);
|
||||||
|
+ struct panvk_cmd_graphics_state *gfx = &cmdbuf->state.gfx;
|
||||||
|
+
|
||||||
|
+ (void)firstCounterBuffer;
|
||||||
|
+ (void)counterBufferCount;
|
||||||
|
+ (void)pCounterBuffers;
|
||||||
|
+ (void)pCounterBufferOffsets;
|
||||||
|
+
|
||||||
|
+ gfx->xfb.active = false;
|
||||||
|
+}
|
||||||
@@ -0,0 +1,169 @@
|
|||||||
|
# Maintainer: Markus Fritsche <fritsche.markus@gmail.com>
|
||||||
|
#
|
||||||
|
# mesa-panvk-bifrost — patched Mesa libvulkan_panfrost.so that exposes
|
||||||
|
# Bifrost-gen Mali (Mali-G31/G52/G72/G76, PAN_ARCH 6/7) to Chromium-family
|
||||||
|
# browsers' Vulkan compositor.
|
||||||
|
#
|
||||||
|
# Campaign: ~/src/panvk-bifrost/ — iter9 close (technical milestone
|
||||||
|
# 2026-05-20, operator-confirmed Brave window). Goal close requires
|
||||||
|
# this package built + published + installable per the
|
||||||
|
# feedback_package_done_means_installable.md 3-point check.
|
||||||
|
#
|
||||||
|
# What it does:
|
||||||
|
# - Builds Mesa 26.0.6 (matching ohm's stock mesa pkg) with two
|
||||||
|
# patches against src/panfrost/vulkan/panvk_vX_physical_device.c:
|
||||||
|
# (1) expose VK_KHR/EXT_robustness2 + nullDescriptor on PAN_ARCH 6/7
|
||||||
|
# (2) set has_vk1_1/has_vk1_2 to true on Bifrost
|
||||||
|
# - Installs the patched libvulkan_panfrost.so to /usr/lib/panvk-bifrost/
|
||||||
|
# (NOT /usr/lib — co-installs alongside stock mesa).
|
||||||
|
# - Registers a custom ICD JSON at a non-default path so the system
|
||||||
|
# Vulkan loader only picks up our driver when VK_ICD_FILENAMES is set.
|
||||||
|
# - Ships /usr/bin/brave-vulkan launcher that wires up env vars + flags.
|
||||||
|
#
|
||||||
|
# Co-existence: stock /usr/lib/libvulkan_panfrost.so is untouched. Stock
|
||||||
|
# /usr/share/vulkan/icd.d/panfrost_icd.json is untouched. Users opt in
|
||||||
|
# via brave-vulkan (or by setting VK_ICD_FILENAMES manually).
|
||||||
|
#
|
||||||
|
# Build target: arch-aarch64 runner via marfrit-packages Gitea Actions.
|
||||||
|
# Mesa build is slow (~30-60min on Cortex-A55). Build deps installed
|
||||||
|
# inside the runner via pacman -S in the workflow.
|
||||||
|
|
||||||
|
pkgname=mesa-panvk-bifrost
|
||||||
|
_mesaver=26.0.6
|
||||||
|
pkgver=26.0.6.r3
|
||||||
|
pkgrel=1
|
||||||
|
pkgdesc="Patched Mesa libvulkan_panfrost.so exposing Bifrost-gen Mali to Vulkan apps (panvk-bifrost campaign)"
|
||||||
|
arch=('aarch64')
|
||||||
|
url="https://github.com/marfrit/panvk-bifrost"
|
||||||
|
license=('MIT')
|
||||||
|
|
||||||
|
# We co-install at /usr/lib/panvk-bifrost/ so no conflicts with stock mesa.
|
||||||
|
# We DO provide a script that requires brave to be installed.
|
||||||
|
depends=(
|
||||||
|
'mesa' # for shared mesa runtime libs (libgallium-mesa etc.)
|
||||||
|
'libdrm'
|
||||||
|
'wayland'
|
||||||
|
'libxcb'
|
||||||
|
'libx11'
|
||||||
|
'libxshmfence'
|
||||||
|
'zlib'
|
||||||
|
'zstd'
|
||||||
|
'libdisplay-info'
|
||||||
|
'expat'
|
||||||
|
'systemd-libs' # libudev
|
||||||
|
'spirv-tools'
|
||||||
|
)
|
||||||
|
optdepends=(
|
||||||
|
'brave-bin: for the brave-vulkan launcher script'
|
||||||
|
)
|
||||||
|
makedepends=(
|
||||||
|
'meson'
|
||||||
|
'ninja'
|
||||||
|
'pkgconf'
|
||||||
|
'bison'
|
||||||
|
'flex'
|
||||||
|
'python'
|
||||||
|
'python-yaml'
|
||||||
|
'python-mako'
|
||||||
|
'glslang'
|
||||||
|
'spirv-tools'
|
||||||
|
'llvm'
|
||||||
|
'clang'
|
||||||
|
'libclc'
|
||||||
|
'spirv-llvm-translator'
|
||||||
|
'vulkan-headers'
|
||||||
|
'wayland-protocols'
|
||||||
|
)
|
||||||
|
|
||||||
|
source=(
|
||||||
|
"https://archive.mesa3d.org/mesa-${_mesaver}.tar.xz"
|
||||||
|
"0001-panvk-expose-robustness2-nullDescriptor-bifrost.patch"
|
||||||
|
"0002-panvk-expose-vulkan-1.1-1.2-on-bifrost.patch"
|
||||||
|
"0003-panvk-bifrost-vk-ext-transform-feedback.patch"
|
||||||
|
"brave-vulkan"
|
||||||
|
"icd.json"
|
||||||
|
)
|
||||||
|
sha256sums=(
|
||||||
|
'SKIP' # TODO: pin once we know the upstream tarball is stable. archive.mesa3d.org tarballs are stable, so we can hash-pin in iter10.
|
||||||
|
'SKIP'
|
||||||
|
'SKIP'
|
||||||
|
'SKIP'
|
||||||
|
'SKIP'
|
||||||
|
'SKIP'
|
||||||
|
)
|
||||||
|
|
||||||
|
prepare() {
|
||||||
|
cd "mesa-${_mesaver}"
|
||||||
|
# iter8 patch: robustness2 + nullDescriptor exposure on Bifrost.
|
||||||
|
# Three hunks in panvk_vX_physical_device.c. Apply via sed since
|
||||||
|
# the upstream context drifts between Mesa releases and unified-diff
|
||||||
|
# patching is brittle (we hit hunk-rejects during manual application).
|
||||||
|
sed -i 's|\.KHR_robustness2 = PAN_ARCH >= 10,|.KHR_robustness2 = true,|' src/panfrost/vulkan/panvk_vX_physical_device.c
|
||||||
|
sed -i 's|\.EXT_robustness2 = PAN_ARCH >= 10,|.EXT_robustness2 = true,|' src/panfrost/vulkan/panvk_vX_physical_device.c
|
||||||
|
sed -i 's|\.nullDescriptor = PAN_ARCH >= 10,|.nullDescriptor = true,|' src/panfrost/vulkan/panvk_vX_physical_device.c
|
||||||
|
# iter9 patch: bump api version to 1.1/1.2 for Bifrost. NOTE: this only
|
||||||
|
# affects extension exposure flags, NOT the reported apiVersion (which
|
||||||
|
# is set by get_api_version() further down and gated separately).
|
||||||
|
# The brave-vulkan launcher sets MESA_VK_VERSION_OVERRIDE=1.2 at runtime
|
||||||
|
# to deal with the latter — no source change needed for that path.
|
||||||
|
sed -i 's|bool has_vk1_1 = PAN_ARCH >= 10;|bool has_vk1_1 = true;|' src/panfrost/vulkan/panvk_vX_physical_device.c
|
||||||
|
sed -i 's|bool has_vk1_2 = PAN_ARCH >= 10;|bool has_vk1_2 = true;|' src/panfrost/vulkan/panvk_vX_physical_device.c
|
||||||
|
|
||||||
|
# iter13: VK_EXT_transform_feedback implementation for Bifrost (PAN_ARCH<9).
|
||||||
|
# Applied as a real unified-diff patch — the change is too large for sed.
|
||||||
|
# Phase-doc context: ~/src/panvk-bifrost/phase{4,5,6}_iter13_close.md.
|
||||||
|
# Unlocks ANGLE-Vulkan → GLES3 → WebGL2 / WebGPU on Brave (chrome://gpu
|
||||||
|
# reports "Hardware accelerated" across the board for the affected paths).
|
||||||
|
patch -p1 < "${srcdir}/0003-panvk-bifrost-vk-ext-transform-feedback.patch"
|
||||||
|
|
||||||
|
# Sanity-check the patches landed.
|
||||||
|
grep -q "KHR_robustness2 = true," src/panfrost/vulkan/panvk_vX_physical_device.c
|
||||||
|
grep -q "EXT_robustness2 = true," src/panfrost/vulkan/panvk_vX_physical_device.c
|
||||||
|
grep -q "nullDescriptor = true," src/panfrost/vulkan/panvk_vX_physical_device.c
|
||||||
|
grep -q "has_vk1_1 = true;" src/panfrost/vulkan/panvk_vX_physical_device.c
|
||||||
|
grep -q "has_vk1_2 = true;" src/panfrost/vulkan/panvk_vX_physical_device.c
|
||||||
|
# iter13 sanity:
|
||||||
|
grep -q "EXT_transform_feedback = PAN_ARCH < 9," src/panfrost/vulkan/panvk_vX_physical_device.c
|
||||||
|
grep -q "pan_nir_lower_xfb" src/panfrost/vulkan/panvk_vX_shader.c
|
||||||
|
test -f src/panfrost/vulkan/jm/panvk_vX_cmd_xfb.c
|
||||||
|
}
|
||||||
|
|
||||||
|
build() {
|
||||||
|
cd "mesa-${_mesaver}"
|
||||||
|
# Minimal Mesa build — only the panvk Vulkan driver. No GLES/GLX/EGL/
|
||||||
|
# gallium drivers — keeps the build narrower and avoids pulling in
|
||||||
|
# the entire Mesa runtime in this package's dep graph.
|
||||||
|
meson setup build/ \
|
||||||
|
--prefix=/usr \
|
||||||
|
--libdir=lib \
|
||||||
|
--buildtype=release \
|
||||||
|
-Dvulkan-drivers=panfrost \
|
||||||
|
-Dgallium-drivers= \
|
||||||
|
-Dplatforms=wayland,x11 \
|
||||||
|
-Dglx=disabled \
|
||||||
|
-Degl=disabled \
|
||||||
|
-Dgles1=disabled \
|
||||||
|
-Dgles2=disabled \
|
||||||
|
-Dvulkan-layers= \
|
||||||
|
-Dtools= \
|
||||||
|
-Dgallium-rusticl=false \
|
||||||
|
-Dmicrosoft-clc=disabled
|
||||||
|
meson compile -C build
|
||||||
|
}
|
||||||
|
|
||||||
|
package() {
|
||||||
|
cd "${srcdir}/mesa-${_mesaver}"
|
||||||
|
|
||||||
|
# Patched lib — co-install path, NOT /usr/lib (to avoid clashing
|
||||||
|
# with stock mesa's libvulkan_panfrost.so).
|
||||||
|
install -Dm755 build/src/panfrost/vulkan/libvulkan_panfrost.so \
|
||||||
|
"$pkgdir/usr/lib/panvk-bifrost/libvulkan_panfrost.so"
|
||||||
|
|
||||||
|
# Custom ICD JSON. NOT under /usr/share/vulkan/icd.d/ (the default
|
||||||
|
# loader search path) — the user has to opt in via VK_ICD_FILENAMES.
|
||||||
|
install -Dm644 "$srcdir/icd.json" \
|
||||||
|
"$pkgdir/usr/lib/panvk-bifrost/icd.json"
|
||||||
|
|
||||||
|
# The brave-vulkan launcher wires up env + flags.
|
||||||
|
install -Dm755 "$srcdir/brave-vulkan" "$pkgdir/usr/bin/brave-vulkan"
|
||||||
|
}
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
# mesa-panvk-bifrost
|
||||||
|
|
||||||
|
Patched Mesa `libvulkan_panfrost.so` exposing Bifrost-gen Mali GPUs
|
||||||
|
(Mali-G31/G52/G72/G76, PAN_ARCH 6/7) to Chromium-family browsers'
|
||||||
|
Vulkan compositor.
|
||||||
|
|
||||||
|
Result of the **panvk-bifrost** campaign ([`~/src/panvk-bifrost/`](../../../panvk-bifrost/)),
|
||||||
|
iter9 close 2026-05-20 (technical milestone — operator-confirmed Brave
|
||||||
|
window) followed by this package as the actual delivery.
|
||||||
|
|
||||||
|
## What it solves
|
||||||
|
|
||||||
|
Stock Chromium / Brave on Bifrost SBCs (PineTab2, etc.) currently dies
|
||||||
|
at GL bindings init:
|
||||||
|
|
||||||
|
```
|
||||||
|
ERROR: ui/gl/gl_context_egl.cc:120 GLES3 is unsupported and ES version fallback is disabled
|
||||||
|
ERROR: ui/gl/init/gl_factory.cc:111 Requested GL implementation not found
|
||||||
|
ERROR: components/viz/service/main/viz_main_impl.cc:189 Exiting GPU process due to errors during initialization
|
||||||
|
```
|
||||||
|
|
||||||
|
This package makes Brave's **Vulkan compositor path** work on Bifrost,
|
||||||
|
side-stepping the failing GL stack. Browser chrome and standard page
|
||||||
|
rendering work.
|
||||||
|
|
||||||
|
## Known limitations (not addressed)
|
||||||
|
|
||||||
|
- **WebGL / WebGL2** in-page: blocked. ANGLE needs `VK_EXT_transform_feedback`
|
||||||
|
to expose GLES3 contexts; PanVk-Bifrost doesn't currently support that.
|
||||||
|
Sites using WebGL will degrade or refuse.
|
||||||
|
- **VAAPI hardware video decode**: unrelated to this package — see the
|
||||||
|
`libva-v4l2-request-fourier` package for that path.
|
||||||
|
|
||||||
|
## Install
|
||||||
|
|
||||||
|
```sh
|
||||||
|
# Ensure [marfrit] is in /etc/pacman.conf, then:
|
||||||
|
sudo pacman -Sy mesa-panvk-bifrost
|
||||||
|
```
|
||||||
|
|
||||||
|
## Use
|
||||||
|
|
||||||
|
```sh
|
||||||
|
brave-vulkan # launches Brave with Vulkan
|
||||||
|
brave-vulkan https://www.example.com
|
||||||
|
brave-vulkan --your-flags-here # extra args passed through
|
||||||
|
```
|
||||||
|
|
||||||
|
The launcher sets:
|
||||||
|
|
||||||
|
- `VK_ICD_FILENAMES=/usr/lib/panvk-bifrost/icd.json` (the patched driver)
|
||||||
|
- `PAN_I_WANT_A_BROKEN_VULKAN_DRIVER=1` (Mesa upstream gate)
|
||||||
|
- `MESA_VK_VERSION_OVERRIDE=1.2` (apiVersion bump for ANGLE)
|
||||||
|
- Brave flags: `--use-gl=disabled --enable-features=Vulkan --use-vulkan=native --ozone-platform=x11 --no-sandbox --disable-gpu-sandbox --ignore-gpu-blocklist`
|
||||||
|
|
||||||
|
## What's in the package
|
||||||
|
|
||||||
|
- `/usr/lib/panvk-bifrost/libvulkan_panfrost.so` — patched Mesa Vulkan driver (Mesa 26.0.6 + 2 sed-applied patches)
|
||||||
|
- `/usr/lib/panvk-bifrost/icd.json` — Vulkan ICD JSON pointing at the patched .so (NOT auto-loaded; only via `VK_ICD_FILENAMES`)
|
||||||
|
- `/usr/bin/brave-vulkan` — launcher script
|
||||||
|
|
||||||
|
System Mesa is untouched. The stock `/usr/lib/libvulkan_panfrost.so` and
|
||||||
|
`/usr/share/vulkan/icd.d/panfrost_icd.json` continue to work for any
|
||||||
|
other Vulkan app.
|
||||||
|
|
||||||
|
## Co-existence
|
||||||
|
|
||||||
|
Both stock Mesa and this package can be installed. Stock Vulkan apps
|
||||||
|
(`vulkaninfo`, `vkcube`, etc.) use the stock driver by default. Only
|
||||||
|
apps started via `brave-vulkan` (or with `VK_ICD_FILENAMES` manually
|
||||||
|
set to our path) use the patched driver.
|
||||||
|
|
||||||
|
## Campaign close criterion
|
||||||
|
|
||||||
|
Per [`feedback_package_done_means_installable`](file:///home/mfritsche/.claude/projects/-home-mfritsche-src/memory/feedback_package_done_means_installable.md)
|
||||||
|
three-point check:
|
||||||
|
|
||||||
|
1. PR merged to `marfrit-packages`
|
||||||
|
2. CI green AND `packages.reauktion.de/arch/aarch64/mesa-panvk-bifrost-*.pkg.tar.zst` exists
|
||||||
|
3. `pacman -Ss mesa-panvk-bifrost` on a fresh consumer host (e.g. ohm
|
||||||
|
after `pacman -Syu` from clean state) returns the package + brave-vulkan launches
|
||||||
|
|
||||||
|
When all three pass, panvk-bifrost iter9 closes.
|
||||||
@@ -0,0 +1,61 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
# brave-vulkan — launch Brave with the PanVk-Bifrost Vulkan compositor on
|
||||||
|
# Bifrost SBCs (PineTab2 / Mali-G52 r1 MC1 and similar).
|
||||||
|
#
|
||||||
|
# Side-steps the GL stack failures stock Brave hits on Bifrost
|
||||||
|
# (the README "Consumer-side benefit" path of the panvk-bifrost campaign).
|
||||||
|
#
|
||||||
|
# Provided by the mesa-panvk-bifrost package. See:
|
||||||
|
# /usr/share/doc/mesa-panvk-bifrost/README
|
||||||
|
# ~/src/panvk-bifrost/phase8_iteration9_close.md (campaign close)
|
||||||
|
#
|
||||||
|
# Usage: brave-vulkan [brave args...]
|
||||||
|
# Equivalent to: brave [VULKAN_FLAGS] [your args]
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# Patched Vulkan driver (from this package) — must point at the custom path
|
||||||
|
# so we don't clash with the stock /usr/share/vulkan/icd.d/panfrost_icd.json
|
||||||
|
export VK_ICD_FILENAMES=/usr/lib/panvk-bifrost/icd.json
|
||||||
|
|
||||||
|
# PanVk's "I know it's not conformant" gate — the patched driver still
|
||||||
|
# refuses to enumerate Bifrost without this env var (Mesa upstream choice,
|
||||||
|
# kept for compatibility).
|
||||||
|
export PAN_I_WANT_A_BROKEN_VULKAN_DRIVER=1
|
||||||
|
|
||||||
|
# Override apiVersion to 1.2 — ANGLE (Chromium's GL stack) requires
|
||||||
|
# device.apiVersion >= 1.1. The patched libvulkan_panfrost.so still has
|
||||||
|
# a PAN_ARCH>=10 gate inside get_api_version(); easier to override at
|
||||||
|
# runtime via this Mesa env var than to add a third patch.
|
||||||
|
export MESA_VK_VERSION_OVERRIDE=1.2
|
||||||
|
|
||||||
|
# Find the live Plasma session's Xauthority. On a fresh boot the suffix
|
||||||
|
# is randomized; pgrep the Xwayland args to find the current one.
|
||||||
|
if [ -z "${XAUTHORITY:-}" ]; then
|
||||||
|
XAUTHF=$(pgrep -fa Xwayland 2>/dev/null | grep -oE "/run/user/$(id -u)/xauth_[A-Za-z0-9]+" | head -1)
|
||||||
|
if [ -n "$XAUTHF" ]; then
|
||||||
|
export XAUTHORITY="$XAUTHF"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Standard session env if not already set
|
||||||
|
: "${XDG_RUNTIME_DIR:=/run/user/$(id -u)}"
|
||||||
|
export XDG_RUNTIME_DIR
|
||||||
|
|
||||||
|
# Default to the active Plasma Wayland session if WAYLAND_DISPLAY unset
|
||||||
|
: "${WAYLAND_DISPLAY:=wayland-0}"
|
||||||
|
export WAYLAND_DISPLAY
|
||||||
|
|
||||||
|
# Default to the XWayland :1 unless DISPLAY is set
|
||||||
|
: "${DISPLAY:=:1}"
|
||||||
|
export DISPLAY
|
||||||
|
|
||||||
|
exec brave \
|
||||||
|
--use-gl=disabled \
|
||||||
|
--enable-features=Vulkan \
|
||||||
|
--use-vulkan=native \
|
||||||
|
--ozone-platform=x11 \
|
||||||
|
--no-sandbox \
|
||||||
|
--disable-gpu-sandbox \
|
||||||
|
--ignore-gpu-blocklist \
|
||||||
|
"$@"
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"ICD": {
|
||||||
|
"api_version": "1.4.335",
|
||||||
|
"library_path": "/usr/lib/panvk-bifrost/libvulkan_panfrost.so"
|
||||||
|
},
|
||||||
|
"file_format_version": "1.0.1"
|
||||||
|
}
|
||||||
Vendored
+1
-1
@@ -16,7 +16,7 @@ work=$(mktemp -d)
|
|||||||
trap "rm -rf $work" EXIT
|
trap "rm -rf $work" EXIT
|
||||||
|
|
||||||
cd "$work"
|
cd "$work"
|
||||||
curl -sSLfo his.tar.gz \
|
curl --connect-timeout 10 --max-time 600 --retry 3 --retry-delay 5 -sSLfo his.tar.gz \
|
||||||
"https://git.reauktion.de/marfrit/claude-his-agent/archive/v${PKGVER}.tar.gz"
|
"https://git.reauktion.de/marfrit/claude-his-agent/archive/v${PKGVER}.tar.gz"
|
||||||
echo "$HIS_TARBALL_SHA256 his.tar.gz" | sha256sum -c
|
echo "$HIS_TARBALL_SHA256 his.tar.gz" | sha256sum -c
|
||||||
tar xzf his.tar.gz
|
tar xzf his.tar.gz
|
||||||
|
|||||||
+50
-24
@@ -14,9 +14,9 @@
|
|||||||
# Sibling userspace package: ../daedalus-v4l2/build-deb.sh
|
# Sibling userspace package: ../daedalus-v4l2/build-deb.sh
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
UPSTREAM_COMMIT=481279c9bffd19e32c8f3299897e9b63fc5a24aa
|
UPSTREAM_COMMIT=79256dc7ef41f83873ca9c23db20f5888858e65d
|
||||||
PKGVER=0.1.0+r18+g481279c
|
PKGVER=0.1.0+r28+g79256dc
|
||||||
PKGREL=1 # reset for new upstream pin (481279c — Phase 8.13 close)
|
PKGREL=1 # reset for new upstream pin (79256dc — H.264 B-frame reorder fix); still carries the #64 multi-kernel postinst fix
|
||||||
MODULE_NAME=daedalus_v4l2
|
MODULE_NAME=daedalus_v4l2
|
||||||
|
|
||||||
HERE=$(dirname "$(readlink -f "$0")")
|
HERE=$(dirname "$(readlink -f "$0")")
|
||||||
@@ -28,7 +28,7 @@ work=$(mktemp -d)
|
|||||||
trap "rm -rf $work" EXIT
|
trap "rm -rf $work" EXIT
|
||||||
|
|
||||||
cd "$work"
|
cd "$work"
|
||||||
curl -sSLfo daedalus-v4l2.tar.gz \
|
curl --connect-timeout 10 --max-time 600 --retry 3 --retry-delay 5 -sSLfo daedalus-v4l2.tar.gz \
|
||||||
"https://git.reauktion.de/reauktion/daedalus-v4l2/archive/${UPSTREAM_COMMIT}.tar.gz"
|
"https://git.reauktion.de/reauktion/daedalus-v4l2/archive/${UPSTREAM_COMMIT}.tar.gz"
|
||||||
tar xzf daedalus-v4l2.tar.gz
|
tar xzf daedalus-v4l2.tar.gz
|
||||||
SRCDIR=daedalus-v4l2
|
SRCDIR=daedalus-v4l2
|
||||||
@@ -78,7 +78,6 @@ set -e
|
|||||||
|
|
||||||
NAME=${MODULE_NAME}
|
NAME=${MODULE_NAME}
|
||||||
VERSION=${PKGVER}
|
VERSION=${PKGVER}
|
||||||
KERNELVER=\$(uname -r)
|
|
||||||
|
|
||||||
# Yellow + bold ANSI for the warning so it stands out in apt's
|
# Yellow + bold ANSI for the warning so it stands out in apt's
|
||||||
# stream of "Setting up" lines. Disable colour on non-TTY.
|
# stream of "Setting up" lines. Disable colour on non-TTY.
|
||||||
@@ -101,29 +100,56 @@ if [ "\$1" = "configure" ]; then
|
|||||||
|
|
||||||
dkms add "\$NAME/\$VERSION" 2>/dev/null || true
|
dkms add "\$NAME/\$VERSION" 2>/dev/null || true
|
||||||
|
|
||||||
# Don't let autoinstall failure mask the actual problem behind '|| true'.
|
# Enumerate every kernel whose headers are actually present
|
||||||
# Run it, capture the result, then verify post-condition.
|
# (/lib/modules/<kver>/build resolves to a directory). We iterate
|
||||||
autoinstall_rc=0
|
# all of them — not just \$(uname -r) — so that installing this
|
||||||
dkms autoinstall "\$NAME/\$VERSION" || autoinstall_rc=\$?
|
# package after a kernel update covers the newly-installed kernel
|
||||||
|
# too, and so that a later kernel-headers install for a previously
|
||||||
|
# uncovered version gets picked up on dpkg-reconfigure. Without
|
||||||
|
# this, autoinstall (which targets only the running kernel) leaves
|
||||||
|
# /dev/daedalus-v4l2 absent after a kernel switch + reboot
|
||||||
|
# (marfrit/marfrit-packages#64).
|
||||||
|
kvers=''
|
||||||
|
for d in /lib/modules/*/build; do
|
||||||
|
[ -d "\$d" ] || continue
|
||||||
|
k=\$(basename "\$(dirname "\$d")")
|
||||||
|
kvers="\$kvers \$k"
|
||||||
|
done
|
||||||
|
|
||||||
# Verify the module actually built + installed for the running kernel.
|
if [ -z "\$kvers" ]; then
|
||||||
status=\$(dkms status -m "\$NAME" -v "\$VERSION" -k "\$KERNELVER" 2>/dev/null || true)
|
|
||||||
if ! printf '%s\\n' "\$status" | grep -q -E 'installed|loaded'; then
|
|
||||||
warn ""
|
warn ""
|
||||||
warn "DKMS build did NOT land for kernel \$KERNELVER."
|
warn "No kernels with headers found under /lib/modules/*/build."
|
||||||
warn " dkms status -m \$NAME -v \$VERSION -k \$KERNELVER:"
|
warn "Install kernel headers (e.g. linux-headers-rpi-2712 on Pi OS)"
|
||||||
warn " \$(printf '%s' "\$status" | head -1)"
|
warn "then finish with:"
|
||||||
warn ""
|
|
||||||
warn "Most likely cause: kernel headers package is missing."
|
|
||||||
warn " Raspberry Pi OS / Pi 5: apt install linux-headers-rpi-2712"
|
|
||||||
warn " Debian generic: apt install linux-headers-\$KERNELVER"
|
|
||||||
warn ""
|
|
||||||
warn "After installing headers, finish the install with:"
|
|
||||||
warn " sudo dkms autoinstall \$NAME/\$VERSION"
|
warn " sudo dkms autoinstall \$NAME/\$VERSION"
|
||||||
warn " sudo modprobe daedalus_v4l2"
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
failed=''
|
||||||
|
for k in \$kvers; do
|
||||||
|
dkms autoinstall -k "\$k" "\$NAME/\$VERSION" >/dev/null 2>&1 || true
|
||||||
|
s=\$(dkms status -m "\$NAME" -v "\$VERSION" -k "\$k" 2>/dev/null || true)
|
||||||
|
if ! printf '%s\\n' "\$s" | grep -q -E 'installed|loaded'; then
|
||||||
|
failed="\$failed \$k"
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
if [ -n "\$failed" ]; then
|
||||||
warn ""
|
warn ""
|
||||||
warn "Until then daedalus_v4l2 will NOT be loadable and the"
|
warn "DKMS build did NOT land for kernel(s):\$failed"
|
||||||
warn "userspace daedalus-v4l2 daemon will have nothing to talk to."
|
warn ""
|
||||||
|
warn "Most likely cause: kernel headers missing for those versions."
|
||||||
|
warn " Raspberry Pi OS / Pi 5: apt install linux-headers-rpi-2712"
|
||||||
|
warn " Debian generic: apt install linux-headers-<version>"
|
||||||
|
warn ""
|
||||||
|
warn "After installing headers, finish with:"
|
||||||
|
for k in \$failed; do
|
||||||
|
warn " sudo dkms autoinstall -k \$k \$NAME/\$VERSION"
|
||||||
|
done
|
||||||
|
warn " sudo modprobe daedalus_v4l2 (after booting that kernel)"
|
||||||
|
warn ""
|
||||||
|
warn "Until then daedalus_v4l2 will NOT be loadable on those kernels"
|
||||||
|
warn "and the userspace daedalus-v4l2 daemon will have nothing to talk to."
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
+74
@@ -1,3 +1,77 @@
|
|||||||
|
daedalus-v4l2-dkms (0.1.0+r28+g79256dc-1) bookworm trixie; urgency=medium
|
||||||
|
|
||||||
|
* Bump to 79256dc — H.264 B-frame display reorder fix (closes
|
||||||
|
daedalus-v4l2#6). libavcodec's H.264 decoder reorders output to
|
||||||
|
display order before returning from avcodec_receive_frame; the
|
||||||
|
daemon was binding each REQ_DECODE's pixels to the cookie of the
|
||||||
|
bitstream that triggered the receive_frame call, not the cookie
|
||||||
|
of the bitstream that actually produced the picture. For B-frame
|
||||||
|
sequences this paired cookie N's CAPTURE buffer with cookie N-2's
|
||||||
|
pixels and silently lost intermediate frames — visible as
|
||||||
|
"2 1 4 3 6 5" frame pairing in mpv / Firefox on Pi CM5.
|
||||||
|
* Wire-protocol bump (DAEDALUS_PROTO_VERSION 0 → 1): REQ_DECODE
|
||||||
|
gains __u64 src_pts; RESP_FRAME gains __u32 flags +
|
||||||
|
__u64 output_src_pts. Kernel + daemon must install atomically
|
||||||
|
(this package + daedalus-v4l2 0.1.0+r28+g79256dc).
|
||||||
|
* Carries forward the #64 multi-kernel postinst fix from -2:
|
||||||
|
autoinstall for every /lib/modules/*/build that resolves to real
|
||||||
|
headers, not just $(uname -r).
|
||||||
|
* Closes #64.
|
||||||
|
|
||||||
|
-- Markus Fritsche <mfritsche@reauktion.de> Thu, 21 May 2026 12:00:00 +0000
|
||||||
|
|
||||||
|
daedalus-v4l2-dkms (0.1.0+r24+gf0d4186-2) bookworm trixie; urgency=medium
|
||||||
|
|
||||||
|
* postinst: autoinstall for every installed kernel with headers, not
|
||||||
|
just the running one. Previously `dkms autoinstall $NAME/$VERSION`
|
||||||
|
built only against `$(uname -r)`, so installing the package on
|
||||||
|
kernel A and then rebooting into a separately-installed kernel B
|
||||||
|
left /lib/modules/B/updates/dkms/ empty — /dev/daedalus-v4l2 absent,
|
||||||
|
daedalus daemon nothing to talk to, browser/VAAPI silently falling
|
||||||
|
back to software with no obvious diagnostic. Now we enumerate every
|
||||||
|
/lib/modules/*/build that resolves to a real directory and run
|
||||||
|
`dkms autoinstall -k <kver>` for each, reporting per-kernel failure
|
||||||
|
only when headers are missing. Closes #64.
|
||||||
|
|
||||||
|
-- Markus Fritsche <mfritsche@reauktion.de> Thu, 21 May 2026 09:30:00 +0000
|
||||||
|
|
||||||
|
daedalus-v4l2-dkms (0.1.0+r24+gf0d4186-1) bookworm trixie; urgency=medium
|
||||||
|
|
||||||
|
* Bump to f0d4186 — per-ctx vb2 lock fix. daedalus_queue_init now
|
||||||
|
uses ctx->vb_mutex instead of ctx->dev->m2m_lock for each
|
||||||
|
vb2_queue's lock, unblocking Firefox's multi-process VAAPI
|
||||||
|
clients (they were colliding on the device-wide mutex and one
|
||||||
|
would EBUSY-fail S_FMT while another was mid-streamon).
|
||||||
|
|
||||||
|
-- Markus Fritsche <mfritsche@reauktion.de> Wed, 20 May 2026 23:00:00 +0000
|
||||||
|
|
||||||
|
daedalus-v4l2-dkms (0.1.0+r22+g462aa4b-1) bookworm trixie; urgency=medium
|
||||||
|
|
||||||
|
* Bump to 462aa4b — kernel device_run() now calls
|
||||||
|
v4l2_ctrl_request_setup() before reading the H.264 stateless
|
||||||
|
control values from the bound media_request, so the values
|
||||||
|
daedalus ships to the userspace daemon match what the V4L2
|
||||||
|
client (libva-v4l2-request-fourier) actually set. Closes the
|
||||||
|
libva→kernel control-binding gap that was causing decoded
|
||||||
|
frames to come back as best-effort zero garbage from libavcodec.
|
||||||
|
* Wire-ABI lockstep with daedalus-v4l2 0.1.0+r22+g462aa4b.
|
||||||
|
|
||||||
|
-- Markus Fritsche <mfritsche@reauktion.de> Wed, 20 May 2026 22:00:00 +0000
|
||||||
|
|
||||||
|
daedalus-v4l2-dkms (0.1.0+r20+g3dd0eb0-1) bookworm trixie; urgency=medium
|
||||||
|
|
||||||
|
* Bump to 3dd0eb0 — DAEMON-PPS kernel-side changes. device_run()
|
||||||
|
now reads the V4L2 H.264 stateless control values from the bound
|
||||||
|
media_request and ships them to the daemon inside REQ_DECODE
|
||||||
|
via the new struct daedalus_h264_meta block (gated on
|
||||||
|
DAEDALUS_REQ_FLAG_H264_META). Required for H.264 decode to
|
||||||
|
work via the libva-v4l2-request -> daedalus daemon path; daemon
|
||||||
|
synthesises AnnexB SPS+PPS NAL units from the structs.
|
||||||
|
* Wire-ABI lockstep with daedalus-v4l2 0.1.0+r20+g3dd0eb0 — install
|
||||||
|
both packages together.
|
||||||
|
|
||||||
|
-- Markus Fritsche <mfritsche@reauktion.de> Wed, 20 May 2026 21:00:00 +0000
|
||||||
|
|
||||||
daedalus-v4l2-dkms (0.1.0+r18+g481279c-1) bookworm trixie; urgency=medium
|
daedalus-v4l2-dkms (0.1.0+r18+g481279c-1) bookworm trixie; urgency=medium
|
||||||
|
|
||||||
* Bump to 481279c in lockstep with the userspace daedalus-v4l2
|
* Bump to 481279c in lockstep with the userspace daedalus-v4l2
|
||||||
|
|||||||
Vendored
+11
-8
@@ -11,13 +11,16 @@
|
|||||||
# Upstream repo: https://git.reauktion.de/reauktion/daedalus-v4l2
|
# Upstream repo: https://git.reauktion.de/reauktion/daedalus-v4l2
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
# Same pin as the Arch PKGBUILD. 481279c = "Phase 8.13: byte-exact
|
# Same pin as the Arch PKGBUILD. 79256dc = "kernel + daemon: H.264
|
||||||
# end-to-end via libva (consumer target hit)" — first commit where the
|
# B-frame display reorder fix (closes #6)" — adds the wire-protocol
|
||||||
# full ffmpeg -hwaccel vaapi → libva → /dev/video0 → daemon path lands
|
# src_pts / output_src_pts / RESP_FRAME flags split that lets H.264
|
||||||
# a pixel-correct decoded frame back in ffmpeg.
|
# streams with B-frames preserve display order through libva → kernel
|
||||||
UPSTREAM_COMMIT=481279c9bffd19e32c8f3299897e9b63fc5a24aa
|
# → daemon. PROTO_VERSION bumps 0 → 1; lock-step userspace + kernel
|
||||||
PKGVER=0.1.0+r18+g481279c
|
# rebuild REQUIRED (daedalus-v4l2-dkms build-deb.sh pinned to the same
|
||||||
PKGREL=1 # reset for new upstream pin (481279c — Phase 8.13 close)
|
# commit).
|
||||||
|
UPSTREAM_COMMIT=79256dc7ef41f83873ca9c23db20f5888858e65d
|
||||||
|
PKGVER=0.1.0+r28+g79256dc
|
||||||
|
PKGREL=1 # reset for new upstream pin (79256dc — H.264 B-frame reorder fix)
|
||||||
|
|
||||||
HERE=$(dirname "$(readlink -f "$0")")
|
HERE=$(dirname "$(readlink -f "$0")")
|
||||||
|
|
||||||
@@ -28,7 +31,7 @@ work=$(mktemp -d)
|
|||||||
trap "rm -rf $work" EXIT
|
trap "rm -rf $work" EXIT
|
||||||
|
|
||||||
cd "$work"
|
cd "$work"
|
||||||
curl -sSLfo daedalus-v4l2.tar.gz \
|
curl --connect-timeout 10 --max-time 600 --retry 3 --retry-delay 5 -sSLfo daedalus-v4l2.tar.gz \
|
||||||
"https://git.reauktion.de/reauktion/daedalus-v4l2/archive/${UPSTREAM_COMMIT}.tar.gz"
|
"https://git.reauktion.de/reauktion/daedalus-v4l2/archive/${UPSTREAM_COMMIT}.tar.gz"
|
||||||
tar xzf daedalus-v4l2.tar.gz
|
tar xzf daedalus-v4l2.tar.gz
|
||||||
SRCDIR=daedalus-v4l2
|
SRCDIR=daedalus-v4l2
|
||||||
|
|||||||
+76
@@ -1,3 +1,79 @@
|
|||||||
|
daedalus-v4l2 (0.1.0+r28+g79256dc-1) bookworm trixie; urgency=medium
|
||||||
|
|
||||||
|
* Bump to 79256dc — H.264 B-frame display reorder fix (closes
|
||||||
|
daedalus-v4l2#6 + #4 menu controls). Daemon side: the
|
||||||
|
avcodec_send_packet → receive_frame loop now stamps pkt->pts =
|
||||||
|
req->src_pts so libavcodec's display-ordered frame->pts identifies
|
||||||
|
which OUTPUT bitstream's pixels each drained frame belongs to.
|
||||||
|
chardev_client maintains a (src_pts → cookie) lookup table so the
|
||||||
|
daemon can ship pixels to the cookie of the *originating*
|
||||||
|
bitstream, not the cookie of whatever REQ triggered the
|
||||||
|
receive_frame call. Multiple RESP_FRAME messages per REQ_DECODE
|
||||||
|
are now possible (one for the just-consumed src, one or more for
|
||||||
|
drained pixels).
|
||||||
|
* Wire-protocol bump (DAEDALUS_PROTO_VERSION 0 → 1): REQ_DECODE
|
||||||
|
gains __u64 src_pts; RESP_FRAME gains __u32 flags +
|
||||||
|
__u64 output_src_pts. Daemon + kernel must install atomically
|
||||||
|
(this package + daedalus-v4l2-dkms 0.1.0+r28+g79256dc).
|
||||||
|
* Also subsumes 79256dc's predecessor 7ff2d89 — H.264 DECODE_MODE +
|
||||||
|
START_CODE menu-control registration that retires the
|
||||||
|
"Unable to set control(s) error_idx=2/2" warning libva-v4l2-
|
||||||
|
request emitted on every context init.
|
||||||
|
|
||||||
|
-- Markus Fritsche <mfritsche@reauktion.de> Thu, 21 May 2026 12:00:00 +0000
|
||||||
|
|
||||||
|
daedalus-v4l2 (0.1.0+r24+gf0d4186-1) bookworm trixie; urgency=medium
|
||||||
|
|
||||||
|
* Bump to f0d4186 — kernel per-ctx vb2 lock fix. daedalus_queue_init
|
||||||
|
was wiring src_vq->lock and dst_vq->lock to ctx->dev->m2m_lock (a
|
||||||
|
device-wide mutex), serialising every vb2 ioctl across all
|
||||||
|
concurrent clients of /dev/video0. For Firefox (which spawns
|
||||||
|
separate content + RDD + GPU processes that each open the device
|
||||||
|
and run libva probe simultaneously), one libva session's
|
||||||
|
S_FMT(OUTPUT_MPLANE) hit EBUSY while another was mid-streamon —
|
||||||
|
Firefox VAAPI playback fell apart at startup.
|
||||||
|
* Fix gives each open() its own ctx->vb_mutex; vb2 ioctls run
|
||||||
|
independently per client. Matches cedrus / rkvdec / hantro
|
||||||
|
pattern.
|
||||||
|
* Verified on higgs: Firefox YouTube playback engages VAAPI cleanly,
|
||||||
|
sustained ~230 fps decode at 640x368 through the daedalus daemon,
|
||||||
|
zero EBUSY in stderr or daemon journal.
|
||||||
|
|
||||||
|
-- Markus Fritsche <mfritsche@reauktion.de> Wed, 20 May 2026 23:00:00 +0000
|
||||||
|
|
||||||
|
daedalus-v4l2 (0.1.0+r22+g462aa4b-1) bookworm trixie; urgency=medium
|
||||||
|
|
||||||
|
* Bump to 462aa4b — kernel-side fix for control-binding gap that
|
||||||
|
closes the libva→daemon SPS/PPS pipeline. Kernel device_run now
|
||||||
|
calls v4l2_ctrl_request_setup() before reading ctrl->p_cur, so
|
||||||
|
the daemon's daedalus_h264_meta block actually carries THIS
|
||||||
|
request's V4L2 stateless H.264 control values instead of stale
|
||||||
|
/default ones. Pairs with libva-v4l2-request-fourier r382+gc1bb444
|
||||||
|
(Fix 3 + Fix 4 from issue libva-v4l2-request-fourier#8).
|
||||||
|
* After-fix on higgs (Pi CM5): ffmpeg -hwaccel vaapi -i h264.mp4
|
||||||
|
produces unique decoded P-frames (per-frame fnv1a hashes differ)
|
||||||
|
and zero "error while decoding MB" / "reference frames exceeds
|
||||||
|
max" warnings.
|
||||||
|
|
||||||
|
-- Markus Fritsche <mfritsche@reauktion.de> Wed, 20 May 2026 22:00:00 +0000
|
||||||
|
|
||||||
|
daedalus-v4l2 (0.1.0+r20+g3dd0eb0-1) bookworm trixie; urgency=medium
|
||||||
|
|
||||||
|
* Bump to 3dd0eb0 — DAEMON-PPS H.264 SPS/PPS NAL synthesiser.
|
||||||
|
Daemon now reconstructs AnnexB SPS+PPS NAL units from the V4L2
|
||||||
|
stateless H.264 control structs (forwarded by the kernel via
|
||||||
|
a new struct daedalus_h264_meta block in REQ_DECODE) and
|
||||||
|
prepends them to the slice bitstream before feeding libavcodec.
|
||||||
|
Without this, ffmpeg -hwaccel vaapi on H.264 sources failed
|
||||||
|
with "non-existing PPS 0 referenced" even after LIBVA-1/-2
|
||||||
|
routing correctly delivered the request.
|
||||||
|
* Wire protocol: new DAEDALUS_REQ_FLAG_H264_META bit + struct
|
||||||
|
daedalus_h264_meta; daemon and kernel must be installed in
|
||||||
|
lockstep (this package + daedalus-v4l2-dkms 0.1.0+r20+g3dd0eb0).
|
||||||
|
* VP9 / AV1 paths unchanged.
|
||||||
|
|
||||||
|
-- Markus Fritsche <mfritsche@reauktion.de> Wed, 20 May 2026 21:00:00 +0000
|
||||||
|
|
||||||
daedalus-v4l2 (0.1.0+r18+g481279c-1) bookworm trixie; urgency=medium
|
daedalus-v4l2 (0.1.0+r18+g481279c-1) bookworm trixie; urgency=medium
|
||||||
|
|
||||||
* Bump to 481279c. Upstream landed the systemd unit + modules-load.d
|
* Bump to 481279c. Upstream landed the systemd unit + modules-load.d
|
||||||
|
|||||||
+42
-5
@@ -10,10 +10,25 @@
|
|||||||
# Upstream fork: https://git.reauktion.de/marfrit/libva-v4l2-request-fourier
|
# Upstream fork: https://git.reauktion.de/marfrit/libva-v4l2-request-fourier
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
# Same pin as the Arch PKGBUILD. de27e95 = "v4l2: log error_idx +
|
# Same pin as the Arch PKGBUILD. c454618 = PR #16 merge "picture,
|
||||||
# failing ctrl id on S_EXT_CTRLS failure" (Phase 8.13 diagnostic).
|
# request_pool: transparent OUTPUT-pool resize on bitstream overrun
|
||||||
UPSTREAM_COMMIT=de27e95571b67ef34619c23a12db4698f9b3454e
|
# (#15)" — follow-up root-cause fix to #13/#14. On a mid-stream
|
||||||
PKGVER=1.0.0+r376+gde27e95
|
# bitstream-budget overrun (typical cause: SPS-driven resolution
|
||||||
|
# upshift in an adaptive-bitrate stream), codec_store_buffer now
|
||||||
|
# snapshots the in-flight surface's accumulated bytes, releases its
|
||||||
|
# OUTPUT pool slot, calls request_pool_resize (STREAMOFF →
|
||||||
|
# REQBUFS(0) → S_FMT with 2×sizeimage hint, capped at 1 GiB, page-
|
||||||
|
# aligned → CREATE_BUFS → mmap → media_request_alloc → STREAMON),
|
||||||
|
# re-acquires a slot, re-mirrors the surface's source_{data,size,
|
||||||
|
# request_fd}, restores the bytes, and continues. The frame
|
||||||
|
# survives instead of being dropped back to libavcodec for surface
|
||||||
|
# recreation. CAPTURE side untouched (per-queue V4L2 streaming
|
||||||
|
# independence).
|
||||||
|
#
|
||||||
|
# Prior pin (2860d75) = PR #14 merge — codec_store_buffer bounds-
|
||||||
|
# check floor (#13).
|
||||||
|
UPSTREAM_COMMIT=c454618ae11addce2e17b560f4deeacbed067d98
|
||||||
|
PKGVER=1.0.0+r390+gc454618
|
||||||
PKGREL=1
|
PKGREL=1
|
||||||
|
|
||||||
HERE=$(dirname "$(readlink -f "$0")")
|
HERE=$(dirname "$(readlink -f "$0")")
|
||||||
@@ -25,7 +40,7 @@ work=$(mktemp -d)
|
|||||||
trap "rm -rf $work" EXIT
|
trap "rm -rf $work" EXIT
|
||||||
|
|
||||||
cd "$work"
|
cd "$work"
|
||||||
curl -sSLfo libva-fourier.tar.gz \
|
curl --connect-timeout 10 --max-time 600 --retry 3 --retry-delay 5 -sSLfo libva-fourier.tar.gz \
|
||||||
"https://git.reauktion.de/marfrit/libva-v4l2-request-fourier/archive/${UPSTREAM_COMMIT}.tar.gz"
|
"https://git.reauktion.de/marfrit/libva-v4l2-request-fourier/archive/${UPSTREAM_COMMIT}.tar.gz"
|
||||||
tar xzf libva-fourier.tar.gz
|
tar xzf libva-fourier.tar.gz
|
||||||
SRCDIR=$(echo libva-v4l2-request-fourier)
|
SRCDIR=$(echo libva-v4l2-request-fourier)
|
||||||
@@ -38,6 +53,28 @@ meson setup build \
|
|||||||
-Db_lto=false
|
-Db_lto=false
|
||||||
meson compile -C build
|
meson compile -C build
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# ABI sanity check: the produced .so MUST export __vaDriverInit_1_<MINOR>
|
||||||
|
# matching the install target's libva runtime. Build is expected to run on
|
||||||
|
# a Debian trixie runner where <va/va.h>'s VA_MINOR is 22 — see
|
||||||
|
# .gitea/workflows/build.yml (runs-on: actrunner-debian-aarch64-bohr). If a future
|
||||||
|
# runner change lands the build on a host with a different libva-dev
|
||||||
|
# version, the produced symbol won't bind on the install target and ffmpeg/
|
||||||
|
# vainfo/firefox-vaapi will all fail with "has no function
|
||||||
|
# __vaDriverInit_1_0". Fail loud at build time instead of shipping a
|
||||||
|
# silently-broken .deb (which is what happened in -1).
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
SO=$(find build -name 'v4l2_request_drv_video.so' | head -1)
|
||||||
|
if ! nm -D --defined-only "$SO" | grep -q '__vaDriverInit_1_22'; then
|
||||||
|
echo "FATAL: built driver does not export __vaDriverInit_1_22."
|
||||||
|
echo " Build host's <va/va.h> VA_MINOR_VERSION is likely != 22."
|
||||||
|
echo " Expected runner: actrunner-debian-aarch64-bohr (trixie, libva 2.22)."
|
||||||
|
echo " Symbol exports found:"
|
||||||
|
nm -D --defined-only "$SO" | grep -i vadriverinit || echo " (none)"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
echo "ABI check: $SO exports __vaDriverInit_1_22 (matches trixie libva 2.22)"
|
||||||
|
|
||||||
ROOT="$work/pkgroot"
|
ROOT="$work/pkgroot"
|
||||||
DESTDIR="$ROOT" meson install -C build
|
DESTDIR="$ROOT" meson install -C build
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,51 @@
|
|||||||
|
libva-v4l2-request-fourier (1.0.0+r380+g9898331-1) bookworm trixie; urgency=medium
|
||||||
|
|
||||||
|
* Bump to 9898331 — LIBVA-2 close. Adds video_fd_daedalus to
|
||||||
|
any_fd_supports_output_format's probe list in config.c so the
|
||||||
|
profile enumerator actually sees daedalus_v4l2's OUTPUT formats
|
||||||
|
(VP9F + AV1F + S264). Before this commit, ffmpeg vaapi against
|
||||||
|
H.264 on higgs bailed with "No support for codec h264 profile 578"
|
||||||
|
because RequestQueryConfigProfiles only walked rkvdec/hantro/
|
||||||
|
rpi-hevc-dec/vpu981 fds and never asked daedalus what it could do.
|
||||||
|
* Backward-compatible on RK3399/3588 — new slot gated by
|
||||||
|
HAVE_DAEDALUS_V4L2 *and* video_fd_daedalus >= 0; both false in
|
||||||
|
those deployments.
|
||||||
|
|
||||||
|
-- Markus Fritsche <mfritsche@reauktion.de> Wed, 20 May 2026 19:30:00 +0000
|
||||||
|
|
||||||
|
libva-v4l2-request-fourier (1.0.0+r378+gc332d34-2) bookworm trixie; urgency=medium
|
||||||
|
|
||||||
|
* Rebuild on a native Debian trixie runner (actrunner-debian-aarch64-bohr) so
|
||||||
|
the driver picks up trixie's libva-dev (2.22) and exports
|
||||||
|
__vaDriverInit_1_22 — the symbol trixie's libva runtime looks up.
|
||||||
|
Previous -1 build used the Arch CI runner (libva 2.23.0) and
|
||||||
|
exported __vaDriverInit_1_23, which trixie's loader cannot bind:
|
||||||
|
vaInitialize() returns -1 ("has no function __vaDriverInit_1_0")
|
||||||
|
and ffmpeg -hwaccel vaapi fails on startup.
|
||||||
|
* No source change; pure build-env fix. CI workflow's
|
||||||
|
libva-v4l2-request-fourier-debian job moved from runs-on:
|
||||||
|
arch-aarch64 to runs-on: actrunner-debian-aarch64-bohr; build-deps installed
|
||||||
|
via apt-get instead of pacman.
|
||||||
|
* Hard sanity check kept in build-deb.sh: build fails if the
|
||||||
|
resulting .so doesn't export __vaDriverInit_1_22 (preempts the
|
||||||
|
silent install-then-refuse-to-load failure mode).
|
||||||
|
|
||||||
|
-- Markus Fritsche <mfritsche@reauktion.de> Wed, 20 May 2026 18:00:00 +0000
|
||||||
|
|
||||||
|
libva-v4l2-request-fourier (1.0.0+r378+gc332d34-1) bookworm trixie; urgency=medium
|
||||||
|
|
||||||
|
* Bump to c332d34 — LIBVA-1 per-codec dispatch close. Pi 5 mixed
|
||||||
|
deployment (rpi-hevc-dec + daedalus_v4l2 both loaded) now correctly
|
||||||
|
opens BOTH decoders: VP9/AV1/H.264 route to daedalus via new 'd'
|
||||||
|
kind, HEVC stays on 'p' (rpi-hevc-dec). Before this commit
|
||||||
|
find_codec_device picked rpi-hevc-dec as the sole primary and the
|
||||||
|
daedalus_v4l2 slot stayed -1, so VP9/AV1/H.264 frames failed.
|
||||||
|
* Also closes a small fd leak in RequestTerminate (daedalus pair).
|
||||||
|
* Backward-compatible: new branches gated by HAVE_DAEDALUS_V4L2
|
||||||
|
*and* video_fd_daedalus >= 0 — RK3399/RK3588 boxes unaffected.
|
||||||
|
|
||||||
|
-- Markus Fritsche <mfritsche@reauktion.de> Wed, 20 May 2026 17:30:00 +0000
|
||||||
|
|
||||||
libva-v4l2-request-fourier (1.0.0+r376+gde27e95-1) bookworm trixie; urgency=medium
|
libva-v4l2-request-fourier (1.0.0+r376+gde27e95-1) bookworm trixie; urgency=medium
|
||||||
|
|
||||||
* Initial Debian packaging (sibling to existing
|
* Initial Debian packaging (sibling to existing
|
||||||
|
|||||||
Vendored
+1
-1
@@ -23,7 +23,7 @@ work=$(mktemp -d)
|
|||||||
trap "rm -rf $work" EXIT
|
trap "rm -rf $work" EXIT
|
||||||
|
|
||||||
cd "$work"
|
cd "$work"
|
||||||
curl -sSLfo lmcp.tar.gz "https://git.reauktion.de/marfrit/lmcp/archive/${UPSTREAM_TAG}.tar.gz"
|
curl --connect-timeout 10 --max-time 600 --retry 3 --retry-delay 5 -sSLfo lmcp.tar.gz "https://git.reauktion.de/marfrit/lmcp/archive/${UPSTREAM_TAG}.tar.gz"
|
||||||
echo "$LMCP_TARBALL_SHA256 lmcp.tar.gz" | sha256sum -c
|
echo "$LMCP_TARBALL_SHA256 lmcp.tar.gz" | sha256sum -c
|
||||||
tar xzf lmcp.tar.gz
|
tar xzf lmcp.tar.gz
|
||||||
|
|
||||||
|
|||||||
Vendored
+1
-1
@@ -33,7 +33,7 @@ work=$(mktemp -d)
|
|||||||
trap "rm -rf $work" EXIT
|
trap "rm -rf $work" EXIT
|
||||||
|
|
||||||
cd "$work"
|
cd "$work"
|
||||||
curl -sSLfo mpv.tar.gz \
|
curl --connect-timeout 10 --max-time 600 --retry 3 --retry-delay 5 -sSLfo mpv.tar.gz \
|
||||||
"https://github.com/mpv-player/mpv/archive/v${MPV_VERSION}/mpv-${MPV_VERSION}.tar.gz"
|
"https://github.com/mpv-player/mpv/archive/v${MPV_VERSION}/mpv-${MPV_VERSION}.tar.gz"
|
||||||
echo "$MPV_TARBALL_SHA256 mpv.tar.gz" | sha256sum -c
|
echo "$MPV_TARBALL_SHA256 mpv.tar.gz" | sha256sum -c
|
||||||
tar xzf mpv.tar.gz
|
tar xzf mpv.tar.gz
|
||||||
|
|||||||
Reference in New Issue
Block a user