Merge #291106: opencolorio: fix tests on staging-next

+15
+2
pkgs/development/libraries/opencolorio/default.nix
··· 45 # Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/25200. 46 # Needed for zlib >= 1.3 && cmake < 3.27.4. 47 ./broken-cmake-zlib-version.patch 48 ]; 49 50 postPatch = lib.optionalString stdenv.isDarwin ''
··· 45 # Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/25200. 46 # Needed for zlib >= 1.3 && cmake < 3.27.4. 47 ./broken-cmake-zlib-version.patch 48 + # Fix incorrect line number in test 49 + ./line-numbers.patch 50 ]; 51 52 postPatch = lib.optionalString stdenv.isDarwin ''
+13
pkgs/development/libraries/opencolorio/line-numbers.patch
···
··· 1 + diff --git a/tests/cpu/fileformats/FileFormatCTF_tests.cpp b/tests/cpu/fileformats/FileFormatCTF_tests.cpp 2 + index 7a7ab67b..18c1f55e 100644 3 + --- a/tests/cpu/fileformats/FileFormatCTF_tests.cpp 4 + +++ b/tests/cpu/fileformats/FileFormatCTF_tests.cpp 5 + @@ -1416,7 +1416,7 @@ OCIO_ADD_TEST(FileFormatCTF, difficult_xml_unknown_elements) 6 + "(37): Unrecognized element 'just_ignore' where its parent is 'ProcessList' (8): Unknown element", 7 + "(69): Unrecognized element 'just_ignore' where its parent is 'Description' (66)", 8 + "(70): Unrecognized element 'just_ignore' where its parent is 'just_ignore' (69)", 9 + - "(75): Unrecognized element 'Matrix' where its parent is 'LUT1D' (43): 'Matrix' not allowed in this element", 10 + + "(75): Unrecognized element 'Matrix' where its parent is 'LUT1D' (46): 'Matrix' not allowed in this element", 11 + "(76): Unrecognized element 'Description' where its parent is 'Matrix' (75)", 12 + "(77): Unrecognized element 'Array' where its parent is 'Matrix' (75)" 13 + };