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
23 lines
1 KiB
Diff
23 lines
1 KiB
Diff
diff -Naur orig/CMakeLists.txt external_openimageio/CMakeLists.txt
|
|
--- orig/CMakeLists.txt 2020-05-10 21:43:52 -0600
|
|
+++ external_openimageio/CMakeLists.txt 2020-05-13 17:03:35 -0600
|
|
@@ -237,7 +237,7 @@
|
|
add_subdirectory (src/iinfo)
|
|
add_subdirectory (src/maketx)
|
|
add_subdirectory (src/oiiotool)
|
|
- add_subdirectory (src/testtex)
|
|
+ #add_subdirectory (src/testtex)
|
|
add_subdirectory (src/iv)
|
|
endif ()
|
|
|
|
diff -Naur orig/src/cmake/compiler.cmake external_openimageio/src/cmake/compiler.cmake
|
|
--- orig/src/cmake/compiler.cmake 2020-05-10 21:43:52 -0600
|
|
+++ external_openimageio/src/cmake/compiler.cmake 2020-05-13 17:02:54 -0600
|
|
@@ -204,6 +204,7 @@ if (MSVC)
|
|
add_compile_definitions (_CRT_NONSTDC_NO_WARNINGS)
|
|
add_compile_definitions (_SCL_SECURE_NO_WARNINGS)
|
|
add_compile_definitions (JAS_WIN_MSVC_BUILD)
|
|
+ add_compile_definitions (OPJ_STATIC)
|
|
# https://github.com/AcademySoftwareFoundation/OpenImageIO/issues/4641#issuecomment-2725013661
|
|
add_compile_definitions (_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR)
|
|
endif (MSVC)
|