nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: ffmpeg: Update to 4.2. 

* gnu/packages/video.scm (ffmpeg): Update to 4.2.
[inputs]: Add dav1d.
* gnu/packages/video.scm (ffmpeg-3.4)[arguments]: Adjust inheritance.
This commit is contained in:
Rutger Helling 2019-08-06 18:56:54 +02:00
parent b120789193
commit 86445c8e35
No known key found for this signature in database
GPG Key ID: F3A727DB44FCCA36
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gnu/packages/video.scm
View File

@ -792,17 +792,18 @@ operate properly.")
(define-public ffmpeg (define-public ffmpeg
(package (package
(name "ffmpeg") (name "ffmpeg")
(version "4.1.4") (version "4.2")
(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
"1qd7a10gs12ifcp31gramcgqjl77swskjfp7cijibgyg5yl4kw7i")))) "1mgcxm7sqkajx35px05szsmn9mawwm03cfpmk3br7bcp3a1i0gq2"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(inputs (inputs
`(("fontconfig" ,fontconfig) `(("dav1d" ,dav1d)
("fontconfig" ,fontconfig)
("freetype" ,freetype) ("freetype" ,freetype)
("frei0r-plugins" ,frei0r-plugins) ("frei0r-plugins" ,frei0r-plugins)
("gnutls" ,gnutls) ("gnutls" ,gnutls)
@ -901,6 +902,7 @@ operate properly.")
"--enable-libbluray" "--enable-libbluray"
"--enable-libcaca" "--enable-libcaca"
"--enable-libcdio" "--enable-libcdio"
"--enable-libdav1d"
"--enable-libfreetype" "--enable-libfreetype"
"--enable-libmp3lame" "--enable-libmp3lame"
"--enable-libopus" "--enable-libopus"
@ -983,9 +985,10 @@ audio/video codec library.")
(arguments (arguments
(substitute-keyword-arguments (package-arguments ffmpeg) (substitute-keyword-arguments (package-arguments ffmpeg)
((#:configure-flags flags) ((#:configure-flags flags)
`(delete "--enable-libaom" ,flags)))) `(delete "--enable-libdav1d" (delete "--enable-libaom"
(inputs (alist-delete "libaom" ,flags)))))
(package-inputs ffmpeg))))) (inputs (alist-delete "dav1d" (alist-delete "libaom"
(package-inputs ffmpeg))))))
(define-public ffmpeg-for-stepmania (define-public ffmpeg-for-stepmania
(hidden-package (hidden-package