From e68dd68ffe95ae07a30a61ddc2a0e697693ba881 Mon Sep 17 00:00:00 2001
From: Leo Famulari <leo@famulari.name>
Date: Wed, 17 Jun 2020 13:46:21 -0400
Subject: gnu: FFmpeg: Update to 4.3.

* gnu/packages/video.scm (ffmpeg): Update to 4.3.
[source]: Remove obsolete patch.
[inputs]: Add rav1e.
[arguments]: Pass "--enable-librav1e" to #:configure-flags.
(ffmpeg-3.4): Don't build with librav1e.
[inputs]: Remove rav1e.
[arguments]: Remove "--enable-librav1e" from #:configure-flags.
* gnu/packages/patches/ffmpeg-prefer-dav1d.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Remove it.
---
 gnu/packages/video.scm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'gnu/packages/video.scm')

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 6e8bc251e8..e3d99feccd 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -937,16 +937,14 @@ operate properly.")
 (define-public ffmpeg
   (package
     (name "ffmpeg")
-    (version "4.2.3")
+    (version "4.3")
     (source (origin
              (method url-fetch)
              (uri (string-append "https://ffmpeg.org/releases/ffmpeg-"
                                  version ".tar.xz"))
-             ;; See <https://issues.guix.gnu.org/issue/39719>
-             (patches (search-patches "ffmpeg-prefer-dav1d.patch"))
              (sha256
               (base32
-               "0cddkb5sma9dzy8i59sfls19rhjlq40zn9mh3x666dqkxl5ckxlx"))))
+               "0pbrsv5v96yd8qzb9bk4kw7qk4xqpi03rsd5xfbwnjzlhijd02hx"))))
     (build-system gnu-build-system)
     (inputs
      `(("dav1d" ,dav1d)
@@ -973,6 +971,7 @@ operate properly.")
        ("mesa" ,mesa)
        ("openal" ,openal)
        ("pulseaudio" ,pulseaudio)
+       ("rav1e" ,rav1e)
        ("sdl" ,sdl2)
        ("soxr" ,soxr)
        ("speex" ,speex)
@@ -1054,6 +1053,7 @@ operate properly.")
          "--enable-libmp3lame"
          "--enable-libopus"
          "--enable-libpulse"
+         "--enable-librav1e"
          "--enable-libsoxr"
          "--enable-libspeex"
          "--enable-libtheora"
@@ -1132,10 +1132,10 @@ audio/video codec library.")
     (arguments
      (substitute-keyword-arguments (package-arguments ffmpeg)
        ((#:configure-flags flags)
-        `(delete "--enable-libdav1d" (delete "--enable-libaom"
-                 ,flags)))))
-    (inputs (alist-delete "dav1d" (alist-delete "libaom"
-                          (package-inputs ffmpeg))))))
+        `(delete "--enable-libdav1d" (delete "--enable-libaom" (delete "--enable-librav1e"
+                  ,flags))))))
+    (inputs (alist-delete "dav1d" (alist-delete "libaom" (alist-delete "rav1e"
+                           (package-inputs ffmpeg)))))))
 
 (define-public ffmpeg-for-stepmania
   (hidden-package
-- 
cgit v1.2.3