Skip to content

Commit

Permalink
opencolorio: fix tests on staging-next
Browse files Browse the repository at this point in the history
  • Loading branch information
K900 authored and vcunat committed Feb 24, 2024
1 parent 7d52ac6 commit 2b0673c
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
2 changes: 2 additions & 0 deletions pkgs/development/libraries/opencolorio/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ stdenv.mkDerivation rec {
# Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/25200.
# Needed for zlib >= 1.3 && cmake < 3.27.4.
./broken-cmake-zlib-version.patch
# Fix incorrect line number in test
./line-numbers.patch
];

postPatch = lib.optionalString stdenv.isDarwin ''
Expand Down
13 changes: 13 additions & 0 deletions pkgs/development/libraries/opencolorio/line-numbers.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/tests/cpu/fileformats/FileFormatCTF_tests.cpp b/tests/cpu/fileformats/FileFormatCTF_tests.cpp
index 7a7ab67b..18c1f55e 100644
--- a/tests/cpu/fileformats/FileFormatCTF_tests.cpp
+++ b/tests/cpu/fileformats/FileFormatCTF_tests.cpp
@@ -1416,7 +1416,7 @@ OCIO_ADD_TEST(FileFormatCTF, difficult_xml_unknown_elements)
"(37): Unrecognized element 'just_ignore' where its parent is 'ProcessList' (8): Unknown element",
"(69): Unrecognized element 'just_ignore' where its parent is 'Description' (66)",
"(70): Unrecognized element 'just_ignore' where its parent is 'just_ignore' (69)",
- "(75): Unrecognized element 'Matrix' where its parent is 'LUT1D' (43): 'Matrix' not allowed in this element",
+ "(75): Unrecognized element 'Matrix' where its parent is 'LUT1D' (46): 'Matrix' not allowed in this element",
"(76): Unrecognized element 'Description' where its parent is 'Matrix' (75)",
"(77): Unrecognized element 'Array' where its parent is 'Matrix' (75)"
};

0 comments on commit 2b0673c

Please sign in to comment.