[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/51: gnu: ffmpeg: Update to 6.0.
From: |
guix-commits |
Subject: |
13/51: gnu: ffmpeg: Update to 6.0. |
Date: |
Tue, 28 Mar 2023 20:20:20 -0400 (EDT) |
apteryx pushed a commit to branch staging
in repository guix.
commit bf23e8518fe62a2c3f2fe77444cce98f0d4e6bbd
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Mar 24 23:47:08 2023 -0400
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.
---
gnu/packages/gnuzilla.scm | 11 +++++++----
gnu/packages/video.scm | 22 +++++++++++++++++-----
2 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 253b8c285c..475c2b5a38 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -706,9 +706,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
@@ -964,7 +966,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
@@ -1492,7 +1494,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
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 064ebb07d3..f0f0683a1a 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -1579,14 +1579,14 @@ operate properly.")
(define-public ffmpeg
(package
(name "ffmpeg")
- (version "5.1.2")
+ (version "6.0")
(source (origin
(method url-fetch)
(uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
version ".tar.xz"))
(sha256
(base32
- "1p7kxr0f9f9d0pyyxq9ciaj9ch2drmcw5p9jk22j111ccrnp17k1"))))
+ "10kh2f4y4isfqj4xpcqqnzk611jh89ywcjyjnq9c2jcv5p18ggjp"))))
(build-system gnu-build-system)
(inputs
(append
@@ -1728,8 +1728,8 @@ operate properly.")
"--disable-static"
#$@(if (target-riscv64?)
- '("--extra-cflags=-fPIC")
- '())
+ '("--extra-cflags=-fPIC")
+ '())
;; Runtime cpu detection is not implemented on
;; MIPS, so we disable some features.
@@ -1770,9 +1770,21 @@ convert and stream audio and video. It includes the
libavcodec
audio/video codec library.")
(license license:gpl2+)))
-(define-public ffmpeg-4
+(define-public ffmpeg-5
(package
(inherit ffmpeg)
+ (version "5.1.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
+ version ".tar.xz"))
+ (sha256
+ (base32
+ "1p7kxr0f9f9d0pyyxq9ciaj9ch2drmcw5p9jk22j111ccrnp17k1"))))))
+
+(define-public ffmpeg-4
+ (package
+ (inherit ffmpeg-5)
(version "4.4.2")
(source (origin
(method url-fetch)
- 05/51: gnu: gst-plugins-good: Update to 1.22.1., (continued)
- 05/51: gnu: gst-plugins-good: Update to 1.22.1., guix-commits, 2023/03/28
- 07/51: gnu: gst-plugins-ugly: Update to 1.22.1., guix-commits, 2023/03/28
- 10/51: gnu: python-gst: Update to 1.22.1., guix-commits, 2023/03/28
- 01/51: NEWS: Mention new rpm format., guix-commits, 2023/03/28
- 04/51: gnu: gst-plugins-base: Update to 1.22.1., guix-commits, 2023/03/28
- 02/51: gnu: gstreamer: Update to 1.22.1., guix-commits, 2023/03/28
- 06/51: gnu: gst-plugins-bad: Update to 1.22.1 and reinstate a few tests., guix-commits, 2023/03/28
- 09/51: gnu: gst-editing-services: Update to 1.22.1., guix-commits, 2023/03/28
- 22/51: gnu: qtsvg-5: Update to 5.15.8., guix-commits, 2023/03/28
- 17/51: gnu: jami-docs: Update to 0.0.0-1.ff466eb., guix-commits, 2023/03/28
- 13/51: gnu: ffmpeg: Update to 6.0.,
guix-commits <=
- 25/51: gnu: qtxmlpatterns: Update to 5.15.8., guix-commits, 2023/03/28
- 31/51: gnu: qtwayland-5: Update to 5.15.8., guix-commits, 2023/03/28
- 28/51: gnu: qtwebsockets-5: Update to 5.15.8., guix-commits, 2023/03/28
- 35/51: gnu: qtwebglplugin: Update to 5.15.8., guix-commits, 2023/03/28
- 38/51: gnu: qttools-5: Update to 5.15.8., guix-commits, 2023/03/28
- 40/51: gnu: qtquickcontrols-5: Update to 5.15.8., guix-commits, 2023/03/28
- 48/51: gnu: qtnetworkauth-5: Update to 5.15.8., guix-commits, 2023/03/28
- 50/51: gnu: qtspeech: Update to 5.15.8., guix-commits, 2023/03/28
- 03/51: gnu: gstreamer-docs: Update to 1.22.1., guix-commits, 2023/03/28
- 11/51: gnu: webkitgtk: Update to 2.40.0., guix-commits, 2023/03/28