diff options
Diffstat (limited to 'gnu/packages/image-processing.scm')
| -rw-r--r-- | gnu/packages/image-processing.scm | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 6e42be1140..ab30dfa31d 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -292,16 +292,14 @@ licences similar to the Modified BSD licence.")))) (substitute* "tests/cpu/fileformats/FileFormatCTF_tests.cpp" (("OCIO_CHECK_NE.*ErrorOutputs.*") "")))) - (add-after 'install 'fix-OpenColorIOConfig + (add-after 'unpack 'fix-broken-test (lambda _ - ;; Work around a CMake Zlib-detection bug: - ;; https://gitlab.kitware.com/cmake/cmake/-/issues/25200 - ;; make OpenColorIOConfig.cmake is a normal cmake file - (substitute* - (string-append #$output - "/lib/cmake/OpenColorIO/OpenColorIOConfig.cmake") - (("\\.#define ZLIB_VERSION \"1\\.3\"") - ""))))))) + ;; Replace the invalid multi-line list. It is unclear why + ;; this is now failing after only build system updates. + ;; (see https://github.com/AcademySoftwareFoundation/OpenColorIO/blob/v2.4.2/tests/cpu/Config_tests.cpp#L6227) + (substitute* "tests/cpu/Config_tests.cpp" + (("cs1\\\\t\\\\n \\\\n, \\\\ncs2") + "cs1, cs2"))))))) (native-inputs ;; XXX: OCIO has unit tests for OpenShadingLanguage, but they fail. ;; They also require OIIO, but OCIO is an optional dependency to it. @@ -366,8 +364,7 @@ many popular formats.") (arguments (list #:build-type "Release" ;Build without '-g' to save space. #:configure-flags - #~'( ;;"-DBUILD_TESTING:BOOL=TRUE" ;not honored - "-DVTK_USE_EXTERNAL=OFF" ;default + #~'("-DVTK_USE_EXTERNAL=OFF" ;default "-DVTK_MODULE_USE_EXTERNAL_VTK_doubleconversion=ON" "-DVTK_MODULE_USE_EXTERNAL_VTK_eigen=ON" "-DVTK_MODULE_USE_EXTERNAL_VTK_expat=ON" @@ -499,7 +496,7 @@ different data arrays similar to those available in the numdiff software.") (define-public opencv (package (name "opencv") - (version "4.11.0") + (version "4.12.0") (source (origin (method git-fetch) (uri (git-reference @@ -513,8 +510,7 @@ different data arrays similar to those available in the numdiff software.") ;; available in Guix. (with-directory-excursion "3rdparty" (for-each delete-file-recursively - '("carotene" - "cpufeatures" + '("cpufeatures" "flatbuffers" "ffmpeg" "include" @@ -528,7 +524,6 @@ different data arrays similar to those available in the numdiff software.") "libwebp" "openexr" "openjpeg" - "openvx" "protobuf" ;;"quirc" "tbb" @@ -538,10 +533,11 @@ different data arrays similar to those available in the numdiff software.") (for-each delete-file (find-files "." "\\.jar$")))) (sha256 (base32 - "1ha0230yw9ihybmg2b3mkk9vbnlgzlwx597v2hm14y403047zvgb")))) + "1n5qif1ispmdby1cmwf9f8isdx07phyhb19jsmgrw5bk3k23dcyy")))) (build-system cmake-build-system) (arguments - `(#:configure-flags + `(#:parallel-tests? #f + #:configure-flags (list "-DWITH_ADE=OFF" ;we don't have a package for ade yet "-DWITH_IPP=OFF" "-DWITH_ITT=OFF" @@ -721,7 +717,7 @@ different data arrays similar to those available in the numdiff software.") (file-name (git-file-name "opencv_extra" version)) (sha256 (base32 - "1zs8ps01vq1pvs5zmpw0wd7xc2l85yqd85vksdj8kddkx6alda8j")))) + "0awang2hl7z194rlnic38ry6fgxy8b7k2qqasinjqznxab4dkhvz")))) ("opencv-contrib" ,(origin (method git-fetch) @@ -730,7 +726,7 @@ different data arrays similar to those available in the numdiff software.") (file-name (git-file-name "opencv_contrib" version)) (sha256 (base32 - "0wsvd7pnj0p6dvdl4x4r46dkrkxkd61v411ih30j3wa9l7m7vmv0")))))) + "1ai1kanlq1wr3173q86yfj6r9h3kkvjx18cakjr31jkb25qyrmny")))))) (inputs (list eigen ffmpeg-4 @@ -1240,6 +1236,9 @@ programmatically.") "")) #t)))) (build-system cmake-build-system) + (arguments + ;; Not an actual test, but is incorrectly generated by the build system. + (list #:test-exclude "vul_vul_test_driver")) (inputs (list libgeotiff libtiff libjpeg-turbo libpng zlib)) (home-page "https://github.com/vxl/vxl/") @@ -1274,10 +1273,12 @@ libraries designed for computer vision research and implementation.") (("add_subdirectory\\((tiff|png|jpeg|zlib|bzlib|geotiff)\\)") "")))))) (arguments - `(#:configure-flags - ;; Needed for itk-snap - (list "-DVNL_CONFIG_LEGACY_METHODS=ON" - "-DCMAKE_CXX_STANDARD=14"))))) + (substitute-keyword-arguments (package-arguments vxl) + ((#:configure-flags flags) + #~(cons* ;; Needed for itk-snap + "-DVNL_CONFIG_LEGACY_METHODS=ON" + "-DCMAKE_CXX_STANDARD=14" + #$flags)))))) (define-public insight-toolkit ;; For information about ITK remote modules, see: |