From 86445c8e35724d0bae3f2be9fe71376e844735fe Mon Sep 17 00:00:00 2001
From: Rutger Helling <rhelling@mykolab.com>
Date: Tue, 6 Aug 2019 18:56:54 +0200
Subject: 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.
---
 gnu/packages/video.scm | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'gnu')

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 04715a5ce1..1c3177ef2a 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -792,17 +792,18 @@ operate properly.")
 (define-public ffmpeg
   (package
     (name "ffmpeg")
-    (version "4.1.4")
+    (version "4.2")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
                                  version ".tar.xz"))
              (sha256
               (base32
-               "1qd7a10gs12ifcp31gramcgqjl77swskjfp7cijibgyg5yl4kw7i"))))
+               "1mgcxm7sqkajx35px05szsmn9mawwm03cfpmk3br7bcp3a1i0gq2"))))
     (build-system gnu-build-system)
     (inputs
-     `(("fontconfig" ,fontconfig)
+     `(("dav1d" ,dav1d)
+       ("fontconfig" ,fontconfig)
        ("freetype" ,freetype)
        ("frei0r-plugins" ,frei0r-plugins)
        ("gnutls" ,gnutls)
@@ -901,6 +902,7 @@ operate properly.")
          "--enable-libbluray"
          "--enable-libcaca"
          "--enable-libcdio"
+         "--enable-libdav1d"
          "--enable-libfreetype"
          "--enable-libmp3lame"
          "--enable-libopus"
@@ -983,9 +985,10 @@ audio/video codec library.")
     (arguments
      (substitute-keyword-arguments (package-arguments ffmpeg)
        ((#:configure-flags flags)
-        `(delete "--enable-libaom" ,flags))))
-    (inputs (alist-delete "libaom"
-                          (package-inputs ffmpeg)))))
+        `(delete "--enable-libdav1d" (delete "--enable-libaom"
+                 ,flags)))))
+    (inputs (alist-delete "dav1d" (alist-delete "libaom"
+                          (package-inputs ffmpeg))))))
 
 (define-public ffmpeg-for-stepmania
   (hidden-package
-- 
cgit v1.2.3

nput type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=820429517f9cc8333704a839b4346ac4b02468c4'>root</a>/<a href='/guix/log/gnu?id=820429517f9cc8333704a839b4346ac4b02468c4'>gnu</a>/<a href='/guix/log/gnu/packages?id=820429517f9cc8333704a839b4346ac4b02468c4'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=820429517f9cc8333704a839b4346ac4b02468c4'>patches</a>/<a href='/guix/log/gnu/packages/patches/glibc-locales.patch?id=820429517f9cc8333704a839b4346ac4b02468c4'>glibc-locales.patch</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/patches/glibc-locales.patch?id=820429517f9cc8333704a839b4346ac4b02468c4&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-05-30 15:21:27 +0200'>2018-05-30</span></td><td><a href='/guix/commit/gnu/packages/patches/glibc-locales.patch?id=9ab0627eee328b03f8014e409d9682c8e295afe2'>gnu: glibc-locales: Adjust patch that no longer applied.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>