summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini2024-02-01 12:21:37 +0100
committer Matteo Bernardini2024-03-16 09:08:39 +0100
commitad6de51dfd691eed7c172bdd62ba43786eb220fb (patch)
tree593d334526487b1a106fed437a8e539a75ac6706
parentf2fd02d810ccafdcb54cd1ce380341a85bbefd77 (diff)
downloadslackbuilds-Blender.tar.gz
graphics/Blender: Added a fix for cmake 3.28.2.Blender
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--graphics/Blender/Blender.SlackBuild3
-rw-r--r--graphics/Blender/cmake-3.28.2.patch13
2 files changed, 16 insertions, 0 deletions
diff --git a/graphics/Blender/Blender.SlackBuild b/graphics/Blender/Blender.SlackBuild
index 93a62dc7a4..aa47433c2f 100644
--- a/graphics/Blender/Blender.SlackBuild
+++ b/graphics/Blender/Blender.SlackBuild
@@ -109,6 +109,9 @@ sed -i -e '/#include <fstream>/a #include <cstdint>' extern/quadriflow/src/loade
# 20220322 bkw: 32-bit needs this
[ -z "$LIBDIRSUFFIX" ] && patch -p1 < $CWD/overloaded_min.diff
+# https://devtalk.blender.org/t/build-on-macos-is-failing-for-me-on-main-branch/33161/8
+patch -p1 < $CWD/cmake-3.28.2.patch
+
mkdir -p build
cd build
cmake ../ \
diff --git a/graphics/Blender/cmake-3.28.2.patch b/graphics/Blender/cmake-3.28.2.patch
new file mode 100644
index 0000000000..0048c29900
--- /dev/null
+++ b/graphics/Blender/cmake-3.28.2.patch
@@ -0,0 +1,13 @@
+diff -Naur blender-3.3.10.orig/CMakeLists.txt blender-3.3.10/CMakeLists.txt
+--- blender-3.3.10.orig/CMakeLists.txt 2023-05-15 15:48:41.000000000 +0200
++++ blender-3.3.10/CMakeLists.txt 2024-02-01 12:13:12.018443284 +0100
+@@ -170,7 +170,8 @@
+ mark_as_advanced(BUILDINFO_OVERRIDE_DATE)
+ mark_as_advanced(BUILDINFO_OVERRIDE_TIME)
+
+-if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16")
++# CMAKE 3.28.2 has issues with the combination of PCH and unity builds, disable for now.
++if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16" AND NOT ${CMAKE_VERSION} VERSION_EQUAL "3.28.2")
+ option(WITH_UNITY_BUILD "Enable unity build for modules that support it to improve compile times" ON)
+ mark_as_advanced(WITH_UNITY_BUILD)
+ else()