gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

opencolorio: 2.4.2 -> 2.5.1

Browse Source
This commit is contained in:
Robert Scott
2026-01-30 21:36:24 +00:00
parent 66d26e1683
commit 4656adf0ce
2 changed files with 8 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/opencolorio/default.nix
+8 -9
View File
@@ -23,26 +23,25 @@
stdenv.mkDerivation rec {
pname = "opencolorio";
version = "2.4.2";
version = "2.5.1";
src = fetchFromGitHub {
owner = "AcademySoftwareFoundation";
repo = "OpenColorIO";
rev = "v${version}";
hash = "sha256-+P7T8UZuQEVmsMykSWtUxg0vC7Sr4fQJpovCU5sKtsA=";
hash = "sha256-iI32dnGZdizLBOs7IQtmLUYMPWxadvWNeqZjy49AWb0=";
};
patches = [
# Fix incorrect line number in test
./line-numbers.patch
];
postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
# these tests don't like being run headless on darwin. no builtin
# way of skipping tests so this is what we're reduced to.
substituteInPlace tests/cpu/Config_tests.cpp \
--replace 'OCIO_ADD_TEST(Config, virtual_display)' 'static void _skip_virtual_display()' \
--replace 'OCIO_ADD_TEST(Config, virtual_display_with_active_displays)' 'static void _skip_virtual_display_with_active_displays()'
--replace-fail 'OCIO_ADD_TEST(Config, virtual_display)' 'static void _skip_virtual_display()' \
--replace-fail 'OCIO_ADD_TEST(Config, virtual_display_with_active_displays)' 'static void _skip_virtual_display_with_active_displays()'
# can't just use /tmp like that on macos
substituteInPlace tests/cpu/UnitTestUtils.cpp \
--replace-fail '"/tmp"' '"'"$(mktemp -d)"'"'
'';
nativeBuildInputs = [ cmake ] ++ lib.optionals pythonBindings [ python3Packages.python ];
pkgs/development/libraries/opencolorio/line-numbers.patch
-13
View File
@@ -1,13 +0,0 @@
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)"
};