* [bug#51677] [PATCH] gnu: libavif: Restrict dependency on rav1e to x86_64.
@ 2021-11-08 4:26 Vinicius Monego
2021-11-08 17:33 ` Leo Famulari
0 siblings, 1 reply; 2+ messages in thread
From: Vinicius Monego @ 2021-11-08 4:26 UTC (permalink / raw)
To: 51677; +Cc: Vinicius Monego
* 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.
---
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 fc021dd2db..ff3963e6f5 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
base-commit: b96ae47bb08f315be8c22f0ee4248dc36c0d6d29
--
2.30.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [bug#51677] [PATCH] gnu: libavif: Restrict dependency on rav1e to x86_64.
2021-11-08 4:26 [bug#51677] [PATCH] gnu: libavif: Restrict dependency on rav1e to x86_64 Vinicius Monego
@ 2021-11-08 17:33 ` Leo Famulari
0 siblings, 0 replies; 2+ messages in thread
From: Leo Famulari @ 2021-11-08 17:33 UTC (permalink / raw)
To: Vinicius Monego; +Cc: 51677
On Mon, Nov 08, 2021 at 04:26:04AM +0000, Vinicius Monego wrote:
> * 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.
Thanks! Pushed as b6e1ba61042c14c9391514472e436e29b2a5167d
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-08 17:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-08 4:26 [bug#51677] [PATCH] gnu: libavif: Restrict dependency on rav1e to x86_64 Vinicius Monego
2021-11-08 17:33 ` Leo Famulari
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).