diff options
| author | Greg Hogan <code@greghogan.com> | 2025-07-31 18:00:56 +0000 |
|---|---|---|
| committer | Greg Hogan <code@greghogan.com> | 2025-08-04 04:11:35 +0000 |
| commit | a13adb9cfa882f783883934a8f4f600e01c629ec (patch) | |
| tree | dcff95f269fdf92bf578e9529e9df82cc5e9d5f8 /gnu/packages/image-processing.scm | |
| parent | ca32dbde90a6380061b79b73bb5ebdd1ab763731 (diff) | |
gnu: opencolorio: Fix build.
* gnu/packages/image-processing.scm (opencolorio)[arguments]<:#phases>
('fix-OpenColorIOConfig): Delete phase.
('fix-broken-test): Add phase.
Change-Id: I1b07e782e650f669e41dca549737b0f1571b8eaa
Diffstat (limited to 'gnu/packages/image-processing.scm')
| -rw-r--r-- | gnu/packages/image-processing.scm | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index b9aaf8cac18..22ad2308a58 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm | |||
| @@ -292,16 +292,14 @@ licences similar to the Modified BSD licence.")))) | |||
| 292 | (substitute* "tests/cpu/fileformats/FileFormatCTF_tests.cpp" | 292 | (substitute* "tests/cpu/fileformats/FileFormatCTF_tests.cpp" |
| 293 | (("OCIO_CHECK_NE.*ErrorOutputs.*") | 293 | (("OCIO_CHECK_NE.*ErrorOutputs.*") |
| 294 | "")))) | 294 | "")))) |
| 295 | (add-after 'install 'fix-OpenColorIOConfig | 295 | (add-after 'unpack 'fix-broken-test |
| 296 | (lambda _ | 296 | (lambda _ |
| 297 | ;; Work around a CMake Zlib-detection bug: | 297 | ;; Replace the invalid multi-line list. It is unclear why |
| 298 | ;; https://gitlab.kitware.com/cmake/cmake/-/issues/25200 | 298 | ;; this is now failing after only build system updates. |
| 299 | ;; make OpenColorIOConfig.cmake is a normal cmake file | 299 | ;; (see https://github.com/AcademySoftwareFoundation/OpenColorIO/blob/v2.4.2/tests/cpu/Config_tests.cpp#L6227) |
| 300 | (substitute* | 300 | (substitute* "tests/cpu/Config_tests.cpp" |
| 301 | (string-append #$output | 301 | (("cs1\\\\t\\\\n \\\\n, \\\\ncs2") |
| 302 | "/lib/cmake/OpenColorIO/OpenColorIOConfig.cmake") | 302 | "cs1, cs2"))))))) |
| 303 | (("\\.#define ZLIB_VERSION \"1\\.3\"") | ||
| 304 | ""))))))) | ||
| 305 | (native-inputs | 303 | (native-inputs |
| 306 | ;; XXX: OCIO has unit tests for OpenShadingLanguage, but they fail. | 304 | ;; XXX: OCIO has unit tests for OpenShadingLanguage, but they fail. |
| 307 | ;; They also require OIIO, but OCIO is an optional dependency to it. | 305 | ;; They also require OIIO, but OCIO is an optional dependency to it. |