diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-24 23:47:08 -0400 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-04-14 15:11:37 -0400 |
commit | 7faa4c2aec3d7e9ece09bb27ae7ccc5a611c5d04 (patch) | |
tree | 2abc4618eaa8f5fbc48418713175bdacf55b1c51 /gnu/packages/gnuzilla.scm | |
parent | f3b5201c86ea1b71ef4420c8ab4be7aedf1de6a5 (diff) | |
download | guix-7faa4c2aec3d7e9ece09bb27ae7ccc5a611c5d04.tar.gz |
gnu: ffmpeg: Update to 6.0.
* gnu/packages/video.scm (ffmpeg): Update to 6.0. (ffmpeg-5): New variable. * gnu/packages/gnuzilla.scm (icecat-minimal) [inputs]: Replace ffmpeg with ffmpeg-5. * gnu/packages/gnuzilla.scm (icedove-minimal): Likewise.
Diffstat (limited to 'gnu/packages/gnuzilla.scm')
-rw-r--r-- | gnu/packages/gnuzilla.scm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 932c0f9951..ace6662d48 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -704,9 +704,11 @@ variable defined below. It requires guile-json to be installed." libxcomposite libxt libffi - ffmpeg + ;; Support for FFmpeg 6 was only added in version 112 (see: + ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374). + ffmpeg-5 libvpx - icu4c-71 ; TODO: Change to 'icu4c' when its version is >= 71. + icu4c-71 ;TODO: Change to 'icu4c' when its version is >= 71. pixman pulseaudio mesa @@ -962,7 +964,7 @@ variable defined below. It requires guile-json to be installed." ;; complain that it's not able to change Cargo.lock. ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1726373 (substitute* "build/RunCbindgen.py" - (("\"--frozen\",") "")))) + (("\"--frozen\",") "")))) (delete 'bootstrap) (replace 'configure ;; configure does not work followed by both "SHELL=..." and @@ -1494,7 +1496,8 @@ ca495991b7852b855")) cairo cups dbus-glib - ffmpeg + ;; Support for FFmpeg 6 was only added in version 112 (see: + ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374). freetype gdk-pixbuf glib |