Date: Mon, 12 Apr 2021 00:34:25 GMT From: Matthias Andree <mandree@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2ae65f787181 - main - graphics/blender: make compatible with OpenEXR/Imath 3.0 Message-ID: <202104120034.13C0YPBN092357@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=2ae65f787181af6f9d5556e85e8f6867f52be117 commit 2ae65f787181af6f9d5556e85e8f6867f52be117 Author: Matthias Andree <mandree@FreeBSD.org> AuthorDate: 2021-04-11 03:12:49 +0000 Commit: Matthias Andree <mandree@FreeBSD.org> CommitDate: 2021-04-12 00:33:41 +0000 graphics/blender: make compatible with OpenEXR/Imath 3.0 --- graphics/blender/Makefile | 7 ++++--- .../patch-build__files_cmake_Modules_FindOpenEXR.cmake | 13 +++++++++++++ ...ource_blender_imbuf_intern_openexr_openexr__api.cpp | 18 ++++++++++++++++++ 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 0e245f24556c..297767cc79c5 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -2,7 +2,7 @@ PORTNAME= blender DISTVERSION= 2.91.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics multimedia MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ @@ -129,8 +129,9 @@ OPENCOLORIO_LIB_DEPENDS= libOpenColorIO.so:graphics/opencolorio \ libyaml-cpp03.so:devel/yaml-cpp03 \ libtinyxml.so:textproc/tinyxml OPENEXR_CMAKE_BOOL= WITH_IMAGE_OPENEXR -OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr \ - libHalf.so:graphics/ilmbase +OPENEXR_CFLAGS= -I${LOCALBASE}/include/Imath +OPENEXR_LIB_DEPENDS= libOpenEXR.so:graphics/openexr \ + libImath.so:math/Imath OPENIMAGEIO_IMPLIES= OPENEXR TIFF OPENIMAGEIO_CMAKE_BOOL= WITH_OPENIMAGEIO OPENIMAGEIO_LIB_DEPENDS= libOpenImageIO.so:graphics/openimageio diff --git a/graphics/blender/files/patch-build__files_cmake_Modules_FindOpenEXR.cmake b/graphics/blender/files/patch-build__files_cmake_Modules_FindOpenEXR.cmake new file mode 100644 index 000000000000..ea60a8073ad9 --- /dev/null +++ b/graphics/blender/files/patch-build__files_cmake_Modules_FindOpenEXR.cmake @@ -0,0 +1,13 @@ +--- build_files/cmake/Modules/FindOpenEXR.cmake.orig 2020-09-25 06:53:19 UTC ++++ build_files/cmake/Modules/FindOpenEXR.cmake +@@ -34,9 +34,8 @@ ENDIF() + SET(_openexr_libs_ver_init "2.0") + + SET(_openexr_FIND_COMPONENTS +- Half + Iex +- IlmImf ++ OpenEXR + IlmThread + Imath + ) diff --git a/graphics/blender/files/patch-source_blender_imbuf_intern_openexr_openexr__api.cpp b/graphics/blender/files/patch-source_blender_imbuf_intern_openexr_openexr__api.cpp new file mode 100644 index 000000000000..6d744f7258d8 --- /dev/null +++ b/graphics/blender/files/patch-source_blender_imbuf_intern_openexr_openexr__api.cpp @@ -0,0 +1,18 @@ +--- source/blender/imbuf/intern/openexr/openexr_api.cpp.orig 2020-11-25 08:31:32 UTC ++++ source/blender/imbuf/intern/openexr/openexr_api.cpp +@@ -38,6 +38,7 @@ + #include <ImfChannelList.h> + #include <ImfCompression.h> + #include <ImfCompressionAttribute.h> ++#include <ImfFrameBuffer.h> + #include <ImfIO.h> + #include <ImfInputFile.h> + #include <ImfOutputFile.h> +@@ -94,6 +95,7 @@ _CRTIMP void __cdecl _invalid_parameter_noinfo(void) + + using namespace Imf; + using namespace Imath; ++typedef uint64_t Int64; + + extern "C" { + /* prototype */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104120034.13C0YPBN092357>