Skip to content

Commit 5a54b90

Browse files
committed
[blender] Update patch and options
1 parent bdf2a2b commit 5a54b90

1 file changed

Lines changed: 3 additions & 11 deletions

File tree

alarmcn/blender/PKGBUILD

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,6 @@ prepare() {
123123
git remote add network-origin https://projects.blender.org/blender/blender
124124
git lfs fetch network-origin
125125
git lfs checkout
126-
127-
# Fix build with CUDA 13
128-
sed -i 's|sm_50|sm_75|' build_files/build_environment/cmake/osl.cmake intern/cycles/kernel/CMakeLists.txt
129-
130-
# Fix build with opencolorio 2.5.0
131-
git cherry-pick -n 98e400c3ae2fef75d2550a5fc1370d6e97ec9560
132-
133-
git cherry-pick -n d92f498ed80ef44b00fca7617aeaab093cd0f7f7
134126
}
135127

136128
_get_pyver() {
@@ -141,9 +133,7 @@ build() {
141133
# This should fix #13.
142134
export CXXFLAGS=${CXXFLAGS/-Wp,-D_GLIBCXX_ASSERTIONS/}
143135
CXXFLAGS+=' --param=max-vartrack-size=640000000'
144-
145-
# Fix numpy discovery
146-
sed -i "s|core/include|_core/include|g" blender/CMakeLists.txt
136+
CXXFLAGS+=' -Wno-error=format-security'
147137

148138
local cmake_options=(
149139
-B build
@@ -160,6 +150,8 @@ build() {
160150
-D WITH_CYCLES_OSL=ON
161151
-D WITH_INSTALL_PORTABLE=OFF
162152
-D WITH_PYTHON_INSTALL=OFF
153+
-D WITH_SYSTEM_GFLAGS=ON
154+
-D WITH_SYSTEM_GLOG=ON
163155
-G Ninja
164156
-S "$pkgname"
165157
-W no-dev

0 commit comments

Comments
 (0)