summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2021-06-04 12:31:28 -0400
committerbill-auger <mr.j.spam.me@gmail.com>2021-06-04 18:18:33 -0400
commit45053883787874ad515dfcc21faaf2b5b4ccf5fb (patch)
tree1cc0b46e70a28ff8bffa22c8727a394f3b0b7c6f
parent6051e1bb3bcda859daea265c76694c1934d4fdb3 (diff)
downloadabslibre-45053883787874ad515dfcc21faaf2b5b4ccf5fb.tar.gz
abslibre-45053883787874ad515dfcc21faaf2b5b4ccf5fb.tar.bz2
abslibre-45053883787874ad515dfcc21faaf2b5b4ccf5fb.zip
[blender]: upgrade to v2.93.0
-rw-r--r--libre/blender/PKGBUILD10
-rw-r--r--libre/blender/blender-openexr3.patch42
2 files changed, 48 insertions, 4 deletions
diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD
index 61e8c73cd..7473e4c63 100644
--- a/libre/blender/PKGBUILD
+++ b/libre/blender/PKGBUILD
@@ -13,8 +13,8 @@
pkgname=blender
-pkgver=2.92.0
-pkgrel=2
+pkgver=2.93.0
+pkgrel=1
pkgrel+=.parabola1
epoch=17
_pythonver_x86_64=3.9
@@ -42,13 +42,13 @@ source=("git+https://git.blender.org/blender.git#tag=v$pkgver"
"git+https://git.blender.org/blender-addons-contrib.git"
"git+https://git.blender.org/blender-translations.git"
"git+https://git.blender.org/blender-dev-tools.git"
-)
+ blender-openexr3.patch)
sha512sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
'SKIP'
-)
+ 'e2dd7210d26b70445e9ae8e33dea35111ad0b0aca9d3b4ded3df560d0fcc8dc044868f729e0f090a04b6f316f083b5505a7056ce088e8702065add87b9b457e5')
_version_constraint() # (dep_pkgname [precision])
@@ -89,6 +89,8 @@ prepare() {
git submodule update
git submodule foreach git checkout v${pkgver}
+ patch -p1 < "$srcdir"/blender-openexr3.patch # Fix build with OpenEXR 3
+
# set OS type string
sed -i 's|BUILD_PLATFORM;|"GNU/Linux-libre";|' 'source/creator/buildinfo.c'
diff --git a/libre/blender/blender-openexr3.patch b/libre/blender/blender-openexr3.patch
new file mode 100644
index 000000000..73a727a3d
--- /dev/null
+++ b/libre/blender/blender-openexr3.patch
@@ -0,0 +1,42 @@
+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>