Repository navigation
Conversation
lusoris
enabled auto-merge (squash)
May 29, 2026 10:07
lusoris
force-pushed
the
chore/changelog-d-hygiene-20260529
branch
from
May 29, 2026 11:22
2946401 to
553ecf6
Compare
lusoris
changed the title
lusoris
disabled auto-merge
May 29, 2026 11:50
lusoris
marked this pull request as draft
May 29, 2026 11:50
…ost-ADR-0726 The Vulkan backend drop (ADR-0726, PR #47) removed 0004 and 0006 from series.txt but left the .patch files on disk and left stale Vulkan context lines in patches 0005, 0008, 0010-0014 that referenced structures introduced only by the deleted patches. These stale context lines caused git am to fail on every patch from 0005 onward. Changes: - Delete orphaned 0004-libvmaf-wire-vulkan-backend-selector.patch and 0006-libvmaf-add-libvmaf-vulkan-filter.patch - Regenerate all 13 remaining patches from a clean n8.1.1 baseline (no-vulkan branch) to strip Vulkan-dependent context lines - Verify: full series replay (0001-0003, 0005, 0007-0015) applies cleanly against pristine n8.1.1 with zero conflicts - README: remove 0004/0006 entries, update patch count 15→13, update verification note, drop -Denable_vulkan from degradation note - docs/rebase-notes.md: add cleanup entry - changelog.d: add changed fragment No rebase impact: ffmpeg-patches/ only, no libvmaf C sources touched. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
lusoris
force-pushed
the
chore/changelog-d-hygiene-20260529
branch
from
May 29, 2026 12:08
553ecf6 to
19575f3
Compare
lusoris
marked this pull request as ready for review
May 31, 2026 13:48
Contributor
Author
|
Superseded by master merge marathon 2026-05-31. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
changelog.d hygiene (original scope)
awkdelimited the[Unreleased]block with^## [^[], which terminated on any## Headingembedded inside a fragment (56 fragments have such headers). Changed to^## \[so only versioned release headers end the block.--checknow passes deterministically.changelog.d/perf/(15 files) andchangelog.d/performance/(5 files) consolidated intochangelog.d/changed/. Only the 6 Keep-a-Changelog sections now exist.ort-run-stack-arrays.md(kept cleaner f3b variant),vmaf-tune-predictor-directory-corpus.mdfromfixed/(kept richerchanged/entry),fr-regressor-v3-namespace.mdinchanged/renamed to disambiguate from the same-namedadded/fragment.CHANGELOG.mdregenerated via--write.ffmpeg-patches Vulkan-drop cleanup (ADR-0726 follow-up)
0004-libvmaf-wire-vulkan-backend-selector.patchand0006-libvmaf-add-libvmaf-vulkan-filter.patch(removed from series.txt by PR feat(core)!: drop Vulkan backend (BREAKING, ADR-0726) #47 but left on disk)git amto fail on the entire seriesTest plan
bash scripts/release/concat-changelog-fragments.sh --checkpasseschangelog.d/perf/andchangelog.d/performance/directories no longer existbash ffmpeg-patches/test/build-and-run.shcompletes without patch apply errors (series replay)ls ffmpeg-patches/0004-*.patch ffmpeg-patches/0006-*.patchreturns no such filesReproducer
# Series replay (requires libvmaf installed) KEEP_BUILD=1 bash ffmpeg-patches/test/build-and-run.shno rebase impact: changelog.d/ + ffmpeg-patches/ only, no libvmaf C sources touched.
🤖 Generated with Claude Code