ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-24 11:39:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: libjxl: Update to 0.6.1-0.b7076f18.

Browse source 
* gnu/packages/image.scm (libjxl): Update to 0.6.1-0.b7076f18.
[inputs]: Add gflags.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Greg Hogan 2022-06-14 19:20:28 +00:00 committed by Ludovic Courtès
parent 1bcf4695f7
commit c9d78e4074
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 51 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
gnu/packages/image.scm
View file

@ -80,6 +80,7 @@ (define-module (gnu packages image)
#:use-module (gnu packages ncurses) #:use-module (gnu packages ncurses)
#:use-module (gnu packages perl) #:use-module (gnu packages perl)
#:use-module (gnu packages photo) #:use-module (gnu packages photo)
#:use-module (gnu packages popt)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
@ -2232,25 +2233,25 @@ (define-public libheif
(license license:lgpl3+))) (license license:lgpl3+)))
(define-public libjxl (define-public libjxl
(let ((commit "b7076f1869914eee47b3eae107750f3a3ce43a76")
(revision "0"))
(package (package
(name "libjxl") (name "libjxl")
(version "0.6.1") (version (git-version "0.6.1" revision commit))
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
(uri (git-reference (uri (git-reference
(url "https://github.com/libjxl/libjxl") (url "https://github.com/libjxl/libjxl")
(commit (string-append "v" version)) (commit commit)
(recursive? #t))) (recursive? #t)))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "17pvc5zgm9az5hfg2p80325f42w3dqspyb03iakrwg9x4n3vjckx")) (base32 "0jx0hkd2nk15mmnzlk7y7fp644w336il7nsnp5yhf14j8zfaiqz8"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
;; Delete the bundles that will not be used. libjxl bundles LCMS ;; 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. ;; which is in Guix, but a newer version is required.
;; This option will be introduced after version 0.6.1 and then we
;; probably won't need to download the submodules.
'(begin '(begin
(for-each (lambda (directory) (for-each (lambda (directory)
(delete-file-recursively (delete-file-recursively
@ -2261,17 +2262,18 @@ (define-public libjxl
`(#:configure-flags `(#:configure-flags
(list "-DJPEGXL_FORCE_SYSTEM_GTEST=true" (list "-DJPEGXL_FORCE_SYSTEM_GTEST=true"
"-DJPEGXL_FORCE_SYSTEM_BROTLI=true" "-DJPEGXL_FORCE_SYSTEM_BROTLI=true"
;; "-DJPEGXL_FORCE_SYSTEM_LCMS2=true" ; next version after 0.6.1 ;; "-DJPEGXL_FORCE_SYSTEM_LCMS2=true" ; requires lcms@2.13
"-DJPEGXL_FORCE_SYSTEM_HWY=true"))) "-DJPEGXL_FORCE_SYSTEM_HWY=true")))
(native-inputs (native-inputs
(list asciidoc doxygen googletest pkg-config python)) (list asciidoc doxygen googletest pkg-config python))
(inputs (inputs
(list freeglut (list freeglut
gflags
giflib giflib
google-brotli google-brotli
google-highway google-highway
imath imath
;; lcms ; next version after 0.6.1 ;; lcms ; requires lcms@2.13
libavif libavif
libjpeg-turbo libjpeg-turbo
libpng libpng
@ -2281,7 +2283,7 @@ (define-public libjxl
(synopsis "JPEG XL image format reference implementation") (synopsis "JPEG XL image format reference implementation")
(description "This package contains a reference implementation of JPEG XL (description "This package contains a reference implementation of JPEG XL
(encoder and decoder).") (encoder and decoder).")
(license license:bsd-3))) (license license:bsd-3))))
(define-public mtpaint (define-public mtpaint
(package (package