diff options
| author | markd <markd@pkgsrc.org> | 2021-07-08 21:25:30 +0000 |
|---|---|---|
| committer | markd <markd@pkgsrc.org> | 2021-07-08 21:25:30 +0000 |
| commit | 045c896b523fbc125ff3d29ebd6814f8fea01518 (patch) | |
| tree | 4df8380b45bd7d1b87b749062c7eccdbbc06a9af /graphics | |
| parent | 1dafa0a784b3b4a06897e7f34ac6323b0e10c6d3 (diff) | |
| download | pkgsrc-045c896b523fbc125ff3d29ebd6814f8fea01518.tar.gz | |
blender: build with openexr3
Diffstat (limited to 'graphics')
4 files changed, 51 insertions, 3 deletions
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index e7560c4e029..d577a24794d 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.173 2021/04/21 13:24:46 adam Exp $ +# $NetBSD: Makefile,v 1.174 2021/07/08 21:25:30 markd Exp $ DISTNAME= blender-2.90.0 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= graphics MASTER_SITES= https://download.blender.org/source/ EXTRACT_SUFX= .tar.xz diff --git a/graphics/blender/distinfo b/graphics/blender/distinfo index 6b763deb599..dc0551dfabd 100644 --- a/graphics/blender/distinfo +++ b/graphics/blender/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.60 2020/09/05 11:40:58 ryoon Exp $ +$NetBSD: distinfo,v 1.61 2021/07/08 21:25:30 markd Exp $ SHA1 (blender-2.90.0.tar.xz) = cbc234b048294ebec34a89116f05663be00f91f2 RMD160 (blender-2.90.0.tar.xz) = 747c96c2453d8203c7df6d80ef246e4834d43984 SHA512 (blender-2.90.0.tar.xz) = 9fc3e423bb13f3b983deba130febf8cc870a65c7d87fff8d9536a54ab606d097cccf46cdd518b15ab483fdf85551fde607b28801c3dbe681c841d7594fcbc57e Size (blender-2.90.0.tar.xz) = 38831704 bytes +SHA1 (patch-build__files_cmake_Modules_FindOpenEXR.cmake) = b663c44b2ba1c641542318936526a0523b607f30 SHA1 (patch-extern_Eigen3_Eigen_src_Core_IO.h) = 791224b988da0383c306e76de5e93cb1cedc960e SHA1 (patch-extern_Eigen3_Eigen_src_Core_arch_CUDA_Half.h) = ee35286558e5590495f1c973ae99ede32048ac38 SHA1 (patch-extern_glog_src_base_mutex.h) = 5fceceefe83400967a59080eeb930d0f3a4b8e88 @@ -11,3 +12,4 @@ SHA1 (patch-extern_glog_src_config.h) = e445c911d4ebb1f7e378c3c46911b55f77ba5608 SHA1 (patch-extern_glog_src_config__netbsd.h) = f96dd9d6afed38466e5765c604efebcd78537a54 SHA1 (patch-intern_cycles_kernel_svm_svm__sky.h) = bc672c23ea5f7c837d6a1f34bae87b9ef093309e SHA1 (patch-intern_guardedalloc_intern_mallocn__intern.h) = 81fb0fd1b34d550168a4bdf63f28b4e199717921 +SHA1 (patch-source_blender_imbuf_intern_openexr_openexr__api.cpp) = 936590a84bc5c2a25567b89fbb8f03467e41d198 diff --git a/graphics/blender/patches/patch-build__files_cmake_Modules_FindOpenEXR.cmake b/graphics/blender/patches/patch-build__files_cmake_Modules_FindOpenEXR.cmake new file mode 100644 index 00000000000..e9d245404d0 --- /dev/null +++ b/graphics/blender/patches/patch-build__files_cmake_Modules_FindOpenEXR.cmake @@ -0,0 +1,29 @@ +$NetBSD: patch-build__files_cmake_Modules_FindOpenEXR.cmake,v 1.1 2021/07/08 21:25:31 markd Exp $ + +openexr3 patch + +--- build_files/cmake/Modules/FindOpenEXR.cmake.orig 2020-08-31 11:59:44.000000000 +0000 ++++ build_files/cmake/Modules/FindOpenEXR.cmake +@@ -34,11 +34,10 @@ ENDIF() + SET(_openexr_libs_ver_init "2.0") + + SET(_openexr_FIND_COMPONENTS +- Half + Iex +- IlmImf +- IlmThread + Imath ++ OpenEXR ++ IlmThread + ) + + SET(_openexr_SEARCH_DIRS +@@ -120,7 +119,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEX + IF(OPENEXR_FOUND) + SET(OPENEXR_LIBRARIES ${_openexr_LIBRARIES}) + # Both include paths are needed because of dummy OSL headers mixing #include <OpenEXR/foo.h> and #include <foo.h> :( +- SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR) ++ SET(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR}/OpenEXR ${OPENEXR_INCLUDE_DIR}/Imath) + ENDIF() + + MARK_AS_ADVANCED( diff --git a/graphics/blender/patches/patch-source_blender_imbuf_intern_openexr_openexr__api.cpp b/graphics/blender/patches/patch-source_blender_imbuf_intern_openexr_openexr__api.cpp new file mode 100644 index 00000000000..b4111886323 --- /dev/null +++ b/graphics/blender/patches/patch-source_blender_imbuf_intern_openexr_openexr__api.cpp @@ -0,0 +1,17 @@ +$NetBSD: patch-source_blender_imbuf_intern_openexr_openexr__api.cpp,v 1.1 2021/07/08 21:25:31 markd Exp $ + +openexr3 patch + +--- source/blender/imbuf/intern/openexr/openexr_api.cpp.orig 2020-08-31 12:03:18.000000000 +0000 ++++ source/blender/imbuf/intern/openexr/openexr_api.cpp +@@ -38,8 +38,10 @@ + #include <ImfChannelList.h> + #include <ImfCompression.h> + #include <ImfCompressionAttribute.h> ++#include <ImfFrameBuffer.h> + #include <ImfIO.h> + #include <ImfInputFile.h> ++#include <ImfInt64.h> + #include <ImfOutputFile.h> + #include <ImfPixelType.h> + #include <ImfStandardAttributes.h> |