From unknown Sun Jun 22 08:05:16 2025 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: -1.3 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * 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)) -- 2.34.1 From unknown Sun Jun 22 08:05:16 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#64132] [PATCH] gnu: libjxl: Update to 0.8.2. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Jun 2023 10:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64132 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Vinicius Monego Cc: 64132-done@debbugs.gnu.org, 64132@debbugs.gnu.org X-Debbugs-Original-Cc: 64132-done@debbugs.gnu.org, guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.168717017620229 (code B ref -1); Mon, 19 Jun 2023 10:23:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Jun 2023 10:22:56 +0000 Received: from localhost ([127.0.0.1]:55574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBC2B-0005GD-O8 for submit@debbugs.gnu.org; Mon, 19 Jun 2023 06:22:56 -0400 Received: from lists.gnu.org ([209.51.188.17]:59072) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBC2A-0005G5-Br for submit@debbugs.gnu.org; Mon, 19 Jun 2023 06:22:54 -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 1qBC2A-0002Cv-5r for guix-patches@gnu.org; Mon, 19 Jun 2023 06:22:54 -0400 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qBC27-0007X0-Ht for guix-patches@gnu.org; Mon, 19 Jun 2023 06:22:53 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id F3E2A27BBE2; Mon, 19 Jun 2023 11:22:48 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 969ac453; Mon, 19 Jun 2023 10:22:48 +0000 (UTC) References: <20230617144010.1688026-1-monego@posteo.net> User-agent: mu4e 1.10.2; emacs 28.2 From: Christopher Baines Date: Mon, 19 Jun 2023 11:22:23 +0100 In-reply-to: <20230617144010.1688026-1-monego@posteo.net> Message-ID: <87mt0vkayv.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain Vinicius Monego writes: > * 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(-) Thanks for the patch, I've pushed this to master as f2be1ea06af6a0bf02c23e5bdf90b1e09c5d39f0. Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmSQLHhfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xdu0A/+KiW+B0DaNnXwBsV0jRmu0r0tE0HzPi3F dOxD+NR8QlmujptfW8EDT8UtD3tnajlyRKpWwzQf8Ibiax3DlSbOrZYQ8e07mdim rdBF5sgPBFk+Li2fbCHMG3Nk90+sltm4wbxC8D8Y7klHTDc756ABtYtCjf3hoSiD W3YHRAP/f0rst9ht834LV4zrYvEFOihWUJke5+/YESsEzc8WJjE8RXUWKCtICvRk lOBV3KMiBYtZAYY8VXY22zZ4uAB0uJGGDoI0EhS+A9Z0gN/dAYOWB61kvnua/rdW yjFXQlaYgPYFsWiFf4piATP7HNhemKT7vxc72I5pvTe10zME1kmhIRNfzHoqtzV0 4EO/9LZkVIYF86muenp074uQlD1ckcGhrpanH/g/uWLsssyI8ynCtgwLPPT3cxd8 p52AhX0E6wVOVafQ5vbY1GVudSzQo7EANvBS/ggeEhydEKmA10CtxggdKf9BMYOz Jc5O9sHmwjbuufIUIvbenQgdNoftfCufBEIDfLJRji5aofyqCBqjeY1Wv9URe8mg BqQVe+rXCv8Ya/qOKhOwcUHcTppzBrCJV3pJeXpSH7u4bPYuIVzEqNkIZmHq/IIF CvfP8bJkdbIRjX51ZkZfn7bD4h5jL9MTxHDDGkpNSEif8kGAhcKDCN3bzdzMKvJv G2kMRwOpAko= =KLb+ -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 08:05:16 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Vinicius Monego Subject: bug#64132: closed (Re: [bug#64132] [PATCH] gnu: libjxl: Update to 0.8.2.) Message-ID: References: <87mt0vkayv.fsf@cbaines.net> <20230617144010.1688026-1-monego@posteo.net> X-Gnu-PR-Message: they-closed 64132 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 64132@debbugs.gnu.org Date: Mon, 19 Jun 2023 10:23:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1687170182-20265-1" This is a multi-part message in MIME format... ------------=_1687170182-20265-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #64132: [PATCH] gnu: libjxl: Update to 0.8.2. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 64132@debbugs.gnu.org. --=20 64132: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D64132 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1687170182-20265-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 64132-done) by debbugs.gnu.org; 19 Jun 2023 10:22:51 +0000 Received: from localhost ([127.0.0.1]:55571 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBC27-0005Fs-Fa for submit@debbugs.gnu.org; Mon, 19 Jun 2023 06:22:51 -0400 Received: from mira.cbaines.net ([212.71.252.8]:42726) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBC25-0005Fk-CH for 64132-done@debbugs.gnu.org; Mon, 19 Jun 2023 06:22:49 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:54d1:d5d4:280e:f699]) by mira.cbaines.net (Postfix) with ESMTPSA id F3E2A27BBE2; Mon, 19 Jun 2023 11:22:48 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 969ac453; Mon, 19 Jun 2023 10:22:48 +0000 (UTC) References: <20230617144010.1688026-1-monego@posteo.net> User-agent: mu4e 1.10.2; emacs 28.2 From: Christopher Baines To: Vinicius Monego Subject: Re: [bug#64132] [PATCH] gnu: libjxl: Update to 0.8.2. Date: Mon, 19 Jun 2023 11:22:23 +0100 In-reply-to: <20230617144010.1688026-1-monego@posteo.net> Message-ID: <87mt0vkayv.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 64132-done Cc: 64132-done@debbugs.gnu.org, guix-patches@gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Vinicius Monego writes: > * 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(-) Thanks for the patch, I've pushed this to master as f2be1ea06af6a0bf02c23e5bdf90b1e09c5d39f0. Chris --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmSQLHhfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9Xdu0A/+KiW+B0DaNnXwBsV0jRmu0r0tE0HzPi3F dOxD+NR8QlmujptfW8EDT8UtD3tnajlyRKpWwzQf8Ibiax3DlSbOrZYQ8e07mdim rdBF5sgPBFk+Li2fbCHMG3Nk90+sltm4wbxC8D8Y7klHTDc756ABtYtCjf3hoSiD W3YHRAP/f0rst9ht834LV4zrYvEFOihWUJke5+/YESsEzc8WJjE8RXUWKCtICvRk lOBV3KMiBYtZAYY8VXY22zZ4uAB0uJGGDoI0EhS+A9Z0gN/dAYOWB61kvnua/rdW yjFXQlaYgPYFsWiFf4piATP7HNhemKT7vxc72I5pvTe10zME1kmhIRNfzHoqtzV0 4EO/9LZkVIYF86muenp074uQlD1ckcGhrpanH/g/uWLsssyI8ynCtgwLPPT3cxd8 p52AhX0E6wVOVafQ5vbY1GVudSzQo7EANvBS/ggeEhydEKmA10CtxggdKf9BMYOz Jc5O9sHmwjbuufIUIvbenQgdNoftfCufBEIDfLJRji5aofyqCBqjeY1Wv9URe8mg BqQVe+rXCv8Ya/qOKhOwcUHcTppzBrCJV3pJeXpSH7u4bPYuIVzEqNkIZmHq/IIF CvfP8bJkdbIRjX51ZkZfn7bD4h5jL9MTxHDDGkpNSEif8kGAhcKDCN3bzdzMKvJv G2kMRwOpAko= =KLb+ -----END PGP SIGNATURE----- --=-=-=-- ------------=_1687170182-20265-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit 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 To: guix-patches@gnu.org Subject: [PATCH] gnu: libjxl: Update to 0.8.2. Date: Sat, 17 Jun 2023 14:40:10 +0000 Message-Id: <20230617144010.1688026-1-monego@posteo.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Vinicius Monego X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * 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)) -- 2.34.1 ------------=_1687170182-20265-1--