From c9ad1d2832326fb13945a5ce8303ff76d247c634 Mon Sep 17 00:00:00 2001 From: Sergey Lapin Date: Mon, 18 Aug 2025 13:48:22 +0300 Subject: [PATCH] x86_64 blender --- .gitattributes | 1 + .../build_environment/patches/ispc.diff | 19 +++++++++++++++---- build-blender.sh | 9 ++++++--- .../Blender-3.6-unknown-linux-x86_64.tar.xz | 3 +++ 4 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 prebuilts/Blender-3.6-unknown-linux-x86_64.tar.xz diff --git a/.gitattributes b/.gitattributes index 11a4423..ebe2b25 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ prebuilts/Blender-3.6-unknown-linux-aarch64.tar.xz filter=lfs diff=lfs merge=lfs -text +prebuilts/Blender-3.6-unknown-linux-x86_64.tar.xz filter=lfs diff=lfs merge=lfs -text diff --git a/blender-build/build_environment/patches/ispc.diff b/blender-build/build_environment/patches/ispc.diff index d0c0940..ab168db 100644 --- a/blender-build/build_environment/patches/ispc.diff +++ b/blender-build/build_environment/patches/ispc.diff @@ -1,6 +1,6 @@ diff -Naur ispc-1.17.0.org/CMakeLists.txt ispc-1.17.0/CMakeLists.txt ---- ispc-1.17.0.org/CMakeLists.txt 2022-01-15 01:35:15 -0700 -+++ ispc-1.17.0/CMakeLists.txt 2022-02-12 12:44:24 -0700 +--- ispc-1.17.0.org/CMakeLists.txt 2022-01-15 11:35:15.000000000 +0300 ++++ ispc-1.17.0/CMakeLists.txt 2025-08-17 23:51:29.551323047 +0300 @@ -36,8 +36,12 @@ cmake_minimum_required(VERSION 3.13) @@ -64,9 +64,20 @@ diff -Naur ispc-1.17.0.org/CMakeLists.txt ispc-1.17.0/CMakeLists.txt # Build target for utility checking host ISA if (ISPC_INCLUDE_UTILS) add_executable(check_isa "") +diff -Naur ispc-1.17.0.org/src/target_registry.h ispc-1.17.0/src/target_registry.h +--- ispc-1.17.0.org/src/target_registry.h 2022-01-15 11:35:15.000000000 +0300 ++++ ispc-1.17.0/src/target_registry.h 2025-08-17 23:52:08.015586903 +0300 +@@ -42,6 +42,7 @@ + #include + #include + #include ++#include + + namespace ispc { + // Some background information useful for understanding how this works. diff -Naur ispc-1.17.0.org/cmake/GenerateBuiltins.cmake ispc-1.17.0/cmake/GenerateBuiltins.cmake ---- ispc-1.17.0.org/cmake/GenerateBuiltins.cmake 2022-01-15 01:35:15 -0700 -+++ ispc-1.17.0/cmake/GenerateBuiltins.cmake 2022-02-12 12:44:24 -0700 +--- ispc-1.17.0.org/cmake/GenerateBuiltins.cmake 2022-01-15 11:35:15.000000000 +0300 ++++ ispc-1.17.0/cmake/GenerateBuiltins.cmake 2025-08-17 23:51:29.551323047 +0300 @@ -124,6 +124,8 @@ if ("${bit}" STREQUAL "32" AND ${arch} STREQUAL "x86") diff --git a/build-blender.sh b/build-blender.sh index 897a2ad..3a70a16 100755 --- a/build-blender.sh +++ b/build-blender.sh @@ -20,24 +20,27 @@ cd ${BASE_PATH}/blender #sed -e 's@set(MESA_URI .*@set(MESA_URI https://archive.mesa3d.org/older-versions/21.x/mesa-${MESA_VERSION}.tar.xz)@g' -i build_files/build_environment/cmake/versions.cmake #sed -e 's@set(FRIBIDI_URI .*@set(FRIBIDI_URI https://github.com/fribidi/fribidi/archive/refs/tags/${FRIBIDI_VERSION}.tar.gz)@g' -i build_files/build_environment/cmake/versions.cmake #sed -e 's@set(FRIBIDI_FILE .*@set(FRIBIDI_FILE fribidi-${FRIBIDI_VERSION}.tar.gz)@g' -i build_files/build_environment/cmake/versions.cmake +ARM_DEFS= if [ x$CPU = xaarch64 ]; then +ARM_DEFS="-DBLENDER_PLATFORM_ARM=ON" python3 ./build_files/utils/make_update.py --architecture arm64 else python3 ./build_files/utils/make_update.py fi cd ${BASE_PATH} - cmake -S ${DEPS_SRC} -B ${DEPS_BUILD} \ -DHARVEST_TARGET=${DEPS_INSTALL} \ - -DBLENDER_PLATFORM_ARM=ON + ${ARM_DEFS} +export VERBOSE=1 cd ${DEPS_BUILD} && make install && cd ${BASE_PATH} cmake -S ${BLENDER_SRC} -B ${BLENDER_BUILD} \ -C${BLENDER_DIR}/build_files/cmake/config/blender_release.cmake \ - -DBLENDER_PLATFORM_ARM=ON \ + ${ARM_DEFS} \ -DWITH_CYCLES_EMBREE=OFF \ -DLIBDIR=${BASE_PATH}/lib/lib_${CPU} +export VERBOSE=1 cd ${BLENDER_BUILD} && make && make install && \ make package_archive && cd ${BASE_PATH} mkdir -p prebuilts diff --git a/prebuilts/Blender-3.6-unknown-linux-x86_64.tar.xz b/prebuilts/Blender-3.6-unknown-linux-x86_64.tar.xz new file mode 100644 index 0000000..242e206 --- /dev/null +++ b/prebuilts/Blender-3.6-unknown-linux-x86_64.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68630d5aa25541a10b41dbc11a484ac827342348a3d5100e6862e1e2de284b0e +size 256464000