From 9bf97fdb4997b0d145698da8d3bc9fe2456f33ff Mon Sep 17 00:00:00 2001 From: claude-noether Date: Thu, 21 May 2026 22:17:00 +0200 Subject: [PATCH] =?UTF-8?q?ffmpeg-v4l2-request-fourier:=20PKGREL=203=20?= =?UTF-8?q?=E2=86=92=205=20(force=20rebuild=20past=20orphan=20-4=20.deb)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR #76 (H.264 IDCT 4×4 daedalus-fourier substitution) was merged but the resulting .deb was not actually built: an orphan ffmpeg-v4l2-request-fourier_8.1+rfourier+gb57fbbe-4_arm64.deb (dated 2026-05-19, no matching source commit in main) sat in the apt pool. .gitea/scripts/check-already-published.sh's debian branch compares `dpkg --compare-versions $pool_ver ge $source_full` — pool -4 ≥ source -3, so CI's skip-check emitted skip=1 and short-circuited the build. The ffmpeg-v4l2-request-debian Action reported success without actually publishing. Bump source PKGREL past -4 so the next CI run sees source >= pool and proceeds to build + publish. No source code change beyond PKGREL + changelog. Arch side unaffected (its skip-check is exact-URL-match, not pool-head-ge). --- debian/ffmpeg-v4l2-request-fourier/build-deb.sh | 5 ++++- .../ffmpeg-v4l2-request-fourier/debian/changelog | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/debian/ffmpeg-v4l2-request-fourier/build-deb.sh b/debian/ffmpeg-v4l2-request-fourier/build-deb.sh index 03fb13d2a..3081fb46e 100755 --- a/debian/ffmpeg-v4l2-request-fourier/build-deb.sh +++ b/debian/ffmpeg-v4l2-request-fourier/build-deb.sh @@ -33,7 +33,10 @@ FFMPEG_VERSION=8.1 # epoch 2 matches Debian's stock ffmpeg (currently 7:7.1.x in trixie); # +rfourier suffix to avoid colliding with upstream/Debian rebuilds. PKGVER=2:${FFMPEG_VERSION}+rfourier+gb57fbbe -PKGREL=3 # pkgrel=3 — H.264 IDCT 4x4 daedalus-fourier substitution (2026-05-21) +PKGREL=5 # pkgrel=5 — H.264 IDCT 4x4 daedalus-fourier substitution; skip past + # an orphan -4 .deb sitting in the apt pool that made + # check-already-published.sh's `pool_ver ge source_full` short- + # circuit the previous -3 build (PR #76). (2026-05-21) # daedalus-fourier pin — first kernel substitution in libavcodec (cycle 6 # H.264 IDCT 4x4). Same SHA as the daedalus-v4l2 daemon already ships diff --git a/debian/ffmpeg-v4l2-request-fourier/debian/changelog b/debian/ffmpeg-v4l2-request-fourier/debian/changelog index 7ee6d335f..aec93033c 100644 --- a/debian/ffmpeg-v4l2-request-fourier/debian/changelog +++ b/debian/ffmpeg-v4l2-request-fourier/debian/changelog @@ -1,3 +1,19 @@ +ffmpeg-v4l2-request-fourier (2:8.1+rfourier+gb57fbbe-5) bookworm trixie; urgency=medium + + * pkgrel-only bump (3 → 5) to force a rebuild of the H.264 IDCT 4x4 + daedalus-fourier substitution that landed in marfrit-packages PR + #76. An orphan -4 .deb already sat in the apt pool (dated + 2026-05-19, no matching source commit in main); CI's + check-already-published.sh compares with `dpkg --compare-versions + pool_ver ge source_full`, which short-circuited PR #76's -3 + build. Skipping past -4 lets the CI workflow actually publish the + substitution. + * No source code change beyond PKGREL and this changelog entry. + Substitution + control + build-deb.sh wiring stay as PR #76 left + them. + + -- Markus Fritsche Thu, 21 May 2026 21:30:00 +0000 + ffmpeg-v4l2-request-fourier (2:8.1+rfourier+gb57fbbe-3) bookworm trixie; urgency=medium * Add 0003-h264-idct4-daedalus-fourier.patch — H264DSPContext.idct_add