diff options
| author | howetuft | 2022-03-13 20:24:17 +0100 |
|---|---|---|
| committer | howetuft | 2022-03-13 20:30:35 +0100 |
| commit | d65d56122e80002a20ae6e85fccd00363162f3d9 (patch) | |
| tree | 2ca729ecede4529fa69f9ae846cea1502ab5a8c4 /openimageio.patch | |
| parent | db601086d0e8dff4cbab33e73422434fd7529594 (diff) | |
| download | aur-d65d56122e80002a20ae6e85fccd00363162f3d9.tar.gz | |
OpenImageIO v2.3
Starting from v2.3, OpenColorIO is distributed in 2 libraries. The
second library (OpenColorIO_Util) needs to be added to related CMake
script. An include is also to be updated.
Diffstat (limited to 'openimageio.patch')
| -rw-r--r-- | openimageio.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/openimageio.patch b/openimageio.patch new file mode 100644 index 000000000000..db61057d932f --- /dev/null +++ b/openimageio.patch @@ -0,0 +1,46 @@ +From f90de3f01f7872c754f815287b6eaebd8e4c7fa1 Mon Sep 17 00:00:00 2001 +From: howetuft <howetuft@gmail.com> +Date: Sun, 13 Mar 2022 19:52:17 +0100 +Subject: [PATCH] OpenImageIO v2.3 + +--- + cmake/modules/FindOpenImageIO.cmake | 3 ++- + .../kernel/rendering/final/texturecontrolledpixelrenderer.cpp | 1 + + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/cmake/modules/FindOpenImageIO.cmake b/cmake/modules/FindOpenImageIO.cmake +index 64f6dc48d..0538b89b2 100644 +--- a/cmake/modules/FindOpenImageIO.cmake ++++ b/cmake/modules/FindOpenImageIO.cmake +@@ -42,6 +42,7 @@ include (FindPackageHandleStandardArgs) + find_path (OPENIMAGEIO_INCLUDE_DIR NAMES OpenImageIO/imageio.h) + + find_library (OPENIMAGEIO_LIBRARY NAMES OpenImageIO) ++find_library (OPENIMAGEIO_UTIL_LIBRARY NAMES OpenImageIO_Util) + + find_program (OPENIMAGEIO_OIIOTOOL NAMES oiiotool) + find_program (OPENIMAGEIO_IDIFF NAMES idiff) +@@ -57,7 +58,7 @@ find_package_handle_standard_args (OPENIMAGEIO DEFAULT_MSG + # Set the output variables. + if (OPENIMAGEIO_FOUND) + set (OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR}) +- set (OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY}) ++ set (OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY} ${OPENIMAGEIO_UTIL_LIBRARY}) + else () + set (OPENIMAGEIO_INCLUDE_DIRS) + set (OPENIMAGEIO_LIBRARIES) +diff --git a/src/appleseed/renderer/kernel/rendering/final/texturecontrolledpixelrenderer.cpp b/src/appleseed/renderer/kernel/rendering/final/texturecontrolledpixelrenderer.cpp +index f30fcc911..389b3d909 100644 +--- a/src/appleseed/renderer/kernel/rendering/final/texturecontrolledpixelrenderer.cpp ++++ b/src/appleseed/renderer/kernel/rendering/final/texturecontrolledpixelrenderer.cpp +@@ -61,6 +61,7 @@ + #include "foundation/platform/_beginoiioheaders.h" + #include "OpenImageIO/imagebufalgo.h" + #include "OpenImageIO/typedesc.h" ++#include "OpenImageIO/imagecache.h" + #include "foundation/platform/_endoiioheaders.h" + + // Standard headers. +-- +2.35.1 + |