unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: mirai@makinata.eu
To: 60131@debbugs.gnu.org
Cc: Bruno Victal <mirai@makinata.eu>
Subject: [bug#60131] [PATCH 1/2] gnu: libavif: Rewrite using G-Exps.
Date: Sat, 17 Dec 2022 00:51:28 +0000	[thread overview]
Message-ID: <e04e51d02ca7965948c64bba048fc3d00dc150e0.1671237624.git.mirai@makinata.eu> (raw)
In-Reply-To: <cover.1671237624.git.mirai@makinata.eu>

From: Bruno Victal <mirai@makinata.eu>

* gnu/packages/image.scm (libavif)[arguments]: Rewrite using
G-Expressions.
---
 gnu/packages/image.scm | 50 +++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index bc1f25627b..80872b1466 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -2168,32 +2168,32 @@ (define-public libavif
                 "1yxmgjlxm1srm98zyj79bj8r8vmg67daqnq0ggcvxknq54plkznk"))))
     (build-system cmake-build-system)
     (arguments
-     `(#:configure-flags '("-DAVIF_CODEC_AOM=ON" "-DAVIF_CODEC_DAV1D=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
-         (replace 'check
-           (lambda _
-             (invoke "./aviftest" "../source/tests/data")))
-         (add-after 'install 'install-readme
-           (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)))))))
+     (list
+      #:configure-flags
+      #~(list "-DAVIF_CODEC_AOM=ON" "-DAVIF_CODEC_DAV1D=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
+          (replace 'check
+            (lambda _
+              (invoke "./aviftest" "../source/tests/data")))
+          (add-after 'install 'install-readme
+            (lambda _
+              (let ((doc (string-append #$output "/share/doc/libavif-" #$version)))
+                (install-file "../source/README.md" doc)))))))
     (inputs
-     `(("dav1d" ,dav1d)
-       ("libaom" ,libaom)
-       ;; 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))
-             '())))
+     (append
+      ;; 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)))
+          (list rav1e) '())
+      (list dav1d libaom)))
     (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
-- 
2.38.1





  reply	other threads:[~2022-12-17  0:52 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-12-17  0:42 [bug#60131] [PATCH 0/2] Build libavif tools mirai
2022-12-17  0:51 ` mirai [this message]
2022-12-17  0:51 ` [bug#60131] [PATCH 2/2] gnu: libavif: Add tools output mirai
2023-01-03  2:13 ` [bug#60131] (no subject) mirai
2023-01-03 17:54 ` bug#60131: [PATCH 0/2] Build libavif tools Leo Famulari

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=e04e51d02ca7965948c64bba048fc3d00dc150e0.1671237624.git.mirai@makinata.eu \
    --to=mirai@makinata.eu \
    --cc=60131@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).