CVS commit: pkgsrc/graphics/blender

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Thu Jul  8 21:25:31 UTC 2021

Modified Files:
        pkgsrc/graphics/blender: Makefile distinfo
Added Files:
        pkgsrc/graphics/blender/patches:
            patch-build__files_cmake_Modules_FindOpenEXR.cmake
            patch-source_blender_imbuf_intern_openexr_openexr__api.cpp

Log Message:
blender: build with openexr3


To generate a diff of this commit:
cvs rdiff -u -r1.173 -r1.174 pkgsrc/graphics/blender/Makefile
cvs rdiff -u -r1.60 -r1.61 pkgsrc/graphics/blender/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/blender/patches/patch-build__files_cmake_Modules_FindOpenEXR.cmake \
    pkgsrc/graphics/blender/patches/patch-source_blender_imbuf_intern_openexr_openexr__api.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/blender/Makefile
diff -u pkgsrc/graphics/blender/Makefile:1.173 pkgsrc/graphics/blender/Makefile:1.174
--- pkgsrc/graphics/blender/Makefile:1.173      Wed Apr 21 13:24:46 2021
+++ pkgsrc/graphics/blender/Makefile    Thu Jul  8 21:25:30 2021
@@ -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

Index: pkgsrc/graphics/blender/distinfo
diff -u pkgsrc/graphics/blender/distinfo:1.60 pkgsrc/graphics/blender/distinfo:1.61
--- pkgsrc/graphics/blender/distinfo:1.60       Sat Sep  5 11:40:58 2020
+++ pkgsrc/graphics/blender/distinfo    Thu Jul  8 21:25:30 2021
@@ -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) = 
 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

Added files:

Index: pkgsrc/graphics/blender/patches/patch-build__files_cmake_Modules_FindOpenEXR.cmake
diff -u /dev/null pkgsrc/graphics/blender/patches/patch-build__files_cmake_Modules_FindOpenEXR.cmake:1.1
--- /dev/null   Thu Jul  8 21:25:31 2021
+++ pkgsrc/graphics/blender/patches/patch-build__files_cmake_Modules_FindOpenEXR.cmake  Thu Jul  8 21:25:31 2021
@@ -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(
Index: pkgsrc/graphics/blender/patches/patch-source_blender_imbuf_intern_openexr_openexr__api.cpp
diff -u /dev/null pkgsrc/graphics/blender/patches/patch-source_blender_imbuf_intern_openexr_openexr__api.cpp:1.1
--- /dev/null   Thu Jul  8 21:25:31 2021
+++ pkgsrc/graphics/blender/patches/patch-source_blender_imbuf_intern_openexr_openexr__api.cpp  Thu Jul  8 21:25:31 2021
@@ -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>