diff options
| author | Vinicius Monego <monego@posteo.net> | 2023-06-17 14:40:10 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2023-06-19 11:08:40 +0100 |
| commit | f2be1ea06af6a0bf02c23e5bdf90b1e09c5d39f0 (patch) | |
| tree | 71e69344c5e50ef058d13682eafcbc736f60360d /gnu/packages/image.scm | |
| parent | 4d9ddeef3ad126725c99c56a4860a4b44a72d4a3 (diff) | |
| download | guix-f2be1ea06af6a0bf02c23e5bdf90b1e09c5d39f0.tar guix-f2be1ea06af6a0bf02c23e5bdf90b1e09c5d39f0.tar.gz | |
gnu: libjxl: Update to 0.8.2.
* 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.
Signed-off-by: Christopher Baines <mail@cbaines.net>
Diffstat (limited to 'gnu/packages/image.scm')
| -rw-r--r-- | gnu/packages/image.scm | 22 |
1 files 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@gmail.com> ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com> -;;; Copyright © 2020, 2021, 2022 Vinicius Monego <monego@posteo.net> +;;; Copyright © 2020, 2021, 2022, 2023 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com> ;;; Copyright © 2021 Nicolò Balzarotti <nicolo@nixo.xyz> ;;; Copyright © 2021 Alexandr Vityazev <avityazev@posteo.org> @@ -2430,7 +2430,7 @@ Format) file format decoder and encoder.") (define-public libjxl (package (name "libjxl") - (version "0.7.0") + (version "0.8.2") (source (origin (method git-fetch) @@ -2440,23 +2440,24 @@ Format) file format decoder and encoder.") (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 @@ Format) file format decoder and encoder.") 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)) |