amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00: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
Download patch file Download diff file Expand all files Collapse all files

100
gnu/packages/image.scm
View file

@ -80,6 +80,7 @@
#: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,56 +2233,57 @@ Format) file format decoder and encoder.")
(license license:lgpl3+))) (license license:lgpl3+)))
(define-public libjxl (define-public libjxl
(package (let ((commit "b7076f1869914eee47b3eae107750f3a3ce43a76")
(name "libjxl") (revision "0"))
(version "0.6.1") (package
(source (name "libjxl")
(origin (version (git-version "0.6.1" revision commit))
(method git-fetch) (source
(uri (git-reference (origin
(url "https://github.com/libjxl/libjxl") (method git-fetch)
(commit (string-append "v" version)) (uri (git-reference
(recursive? #t))) (url "https://github.com/libjxl/libjxl")
(file-name (git-file-name name version)) (commit commit)
(sha256 (recursive? #t)))
(base32 "17pvc5zgm9az5hfg2p80325f42w3dqspyb03iakrwg9x4n3vjckx")) (file-name (git-file-name name version))
(modules '((guix build utils))) (sha256
(snippet (base32 "0jx0hkd2nk15mmnzlk7y7fp644w336il7nsnp5yhf14j8zfaiqz8"))
;; Delete the bundles that will not be used. libjxl bundles LCMS (modules '((guix build utils)))
;; which is in Guix but there is no option to use the system package. (snippet
;; This option will be introduced after version 0.6.1 and then we ;; Delete the bundles that will not be used. libjxl bundles LCMS,
;; probably won't need to download the submodules. ;; which is in Guix, but a newer version is required.
'(begin '(begin
(for-each (lambda (directory) (for-each (lambda (directory)
(delete-file-recursively (delete-file-recursively
(string-append "third_party/" directory))) (string-append "third_party/" directory)))
'("brotli" "googletest" "highway")))))) '("brotli" "googletest" "highway"))))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#: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
giflib gflags
google-brotli giflib
google-highway google-brotli
imath google-highway
;; lcms ; next version after 0.6.1 imath
libavif ;; lcms ; requires lcms@2.13
libjpeg-turbo libavif
libpng libjpeg-turbo
libwebp libpng
openexr)) libwebp
(home-page "https://github.com/libjxl/libjxl") openexr))
(synopsis "JPEG XL image format reference implementation") (home-page "https://github.com/libjxl/libjxl")
(description "This package contains a reference implementation of JPEG XL (synopsis "JPEG XL image format reference implementation")
(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