Received: by mail.netbsd.org (Postfix, from userid 605) id 5160784F9C; Tue, 13 Jul 2021 13:05:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8B61C84D3F for ; Tue, 13 Jul 2021 13:05:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id Kh-UCJx1T6Ic for ; Tue, 13 Jul 2021 13:05:08 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id B462E84D1C for ; Tue, 13 Jul 2021 13:05:08 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A888FFA95; Tue, 13 Jul 2021 13:05:08 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1626181508168450" MIME-Version: 1.0 Date: Tue, 13 Jul 2021 13:05:08 +0000 From: "Mark Davies" Subject: CVS commit: pkgsrc/graphics/blender-lts To: pkgsrc-changes@NetBSD.org Reply-To: markd@netbsd.org X-Mailer: log_accum Message-Id: <20210713130508.A888FFA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1626181508168450 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: markd Date: Tue Jul 13 13:05:08 UTC 2021 Modified Files: pkgsrc/graphics/blender-lts: Makefile distinfo Added Files: pkgsrc/graphics/blender-lts/patches: patch-build__files_cmake_Modules_FindOpenEXR.cmake patch-source_blender_imbuf_intern_openexr_openexr__api.cpp Log Message: blender-lts: fix for openexr3 To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/blender-lts/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/blender-lts/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/graphics/blender-lts/patches/patch-build__files_cmake_Modules_FindOpenEXR.cmake \ pkgsrc/graphics/blender-lts/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. --_----------=_1626181508168450 Content-Disposition: inline Content-Length: 4511 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/blender-lts/Makefile diff -u pkgsrc/graphics/blender-lts/Makefile:1.7 pkgsrc/graphics/blender-lts/Makefile:1.8 --- pkgsrc/graphics/blender-lts/Makefile:1.7 Wed Apr 21 13:24:46 2021 +++ pkgsrc/graphics/blender-lts/Makefile Tue Jul 13 13:05:08 2021 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2021/04/21 13:24:46 adam Exp $ +# $NetBSD: Makefile,v 1.8 2021/07/13 13:05:08 markd Exp $ DISTNAME= blender-2.83.5 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= graphics MASTER_SITES= https://download.blender.org/source/ EXTRACT_SUFX= .tar.xz Index: pkgsrc/graphics/blender-lts/distinfo diff -u pkgsrc/graphics/blender-lts/distinfo:1.1 pkgsrc/graphics/blender-lts/distinfo:1.2 --- pkgsrc/graphics/blender-lts/distinfo:1.1 Sat Sep 5 11:46:40 2020 +++ pkgsrc/graphics/blender-lts/distinfo Tue Jul 13 13:05:08 2021 @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.1 2020/09/05 11:46:40 ryoon Exp $ +$NetBSD: distinfo,v 1.2 2021/07/13 13:05:08 markd Exp $ SHA1 (blender-2.83.5.tar.xz) = c3ccf14288f038999e3bdb96be4e2f373c98d6f5 RMD160 (blender-2.83.5.tar.xz) = 52957a68afd8e8c019fc0c1499ec2cb26bfd0b79 SHA512 (blender-2.83.5.tar.xz) = 6179b4c285d40f59b7701cafe8d2cca5d764ef15b5c390c42cfb7cf8a41704b09a4e62fcf644d76bd2b7f47bcfc96395f0afa4a1d748c4c2ba8dfdee7356df9f Size (blender-2.83.5.tar.xz) = 38551588 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 @@ -12,3 +13,4 @@ SHA1 (patch-extern_glog_src_config__netb SHA1 (patch-extern_wcwidth_wcwidth.h) = c6ebe1ec27cd9096621b26bd6b83560ea2c1770a SHA1 (patch-intern_guardedalloc_intern_mallocn__intern.h) = 81fb0fd1b34d550168a4bdf63f28b4e199717921 SHA1 (patch-source_blender_blenlib_BLI__sys__types.h) = 05d9dee88356021af4c7da28953ade18c012a702 +SHA1 (patch-source_blender_imbuf_intern_openexr_openexr__api.cpp) = 936590a84bc5c2a25567b89fbb8f03467e41d198 Added files: Index: pkgsrc/graphics/blender-lts/patches/patch-build__files_cmake_Modules_FindOpenEXR.cmake diff -u /dev/null pkgsrc/graphics/blender-lts/patches/patch-build__files_cmake_Modules_FindOpenEXR.cmake:1.1 --- /dev/null Tue Jul 13 13:05:08 2021 +++ pkgsrc/graphics/blender-lts/patches/patch-build__files_cmake_Modules_FindOpenEXR.cmake Tue Jul 13 13:05:08 2021 @@ -0,0 +1,29 @@ +$NetBSD: patch-build__files_cmake_Modules_FindOpenEXR.cmake,v 1.1 2021/07/13 13:05:08 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 and #include :( +- 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-lts/patches/patch-source_blender_imbuf_intern_openexr_openexr__api.cpp diff -u /dev/null pkgsrc/graphics/blender-lts/patches/patch-source_blender_imbuf_intern_openexr_openexr__api.cpp:1.1 --- /dev/null Tue Jul 13 13:05:08 2021 +++ pkgsrc/graphics/blender-lts/patches/patch-source_blender_imbuf_intern_openexr_openexr__api.cpp Tue Jul 13 13:05:08 2021 @@ -0,0 +1,17 @@ +$NetBSD: patch-source_blender_imbuf_intern_openexr_openexr__api.cpp,v 1.1 2021/07/13 13:05:08 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 + #include + #include ++#include + #include + #include ++#include + #include + #include + #include --_----------=_1626181508168450--