Unverified Commit fb8af740 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

openimageio: 2.5.16.0 -> 3.0.5.0 (#401089)

parents 53721d0a a7d096c3

pkgs/by-name/bl/blender/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
  opencolorio,

  openexr,

  openimagedenoise,

  openimageio,

  openimageio_2,

  openjpeg,

  openpgl,

  opensubdiv,
@@ -251,7 +251,7 @@ stdenv'.mkDerivation (finalAttrs: { 
      libwebp

      opencolorio

      openexr

      openimageio

      openimageio_2

      openjpeg

      openpgl

      (opensubdiv.override { inherit cudaSupport; })

pkgs/by-name/gp/gpupad/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
  glslang,

  imath,

  ktx-tools,

  openimageio,

  openimageio_2,

  qt6Packages,

  spdlog,

  spirv-cross,
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { 
    glslang

    imath # needed for openimageio

    ktx-tools

    openimageio

    openimageio_2

    qt6Packages.qtbase

    qt6Packages.qtdeclarative

    qt6Packages.qtmultimedia

pkgs/by-name/op/openimageio/2.nix

0 → 100644
+15 −0
Original line number Diff line number Diff line 
{ fetchFromGitHub, openimageio }:



let

  version = "2.5.17.0";

in

openimageio.overrideAttrs {

  inherit version;



  src = fetchFromGitHub {

    owner = "AcademySoftwareFoundation";

    repo = "OpenImageIO";

    tag = "v${version}";

    hash = "sha256-d5LqRcqWj6E9jJYY/Pa5e7/MeuQGMjUo/hMCYRKsKeU=";

  };

}

pkgs/development/libraries/openimageio/default.nix→pkgs/by-name/op/openimageio/package.nix

+9 −15
Original line number Diff line number Diff line
@@ -15,23 +15,17 @@ 
  fmt,

}:



stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "openimageio";

  version = "2.5.16.0";

  version = "3.0.5.0";



  src = fetchFromGitHub {

    owner = "AcademySoftwareFoundation";

    repo = "OpenImageIO";

    rev = "v${version}";

    hash = "sha256-hUCwlzQW5mJH5HYPbLWOcupc36nxM12CV0sakZhiGzo=";

    tag = "v${finalAttrs.version}";

    hash = "sha256-CG2tb6jf7xmQnrLaTqEFKG3g4nkEwZoI44bXxdCRmrM=";

  };



  # Workaround broken zlib version detection in CMake < 3.37.

  postPatch = ''

    substituteInPlace ./src/cmake/Config.cmake.in \

      --replace " @ZLIB_VERSION@" ""

  '';



  outputs = [

    "bin"

    "out"
@@ -73,11 +67,11 @@ stdenv.mkDerivation rec { 
      --replace "\''${_IMPORT_PREFIX}/lib/lib" "$out/lib/lib"

  '';



  meta = with lib; {

  meta = {

    homepage = "https://openimageio.org";

    description = "Library and tools for reading and writing images";

    license = licenses.bsd3;

    maintainers = [ ];

    platforms = platforms.unix;

    license = lib.licenses.asl20;

    maintainers = with lib.maintainers; [ yzx9 ];

    platforms = lib.platforms.unix;

  };

}
 
})

pkgs/development/compilers/osl/default.nix

+2 −4
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
  libxml2,

  zlib,

  openexr,

  openimageio,

  openimageio_2,

  llvm,

  boost,

  flex,
@@ -20,9 +20,7 @@ 
}:



let



  boost_static = boost.override { enableStatic = true; };



in

stdenv.mkDerivation rec {

  pname = "openshadinglanguage";
@@ -65,7 +63,7 @@ stdenv.mkDerivation rec { 
      libclang

      llvm

      openexr

      openimageio

      openimageio_2

      partio

      pugixml

      python3.pkgs.pybind11