From c329107a4d4ff7b122e6ebb74e481d3c3fd1c7dc Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 6 Mar 2022 04:11:21 +0000
Subject: [PATCH] community/blender to 3.0.1-6

---
 community/blender/PKGBUILD               |  8 ++---
 community/blender/blender-openexr3.patch | 42 ------------------------
 2 files changed, 4 insertions(+), 46 deletions(-)
 delete mode 100644 community/blender/blender-openexr3.patch

diff --git a/community/blender/PKGBUILD b/community/blender/PKGBUILD
index f1d996ef0..b19b53014 100644
--- a/community/blender/PKGBUILD
+++ b/community/blender/PKGBUILD
@@ -15,7 +15,7 @@ buildarch=8
 
 pkgname=blender
 pkgver=3.0.1
-pkgrel=5
+pkgrel=6
 epoch=17
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('x86_64')
@@ -35,7 +35,7 @@ source=("git+https://git.blender.org/blender.git#tag=v$pkgver"
         "git+https://git.blender.org/blender-translations.git"
         "git+https://git.blender.org/blender-dev-tools.git"
         https://developer.download.nvidia.com/redist/optix/v7.3/OptiX-7.3.0-Include.zip
-        blender-openexr3.patch
+        https://dev-files.blender.org/file/data/tcfvs2kikz4ygt3ijgrj/PHID-FILE-oiqrsdika6wadprdqxfz/D14128.diff
         force-draco1.patch
         force-draco2.patch)
 sha512sums=('SKIP'
@@ -44,7 +44,7 @@ sha512sums=('SKIP'
             'SKIP'
             'SKIP'
             'd842e989bf86f4ae932f8708f6340861de4ea33b21435cceeb9a5e3135ef2ddb671e19fe11c397bddbf85894ba312194eac5acc21cbec70607120c0bda0100ef'
-            'e2dd7210d26b70445e9ae8e33dea35111ad0b0aca9d3b4ded3df560d0fcc8dc044868f729e0f090a04b6f316f083b5505a7056ce088e8702065add87b9b457e5'
+            '62a92e849fb2d58092c147e517dd5d85ca488bc6a0bb8943a65f0fd110f14d4fc33e1d83b307aa5d0927f7af9be9018476c3fd1cbb5102adf7f756db0ee4a94c'
             'e239da4f3906f1b54265435181cf770bae3d269c8d915df9a73861e6ee71ec70bf2339426e7c81a91e5a567273b3b3742d7a99feefd3398d821b26e1ff3a56d0'
             '527ab66e5eace777de0043c1ca5787a488f6471450ce67fd6d08137ad0ef56177bc0c17696f30a5fca23fa55d8ca9c3f30cb7b17550dba2dbd8e89ca0b361990')
 
@@ -59,7 +59,7 @@ prepare() {
   git submodule update
   git submodule foreach git checkout v${pkgver}
 
-  patch -p1 -i "$srcdir"/blender-openexr3.patch # Fix build with OpenEXR 3
+  patch -p1 -i "$srcdir"/D14128.diff # Fix build with OpenEXR 3 and OpenImageIO 2.3
   patch -p1 -i "$srcdir"/force-draco1.patch
   patch -p1 -d release/scripts/addons -i "$srcdir"/force-draco2.patch
 }
diff --git a/community/blender/blender-openexr3.patch b/community/blender/blender-openexr3.patch
deleted file mode 100644
index 73a727a3d..000000000
--- a/community/blender/blender-openexr3.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/build_files/cmake/Modules/FindOpenEXR.cmake b/build_files/cmake/Modules/FindOpenEXR.cmake
-index 090f80b8df7..a2f7b4c622b 100644
---- a/build_files/cmake/Modules/FindOpenEXR.cmake
-+++ b/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(OpenEXR  DEFAULT_MSG
- 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/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp
-index 382d86f2645..eff50b19c31 100644
---- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
-+++ b/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>