guix_mirror_bot pushed a commit to branch world-rebuild in repository guix.
commit 2180ce5dc1d791e395aa10f652f1775e2c25975f Author: Nguyễn Gia Phong <[email protected]> AuthorDate: Thu Jul 23 11:51:09 2026 +0900 gnu: ffmpeg-6: Ungraft. * gnu/packages/video.scm (ffmpeg-6): Update to 6.1.6. [replacement]: Unset. (ffmpeg-6.1.6): Delete variable. Merges: https://codeberg.org/guix/guix/pulls/10122 References: ff0ac71c7eb9 ("gnu: ffmpeg-6: Graft to 6.1.6.") --- gnu/packages/video.scm | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 81dc9cac9f..6225378d2c 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -1988,15 +1988,14 @@ audio/video codec library.") (define-public ffmpeg-6 (package (inherit ffmpeg) - (version "6.1.5") - (replacement ffmpeg-6.1.6) + (version "6.1.6") (source (origin (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"; version ".tar.xz")) (sha256 - (base32 "04ll214qrdbjy7j945l9ca0v0jwxva8vzndibdha6ljl3zdykyq5")) + (base32 "02ip0zsghyz09p0jv8ayqxrnkb3awirarh4jbppbxlwd09jb3z6l")) (patches (search-patches "ffmpeg-add-av_stream_get_first_dts-for-chromium.patch")))) (arguments @@ -2012,20 +2011,6 @@ audio/video codec library.") " -Wno-error=int-conversion"))))))) (package-arguments ffmpeg))))) -(define-public ffmpeg-6.1.6 - (package - (inherit ffmpeg-6) - (version "6.1.6") - (source - (origin - (method url-fetch) - (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"; version - ".tar.xz")) - (sha256 - (base32 "02ip0zsghyz09p0jv8ayqxrnkb3awirarh4jbppbxlwd09jb3z6l")) - (patches (search-patches - "ffmpeg-add-av_stream_get_first_dts-for-chromium.patch")))))) - (define-public ffmpeg-5 (package (inherit ffmpeg-6)
