From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id wPm7G8USnWMI1QAAbAwnHQ (envelope-from ) for ; Sat, 17 Dec 2022 01:52:21 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 0MG2G8USnWPP+AAA9RJhRA (envelope-from ) for ; Sat, 17 Dec 2022 01:52:21 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 10DD917D16 for ; Sat, 17 Dec 2022 01:52:21 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6LQq-0005UP-9l; Fri, 16 Dec 2022 19:52:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p6LQo-0005Pr-Od for guix-patches@gnu.org; Fri, 16 Dec 2022 19:52:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6LQo-00082i-G3 for guix-patches@gnu.org; Fri, 16 Dec 2022 19:52:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6LQo-0003Ag-BM for guix-patches@gnu.org; Fri, 16 Dec 2022 19:52:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60131] [PATCH 1/2] gnu: libavif: Rewrite using G-Exps. Resent-From: mirai@makinata.eu Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Dec 2022 00:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60131 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60131@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 60131-submit@debbugs.gnu.org id=B60131.167123830112172 (code B ref 60131); Sat, 17 Dec 2022 00:52:02 +0000 Received: (at 60131) by debbugs.gnu.org; 17 Dec 2022 00:51:41 +0000 Received: from localhost ([127.0.0.1]:52634 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6LQT-0003AG-7C for submit@debbugs.gnu.org; Fri, 16 Dec 2022 19:51:41 -0500 Received: from smtpmciv4.myservices.hosting ([185.26.107.240]:46532) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6LQQ-0003AA-W3 for 60131@debbugs.gnu.org; Fri, 16 Dec 2022 19:51:39 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.172]) by smtpmciv4.myservices.hosting (Postfix) with ESMTP id 47D0420BC0 for <60131@debbugs.gnu.org>; Sat, 17 Dec 2022 01:51:38 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id E686880096; Sat, 17 Dec 2022 01:51:37 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-1.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Xrvdpwd5kXp7; Sat, 17 Dec 2022 01:51:37 +0100 (CET) Received: from guix-nuc.home.arpa (bl12-93-156.dsl.telepac.pt [85.245.93.156]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 1F92F80093; Sat, 17 Dec 2022 01:51:37 +0100 (CET) From: mirai@makinata.eu Date: Sat, 17 Dec 2022 00:51:28 +0000 Message-Id: X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1671238341; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=9a3SCXteyPe4Q/BnUljhNmsQ5+JHNdKoPPaXgsNfpH8=; b=gKrQ9K5THRcm1Hrz94vw7zH1RC1PJL8cWurAxfA5yQh65eKlhs4HE3J1G27F7r9YqH0PQH q0v7NDqy4gBZs1kxQHoDsHi9N4oKRvDOGRVVgc4wiXYjk29YdPT4cpSG24qcJ7FaiM/FtM Y4gPiEqLKKF2Po/vZGxzJbTrtzCdqFo5p7f/Bz1wSvez1ErB2u9fik31eCwZ8tW4pDoFFw LX2Vcv6pXQm/B9q+VCo1mlOgqjm88S6gs70Tchsfzn2qKIx09qbi6axZMIztUOJJTkN2Jd AxdFqV9UeP+chAEmyhv3fN/26hT8Jt+Lc5LSAG1HpJmGFTH2df7WbVAWDp2GQA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1671238341; a=rsa-sha256; cv=none; b=gw5ttczSbuo0ZnL83EZ0/hQUck4WzSaC1zRTa6o43HSzEF8OFqm5EBLJk/A+KanLa3G3j3 FCmL5rBVvnXWguXOKpHgkt6nbixcQMxkj4fNEVVKnkfokFuVgj9Anb138F3rU2JNZCDDhM ozFKCtyHGo8xmSDkqV3P3+P/FxWyljeaRk/LQpcyjkpK8EB03cjz/zwk1ApcKTo8r2z8IC 7as/b+HEmJJU0dxqWqIQ6LtO6tQ3jAQ7UUw+gLiBMU6sEo9kIfbenP6I588ENX8yY8IgEd D7kW+NA5DuIBh19ev//j4fEjFl+ZfmZ3JJzdrTW72vxVhnh53HOC++J86htJmQ== X-Migadu-Spam-Score: -1.47 X-Spam-Score: -1.47 X-Migadu-Queue-Id: 10DD917D16 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none X-TUID: xF5vtLN7qbxP From: Bruno Victal * 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