diff --git a/crates/pptx-reporter/ffprobe-pins.json b/crates/pptx-reporter/ffprobe-pins.json index 9e2030b..ea89719 100644 --- a/crates/pptx-reporter/ffprobe-pins.json +++ b/crates/pptx-reporter/ffprobe-pins.json @@ -1,13 +1,13 @@ { "x86_64-pc-windows-gnu": { - "release": "autobuild-2026-10-20-13-08", - "asset": "ffmpeg-n9.0.2-29-g6dfaba896f-win64-lgpl-9.0.zip", - "sha256": "e7bca5e004c2d13bcb374c3a4bd30c4588b08607a4b1a01369341a4f9678dff3" + "release": "autobuild-2026-11-21-12-37", + "asset": "ffmpeg-n9.0.2-61-gd59078794d-win64-lgpl-9.0.zip", + "sha256": "3508eac94b9cfd5ffe34e88cef4fd5ba15b4ccdd6b4083488e070c702342a26a" }, "x86_64-unknown-linux-gnu": { - "release": "autobuild-2026-10-20-13-08", - "asset": "ffmpeg-n9.0.2-29-g6dfaba896f-linux64-lgpl-9.0.tar.xz", - "sha256": "5ae5939260c72671383f0a0d8785695bfe06c94c27d4daac2e63eb8576417927" + "release": "autobuild-2026-11-21-12-37", + "asset": "ffmpeg-n9.0.2-61-gd59078794d-linux64-lgpl-9.0.tar.xz", + "sha256": "7426ff6a8195b6e406f40d7155174e51ce6ef16a7d5e1f7d839c389cbc33817f" }, "aarch64-apple-darwin": { "release": "9.0.2", diff --git a/docs/development/releases.md b/docs/development/releases.md index 4cbf62a..0df04bb 100644 --- a/docs/development/releases.md +++ b/docs/development/releases.md @@ -20,7 +20,7 @@ are protected; use `--output DIR` for a new test build. ## FFprobe -`scripts/fetch_ffprobe.py` downloads BtbN FFmpeg 9.0 release-branch, non-shared +`scripts/fetch_ffprobe.py` downloads FFmpeg-Builds 9.0 release-branch, non-shared LGPL builds. It verifies GitHub's archive SHA-256, executable format and x86-64 architecture, then tests `ffprobe -version` on a matching host. Foreign binaries are inspected without execution. Verified binaries/notices are cached in @@ -69,7 +69,7 @@ never guesses Cargo output paths or creates archives. The publisher handles archive validation, checksums and upload. See the upstream [named-bundle contract](https://proxy.dandaedre.com/gitea/idle-org/rust_realease/raw/branch/main/docs/portable-bundles.md). -`crates/pptx-reporter/ffprobe-pins.json` pins a dated BtbN release, exact non-shared +`crates/pptx-reporter/ffprobe-pins.json` pins a dated FFmpeg-Builds release, exact non-shared LGPL 9.0 asset name and published SHA-256 digest per Windows/Linux target. Dated assets have versioned names, unlike the downloader's default `latest` assets. To update, review the provider release and its notices, then update all three fields together. diff --git a/docs/pptx-reporter/changelog.md b/docs/pptx-reporter/changelog.md index 2d300da..1081efa 100644 --- a/docs/pptx-reporter/changelog.md +++ b/docs/pptx-reporter/changelog.md @@ -8,6 +8,8 @@ Windows, Linux, Apple Silicon macOS and Intel macOS. - Make the GUI the primary download and README workflow while retaining the CLI inside each portable package for optional automation. +- Refresh the pinned Windows and Linux FFprobe archives and accept the provider's + current GitHub organisation URL after its repository move. - Publish future release assets to both Gitea and GitHub from one build, with separate named credentials for each service. - Move PPTX Reporter from the Beffroi tools workspace into its own Idle-owned diff --git a/scripts/fetch_ffprobe.py b/scripts/fetch_ffprobe.py index 4a2325c..ebf4eab 100644 --- a/scripts/fetch_ffprobe.py +++ b/scripts/fetch_ffprobe.py @@ -166,7 +166,11 @@ def fetch(target, cache=None, release="latest", expected_sha256=None, *, asset_n if expected_sha256 is not None and digest != expected_sha256.lower(): raise ValueError("Upstream SHA-256 differs from the requested pin") url = asset["browser_download_url"] - if not url.startswith("https://github.com/BtbN/FFmpeg-Builds/releases/download/"): + providers = ( + "https://github.com/BtbN/FFmpeg-Builds/releases/download/", + "https://github.com/FFmpeg-Builds/FFmpeg-Builds/releases/download/", + ) + if not url.startswith(providers): raise ValueError("Unexpected upstream download URL") folder = cache / target / digest binary = folder / ("ffprobe.exe" if "windows" in target else "ffprobe") @@ -193,7 +197,7 @@ def fetch(target, cache=None, release="latest", expected_sha256=None, *, asset_n raise ValueError("Downloaded executable did not identify itself as FFprobe") version = lines[0] receipt = { - "provider": "https://github.com/BtbN/FFmpeg-Builds", + "provider": url.split("/releases/download/", 1)[0], "release": release, "release_id": release_data["id"], "asset_id": asset["id"], "url": url, "archive_sha256": digest, "target": target, "native_version_check": version, @@ -211,7 +215,8 @@ def main(): parser = argparse.ArgumentParser(description=__doc__) parser.add_argument("--target", required=True, choices=ASSETS) parser.add_argument("--cache", type=Path, default=ROOT / "downloads/ffprobe") - parser.add_argument("--release", default="latest", help="BtbN release tag; default latest") + parser.add_argument("--release", default="latest", + help="FFmpeg-Builds release tag; default latest") parser.add_argument("--sha256", help="Optional expected archive digest for reproducibility") args = parser.parse_args() try: diff --git a/tests/test_fetch_ffprobe.py b/tests/test_fetch_ffprobe.py index 14774f5..32b4b18 100644 --- a/tests/test_fetch_ffprobe.py +++ b/tests/test_fetch_ffprobe.py @@ -43,7 +43,7 @@ class FetchTests(unittest.TestCase): name = fetcher.ASSETS[WINDOWS] release = {"id": 1, "assets": [{"id": 2, "name": name, "digest": "sha256:" + digest, "size": len(content), - "browser_download_url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/latest/" + name}]} + "browser_download_url": "https://github.com/FFmpeg-Builds/FFmpeg-Builds/releases/download/latest/" + name}]} def download(url, destination, limit=None): destination.write_bytes(json.dumps(release).encode() if url.startswith(fetcher.API) else content) with tempfile.TemporaryDirectory() as temp, patch.object(fetcher, "download", side_effect=download) as get, \