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.
This commit is contained in:
parent
d624cd4c84
commit
bf23e8518f
|
@ -706,9 +706,11 @@ (define-public icecat-minimal
|
|||
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 @@ (define (runpaths-of-input label)
|
|||
;; 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 @@ (define-public icedove-minimal
|
|||
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
|
||||
|
|
|
@ -1579,14 +1579,14 @@ (define-public libva-utils
|
|||
(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 @@ (define-public ffmpeg
|
|||
"--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 @@ (define-public ffmpeg
|
|||
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)
|
||||
|
|
Loading…
Reference in a new issue