diff options
| author | Thomas Gerbet <thomas@gerbet.me> | 2023-01-14 11:51:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-14 11:51:20 +0100 |
| commit | cb5e28c2108ff6979e800062c67b4fe298889d3e (patch) | |
| tree | 6e7cc708253d34fc168b0e0e3c13298c1e963788 | |
| parent | 332b371e6dc430438d77234b8fe59092a29da47d (diff) | |
| parent | cfba96b8a12409cd9c6c44b0321bef2e8fe13e89 (diff) | |
Merge pull request #209959 from risicle/ris-openimageio-2.4.6.1-r22.11
[22.11] openimageio2: 2.2.17.0 -> 2.4.6.1
| -rw-r--r-- | pkgs/applications/graphics/openimageio/2.x.nix | 17 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 14 insertions, 5 deletions
diff --git a/pkgs/applications/graphics/openimageio/2.x.nix b/pkgs/applications/graphics/openimageio/2.x.nix index d6b710595a31..3857a1a91dfe 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 @@ -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 = [ @@ -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 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 33d9a9b5d835..d4c33ded44b8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31054,7 +31054,7 @@ with pkgs; boost = boost175; }; - openimageio2 = callPackage ../applications/graphics/openimageio/2.x.nix { }; + openimageio2 = darwin.apple_sdk_11_0.callPackage ../applications/graphics/openimageio/2.x.nix { }; openjump = callPackage ../applications/misc/openjump { }; |