From patchwork Sat Jun 17 14:40:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vinicius Monego X-Patchwork-Id: 51001 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 8FC1927BBEA; Sat, 17 Jun 2023 15:41:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7D47E27BBE2 for ; Sat, 17 Jun 2023 15:41:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAX6t-0005ko-GX; Sat, 17 Jun 2023 10:41:03 -0400 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 1qAX6s-0005kB-HU for guix-patches@gnu.org; Sat, 17 Jun 2023 10:41:02 -0400 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 1qAX6s-0000SZ-8v for guix-patches@gnu.org; Sat, 17 Jun 2023 10:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAX6r-0007ia-Td for guix-patches@gnu.org; Sat, 17 Jun 2023 10:41:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64132] [PATCH] gnu: libjxl: Update to 0.8.2. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 17 Jun 2023 14:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64132 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64132@debbugs.gnu.org Cc: Vinicius Monego X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168701283229615 (code B ref -1); Sat, 17 Jun 2023 14:41:01 +0000 Received: (at submit) by debbugs.gnu.org; 17 Jun 2023 14:40:32 +0000 Received: from localhost ([127.0.0.1]:52253 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAX6O-0007ha-4O for submit@debbugs.gnu.org; Sat, 17 Jun 2023 10:40:32 -0400 Received: from lists.gnu.org ([209.51.188.17]:40240) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAX6L-0007hR-Qn for submit@debbugs.gnu.org; Sat, 17 Jun 2023 10:40:31 -0400 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 1qAX6L-0005ZS-GK for guix-patches@gnu.org; Sat, 17 Jun 2023 10:40:29 -0400 Received: from mout02.posteo.de ([185.67.36.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qAX6J-0000Kl-A1 for guix-patches@gnu.org; Sat, 17 Jun 2023 10:40:29 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 24970240101 for ; Sat, 17 Jun 2023 16:40:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1687012824; bh=ObHzS/IyMt/gxUNRDvblEw8PB4VDOsrd03IWs0LwLI0=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version: Content-Transfer-Encoding:From; b=rwmiQLBhN+iulzt7ztM6Tkqzn87nZPPR7sJcKT/IcJy8nqwgSgsIn3mXz7JbtorIT aKJNLam90Dqcjx6wBRHwyHyNqrwONSVTj8X7/Tq+j/yNSp9wRUaqEicIS0KcWvF2I9 LTkk+7b0Cs3m+BrLTS/vMFnYjUN/jhHmckJCno6xfjulQEW/7UMxATgfTWdIYyzIx2 1DjiibVBBY82SVnCvMBpkqpHKmerUHsJx5VCxlGTqC2GoLR+ne5oAZhEE2Zi6D6hkL w1WeG92j/c/MVQHUTAtyMkAPGCo8W4fhc0Jo2p3nx8ZtErsJCPRQ7DjO2f3ttjLBlo CbL7YdWkojUoA== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4QjzGF2yJDz9rxK; Sat, 17 Jun 2023 16:40:21 +0200 (CEST) From: Vinicius Monego Date: Sat, 17 Jun 2023 14:40:10 +0000 Message-Id: <20230617144010.1688026-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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/image.scm (libjxl): Update to 0.8.2. [source]: Remove lcms, libpng and zlib bundles in the snippet. [arguments]<#:configure-flags>: Add "-DJPEGXL_FORCE_SYSTEM_LCMS2=true" and "-DJPEGXL_BUNDLE_LIBPNG=false". [inputs]: Add lcms, zlib. --- gnu/packages/image.scm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 2005243cf7..50af2001ad 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -28,7 +28,7 @@ ;;; Copyright © 2020, 2023 Maxim Cournoyer ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2020 Zhu Zihao -;;; Copyright © 2020, 2021, 2022 Vinicius Monego +;;; Copyright © 2020, 2021, 2022, 2023 Vinicius Monego ;;; Copyright © 2021 Sharlatan Hellseher ;;; Copyright © 2021 Nicolò Balzarotti ;;; Copyright © 2021 Alexandr Vityazev @@ -2430,7 +2430,7 @@ (define-public libheif (define-public libjxl (package (name "libjxl") - (version "0.7.0") + (version "0.8.2") (source (origin (method git-fetch) @@ -2440,23 +2440,24 @@ (define-public libjxl (recursive? #t))) (file-name (git-file-name name version)) (sha256 - (base32 "1ysh7kd30wwnq0gc1l8c0j9b6wzd15k0kkvfaacjvjqcz11lnc7l")) + (base32 "1alhnnxkwy5bdwahfsdh87xk9rg1s2fm3r9y2w11ka8p3n1ccwr3")) (modules '((guix build utils))) (snippet - ;; Delete the bundles that will not be used. libjxl bundles LCMS, - ;; which is in Guix, but a newer version is required. + ;; Delete the bundles that will not be used. '(begin (for-each (lambda (directory) (delete-file-recursively (string-append "third_party/" directory))) - '("brotli" "googletest" "highway")))))) + '("brotli" "googletest" "highway" "lcms" "libpng" + "zlib")))))) (build-system cmake-build-system) (arguments `(#:configure-flags (list "-DJPEGXL_FORCE_SYSTEM_GTEST=true" "-DJPEGXL_FORCE_SYSTEM_BROTLI=true" - ;; "-DJPEGXL_FORCE_SYSTEM_LCMS2=true" ; requires lcms@2.13 - "-DJPEGXL_FORCE_SYSTEM_HWY=true"))) + "-DJPEGXL_FORCE_SYSTEM_LCMS2=true" + "-DJPEGXL_FORCE_SYSTEM_HWY=true" + "-DJPEGXL_BUNDLE_LIBPNG=false"))) (native-inputs (list asciidoc doxygen googletest pkg-config python)) (inputs @@ -2464,12 +2465,13 @@ (define-public libjxl gflags giflib imath - ;; lcms ; requires lcms@2.13 + lcms libavif libjpeg-turbo libpng libwebp - openexr)) + openexr + zlib)) ;; These are in Requires.private of libjxl.pc. (propagated-inputs (list brotli google-highway))