Thu Jul 8 21:25:31 2021 UTC ()
blender: build with openexr3


(markd)
diff -r1.173 -r1.174 pkgsrc/graphics/blender/Makefile
diff -r1.60 -r1.61 pkgsrc/graphics/blender/distinfo
diff -r0 -r1.1 pkgsrc/graphics/blender/patches/patch-build__files_cmake_Modules_FindOpenEXR.cmake
diff -r0 -r1.1 pkgsrc/graphics/blender/patches/patch-source_blender_imbuf_intern_openexr_openexr__api.cpp
cvs diff -r1.173 -r1.174 pkgsrc/graphics/blender/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/blender/Makefile 2021/04/21 13:24:46 1.173
+++ pkgsrc/graphics/blender/Makefile 2021/07/08 21:25:30 1.174
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.173 2021/04/21 13:24:46 adam Exp $ 1# $NetBSD: Makefile,v 1.174 2021/07/08 21:25:30 markd Exp $
2 2
3DISTNAME= blender-2.90.0 3DISTNAME= blender-2.90.0
4PKGREVISION= 6 4PKGREVISION= 7
5CATEGORIES= graphics 5CATEGORIES= graphics
6MASTER_SITES= https://download.blender.org/source/ 6MASTER_SITES= https://download.blender.org/source/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.blender.org/ 10HOMEPAGE= https://www.blender.org/
11COMMENT= Fully integrated 3D graphics creation suite 11COMMENT= Fully integrated 3D graphics creation suite
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_CMAKE= yes 14USE_CMAKE= yes
15USE_LANGUAGES= c gnu++11 15USE_LANGUAGES= c gnu++11
16 16
17# C++11 17# C++11
cvs diff -r1.60 -r1.61 pkgsrc/graphics/blender/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/blender/distinfo 2020/09/05 11:40:58 1.60
+++ pkgsrc/graphics/blender/distinfo 2021/07/08 21:25:30 1.61
@@ -1,13 +1,15 @@ @@ -1,13 +1,15 @@
1$NetBSD: distinfo,v 1.60 2020/09/05 11:40:58 ryoon Exp $ 1$NetBSD: distinfo,v 1.61 2021/07/08 21:25:30 markd Exp $
2 2
3SHA1 (blender-2.90.0.tar.xz) = cbc234b048294ebec34a89116f05663be00f91f2 3SHA1 (blender-2.90.0.tar.xz) = cbc234b048294ebec34a89116f05663be00f91f2
4RMD160 (blender-2.90.0.tar.xz) = 747c96c2453d8203c7df6d80ef246e4834d43984 4RMD160 (blender-2.90.0.tar.xz) = 747c96c2453d8203c7df6d80ef246e4834d43984
5SHA512 (blender-2.90.0.tar.xz) = 9fc3e423bb13f3b983deba130febf8cc870a65c7d87fff8d9536a54ab606d097cccf46cdd518b15ab483fdf85551fde607b28801c3dbe681c841d7594fcbc57e 5SHA512 (blender-2.90.0.tar.xz) = 9fc3e423bb13f3b983deba130febf8cc870a65c7d87fff8d9536a54ab606d097cccf46cdd518b15ab483fdf85551fde607b28801c3dbe681c841d7594fcbc57e
6Size (blender-2.90.0.tar.xz) = 38831704 bytes 6Size (blender-2.90.0.tar.xz) = 38831704 bytes
 7SHA1 (patch-build__files_cmake_Modules_FindOpenEXR.cmake) = b663c44b2ba1c641542318936526a0523b607f30
7SHA1 (patch-extern_Eigen3_Eigen_src_Core_IO.h) = 791224b988da0383c306e76de5e93cb1cedc960e 8SHA1 (patch-extern_Eigen3_Eigen_src_Core_IO.h) = 791224b988da0383c306e76de5e93cb1cedc960e
8SHA1 (patch-extern_Eigen3_Eigen_src_Core_arch_CUDA_Half.h) = ee35286558e5590495f1c973ae99ede32048ac38 9SHA1 (patch-extern_Eigen3_Eigen_src_Core_arch_CUDA_Half.h) = ee35286558e5590495f1c973ae99ede32048ac38
9SHA1 (patch-extern_glog_src_base_mutex.h) = 5fceceefe83400967a59080eeb930d0f3a4b8e88 10SHA1 (patch-extern_glog_src_base_mutex.h) = 5fceceefe83400967a59080eeb930d0f3a4b8e88
10SHA1 (patch-extern_glog_src_config.h) = e445c911d4ebb1f7e378c3c46911b55f77ba5608 11SHA1 (patch-extern_glog_src_config.h) = e445c911d4ebb1f7e378c3c46911b55f77ba5608
11SHA1 (patch-extern_glog_src_config__netbsd.h) = f96dd9d6afed38466e5765c604efebcd78537a54 12SHA1 (patch-extern_glog_src_config__netbsd.h) = f96dd9d6afed38466e5765c604efebcd78537a54
12SHA1 (patch-intern_cycles_kernel_svm_svm__sky.h) = bc672c23ea5f7c837d6a1f34bae87b9ef093309e 13SHA1 (patch-intern_cycles_kernel_svm_svm__sky.h) = bc672c23ea5f7c837d6a1f34bae87b9ef093309e
13SHA1 (patch-intern_guardedalloc_intern_mallocn__intern.h) = 81fb0fd1b34d550168a4bdf63f28b4e199717921 14SHA1 (patch-intern_guardedalloc_intern_mallocn__intern.h) = 81fb0fd1b34d550168a4bdf63f28b4e199717921
 15SHA1 (patch-source_blender_imbuf_intern_openexr_openexr__api.cpp) = 936590a84bc5c2a25567b89fbb8f03467e41d198
File Added: pkgsrc/graphics/blender/patches/Attic/patch-build__files_cmake_Modules_FindOpenEXR.cmake
$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(
File Added: pkgsrc/graphics/blender/patches/Attic/patch-source_blender_imbuf_intern_openexr_openexr__api.cpp
$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>