[bug#55982] [PATCH 0/2] Update google-highway.

[bug#55982] [PATCH 0/2] Update google-highway.

[Greg Hogan]

The dependent package libjxl required updating to a pre-release commit.

$ ./pre-inst-env guix refresh -l google-highway
A single dependent package: libjxl@0.6.1-0.b7076f1

Greg Hogan (2):
  gnu: google-highway: Update to 0.17.0.
  gnu: libjxl: Update to 0.6.1-0.b7076f18.

 gnu/packages/cpp.scm   |   4 +-
 gnu/packages/image.scm | 100 +++++++++++++++++++++--------------------
 2 files changed, 53 insertions(+), 51 deletions(-)

-- 
2.36.1

[bug#55982] [PATCH 1/2] gnu: google-highway: Update to 0.17.0.

[Greg Hogan]

* gnu/packages/cpp.scm (google-highway): Update to 0.17.0.
---
 gnu/packages/cpp.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 78e4f3bd8e..a17f1ee4b6 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -435,7 +435,7 @@ (define-public xsimd
 (define-public google-highway
   (package
     (name "google-highway")
-    (version "0.15.0")
+    (version "0.17.0")
     (source
      (origin
        (method git-fetch)
@@ -444,7 +444,7 @@ (define-public google-highway
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1yjwgnrpd9m99x2nqf6ld28zc6y9nlsxqg128bxxmja1gg4g4qdz"))))
+        (base32 "0iwn7m8f1j7bchwbi5h84nzkzmzqd7byddbr4lh6i6lpd87wny08"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags (list "-DHWY_SYSTEM_GTEST=on")))
-- 
2.36.1

[bug#55982] [PATCH 2/2] gnu: libjxl: Update to 0.6.1-0.b7076f18.

[Greg Hogan]

* 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

bug#55982: [PATCH 0/2] Update google-highway.

[Ludovic Courtès]

Hi,

Greg Hogan <code@greghogan.com> skribis:

>   gnu: google-highway: Update to 0.17.0.
>   gnu: libjxl: Update to 0.6.1-0.b7076f18.

Applied, thanks!

Ludo’.