aboutsummaryrefslogtreecommitdiffstats
path: root/testing/blender
diff options
context:
space:
mode:
Diffstat (limited to 'testing/blender')
-rw-r--r--testing/blender/0001-musl-fixes.patch6
-rw-r--r--testing/blender/0002-fix-linking-issue.patch6
-rw-r--r--testing/blender/0003-increase-thread-stack-size-for-musl.patch6
-rw-r--r--testing/blender/0004-OpenEXR-3.patch50
-rw-r--r--testing/blender/APKBUILD14
5 files changed, 68 insertions, 14 deletions
diff --git a/testing/blender/0001-musl-fixes.patch b/testing/blender/0001-musl-fixes.patch
index 8ca03d433c..1a52f3e3d2 100644
--- a/testing/blender/0001-musl-fixes.patch
+++ b/testing/blender/0001-musl-fixes.patch
@@ -1,7 +1,7 @@
-From 9f5cd19b34c6357d0473f61b8b4d13b28c3e8b6c Mon Sep 17 00:00:00 2001
+From d6f5fac8b9f47f59ce50f70f82e6469c4fe3868a Mon Sep 17 00:00:00 2001
From: Leon Marz <lmarz@cs.uni-frankfurt.de>
Date: Wed, 25 Nov 2020 10:10:41 +0100
-Subject: [PATCH 1/3] musl fixes
+Subject: [PATCH 1/5] musl fixes
Original patch by Nathanael Copa
---
@@ -92,5 +92,5 @@ index 29e12a9..d90da8f 100644
# endif /* defined(__linux__) && defined(__GNUC__) */
# if defined(OSX_SSE_FPE)
--
-2.31.1
+2.33.0
diff --git a/testing/blender/0002-fix-linking-issue.patch b/testing/blender/0002-fix-linking-issue.patch
index 2eac80f9e5..21cbf63b00 100644
--- a/testing/blender/0002-fix-linking-issue.patch
+++ b/testing/blender/0002-fix-linking-issue.patch
@@ -1,7 +1,7 @@
-From 38035cf0b6f9a8af1938930d151973687d4ba561 Mon Sep 17 00:00:00 2001
+From eccf3810918be4ef46d64aebde179a0251b2070e Mon Sep 17 00:00:00 2001
From: Leon Marz <lmarz@cs.uni-frankfurt.de>
Date: Tue, 1 Sep 2020 09:11:18 +0200
-Subject: [PATCH 2/3] fix linking issue
+Subject: [PATCH 2/5] fix linking issue
---
intern/ghost/CMakeLists.txt | 2 +-
@@ -19,5 +19,5 @@ index 1739659..d6b442b 100644
+list(APPEND LIB "-lX11" "-lXi" "-lXxf86vm" "-lXfixes" "-lXrender")
blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--
-2.31.1
+2.33.0
diff --git a/testing/blender/0003-increase-thread-stack-size-for-musl.patch b/testing/blender/0003-increase-thread-stack-size-for-musl.patch
index 8ff94b9463..ab1cc1255c 100644
--- a/testing/blender/0003-increase-thread-stack-size-for-musl.patch
+++ b/testing/blender/0003-increase-thread-stack-size-for-musl.patch
@@ -1,7 +1,7 @@
-From 7c5e611332e97d1678e4c32de84ad3dad1cc81a7 Mon Sep 17 00:00:00 2001
+From d31525d54b7f462bf0851c88c7c718a2b8954809 Mon Sep 17 00:00:00 2001
From: Damian Kurek <starfire24680@gmail.com>
Date: Sun, 22 Nov 2020 02:03:11 +0100
-Subject: [PATCH 3/3] increase thread stack size for musl
+Subject: [PATCH 3/5] increase thread stack size for musl
---
intern/cycles/util/util_thread.cpp | 4 ++--
@@ -44,5 +44,5 @@ index 29f9bec..58a63ce 100644
#else
std::thread std_thread;
--
-2.31.1
+2.33.0
diff --git a/testing/blender/0004-OpenEXR-3.patch b/testing/blender/0004-OpenEXR-3.patch
new file mode 100644
index 0000000000..28220bc842
--- /dev/null
+++ b/testing/blender/0004-OpenEXR-3.patch
@@ -0,0 +1,50 @@
+From b5a872ee9c64d5b882019fd3028ea6a458a08513 Mon Sep 17 00:00:00 2001
+From: Leon Marz <main@lmarz.org>
+Date: Sat, 7 Aug 2021 16:01:52 +0000
+Subject: [PATCH 4/5] OpenEXR 3
+
+---
+ build_files/cmake/Modules/FindOpenEXR.cmake | 5 ++---
+ source/blender/imbuf/intern/openexr/openexr_api.cpp | 2 ++
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/build_files/cmake/Modules/FindOpenEXR.cmake b/build_files/cmake/Modules/FindOpenEXR.cmake
+index 090f80b..4f5e9d8 100644
+--- a/build_files/cmake/Modules/FindOpenEXR.cmake
++++ b/build_files/cmake/Modules/FindOpenEXR.cmake
+@@ -34,9 +34,8 @@ ENDIF()
+ SET(_openexr_libs_ver_init "2.0")
+
+ SET(_openexr_FIND_COMPONENTS
+- Half
++ OpenEXR
+ Iex
+- IlmImf
+ IlmThread
+ Imath
+ )
+@@ -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 382d86f..3e1ab70 100644
+--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
++++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
+@@ -32,6 +32,8 @@
+ #include <stdexcept>
+ #include <string>
+
++#include <ImfInt64.h>
++#include <ImfFrameBuffer.h>
+ #include <Iex.h>
+ #include <ImathBox.h>
+ #include <ImfArray.h>
+--
+2.33.0
+
diff --git a/testing/blender/APKBUILD b/testing/blender/APKBUILD
index d70e73525e..2481049540 100644
--- a/testing/blender/APKBUILD
+++ b/testing/blender/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Leon Marz <main@lmarz.org>
# Maintainer: Leon Marz <main@lmarz.org>
pkgname=blender
-pkgver=2.93.1
+pkgver=2.93.5
_pkgver=${pkgver%.[0-9]}
pkgrel=0
pkgdesc="3D Creation/Animation/Publishing System"
@@ -36,6 +36,7 @@ makedepends="cmake
openal-soft-dev
opencolorio-dev
openexr-dev
+ openimagedenoise-dev
openimageio-dev
openjpeg-dev
opensubdiv-dev
@@ -56,6 +57,7 @@ source="https://download.blender.org/source/blender-$pkgver.tar.xz
0001-musl-fixes.patch
0002-fix-linking-issue.patch
0003-increase-thread-stack-size-for-musl.patch
+ 0004-OpenEXR-3.patch
"
@@ -91,6 +93,7 @@ _build() {
-DWITH_SYSTEM_EIGEN3=ON \
-DWITH_SYSTEM_GLEW=ON \
-DPYTHON_VERSION=$_py_version
+
cmake --build .
}
@@ -139,8 +142,9 @@ python() {
}
sha512sums="
-b14e8cca248c53e4a93976d7fa1cd1ab92a7d18a3809b2a535881731aad2f68d8d155ad175b27aa1890714b81aa6648604a614cacc90e95b7269569661e393b1 blender-2.93.1.tar.xz
-9a26ddc83d03fb24a03d567d134a30425b84d290e2d36f7bf4d5644b1d0a78a46f44c512550c1663d4c5ed5a316763446ff2da4cae2c63822f33f354fb7e6a05 0001-musl-fixes.patch
-aa3ac2d938e7182fde2ee9219f55c02f1447781f679a28b651f377f0b27f885a063b5bcbe6f8bafd80e4259b0f1e8e21c08cef05d54930b4aa828b818e1d1cee 0002-fix-linking-issue.patch
-8b305ad69ead11b12f08bfd55796cdb4560d04953ac2817d687c599a2179f7525a74a86f7b3d292832b002cf4075c7e1e7e2c164bb71ad977b917ec850e756f7 0003-increase-thread-stack-size-for-musl.patch
+274e94fa64af0a414815d2809870982dc1093732ddad9e91318f96ce5b72102d9afab16273724127568c0e890dad921bd8f72d7b0e74c9c501b3e86f6b7cfaa0 blender-2.93.5.tar.xz
+c3d783e049e08acf5a2a474e86b7cf6d3d9f0e47984c199ae748b86c82b36a201c1b1f3e6eae932a1b3bcf808456df9bae4ea2bdbbbb00b7d092391478aa094f 0001-musl-fixes.patch
+792b8bd42fb4301a371338c2de6124f6ec4e98a45d10d6e5a03b086d56b8da7396d258d77e517655fd73e2cc8d7ede3bf9240f8b98e207beeea8f4dec7a90e03 0002-fix-linking-issue.patch
+b31f7c9d98477e9ee4929357a8d57bc75b1c66312d63ee6d05f6c865025a16cd4ceb99648fe09941b44581807f817ba578b3c7422f0bee6228b268d51f849d85 0003-increase-thread-stack-size-for-musl.patch
+90cbcb342c948fa954c42e8a48dfd92dd434c29dcd47210383bf00f0bad415e19e59ff8276deffa7f8ef3f270f28c8beef2000ccdbb2879e77dfeea5af0bda4e 0004-OpenEXR-3.patch
"