guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/07: gnu: ffmpeg: Enable rav1e on x86_64 only.


From: guix-commits
Subject: 01/07: gnu: ffmpeg: Enable rav1e on x86_64 only.
Date: Mon, 22 Jun 2020 11:17:31 -0400 (EDT)

mbakke pushed a commit to branch master
in repository guix.

commit 402d03751c03e509b9aee1f26eed40cae81eebba
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Mon Jun 22 16:57:13 2020 +0200

    gnu: ffmpeg: Enable rav1e on x86_64 only.
    
    Fixes <https://bugs.gnu.org/41993>.
    Reported by Kurt I <gitlabcanada@runbox.com>.
    
    * gnu/packages/video.scm (ffmpeg)[inputs]: Conditionally add RAV1E.
    [arguments]: Adjust #:configure-flags accordingly.
---
 gnu/packages/video.scm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 4e52147..eabd657 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -971,7 +971,12 @@ operate properly.")
        ("mesa" ,mesa)
        ("openal" ,openal)
        ("pulseaudio" ,pulseaudio)
-       ("rav1e" ,rav1e)
+       ;; XXX: rav1e depends on rust, which currently only works on x86_64.
+       ;; See also the related configure flag when changing this.
+       ,@(if (string-prefix? "x86_64" (or (%current-target-system)
+                                          (%current-system)))
+             `(("rav1e" ,rav1e))
+             '())
        ("sdl" ,sdl2)
        ("soxr" ,soxr)
        ("speex" ,speex)
@@ -1053,7 +1058,10 @@ operate properly.")
          "--enable-libmp3lame"
          "--enable-libopus"
          "--enable-libpulse"
-         "--enable-librav1e"
+         ,@(if (string-prefix? "x86_64" (or (%current-target-system)
+                                            (%current-system)))
+               '("--enable-librav1e")
+               '())
          "--enable-libsoxr"
          "--enable-libspeex"
          "--enable-libtheora"



reply via email to

[Prev in Thread] Current Thread [Next in Thread]