From: Greg Hogan <code@greghogan.com>
To: 55982@debbugs.gnu.org
Cc: Greg Hogan <code@greghogan.com>
Subject: [bug#55982] [PATCH 2/2] gnu: libjxl: Update to 0.6.1-0.b7076f18.
Date: Tue, 14 Jun 2022 19:20:28 +0000 [thread overview]
Message-ID: <503147c80552e0f4720460e542002f5720033a44.1655233921.git.code@greghogan.com> (raw)
In-Reply-To: <cover.1655233921.git.code@greghogan.com>
* gnu/packages/image.scm (libjxl): Update to 0.6.1-0.b7076f18.
[inputs]: Add gflags.
---
gnu/packages/image.scm | 100 +++++++++++++++++++++--------------------
1 file changed, 51 insertions(+), 49 deletions(-)
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 5a13ce56b3..a09e27088b 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -80,6 +80,7 @@ (define-module (gnu packages image)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl)
#:use-module (gnu packages photo)
+ #:use-module (gnu packages popt)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages python-xyz)
@@ -2232,56 +2233,57 @@ (define-public libheif
(license license:lgpl3+)))
(define-public libjxl
- (package
- (name "libjxl")
- (version "0.6.1")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/libjxl/libjxl")
- (commit (string-append "v" version))
- (recursive? #t)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "17pvc5zgm9az5hfg2p80325f42w3dqspyb03iakrwg9x4n3vjckx"))
- (modules '((guix build utils)))
- (snippet
- ;; Delete the bundles that will not be used. libjxl bundles LCMS
- ;; which is in Guix but there is no option to use the system package.
- ;; This option will be introduced after version 0.6.1 and then we
- ;; probably won't need to download the submodules.
- '(begin
- (for-each (lambda (directory)
- (delete-file-recursively
- (string-append "third_party/" directory)))
- '("brotli" "googletest" "highway"))))))
- (build-system cmake-build-system)
- (arguments
- `(#:configure-flags
- (list "-DJPEGXL_FORCE_SYSTEM_GTEST=true"
- "-DJPEGXL_FORCE_SYSTEM_BROTLI=true"
- ;; "-DJPEGXL_FORCE_SYSTEM_LCMS2=true" ; next version after 0.6.1
- "-DJPEGXL_FORCE_SYSTEM_HWY=true")))
- (native-inputs
- (list asciidoc doxygen googletest pkg-config python))
- (inputs
- (list freeglut
- giflib
- google-brotli
- google-highway
- imath
- ;; lcms ; next version after 0.6.1
- libavif
- libjpeg-turbo
- libpng
- libwebp
- openexr))
- (home-page "https://github.com/libjxl/libjxl")
- (synopsis "JPEG XL image format reference implementation")
- (description "This package contains a reference implementation of JPEG XL
+ (let ((commit "b7076f1869914eee47b3eae107750f3a3ce43a76")
+ (revision "0"))
+ (package
+ (name "libjxl")
+ (version (git-version "0.6.1" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/libjxl/libjxl")
+ (commit commit)
+ (recursive? #t)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0jx0hkd2nk15mmnzlk7y7fp644w336il7nsnp5yhf14j8zfaiqz8"))
+ (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.
+ '(begin
+ (for-each (lambda (directory)
+ (delete-file-recursively
+ (string-append "third_party/" directory)))
+ '("brotli" "googletest" "highway"))))))
+ (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")))
+ (native-inputs
+ (list asciidoc doxygen googletest pkg-config python))
+ (inputs
+ (list freeglut
+ gflags
+ giflib
+ google-brotli
+ google-highway
+ imath
+ ;; lcms ; requires lcms@2.13
+ libavif
+ libjpeg-turbo
+ libpng
+ libwebp
+ openexr))
+ (home-page "https://github.com/libjxl/libjxl")
+ (synopsis "JPEG XL image format reference implementation")
+ (description "This package contains a reference implementation of JPEG XL
(encoder and decoder).")
- (license license:bsd-3)))
+ (license license:bsd-3))))
(define-public mtpaint
(package
--
2.36.1
next prev parent reply other threads:[~2022-06-14 19:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-14 19:18 [bug#55982] [PATCH 0/2] Update google-highway Greg Hogan
2022-06-14 19:20 ` [bug#55982] [PATCH 1/2] gnu: google-highway: Update to 0.17.0 Greg Hogan
2022-06-14 19:20 ` Greg Hogan [this message]
2022-06-22 21:42 ` bug#55982: [PATCH 0/2] Update google-highway Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=503147c80552e0f4720460e542002f5720033a44.1655233921.git.code@greghogan.com \
--to=code@greghogan.com \
--cc=55982@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).