[bug#68560] [PATCH v2 1/4] gnu: Add libjpeg-turbo-3.

[bug#68560] [PATCH v2 1/4] gnu: Add libjpeg-turbo-3.

[Herman Rimm via Guix-patches via]

  * gnu/packages/image.scm (libjpeg-turbo-3): Add package.

Change-Id: Id73508b185ecba7169e958467bdb1ad4d6682285
---
 gnu/packages/image.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 9a7d888560..bc5d68339a 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -38,6 +38,7 @@
 ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2023 Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;;; Copyright © 2023 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2023 Herman Rimm <herman@rimm.ee>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1922,6 +1923,18 @@ (define-public libjpeg-turbo
                    license:ijg          ;the libjpeg library and associated tools
                    license:zlib))))     ;the libjpeg-turbo SIMD extensions
 
+(define-public libjpeg-turbo-3
+  (package
+    (inherit libjpeg-turbo)
+    (version "3.0.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "mirror://sourceforge/libjpeg-turbo/" version
+                           "/libjpeg-turbo-" version ".tar.gz"))
+       (sha256
+        (base32 "0x9ap9wlabi5iv12z22nykcybz4r43l9klmcmjrlgqaaf43rahi2"))))))
+
 (define-public niftilib
   (package
     (name "niftilib")
-- 
2.41.0

[bug#68560] [PATCH v2 2/4] gnu: Add openjpeg-2024.

[Herman Rimm via Guix-patches via]

* gnp/packages/image.scm (openjpeg-2024): New variable.
(openjpeg-data): Update to latest commit on 2024.01.14.

Change-Id: I4639bdd21d170246c7962c15ea017a297c00069e
---
 gnu/packages/image.scm | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index bc5d68339a..9b120760ae 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -947,17 +947,17 @@ (define-public jbigkit
 (define-public openjpeg-data
   (package
     (name "openjpeg-data")
-    (version "2021.09.26")
+    (version "2024.01.14")
     (source
      (origin
        (method git-fetch)
        (uri
         (git-reference
          (url "https://github.com/uclouvain/openjpeg-data")
-         (commit "1f3d093030f9a0b43353ec6b48500f65786ff57a")))
+         (commit "f9991d5fa9a4a08fc9c29bae6405d6c67cf2b8eb")))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "13jpdaqk7mngk0xw6xbh9zgipip6n25spvqd97hwpfna1zyh8lzh"))))
+        (base32 "1agnpwq2fkwzjf12rmb6f06k80xgd5mnkyjb1fhbpxc5gxy0hwqs"))))
     (build-system copy-build-system)
     (synopsis "Test files for OpenJPEG")
     (description "OpenJPEG-Data contains all files required to run the openjpeg
@@ -1021,6 +1021,21 @@ (define-public openjpeg
     (home-page "https://github.com/uclouvain/openjpeg")
     (license license:bsd-2)))
 
