mirror of
https://github.com/blender/blender
synced 2026-10-25 03:07:01 +03:00
d5d927b670
### New libraries - meshoptimizer v1.0 - tomli-w 1.2.0 - Tracy 0.13.1 ### Updates of existing libraries - OpenShadingLanguage 1.15.3.0 - OpenPGL 0.7.1 - ThorVG 1.0.3 - OpenUSD 26.03 - OpenImageIO 3.1.13.1 - libpng 1.6.58 - DPC++ 6.3.0 - Embree 4.4.1 - Intel Graphics Compiler v2.30.1 - Manifold 3.4.1 - x265 4.1 - ROCm / HIP 7.1.1 / 7.1.51803 - libexpat 2.7.5 - libtiff 4.7.1 - mesa 25.3.6 - OpenEXR 3.4.10 - OpenSSL 3.5.6 - Python 3.13.13 - sqlite 3.51.3 - libxml2 2.14.6 - ffmpeg 8.1 - Draco 1.5.7 - SDL 3.4.2 Library changes tracking issue ref: #153974 Co-authored-by: Sebastian Parborg <sebastian@blender.org> Co-authored-by: Ray Molenkamp <github@lazydodo.com> Co-authored-by: Sahar A. Kashi <salipour@noreply.localhost> Co-authored-by: Nikita Sirgienko <nikita.sirgienko@intel.com> Co-authored-by: Bart van der Braak <bart@blender.org> Co-authored-by: Thomas Dinges <thomas@blender.org> Co-authored-by: Alaska <Alaskayou01@gmail.com> Pull Request: https://projects.blender.org/blender/blender/pulls/157180
49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
|
|
index c74db2179..bb8fb3c29 100755
|
|
--- a/source/CMakeLists.txt
|
|
+++ b/source/CMakeLists.txt
|
|
@@ -378,7 +378,7 @@ if(GCC)
|
|
endif()
|
|
endif()
|
|
endif(ENABLE_AGGRESSIVE_CHECKS)
|
|
- execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE CC_VERSION)
|
|
+ #execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE CC_VERSION)
|
|
endif(GCC)
|
|
|
|
find_package(Nasm)
|
|
diff --git a/source/dynamicHDR10/CMakeLists.txt b/source/dynamicHDR10/CMakeLists.txt
|
|
index 22fb79d44..ad0f3a7a8 100644
|
|
--- a/source/dynamicHDR10/CMakeLists.txt
|
|
+++ b/source/dynamicHDR10/CMakeLists.txt
|
|
@@ -140,7 +140,7 @@ if(GCC)
|
|
endif()
|
|
endif()
|
|
endif(ENABLE_AGGRESSIVE_CHECKS)
|
|
- execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE CC_VERSION)
|
|
+ #execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE CC_VERSION)
|
|
endif(GCC)
|
|
|
|
# Build options
|
|
diff --git a/source/common/cpu.cpp b/source/common/cpu.cpp
|
|
index ae0907890..4d4c7dd97 100644
|
|
--- a/source/common/cpu.cpp
|
|
+++ b/source/common/cpu.cpp
|
|
@@ -61,6 +61,10 @@ static void sigill_handler(int sig)
|
|
|
|
#endif // if X265_ARCH_ARM
|
|
|
|
+#if X265_ARCH_ARM64
|
|
+#include "aarch64/cpu.h"
|
|
+#endif // if X265_ARCH_ARM64
|
|
+
|
|
namespace X265_NS {
|
|
static bool enable512 = false;
|
|
const cpu_name_t cpu_names[] =
|
|
@@ -390,7 +394,6 @@ uint32_t cpu_detect(bool benableavx512)
|
|
}
|
|
|
|
#elif X265_ARCH_ARM64
|
|
-#include "aarch64/cpu.h"
|
|
|
|
uint32_t cpu_detect(bool benableavx512)
|
|
{
|