guix-commits
[Top][All Lists]
Advanced

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

branch master updated: gnu: libavif: Restrict dependency on rav1e to x86


From: guix-commits
Subject: branch master updated: gnu: libavif: Restrict dependency on rav1e to x86_64.
Date: Mon, 08 Nov 2021 12:33:14 -0500

This is an automated email from the git hooks/post-receive script.

lfam pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new b6e1ba6  gnu: libavif: Restrict dependency on rav1e to x86_64.
b6e1ba6 is described below

commit b6e1ba61042c14c9391514472e436e29b2a5167d
Author: Vinicius Monego <monego@posteo.net>
AuthorDate: Mon Nov 8 04:26:04 2021 +0000

    gnu: libavif: Restrict dependency on rav1e to x86_64.
    
    * gnu/packages/image.scm (libavif)[arguments]<#:configure-flags>: Pass
    "-DAVIF_CODEC_RAV1E=ON" only on x84_64.
    <#:phases>: Don't return #t.
    [inputs]: Add rav1e only on x86_64.
    
    Signed-off-by: Leo Famulari <leo@famulari.name>
---
 gnu/packages/image.scm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index fc021dd..ff3963e 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -2182,7 +2182,11 @@ This package can be used to create @code{favicon.ico} 
files for web sites.")
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags '("-DAVIF_CODEC_AOM=ON" "-DAVIF_CODEC_DAV1D=ON"
-                           "-DAVIF_CODEC_RAV1E=ON"
+                           ,@(if (string-prefix? "x86_64"
+                                                 (or (%current-target-system)
+                                                     (%current-system)))
+                                 '("-DAVIF_CODEC_RAV1E=ON")
+                                 '())
                            "-DAVIF_BUILD_TESTS=ON")
        #:phases
        (modify-phases %standard-phases
@@ -2193,12 +2197,16 @@ This package can be used to create @code{favicon.ico} 
files for web sites.")
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
                     (doc (string-append out "/share/doc/libavif-" ,version)))
-               (install-file "../source/README.md" doc)
-               #t))))))
+               (install-file "../source/README.md" doc)))))))
     (inputs
      `(("dav1d" ,dav1d)
        ("libaom" ,libaom)
-       ("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))
+             '())))
     (synopsis "Encode and decode AVIF files")
     (description "Libavif is a C implementation of @acronym{AVIF, the AV1 Image
 File Format}.  It can encode and decode all YUV formats and bit depths 
supported



reply via email to

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