me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Maxim Cournoyer 2023-03-24 23:47:08 -04:00
parent f3b5201c86
commit 7faa4c2aec
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/packages/gnuzilla.scm
View File

@ -704,9 +704,11 @@ variable defined below. It requires guile-json to be installed."
libxcomposite libxcomposite
libxt libxt
libffi 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 libvpx
icu4c-71 ; TODO: Change to 'icu4c' when its version is >= 71. icu4c-71 ;TODO: Change to 'icu4c' when its version is >= 71.
pixman pixman
pulseaudio pulseaudio
mesa 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. ;; complain that it's not able to change Cargo.lock.
;; https://bugzilla.mozilla.org/show_bug.cgi?id=1726373 ;; https://bugzilla.mozilla.org/show_bug.cgi?id=1726373
(substitute* "build/RunCbindgen.py" (substitute* "build/RunCbindgen.py"
(("\"--frozen\",") "")))) (("\"--frozen\",") ""))))
(delete 'bootstrap) (delete 'bootstrap)
(replace 'configure (replace 'configure
;; configure does not work followed by both "SHELL=..." and ;; configure does not work followed by both "SHELL=..." and
@ -1494,7 +1496,8 @@ ca495991b7852b855"))
cairo cairo
cups cups
dbus-glib dbus-glib
ffmpeg ;; Support for FFmpeg 6 was only added in version 112 (see:
;; https://bugzilla.mozilla.org/show_bug.cgi?id=1819374).
freetype freetype
gdk-pixbuf gdk-pixbuf
glib glib

22
gnu/packages/video.scm
View File

@ -1579,14 +1579,14 @@ operate properly.")
(define-public ffmpeg (define-public ffmpeg
(package (package
(name "ffmpeg") (name "ffmpeg")
(version "5.1.2") (version "6.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://ffmpeg.org/releases/ffmpeg-" (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1p7kxr0f9f9d0pyyxq9ciaj9ch2drmcw5p9jk22j111ccrnp17k1")))) "10kh2f4y4isfqj4xpcqqnzk611jh89ywcjyjnq9c2jcv5p18ggjp"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
(append (append
@ -1728,8 +1728,8 @@ operate properly.")
"--disable-static" "--disable-static"
#$@(if (target-riscv64?) #$@(if (target-riscv64?)
'("--extra-cflags=-fPIC") '("--extra-cflags=-fPIC")
'()) '())
;; Runtime cpu detection is not implemented on ;; Runtime cpu detection is not implemented on
;; MIPS, so we disable some features. ;; MIPS, so we disable some features.
@ -1770,9 +1770,21 @@ convert and stream audio and video. It includes the libavcodec
audio/video codec library.") audio/video codec library.")
(license license:gpl2+))) (license license:gpl2+)))
(define-public ffmpeg-4 (define-public ffmpeg-5
(package (package
(inherit ffmpeg) (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") (version "4.4.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)