about summary refs log tree commit diff
path: root/pkgs/applications/graphics
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2022-12-27 17:44:06 +0000
committerRobert Scott <code@humanleg.org.uk>2022-12-30 18:19:35 +0000
commitde947d81f3de76f6c0bbc6e795deab432a10854d (patch)
tree8de37a5921c0544bd3bc13d9bf3f76634f8abd91 /pkgs/applications/graphics
parent8a02212d0e3fa564d488d2f66d74d20e6e80fff5 (diff)
openimageio: 2.2.17.0 -> 2.4.6.1
switch to opencolorio 2 & use apple sdk 11.0 because upstream
have decided to use futimens and we can't hold back the tide
forever
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r--pkgs/applications/graphics/openimageio/2.x.nix21
1 files changed, 15 insertions, 6 deletions
diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix
index d6b710595a315..88d99a0fae76e 100644
--- a/pkgs/applications/graphics/openimageio/2.x.nix
+++ b/pkgs/applications/graphics/openimageio/2.x.nix
@@ -1,5 +1,6 @@
 { lib, stdenv
 , fetchFromGitHub
+, fetchpatch
 , boost
 , cmake
 , giflib
@@ -7,7 +8,7 @@
 , libjpeg
 , libpng
 , libtiff
-, opencolorio_1
+, opencolorio
 , openexr
 , robin-map
 , unzip
@@ -16,15 +17,23 @@
 
 stdenv.mkDerivation rec {
   pname = "openimageio";
-  version = "2.2.17.0";
+  version = "2.4.6.1";
 
   src = fetchFromGitHub {
     owner = "OpenImageIO";
     repo = "oiio";
-    rev = "Release-${version}";
-    sha256 = "0jqpb1zci911wdm928addsljxx8zsh0gzbhv9vbw6man4wi93h6h";
+    rev = "v${version}";
+    sha256 = "sha256-oBICukkborxXFHXyM2rIn5qSbCWECjwDQI9MUg13IRU=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "arm-fix-signed-unsigned-simd-mismatch.patch";
+      url = "https://github.com/OpenImageIO/oiio/commit/726c51181a2888b0bd1edbef5ac8451e9cc3f893.patch";
+      hash = "sha256-G4vexf0OHZ/sbcRob5X92tajkmAv72ok8rcVQtIE9XE=";
+    })
+  ];
+
   outputs = [ "bin" "out" "dev" "doc" ];
 
   nativeBuildInputs = [
@@ -39,7 +48,7 @@ stdenv.mkDerivation rec {
     libjpeg
     libpng
     libtiff
-    opencolorio_1
+    opencolorio
     openexr
     robin-map
     fmt
@@ -58,7 +67,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    homepage = "http://www.openimageio.org";
+    homepage = "https://openimageio.org";
     description = "A library and tools for reading and writing images";
     license = licenses.bsd3;
     maintainers = with maintainers; [ goibhniu ];