Subject: [bug#77350] [PATCH 1/6] gnu: vigra: Update to 1.12.2.

From: Vinicius Monego <[email-masked]>
Date: Sat, 29 Mar 2025 02:11:31 +0000

* gnu/packages/image.scm (vigra): Update to 1.12.2.
[arguments]<#:phases>: Delete the 'disable-broken-tests phase.
<#:configure-flags>: Don't pass "-DCMAKE_CXX_FLAGS", "-DCMAKE_C_FLAGS",
"-Wno-dev".
[inputs]: Remove package labels. Replace openexr-2 by openexr. Remove ilmbase.

Change-Id: Ie953a45f6b5e9da5985e307d4acf25a955e73539
---
 gnu/packages/image.scm | 124 +++++++++++++++--------------------------
 1 file changed, 45 insertions(+), 79 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 89e7ef83e6..41c1a55f4a 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -28,7 +28,7 @@
 ;;; Copyright © 2020, 2023 Maxim Cournoyer <[email-masked]>
 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <[email-masked]>
 ;;; Copyright © 2020 Zhu Zihao <[email-masked]>
-;;; Copyright © 2020, 2021, 2022, 2023, 2024 Vinicius Monego <[email-masked]>
+;;; Copyright © 2020-2025 Vinicius Monego <[email-masked]>
 ;;; Copyright © 2021 Sharlatan Hellseher <[email-masked]>
 ;;; Copyright © 2021 Nicolò Balzarotti <[email-masked]>
 ;;; Copyright © 2021 Alexandr Vityazev <[email-masked]>
@@ -1365,87 +1365,53 @@ (define-public freeimage
     (home-page "https://freeimage.sourceforge.io/")))
 
 (define-public vigra
-    (let ((commit "9b514fa00a136f5fd81bb57ee9f6293c333ffc1f")
-          (revision "0"))
-    (package
-     (name "vigra")
-     (version (git-version "1.11.1" revision commit))
-     (source
-      (origin
-        ;; The last release is 1.11.1, from 2017. It's becoming more and more
-        ;; difficult to build this old release, and the upstream developers
-        ;; suggest on their home page to build from the Git repo, saying "It is
-        ;; generally safe to use the 'master' branch of the development snapshot,
-        ;; as we avoid uploading untested or incompatible changes to this branch."
-        (method git-fetch)
-        (uri (git-reference
-               (url "https://github.com/ukoethe/vigra")
-               (commit commit)))
-        (file-name (git-file-name name version))
-        (sha256 (base32
-                  "1vzlypviala109imwxkp46lqhhxszf79ypfb8wxg6z7g02j7mm73"))))
-     (build-system cmake-build-system)
-     (inputs
-      `(("boost" ,boost)
-        ("fftw" ,fftw)
-        ("fftwf" ,fftwf)
-        ("hdf5" ,hdf5)
-        ("ilmbase" ,ilmbase) ; propagated by openexr, but needed explicitly
-                             ; to create a configure-flag
-        ("libjpeg" ,libjpeg-turbo)
-        ("libpng" ,libpng)
-        ("libtiff" ,libtiff)
-        ("openexr" ,openexr-2)
-        ("python" ,python-wrapper)
-        ;("python-numpy" ,python-numpy)
-        ("zlib" ,zlib)))
-     (native-inputs
-      `(("doxygen" ,doxygen)
-        ("python-nose" ,python-nose)
-        ("sphinx" ,python-sphinx)))
-     (arguments
-      `(#:test-target "check"
-        #:phases
-        (modify-phases %standard-phases
-          (add-after 'unpack 'disable-broken-tests
-            (lambda _
-              ;; See https://github.com/ukoethe/vigra/issues/432
-              (substitute* "test/fourier/CMakeLists.txt"
-                (("VIGRA_ADD_TEST.*") ""))
-              ;; This test fails with Numpy 1.15:
-              ;; <https://github.com/ukoethe/vigra/issues/436>.
-              (substitute* "vigranumpy/test/CMakeLists.txt"
-                (("test1\\.py") ""))
-              #t)))
-        #:configure-flags
-          (list "-Wno-dev" ; suppress developer mode with lots of warnings
-                (string-append "-DVIGRANUMPY_INSTALL_DIR="
-                               (assoc-ref %outputs "out")
-                               "/lib/python"
-                               ,(version-major+minor (package-version python))
-                               "/site-packages")
-                ;; Vigranumpy isn't compatible with numpy >= 1.20.
-                "-DWITH_VIGRANUMPY=0"
-                ;; OpenEXR is not enabled by default.
-                "-DWITH_OPENEXR=1"
-                ;; Fix rounding error on 32-bit machines
-                "-DCMAKE_C_FLAGS=-ffloat-store"
-                ;; The header files of ilmbase are not found when included
-                ;; by the header files of openexr, and an explicit flag
-                ;; needs to be set.
-                (string-append "-DCMAKE_CXX_FLAGS=-I"
-                               (assoc-ref %build-inputs "ilmbase")
-                               "/include/OpenEXR"
-                               " -ffloat-store"))))
-     (synopsis "Computer vision library")
-     (description
-      "VIGRA stands for Vision with Generic Algorithms.  It is an image
+  (package
+    (name "vigra")
+    (version "1.12.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/ukoethe/vigra")
+             (commit "Version-1-12-1")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1pshpdylji9yz6n3h6rc6njgjih4cas8cf8jpd1c185j2kaf6qb6"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:test-target "check"
+       #:configure-flags
+       (list (string-append "-DVIGRANUMPY_INSTALL_DIR="
+                            (assoc-ref %outputs "out")
+                            "/lib/python"
+                            ,(version-major+minor (package-version python))
+                            "/site-packages")
+             ;; Vigranumpy isn't compatible with numpy >= 1.20.
+             "-DWITH_VIGRANUMPY=0"
+             ;; OpenEXR is not enabled by default.
+             "-DWITH_OPENEXR=1")))
+    (native-inputs (list doxygen
+                         python-nose
+                         python-sphinx))
+    (inputs (list boost
+                  fftw
+                  fftwf
+                  hdf5
+                  libjpeg-turbo
+                  libpng
+                  libtiff
+                  openexr
+                  python-wrapper
+                  zlib))
+    (synopsis "Computer vision library")
+    (description
+     "VIGRA stands for Vision with Generic Algorithms.  It is an image
   processing and analysis library that puts its main emphasis on customizable
   algorithms and data structures.  It is particularly strong for
   multi-dimensional image processing.")
-     (license license:expat)
-     (home-page "https://ukoethe.github.io/vigra/")
-     (properties '((max-silent-time . 7200)))))) ;2 hours, to avoid timing out
+    (license license:expat)
+    (home-page "https://ukoethe.github.io/vigra/")
+    (properties '((max-silent-time . 7200))))) ;2 hours, to avoid timing out
 
 (define-public vigra-c
   (let* ((commit "66ff4fa5a7d4a77415caa676a45c2c6ea16562e7")
-- 
2.49.0