mirror of
https://github.com/blender/blender
synced 2026-10-25 03:07:01 +03:00
f7d920a89b
This commit includes new minimum compiler requirements for Blender 5.1 as well as updated and new libraries. **New compiler requirements** * Windows x64: Visual Studio 2022 (17.14.14 or newer) * Windows arm64: Visual Studio 2022 (17.14.23 or newer) * Linux x64: gcc 14 (when used with our libraries) **New libraries** Abseil 20250814.1 ThorVG 1.0.0-pre31 OpenJPH 0.25.2 **Updated libraries** AOM 3.13.1 Expat 2.7.2 FFI 3.5.2 HIPRT 606b4886efabce918dd0634ef71c06615a47c83b Imath 3.2.2 ISPC 1.29.1 libheif 1.20.2 MaterialX 1.39.4 MESON 1.9.0 minizip-ng 4.0.10 Numpy 2.3.4 oneAPI Level Zero 1.21.9 OneTBB 2022.3.0 OpenColorIO 2.5.0 OpenEXR 3.4.3 OpenImageDenoise 2.4.1 OpenImageIO 3.1.7 OpenSubDiv 3.7.0 OpenVDB 13.0.0 OpenXR 1.1.53 PIP 25.2 Python 3.13.9 ShaderC 2025.4 Vulkan 1.4.328 webp 1.6.0 Yaml CPP 0.8.0 ZSTD 1.5.7 (z-standard 0.25.0) **Library changes** FMT (moved from /extern to libs) Ceres (updated version in lib, will be removed from /extern in a later commit) Eigen (updated version in lib, will be removed from /extern in a later commit)) Ref #147201 Co-authored-by: Nikita Sirgienko <nikita.sirgienko@intel.com> Co-authored-by: Ray Molenkamp <github@lazydodo.com> Co-authored-by: Sebastian Parborg <sebastian@blender.org> Co-authored-by: Anthony Roberts <anthony.roberts@linaro.org> Co-authored-by: Jonas Holzman <jonas@holzman.fr> Co-authored-by: Bart van der Braak <bart@blender.org> Pull Request: https://projects.blender.org/blender/blender/pulls/149852
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
commit 6d2b7f71b98bfa28e372b1f2d85f137280bdb3de
|
|
Author: James Zern <jzern@google.com>
|
|
Date: Tue Oct 7 14:08:44 2025 -0700
|
|
|
|
cmake: fix nasm detection w/3.0
|
|
|
|
nasm 3.0 separated Oflags (-Ox) output to `-hO` which is used to
|
|
validate the nasm binary. This change is compatible with older versions
|
|
(tested with NASM version 2.16.03 & 2.13.02).
|
|
|
|
Bug: aomedia:448994065
|
|
Fixed: aomedia:448994065
|
|
Change-Id: I704dcfe39ac6e68bc4d5b9e409fb59a0d277170e
|
|
|
|
diff --git a/build/cmake/aom_optimization.cmake b/build/cmake/aom_optimization.cmake
|
|
index 9cc34de362..2750a0be41 100644
|
|
--- a/build/cmake/aom_optimization.cmake
|
|
+++ b/build/cmake/aom_optimization.cmake
|
|
@@ -212,7 +212,7 @@ endfunction()
|
|
# Currently checks only for presence of required object formats and support for
|
|
# the -Ox argument (multipass optimization).
|
|
function(test_nasm)
|
|
- execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hf
|
|
+ execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hO
|
|
OUTPUT_VARIABLE nasm_helptext)
|
|
|
|
if(NOT "${nasm_helptext}" MATCHES "-Ox")
|
|
@@ -220,6 +220,8 @@ function(test_nasm)
|
|
FATAL_ERROR "Unsupported nasm: multipass optimization not supported.")
|
|
endif()
|
|
|
|
+ execute_process(COMMAND ${CMAKE_ASM_NASM_COMPILER} -hf
|
|
+ OUTPUT_VARIABLE nasm_helptext)
|
|
if("${AOM_TARGET_CPU}" STREQUAL "x86")
|
|
if("${AOM_TARGET_SYSTEM}" STREQUAL "Darwin")
|
|
if(NOT "${nasm_helptext}" MATCHES "macho32")
|