GNU bug report logs - #64132
[PATCH] gnu: libjxl: Update to 0.8.2.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 64132 in the body.
You can then email your comments to 64132 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Vinicius Monego <monego <at> posteo.net>
To: guix-patches <at> gnu.org
Cc: Vinicius Monego <monego <at> posteo.net>
Subject: [PATCH] gnu: libjxl: Update to 0.8.2.
Date: Sat, 17 Jun 2023 14:40:10 +0000

* 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 <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke <at> gnu.org>
 ;;; Copyright © 2020 Zhu Zihao <all_but_last <at> 163.com>
-;;; Copyright © 2020, 2021, 2022 Vinicius Monego <monego <at> posteo.net>
+;;; Copyright © 2020, 2021, 2022, 2023 Vinicius Monego <monego <at> posteo.net>
 ;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus <at> gmail.com>
 ;;; Copyright © 2021 Nicolò Balzarotti <nicolo <at> nixo.xyz>
 ;;; Copyright © 2021 Alexandr Vityazev <avityazev <at> posteo.org>
@@ -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 <at> 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 <at> 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

Message #8 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: Vinicius Monego <monego <at> posteo.net>
Cc: 64132-done <at> debbugs.gnu.org, guix-patches <at> gnu.org
Subject: Re: [bug#64132] [PATCH] gnu: libjxl: Update to 0.8.2.
Date: Mon, 19 Jun 2023 11:22:23 +0100

[Message part 1 (text/plain, inline)]

Vinicius Monego <monego <at> posteo.net> 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

[signature.asc (application/pgp-signature, inline)]

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.