From patchwork Mon Nov 8 04:26:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 34315 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 4506D27BBE1; Mon, 8 Nov 2021 04:27:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BED8F27BBE3 for ; Mon, 8 Nov 2021 04:27:19 +0000 (GMT) Received: from localhost ([::1]:44334 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mjwFa-0003vZ-Tc for patchwork@mira.cbaines.net; Sun, 07 Nov 2021 23:27:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54050) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjwFL-0003tv-2O for guix-patches@gnu.org; Sun, 07 Nov 2021 23:27:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44037) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mjwFK-0003ZX-QN for guix-patches@gnu.org; Sun, 07 Nov 2021 23:27:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mjwFK-00009z-ME for guix-patches@gnu.org; Sun, 07 Nov 2021 23:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51677] [PATCH] gnu: libavif: Restrict dependency on rav1e to x86_64. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Nov 2021 04:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 51677 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51677@debbugs.gnu.org Cc: Vinicius Monego X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1636345590574 (code B ref -1); Mon, 08 Nov 2021 04:27:02 +0000 Received: (at submit) by debbugs.gnu.org; 8 Nov 2021 04:26:30 +0000 Received: from localhost ([127.0.0.1]:55583 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mjwEo-00009B-1v for submit@debbugs.gnu.org; Sun, 07 Nov 2021 23:26:30 -0500 Received: from lists.gnu.org ([209.51.188.17]:44750) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mjwEj-000091-Ky for submit@debbugs.gnu.org; Sun, 07 Nov 2021 23:26:29 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjwEj-00034G-AQ for guix-patches@gnu.org; Sun, 07 Nov 2021 23:26:25 -0500 Received: from mout02.posteo.de ([185.67.36.66]:51811) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjwEg-0002r3-Ns for guix-patches@gnu.org; Sun, 07 Nov 2021 23:26:25 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 42AA5240101 for ; Mon, 8 Nov 2021 05:26:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1636345580; bh=T7jTbUBdAeVIy4vy32NpudG7JQMMETJTu6xaN1r5NAc=; h=From:To:Cc:Subject:Date:From; b=e44SiybUrld6MYbteF7pltzaJu/mgxB16hTlz2/30FkUKBRpQ0oJxjNGdZbh8BPnj kZUujqrTbhpUKJ12RVlnVSHJBLse7D2XCclvANz9PMjX0aH0C7XttgEveZ7Ya0W9PU h1xb5KedAJ5GHqJUBC1Kn8tzENziv2Yqa8+scDNFVAJe40tMfUumsfq/vvscAqlkwi 1RWdgc2omQMtN10VJ85w5y4B1DimYpXz9zI2XmxPoYCJ6G+HHiSALtQURg7GBwvW66 bYvmBGKza2NdE/6vf6bTYZEOgKEjXWQprpXFdSllMRgQ0o93hQMy2mdPTjjupJ+eyC gYgRY2+tTBRww== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HndNC0GMLz9rxD; Mon, 8 Nov 2021 05:26:18 +0100 (CET) From: Vinicius Monego Date: Mon, 8 Nov 2021 04:26:04 +0000 Message-Id: <20211108042604.101487-1-monego@posteo.net> MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.66; envelope-from=monego@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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(-) base-commit: b96ae47bb08f315be8c22f0ee4248dc36c0d6d29 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