+(define-public openjpeg-2024
+  (package
+    (inherit openjpeg)
+    (name "openjpeg")
+    (version "2024.01.14")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/uclouvain/openjpeg")
+             (commit "0e3b3bd716f2b5178d981b17de9505f94ddfff58")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0k433n0wv5alvl7vmpiq34a6xgv23nlhy932ciw1lk34667r1ajr"))))))
+
 (define-public giflib
   (package
     (name "giflib")
-- 
2.41.0

[bug#68560] [PATCH v2 3/4] gnu: leptonica: Update to 1.84.1.

[Herman Rimm via Guix-patches via]

  * gnu/packages/image.scm (leptonica): Update to 1.84.1.
  [inputs]: Replace with libjpeg-turbo-3 and openjpeg-2024.
  [arguments]: Add phase to disable ioformats_reg and pngio_reg tests.

Change-Id: I31e104532c87fbe3a5648ef8c0f3c8961877b15b
---
 gnu/packages/image.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 9b120760ae..6ba2c2464f 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -752,7 +752,7 @@ (define-public libtiff
 (define-public leptonica
   (package
     (name "leptonica")
-    (version "1.83.1")
+    (version "1.84.1")
     (source
      (origin
        (method git-fetch)
@@ -761,7 +761,7 @@ (define-public leptonica
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1j7qf9flb48q0aymf0yx9rypy3bs6hfjcln08zmy8qn2qcjzrmvi"))))
+        (base32 "0b4ikf1p2ll4310n4dg5lg0b79wys71fb6nj22i7pz17wjdma0j8"))))
     (build-system gnu-build-system)
     (native-inputs
      (list gnuplot ;needed for test suite
@@ -771,16 +771,21 @@ (define-public leptonica
            pkg-config))
     (inputs
      (list giflib
-           libjpeg-turbo
+           libjpeg-turbo-3
            libpng
            libtiff
            libwebp
-           openjpeg
+           openjpeg-2024
            zlib))
     (arguments
      (list
       #:phases
       #~(modify-phases %standard-phases
+          (add-after 'unpack 'disable-failing-tests
+            (lambda _
+              (substitute* "prog/Makefile.am"
+                (("ioformats_reg") ""); Fails for unclear reason.
+                (("pngio_reg") "")))) ; Fails non-deterministically.
           (add-after 'unpack 'patch-reg-wrapper
             (lambda _
               (substitute* "prog/reg_wrapper.sh"
-- 
2.41.0

[bug#68560] [PATCH v2 4/4] gnu: libpng: Update to 1.6.40.

[Herman Rimm via Guix-patches via]

  * gnu/packages/image.scm (libpng, libpng-apng): Update to 1.6.40.

Change-Id: I7e8aeac53e862c768baf58f6bb18211a4bd801f8
---
 gnu/packages/image.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 6ba2c2464f..3fd3548766 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -199,7 +199,7 @@ (define-public iqa
 (define-public libpng
   (package
    (name "libpng")
-   (version "1.6.37")  ; Remember to also update libpng-apng if possible!
+   (version "1.6.40")  ; Remember to also update libpng-apng if possible!
    (source (origin
             (method url-fetch)
             (uri (list (string-append "mirror://sourceforge/libpng/libpng16/"
@@ -212,7 +212,7 @@ (define-public libpng
                         "/libpng16/libpng-" version ".tar.xz")))
             (sha256
              (base32
-              "1jl8in381z0128vgxnvn33nln6hzckl7l7j9nqvkaf1m9n1p0pjh"))))
+              "18dk04x3ypg0vdk4zgkqg7r8xyq6b592mnf67qd27zv74jdlfnsk"))))
    (build-system gnu-build-system)
    (arguments
     `(#:configure-flags '("--disable-static")))
@@ -231,7 +231,7 @@ (define-public libpng-apng
   ;; The APNG patch is maintained separately and may lag behind upstream libpng.
   (package
     (name "libpng-apng")
-    (version "1.6.39")
+    (version "1.6.40")
     (source
      (origin
        (method url-fetch)
@@ -244,7 +244,7 @@ (define-public libpng-apng
                    "ftp://ftp.simplesystems.org/pub/libpng/png/src/history"
                    "/libpng16/libpng-" version ".tar.xz")))
        (sha256
-        (base32 "0dv90dxvmqpk7mbywyjbz8lh08cv4b0ksqp1y62mzvmlf379cihz"))))
+        (base32 "18dk04x3ypg0vdk4zgkqg7r8xyq6b592mnf67qd27zv74jdlfnsk"))))
     (build-system gnu-build-system)
     (arguments
      `(#:modules ((guix build gnu-build-system)
@@ -276,7 +276,7 @@ (define-public libpng-apng
                                   version "/libpng-" version "-apng.patch.gz"))
                   (sha256
                    (base32
-                    "1z8cx011a2c7vagwgi92rbmky1wi8awmrdldqh9f5k80pbmbdi2a"))))))
+                    "0byvav9xh6njrsrl8i32nnhna37fqz9bwqi6f9n8v3ckh9ja8g0a"))))))
     (native-inputs
      (list libtool))
     ;; libpng.la says "-lz", so propagate it.
-- 
2.41.0